<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173563] branches/safari-600.1-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173563">173563</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 10:17:10 -0700 (Fri, 12 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173544">r173544</a>. rdar://problem/18195616</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageFocusControllercpp">branches/safari-600.1-branch/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageFocusControllerh">branches/safari-600.1-branch/Source/WebCore/page/FocusController.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageFrameViewcpp">branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageFrameViewh">branches/safari-600.1-branch/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepagePagecpp">branches/safari-600.1-branch/Source/WebCore/page/Page.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-09-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173544
+
+ 2014-09-11 Beth Dakin <bdakin@apple.com>
+
+ WebKit scrollbars flash in non-dominant spaces when entering Mission Control
+ https://bugs.webkit.org/show_bug.cgi?id=136761
+ -and corresponding-
+ rdar://problem/18195616
+
+ Reviewed by Tim Horton.
+
+ This patch makes our logic about when to call ScrollableArea::contentAreaDidHide/
+ Show match the logic in AppKit. We only want these notifications when the window
+ has become both visible and active (or lost both, in the case of hide).
+
+ Re-name setIsVisibleInternal() to setIsVisibleAndActiveInternal(), and call it
+ only when both visibility and active-state have changed.
+ * page/FocusController.cpp:
+ (WebCore::FocusController::setViewState):
+ (WebCore::FocusController::setIsVisibleAndActiveInternal):
+ (WebCore::FocusController::setIsVisibleInternal): Deleted.
+ * page/FocusController.h:
+
+ FocusController::setViewState() is the only place that needs to call
+ ScrollableArea::contentAreaDidHide/Show, so remove these callers.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::didMoveOnscreen): Deleted.
+ (WebCore::FrameView::willMoveOffscreen): Deleted.
+ * page/FrameView.h:
+ * page/Page.cpp:
+ (WebCore::Page::setIsVisibleInternal):
+
+2014-09-12 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r173533
</span><span class="cx">
</span><span class="cx"> 2014-09-11 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/FocusController.cpp (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/FocusController.cpp 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/page/FocusController.cpp 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -645,10 +645,11 @@
</span><span class="cx">
</span><span class="cx"> if (changed & ViewState::IsFocused)
</span><span class="cx"> setFocusedInternal(viewState & ViewState::IsFocused);
</span><del>- if (changed & ViewState::WindowIsActive)
</del><ins>+ if (changed & ViewState::WindowIsActive) {
</ins><span class="cx"> setActiveInternal(viewState & ViewState::WindowIsActive);
</span><del>- if (changed & ViewState::IsVisible)
- setIsVisibleInternal(viewState & ViewState::IsVisible);
</del><ins>+ if (changed & ViewState::IsVisible)
+ setIsVisibleAndActiveInternal(viewState & ViewState::WindowIsActive);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FocusController::setActive(bool active)
</span><span class="lines">@@ -679,7 +680,7 @@
</span><span class="cx"> scrollableArea->contentAreaDidHide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FocusController::setIsVisibleInternal(bool contentIsVisible)
</del><ins>+void FocusController::setIsVisibleAndActiveInternal(bool contentIsVisible)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* view = m_page.mainFrame().view();
</span><span class="cx"> if (!view)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageFocusControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/FocusController.h (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/FocusController.h 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/page/FocusController.h 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void setActiveInternal(bool);
</span><span class="cx"> void setFocusedInternal(bool);
</span><del>- void setIsVisibleInternal(bool);
</del><ins>+ void setIsVisibleAndActiveInternal(bool);
</ins><span class="cx">
</span><span class="cx"> bool advanceFocusDirectionally(FocusDirection, KeyboardEvent*);
</span><span class="cx"> bool advanceFocusInDocumentOrder(FocusDirection, KeyboardEvent*, bool initialFocus);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -1032,16 +1032,6 @@
</span><span class="cx"> return !renderView || !renderView->compositor().has3DContent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::didMoveOnscreen()
-{
- contentAreaDidShow();
-}
-
-void FrameView::willMoveOffscreen()
-{
- contentAreaDidHide();
-}
-
</del><span class="cx"> void FrameView::setIsInWindow(bool isInWindow)
</span><span class="cx"> {
</span><span class="cx"> if (RenderView* renderView = this->renderView())
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/FrameView.h (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/FrameView.h 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/page/FrameView.h 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -177,8 +177,6 @@
</span><span class="cx"> // a faithful representation of the content.
</span><span class="cx"> bool isSoftwareRenderable() const;
</span><span class="cx">
</span><del>- void didMoveOnscreen();
- void willMoveOffscreen();
</del><span class="cx"> void setIsInWindow(bool);
</span><span class="cx">
</span><span class="cx"> void resetScrollbars();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/Page.cpp (173562 => 173563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/Page.cpp 2014-09-12 17:11:23 UTC (rev 173562)
+++ branches/safari-600.1-branch/Source/WebCore/page/Page.cpp 2014-09-12 17:17:10 UTC (rev 173563)
</span><span class="lines">@@ -1253,11 +1253,6 @@
</span><span class="cx"> if (isVisible) {
</span><span class="cx"> m_isPrerender = false;
</span><span class="cx">
</span><del>- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (FrameView* frameView = frame->view())
- frameView->didMoveOnscreen();
- }
-
</del><span class="cx"> resumeScriptedAnimations();
</span><span class="cx">
</span><span class="cx"> if (FrameView* view = mainFrame().view())
</span><span class="lines">@@ -1280,11 +1275,6 @@
</span><span class="cx"> if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
</span><span class="cx"> mainFrame().animation().suspendAnimations();
</span><span class="cx">
</span><del>- for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (FrameView* frameView = frame->view())
- frameView->willMoveOffscreen();
- }
-
</del><span class="cx"> suspendScriptedAnimations();
</span><span class="cx">
</span><span class="cx"> if (FrameView* view = mainFrame().view())
</span></span></pre>
</div>
</div>
</body>
</html>