<!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>[184269] branches/safari-601.1.32-branch</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/184269">184269</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 22:34:21 -0700 (Tue, 12 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix horked ChangeLogs</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsChangeLog">branches/safari-601.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEChangeLog">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyChangeLog">branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWTFChangeLog">branches/safari-601.1.32-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebInspectorUIChangeLog">branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitChangeLog">branches/safari-601.1.32-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacChangeLog">branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitwinChangeLog">branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchToolsChangeLog">branches/safari-601.1.32-branch/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184116. rdar://problem/20774613
</span><span class="cx"> 
</span><span class="lines">@@ -15,65 +13,61 @@
</span><span class="cx">             * http/tests/contentextensions/domain-rules.html: Added.
</span><span class="cx">             * http/tests/contentextensions/domain-rules.html.json: Added.
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r183943. rdar://problem/19913748
</del><ins>+        Merge r183943. rdar://problem/19913748
</ins><span class="cx"> 
</span><del>-        2015-05-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</del><ins>+    2015-05-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Remove the WK1-only code path for independently composited iframes
-                https://bugs.webkit.org/show_bug.cgi?id=144722
</del><ins>+            Remove the WK1-only code path for independently composited iframes
+            https://bugs.webkit.org/show_bug.cgi?id=144722
</ins><span class="cx"> 
</span><del>-                Reviewed by Dean Jackson.
</del><ins>+            Reviewed by Dean Jackson.
</ins><span class="cx"> 
</span><del>-                Results different from WK2, because WK1 does not make layers for scrollbars.
</del><ins>+            Results different from WK2, because WK1 does not make layers for scrollbars.
</ins><span class="cx"> 
</span><del>-                * platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt: Added.
</del><ins>+            * platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt: Added.
</ins><span class="cx"> 
</span><del>-        2015-05-12  Dana Burkart
-        Dana Burkart  &lt;dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Merge r183942. rdar://problem/20049088
</del><ins>+        Merge r183942. rdar://problem/20049088
</ins><span class="cx"> 
</span><del>-            2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</del><ins>+    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                    Handle backdrop views that have to tile
-                    https://bugs.webkit.org/show_bug.cgi?id=142317
-                    &lt;rdar://problem/20049088&gt;
</del><ins>+            Handle backdrop views that have to tile
+            https://bugs.webkit.org/show_bug.cgi?id=142317
+            &lt;rdar://problem/20049088&gt;
</ins><span class="cx"> 
</span><del>-                    Reviewed by Simon Fraser.
</del><ins>+            Reviewed by Simon Fraser.
</ins><span class="cx"> 
</span><del>-                    Take 2 - this was rolled out because Mavericks was crashing.
</del><ins>+            Take 2 - this was rolled out because Mavericks was crashing.
</ins><span class="cx"> 
</span><del>-                    A test that creates some backdrop views, then makes them
-                    big enough that it would trigger tiling (which we don't want
-                    to happen).
</del><ins>+            A test that creates some backdrop views, then makes them
+            big enough that it would trigger tiling (which we don't want
+            to happen).
</ins><span class="cx"> 
</span><del>-                    * compositing/media-controls-bar-appearance-big-expected.txt: Added.
-                    * compositing/media-controls-bar-appearance-big.html: Added.
-                    * platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
</del><ins>+            * compositing/media-controls-bar-appearance-big-expected.txt: Added.
+            * compositing/media-controls-bar-appearance-big.html: Added.
+            * platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
</ins><span class="cx"> 
</span><del>-            2015-05-12  Dana Burkart
-            Dana Burkart  &lt;dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                    Merge r183894. rdar://problem/20049088
</del><ins>+        Merge r183894. rdar://problem/20049088
</ins><span class="cx"> 
</span><del>-                2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</del><ins>+    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                        Handle backdrop views that have to tile
-                        https://bugs.webkit.org/show_bug.cgi?id=142317
-                        &lt;rdar://problem/20049088&gt;
</del><ins>+            Handle backdrop views that have to tile
+            https://bugs.webkit.org/show_bug.cgi?id=142317
+            &lt;rdar://problem/20049088&gt;
</ins><span class="cx"> 
</span><del>-                        Reviewed by Simon Fraser.
</del><ins>+            Reviewed by Simon Fraser.
</ins><span class="cx"> 
</span><del>-                        A test that creates some backdrop views, then makes them
-                        big enough that it would trigger tiling (which we don't want
-                        to happen).
</del><ins>+            A test that creates some backdrop views, then makes them
+            big enough that it would trigger tiling (which we don't want
+            to happen).
</ins><span class="cx"> 
</span><del>-                        * compositing/media-controls-bar-appearance-big-expected.txt: Added.
-                        * compositing/media-controls-bar-appearance-big.html: Added.
</del><ins>+            * compositing/media-controls-bar-appearance-big-expected.txt: Added.
+            * compositing/media-controls-bar-appearance-big.html: Added.
</ins><span class="cx"> 
</span><span class="cx"> 2015-05-06  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WTF/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WTF/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WTF/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,674 +1,3 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
-
-        Merge r184226. rdar://problem/20707307
-
-    2015-05-12  Brent Fulgham  &lt;bfulgham@apple.com&gt;
-
-            [Win] Update DXSDK_DIR settings for build system.
-
-            Unreviewed build fix.
-
-            * WebCore.vcxproj/WebCore.proj: Add DXSDK_DIR definition for builder.
-
-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
-
-            Merge r184207. rdar://problem/20707307
-
-        2015-05-12  Brent Fulgham  &lt;bfulgham@apple.com&gt;
-
-                [Win] Unreviewed build fix for older DirectX build environments.
-
-                * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Switch back to our
-                d3d stub header to avoid build failures on July 2004 DXSDK build environments.
-
-        2015-05-12  Dana Burkart
-        Dana Burkart  &lt;dburkart@apple.com
-        dburkart@apple.com&gt;
-
-                Merge r184140. rdar://problem/20907253
-
-            2015-05-11  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-                    [Mac] Update device picker icon when video tracks change
-                    https://bugs.webkit.org/show_bug.cgi?id=144889
-                    &lt;rdar://problem/20907253&gt;
-
-                    Reviewed by Brent Fulgham.
-
-                    * Modules/mediacontrols/mediaControlsApple.js:
-                    (Controller.prototype.updateHasVideo):
-
-            2015-05-12  Dana Burkart
-            Dana Burkart  &lt;dburkart@apple.com
-            dburkart@apple.com&gt;
-
-                    Merge r184139. rdar://problem/20125088
-
-                2015-05-11  Brent Fulgham  &lt;bfulgham@apple.com&gt;
-
-                        Scroll snap logic should be triggered when resizing the WebView
-                        https://bugs.webkit.org/show_bug.cgi?id=142590
-                        &lt;rdar://problem/20125088&gt;
-
-                        Reviewed by Simon Fraser.
-
-                        Tests coming in a second patch.
-
-                        Resizing of the main frame or overflow regions was properly recalculating the scroll snap points,
-                        but there was no code to honor these values when window resizing was occurring. The correction was
-                        handled in two ways:
-                        1. Scrolling thread operations that moved to new snap points needed to notify the main thread that
-                           it had shifted to a new snap point, so that the resize code (which happens on the main thread)
-                           could ensure that we stayed clamped to the correct 'tile' in the snap region.
-                        2. Main thread (overflow) resizes were likewise missing code to honor the current snap position
-                           after resizing calculations were complete.
-
-                        This change also required the addition of two indices to the scrollable area to track which scroll
-                        snap point was currently being used. We don't bother with a 'none' case because you cannot have a
-                        'none' state when you have an active set of scroll snap points, and we do not execute this code
-                        if the scroll snap points are null.
-
-                        The FrameView code was computing updated snap offsets after it had dispatched frame view layout
-                        information to the scrolling thread, which was wrong. This was also corrected.
-
-                        I think it might be possible to track all of this state inside the ScrollController, but the current
-                        scroll snap architecture destroys and recreates the state each time a new set of interactions starts.
-                        This should be fixed in the future, which would allow us to remove some of this local state.
-
-                        * page/FrameView.cpp:
-                        (WebCore::FrameView::performPostLayoutTasks): Make sure 'updateSnapOffsets' is called prior to
-                        calling 'frameViewLayoutUpdated' so the scrolling thread gets correct updated points. Add a new
-                        call to 'scrollToNearestActiveSnapPoint', which will keep us on our current snap point during
-                        resize (if appropriate).
-                        * page/scrolling/AsyncScrollingCoordinator.cpp:
-                        (WebCore::AsyncScrollingCoordinator::updateScrollSnapOffsetIndices): Added. This finds and notifies
-                        the correct scroll region when a new snap position (index) has been selected by user interaction on
-                        the scrolling thread.
-                        (WebCore::AsyncScrollingCoordinator::deferTestsForReason): Added an assertion for 'isMainThread'.
-                        (WebCore::AsyncScrollingCoordinator::removeTestDeferralForReason): Ditto.
-                        * page/scrolling/AsyncScrollingCoordinator.h:
-                        * page/scrolling/AxisScrollSnapOffsets.h:
-                        (WebCore::closestSnapOffset): Modified to also return the selected snap point index so we can track
-                        it to handle resize operations.
-                        * page/scrolling/ScrollingTree.h:
-                        (WebCore::ScrollingTree::updateScrollSnapOffsetIndices):
-                        * page/scrolling/ThreadedScrollingTree.cpp:
-                        (WebCore::ThreadedScrollingTree::updateScrollSnapOffsetIndices): Added method to dispatch the active
-                        horizontal and vertical scroll snap indices back to the main thread.
-                        * page/scrolling/ThreadedScrollingTree.h:
-                        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
-                        (WebCore::ScrollingTreeFrameScrollingNodeMac::handleWheelEvent): After the scroll controller processes
-                        the current event, notify the main thread of any change in the active scroll snap index.
-                        * platform/ScrollAnimator.cpp:
-                        (WebCore::ScrollAnimator::activeScrollSnapOffsetIndexDidChange): Added method to allow ScrollAnimator
-                        clients to find out about the current scroll snap state, which is only known by the ScrollController.
-                        (WebCore::ScrollAnimator::activeScrollSnapOffsetIndexForAxis): Ditto.
-                        * platform/ScrollAnimator.h:
-                        * platform/ScrollView.cpp:
-                        (WebCore::ScrollView::scrollToNearestActiveSnapPoint): Added method that allows us to set scroll position
-                        to one of our active scroll snap offsets.
-                        * platform/ScrollView.h:
-                        * platform/ScrollableArea.cpp:
-                        (WebCore::ScrollableArea::handleWheelEvent): If the active scroll snap offset has changed, make sure we
-                        keep track of the new values for potential resize operations.
-                        (WebCore::ScrollableArea::clearHorizontalSnapOffsets): Make sure to also clear out the current snap index.
-                        (WebCore::ScrollableArea::clearVerticalSnapOffsets): Ditto.
-                        (WebCore::ScrollableArea::nearestActiveSnapPoint): New method that returns an updated IntPoint reflecting
-                        the proper scroll position based on the active scroll snap offset.
-                        * platform/ScrollableArea.h:
-                        (WebCore::ScrollableArea::currentHorizontalSnapPointIndex): Added.
-                        (WebCore::ScrollableArea::setCurrentHorizontalSnapPointIndex): Added.
-                        (WebCore::ScrollableArea::currentVerticalSnapPointIndex): Added.
-                        (WebCore::ScrollableArea::setCurrentVerticalSnapPointIndex): Added.
-                        (WebCore::ScrollableArea::scrollToNearestActiveSnapPoint): Added.
-                        * platform/cocoa/ScrollController.h:
-                        (WebCore::ScrollControllerClient::activeScrollOffsetIndex): Added new method for clients to implement.
-                        (WebCore::ScrollController::activeScrollSnapOffsetIndexDidChange): Added.
-                        (WebCore::ScrollController::setScrollSnapOffsetIndexDidChange): Added.
-                        * platform/cocoa/ScrollController.mm:
-                        (WebCore::ScrollController::activeScrollSnapOffsetIndexForAxis): Helper method to return current active
-                        index (if applicable).
-                        (WebCore::ScrollController::setActiveScrollSnapOffsetIndexForAxis): Helper function to safely set
-                        the current active index.
-                        (WebCore::ScrollController::beginScrollSnapAnimation): Updated to keep track of the new active scroll snap
-                        index, as well as whether the current animation actually changed the active snap point offset.
-                        * platform/cocoa/ScrollSnapAnimatorState.h: Revise to use modern C++ initializers, and to track a new index
-                        that represents the current scroll snap offset.
-                        * platform/cocoa/ScrollSnapAnimatorState.mm:
-                        (WebCore::ScrollSnapAnimatorState::ScrollSnapAnimatorState): Update for modern C++ syntax.
-                        * rendering/RenderLayer.cpp:
-                        (WebCore::RenderLayer::scrollToNearestActiveSnapPoint): New method to set scroll position to be one of our
-                        active scroll snap points.
-                        (WebCore::RenderLayer::updateScrollInfoAfterLayout): Add a new call to 'scrollToNearestActiveSnapPoint' so that
-                        we stay on the current scroll snap offset during resizing.
-                        * rendering/RenderLayer.h:
-
-                2015-05-12  Dana Burkart
-                Dana Burkart  &lt;dburkart@apple.com
-                dburkart@apple.com&gt;
-
-                        Merge r184137. rdar://problem/20707307
-
-                    2015-05-11  Brent Fulgham  &lt;bfulgham@apple.com&gt;
-
-                            [Win] Move Windows build target to Windows 7 (or newer)
-                            https://bugs.webkit.org/show_bug.cgi?id=144890
-                            &lt;rdar://problem/20707307&gt;
-
-                            Reviewed by Anders Carlsson.
-
-                            Update linked SDK and minimal Windows level to be compatible with
-                            Windows 7 or newer.
-
-                            * WebCore.vcxproj/WebCore.vcxproj:
-                            * WebCore.vcxproj/WebCoreGenerated.vcxproj:
-                            * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
-                            * WebCorePrefix.h:
-                            * config.h:
-                            * testing/js/WebCoreTestSupportPrefix.h:
-
-                    2015-05-12  Dana Burkart
-                    Dana Burkart  &lt;dburkart@apple.com
-                    dburkart@apple.com&gt;
-
-                            Merge r184116. rdar://problem/20774613
-
-                        2015-05-11  Alex Christensen  &lt;achristensen@webkit.org&gt;
-
-                                [Content Extensions] Support domain-specific rules and exceptions.
-                                https://bugs.webkit.org/show_bug.cgi?id=144833
-
-                                Reviewed by Darin Adler.
-
-                                Test: http/tests/contentextensions/domain-rules.html
-                                (And lots of API tests)
-
-                                This patch adds if-domain and unless-domain to the trigger in the JSON format.
-                                if-domain makes the rule apply only to domains in the list.
-                                unless-domain makes the rule apply to domains that are not in the list.
-
-                                All rules without if-domain or unless-domain are compiled into a set of DFAs.  This behavior is unchanged.
-                                All rules with if-domain or unless-domain are compiled into a separate set of DFAs.
-                                The domains are also compiled into another set of DFAs.  This makes 3 arrays of DFA bytecode instead of 1.
-
-                                If there are no domain specific rules, there is no change in behavior.
-                                If there are domain specific rules, the URL will be checked for matches in both
-                                filtersWithoutDomainsBytecode and filtersWithDomainsBytecode.  If there are matches from
-                                filtersWithDomainsBytecode then the domain of the main document will be checked with
-                                domainFiltersBytecode to see which of the matches applies to this domain.
-
-                                * contentextensions/CombinedURLFilters.cpp:
-                                (WebCore::ContentExtensions::CombinedURLFilters::isEmpty):
-                                (WebCore::ContentExtensions::CombinedURLFilters::addDomain):
-                                * contentextensions/CombinedURLFilters.h:
-                                Added addDomain, which adds characters from a domain to the prefix tree directly without using YARR.
-                                * contentextensions/CompiledContentExtension.cpp:
-                                (WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
-                                * contentextensions/CompiledContentExtension.h:
-                                * contentextensions/ContentExtensionCompiler.cpp:
-                                (WebCore::ContentExtensions::serializeActions):
-                                (WebCore::ContentExtensions::compileRuleList):
-                                Separate the rules into rules with domains and rules without domains and compile to bytecode.
-                                * contentextensions/ContentExtensionCompiler.h:
-                                Updated compiler interface to reflect the slightly more complicated structure.
-                                * contentextensions/ContentExtensionError.cpp:
-                                (WebCore::ContentExtensions::contentExtensionErrorCategory):
-                                * contentextensions/ContentExtensionError.h:
-                                Added new parsing errors.
-                                * contentextensions/ContentExtensionParser.cpp:
-                                (WebCore::ContentExtensions::getDomainList):
-                                (WebCore::ContentExtensions::loadTrigger):
-                                (WebCore::ContentExtensions::loadEncodedRules):
-                                * contentextensions/ContentExtensionRule.h:
-                                (WebCore::ContentExtensions::Trigger::operator==):
-                                Parse the new domain structures from JSON into the Trigger structure.
-                                * contentextensions/ContentExtensionsBackend.cpp:
-                                (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
-                                Interpret as much bytecode as necessary to determine which rules apply to this URL and domain.
-                                * contentextensions/DFABytecode.h:
-                                (WebCore::ContentExtensions::instructionSizeWithArguments):
-                                * contentextensions/DFABytecodeCompiler.cpp:
-                                (WebCore::ContentExtensions::DFABytecodeCompiler::emitAppendAction):
-                                (WebCore::ContentExtensions::DFABytecodeCompiler::emitTestFlagsAndAppendAction):
-                                (WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):
-                                * contentextensions/DFABytecodeCompiler.h:
-                                * contentextensions/DFABytecodeInterpreter.cpp:
-                                (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretAppendAction):
-                                (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretTestFlagsAndAppendAction):
-                                (WebCore::ContentExtensions::DFABytecodeInterpreter::actionsFromDFARoot):
-                                (WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
-                                * contentextensions/DFABytecodeInterpreter.h:
-                                * loader/ResourceLoadInfo.h:
-                                Keep track of which actions have an if-domain trigger.  If an action is in the
-                                filtersWithDomainsBytecode, then it either has an if-domain or an unless-domain in its trigger.
-                                This requires additional information in the bytecode, so there are two new bytecode types.
-
-                        2015-05-12  Dana Burkart
-                        Dana Burkart  &lt;dburkart@apple.com
-                        dburkart@apple.com&gt;
-
-                                Merge r184104. rdar://problem/20727702
-
-                            2015-05-11  Antti Koivisto  &lt;antti@apple.com&gt;
-
-                                    WebContent crash under com.apple.WebCore: WebCore::WebKitCSSResourceValue::isCSSValueNone const + 6
-                                    https://bugs.webkit.org/show_bug.cgi?id=144870
-                                    rdar://problem/20727702
-
-                                    Reviewed by Simon Fraser.
-
-                                    No repro but we are seeing null pointer crashes like this:
-
-                                    Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
-                                    0   com.apple.WebCore   0x00007fff92da5706 WebCore::WebKitCSSResourceValue::isCSSValueNone() const + 6
-                                    1   com.apple.WebCore   0x00007fff93382b48 WebCore::MaskImageOperation::isCSSValueNone() const + 24
-                                    2   com.apple.WebCore   0x00007fff92e0475e WebCore::FillLayer::hasNonEmptyMaskImage() const + 30
-
-                                    * platform/graphics/MaskImageOperation.cpp:
-                                    (WebCore::MaskImageOperation::MaskImageOperation):
-                                    (WebCore::MaskImageOperation::isCSSValueNone):
-
-                                        This would crash like this if both m_styleImage and m_cssMaskImageValue are null.
-                                        There are no obvious guarantees that this doesn't happen. Two of the constructor variants allow it
-                                        and there is setImage which may turn m_styleImage null later too.
-
-                                        Fix by making null m_cssMaskImageValue always signify CSSValueNone.
-
-                                    (WebCore::MaskImageOperation::cssValue):
-
-                            2015-05-12  Dana Burkart
-                            Dana Burkart  &lt;dburkart@apple.com
-                            dburkart@apple.com&gt;
-
-                                    Merge r184005. rdar://problem/20486538
-
-                                2015-05-08  Alexey Proskuryakov  &lt;ap@apple.com&gt;
-
-                                        Crashes in SocketStreamHandleBase::close
-                                        https://bugs.webkit.org/show_bug.cgi?id=144767
-                                        rdar://problem/20486538
-
-                                        Reviewed by Brady Eidson.
-
-                                        This is a speculative fix, I could not reproduce the crash.
-
-                                        * Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
-                                        Normally, processOutgoingFrameQueue() closes the handle in the end when called in
-                                        OutgoingFrameQueueClosing state. But there is no definitive protection against
-                                        processing two CLOSE frames, in which case we'd try to close the handle twice.
-
-                                        * platform/network/cf/SocketStreamHandleCFNet.cpp:
-                                        (WebCore::SocketStreamHandle::readStreamCallback): Passing empty data to the client
-                                        results in the socket being closed, which makes no sense here.
-
-                                2015-05-12  Dana Burkart
-                                Dana Burkart  &lt;dburkart@apple.com
-                                dburkart@apple.com&gt;
-
-                                        Merge r184001. rdar://problem/20862460
-
-                                    2015-05-08  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-                                            [Mac] Playback target clients do not unregister on page reload
-                                            https://bugs.webkit.org/show_bug.cgi?id=144761
-
-                                            Reviewed by Brady Eidson.
-
-                                            * dom/Document.cpp:
-                                            (WebCore::Document::prepareForDestruction): Unregister all target picker clients.
-
-                                            * html/HTMLMediaElement.cpp:
-                                            (WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
-                                            (WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
-                                            (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
-                                            (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
-
-                                    2015-05-12  Dana Burkart
-                                    Dana Burkart  &lt;dburkart@apple.com
-                                    dburkart@apple.com&gt;
-
-                                            Merge r183971. rdar://problem/20065572
-
-                                        2015-05-07  Dean Jackson  &lt;dino@apple.com&gt;
-
-                                                [iOS] MediaControls: disappear while scrubbing
-                                                https://bugs.webkit.org/show_bug.cgi?id=144777
-                                                &lt;rdar://problem/20065572&gt;
-
-                                                Reviewed by Eric Carlson.
-
-                                                If we are scrubbing we shouldn't hide the controls.
-
-                                                * Modules/mediacontrols/mediaControlsApple.js:
-                                                (Controller.prototype.hideControls): Return early if we are scrubbing.
-                                                * Modules/mediacontrols/mediaControlsiOS.js:
-                                                (ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
-                                                rename from non-underscored value throughout the file.
-                                                (ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
-                                                the timer to hide the controls.
-
-                                        2015-05-12  Dana Burkart
-                                        Dana Burkart  &lt;dburkart@apple.com
-                                        dburkart@apple.com&gt;
-
-                                                Merge r183970. rdar://problem/20769741
-
-                                            2015-05-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
-
-                                                    REGRESSION (r183300): Fixed elements flash when scrolling
-                                                    https://bugs.webkit.org/show_bug.cgi?id=144778
-                                                    rdar://problem/20769741
-
-                                                    Reviewed by Dean Jackson.
-
-                                                    After r183300 we can detached layer backing store when outside the coverage region.
-                                                    However, position:fixed layers are moved around by the ScrollingCoordinator behind
-                                                    GraphicsLayer's back, so we can do layer flushes with stale information about layer
-                                                    geometry.
-
-                                                    To avoid dropping backing store for layers in this situation, prevent backing
-                                                    store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
-                                                    layers. Preventing detachment on a layer also prevents detachment on all descendant
-                                                    layers.
-
-                                                    * platform/graphics/GraphicsLayer.h:
-                                                    (WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
-                                                    (WebCore::GraphicsLayer::allowsBackingStoreDetachment):
-                                                    * platform/graphics/ca/GraphicsLayerCA.cpp:
-                                                    (WebCore::GraphicsLayerCA::GraphicsLayerCA):
-                                                    (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
-                                                    if backing store detachment is prevented.
-                                                    (WebCore::GraphicsLayerCA::recursiveCommitChanges): Set a bit in the CommitState to
-                                                    communicate to descendants that detachment is prevented.
-                                                    * platform/graphics/ca/GraphicsLayerCA.h:
-                                                    (WebCore::GraphicsLayerCA::CommitState::CommitState): Deleted.
-                                                    * rendering/RenderLayerBacking.cpp:
-                                                    (WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
-                                                    * rendering/RenderLayerBacking.h:
-                                                    (WebCore::RenderLayerBacking::setScrollingNodeIDForRole): If registering with a non-zero
-                                                    nodeID for the ViewportConstrained role, turn off backing store detachment.
-
-                                            2015-05-12  Dana Burkart
-                                            Dana Burkart  &lt;dburkart@apple.com
-                                            dburkart@apple.com&gt;
-
-                                                    Merge r183965. rdar://problem/20866590
-
-                                                2015-05-07  Dean Jackson  &lt;dino@apple.com&gt;
-
-                                                        [iOS] While scrubbing and holding down, video continues to play
-                                                        https://bugs.webkit.org/show_bug.cgi?id=144776
-                                                        &lt;rdar://problem/20863757&gt;
-
-                                                        Reviewed by Simon Fraser.
-
-                                                        When we are scrubbing a video, we should pause playback. As we
-                                                        let go of the scrubber playback can resume (but only if it was
-                                                        playing originally).
-
-                                                        * Modules/mediacontrols/mediaControlsiOS.js:
-                                                        (ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
-                                                        (ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
-                                                        (ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
-                                                        (ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
-                                                        potentially about to scrub.
-                                                        (ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
-
-                                                2015-05-12  Dana Burkart
-                                                Dana Burkart  &lt;dburkart@apple.com
-                                                dburkart@apple.com&gt;
-
-                                                        Merge r183954. rdar://problem/20281886
-
-                                                    2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
-
-                                                            New force-related DOM events should fire in WK1 views
-                                                            https://bugs.webkit.org/show_bug.cgi?id=144663
-                                                            -and corresponding-
-                                                            rdar://problem/20281886
-
-                                                            Reviewed by Sam Weinig.
-
-                                                            All of the WK1 mouse events need to take the correspondingPressureEvent.
-                                                            * page/EventHandler.h:
-
-                                                            Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
-                                                            have accurate pressure information for all of the mouse events in subframes.
-                                                            * page/mac/EventHandlerMac.mm:
-                                                            (WebCore::correspondingPressureEventSlot):
-                                                            (WebCore::EventHandler::correspondingPressureEvent):
-                                                            (WebCore::CurrentEventScope::CurrentEventScope):
-                                                            (WebCore::CurrentEventScope::~CurrentEventScope):
-
-                                                            These events don’t have an associated pressure, so send nil for the
-                                                            correspondingPressureEvent.
-                                                            (WebCore::EventHandler::wheelEvent):
-                                                            (WebCore::EventHandler::keyEvent):
-
-                                                            Pipe through correspondingPressureEvent.
-                                                            (WebCore::EventHandler::mouseDown):
-                                                            (WebCore::EventHandler::mouseDragged):
-                                                            (WebCore::EventHandler::mouseUp):
-                                                            (WebCore::EventHandler::mouseMoved):
-
-                                                            New function to handle pressure change events.
-                                                            (WebCore::EventHandler::pressureChange):
-
-                                                            Pipe through correspondingPressureEvent.
-                                                            (WebCore::EventHandler::passMouseMovedEventToScrollbars):
-                                                            (WebCore::EventHandler::currentPlatformMouseEvent):
-
-                                                            Take the correspondingPressureEvent in order to build a PlatformMouseEvent with
-                                                            the correct pressure information.
-                                                            * platform/mac/PlatformEventFactoryMac.h:
-                                                            * platform/mac/PlatformEventFactoryMac.mm:
-                                                            (WebCore::globalPointForEvent):
-                                                            (WebCore::pointForEvent):
-                                                            (WebCore::mouseButtonForEvent):
-                                                            (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
-                                                            (WebCore::PlatformEventFactory::createPlatformMouseEvent):
-
-                                                    2015-05-12  Dana Burkart
-                                                    Dana Burkart  &lt;dburkart@apple.com
-                                                    dburkart@apple.com&gt;
-
-                                                            Merge r183953. rdar://problem/19997548
-
-                                                        2015-05-06  Roger Fong  &lt;roger_fong@apple.com&gt;
-
-                                                                Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
-                                                                https://bugs.webkit.org/show_bug.cgi?id=144700.
-                                                                &lt;rdar://problem/19997548&gt;
-
-                                                                Reviewed by Jer Noble.
-
-                                                                Update time and timeline during the timeline input event instead of the wrapper's mousemove.
-                                                                (Controller.prototype.handleWrapperMouseMove):
-                                                                (Controller.prototype.handleTimelineMouseMove):
-                                                                (Controller.prototype.drawTimelineBackground):
-
-                                                                (Controller.prototype.updateControlsWhileScrubbing):
-                                                                Updates time and scrubber to reflect timeline user input.
-
-                                                        2015-05-12  Dana Burkart
-                                                        Dana Burkart  &lt;dburkart@apple.com
-                                                        dburkart@apple.com&gt;
-
-                                                                Merge r183943. rdar://problem/19913748
-
-                                                            2015-05-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
-
-                                                                    Remove the WK1-only code path for independently composited iframes
-                                                                    https://bugs.webkit.org/show_bug.cgi?id=144722
-
-                                                                    Reviewed by Dean Jackson.
-
-                                                                    In WebKit1 on Mac, we allowed iframes to be composited independently of their
-                                                                    parent document, relying on the fact that the frame's platform view can host
-                                                                    a layer-backed view. However, this ran into bugs (rdar://problem/18862298),
-                                                                    and triggers the assertion at the end of FrameView::updateLayoutAndStyleIfNeededRecursive(),
-                                                                    because the compositing update after a layout can dirty style in notifyIFramesOfCompositingChange().
-
-                                                                    Removing the WK1-only code path solves these problems. It also eliminates the need
-                                                                    to do compositing-specific frame overlap testing.
-
-                                                                    * page/FrameView.cpp:
-                                                                    (WebCore::FrameView::setIsOverlapped): No need to do compositing-related things here.
-                                                                    Any iframe that gets composited will participate in the normal compositing overlap
-                                                                    testing in its parent frame.
-                                                                    (WebCore::FrameView::hasCompositedContentIncludingDescendants): Deleted.
-                                                                    (WebCore::FrameView::hasCompositingAncestor): Deleted.
-                                                                    * page/FrameView.h:
-                                                                    * rendering/RenderLayerCompositor.cpp: Replace ownerElement() checks in this file
-                                                                    with an isMainFrameCompositor() for readability. Some 0-&gt;nullptr.
-                                                                    (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
-                                                                    (WebCore::RenderLayerCompositor::chromeClient):
-                                                                    (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
-                                                                    (WebCore::RenderLayerCompositor::updateCompositingLayers):
-                                                                    (WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
-                                                                    (WebCore::RenderLayerCompositor::updateBacking):
-                                                                    (WebCore::RenderLayerCompositor::layerTreeAsText):
-                                                                    (WebCore::RenderLayerCompositor::frameContentsCompositor):
-                                                                    (WebCore::RenderLayerCompositor::setIsInWindow):
-                                                                    (WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame):
-                                                                    (WebCore::RenderLayerCompositor::requiresCompositingForFrame): frameRenderer.requiresAcceleratedCompositing()
-                                                                    already bails on no content RenderView, so the shouldPropagateCompositingToEnclosingFrame() check does
-                                                                    nothing and is removed.
-                                                                    (WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer):
-                                                                    (WebCore::RenderLayerCompositor::requiresScrollLayer):
-                                                                    (WebCore::RenderLayerCompositor::documentUsesTiledBacking):
-                                                                    (WebCore::RenderLayerCompositor::isMainFrameCompositor):
-                                                                    (WebCore::RenderLayerCompositor::shouldCompositeOverflowControls):
-                                                                    (WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):
-                                                                    (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
-                                                                    (WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
-                                                                    (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
-                                                                    (WebCore::RenderLayerCompositor::updateLayerForHeader):
-                                                                    (WebCore::RenderLayerCompositor::updateLayerForFooter):
-                                                                    (WebCore::RenderLayerCompositor::ensureRootLayer): Main frame attaches via ChromeClient,
-                                                                    all other frames attach via parent frame.
-                                                                    (WebCore::RenderLayerCompositor::notifyIFramesOfCompositingChange): This call to
-                                                                    scheduleSetNeedsStyleRecalc(SyntheticStyleChange) was the source of dirtying style after
-                                                                    layout, but is no longer needed so remove it.
-                                                                    (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
-                                                                    (WebCore::RenderLayerCompositor::unregisterAllViewportConstrainedLayers):
-                                                                    (WebCore::RenderLayerCompositor::scrollingCoordinator):
-                                                                    (WebCore::RenderLayerCompositor::graphicsLayerFactory):
-                                                                    (WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames): Deleted.
-                                                                    (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame): Deleted.
-                                                                    (WebCore::RenderLayerCompositor::mainFrameBackingIsTiled): Deleted. This was mis-named;
-                                                                    it really asks whether the document uses tiled backing, but does not check for main frame.
-                                                                    * rendering/RenderLayerCompositor.h:
-                                                                    * rendering/RenderWidget.cpp:
-                                                                    (WebCore::RenderWidget::paintContents): No need to do frame overlap testing for
-                                                                    compositing now.
-
-                                                            2015-05-12  Dana Burkart
-                                                            Dana Burkart  &lt;dburkart@apple.com
-                                                            dburkart@apple.com&gt;
-
-                                                                    Merge r183927. rdar://problem/20854785
-
-                                                                2015-05-07  Eric Carlson  &lt;eric.carlson@apple.com&gt;
-
-                                                                        [Mac] Playback target isn't set on new element
-                                                                        https://bugs.webkit.org/show_bug.cgi?id=144724
-
-                                                                        Reviewed by Jer Noble.
-
-                                                                        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
-                                                                        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
-                                                                        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setShouldPlayToPlaybackTarget
-                                                                        if necessary.
-                                                                        (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Remember
-                                                                        the setting in case we don't have an AVPlayer yet.
-
-                                                                2015-05-12  Dana Burkart
-                                                                Dana Burkart  &lt;dburkart@apple.com
-                                                                dburkart@apple.com&gt;
-
-                                                                        Merge r183909. rdar://problem/18894598
-
-                                                                    2015-05-06  Daniel Bates  &lt;dabates@apple.com&gt;
-
-                                                                            [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
-                                                                            https://bugs.webkit.org/show_bug.cgi?id=144657
-                                                                            &lt;rdar://problem/18894598&gt;
-
-                                                                            Reviewed by Andy Estes.
-
-                                                                            Export WebCore functionality to pause and resume the database thread so that we can
-                                                                            make use of this functionality from WebKit2.
-
-                                                                            * Modules/webdatabase/AbstractDatabaseServer.h:
-                                                                            * Modules/webdatabase/DatabaseManager.cpp:
-                                                                            (WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
-                                                                            * Modules/webdatabase/DatabaseManager.h:
-                                                                            * Modules/webdatabase/DatabaseServer.cpp:
-                                                                            (WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
-                                                                            DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
-                                                                            For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
-                                                                            we fix &lt;https://bugs.webkit.org/show_bug.cgi?id=144660&gt;.
-                                                                            * Modules/webdatabase/DatabaseServer.h:
-
-                                                                    2015-05-12  Dana Burkart
-                                                                    Dana Burkart  &lt;dburkart@apple.com&gt;
-
-                                                                            Merge r183942. rdar://problem/20049088
-
-                                                                        2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
-
-                                                                                Handle backdrop views that have to tile
-                                                                                https://bugs.webkit.org/show_bug.cgi?id=142317
-                                                                                &lt;rdar://problem/20049088&gt;
-
-                                                                                Reviewed by Simon Fraser.
-
-                                                                                Take 2 - this was rolled out because Mavericks was crashing.
-
-                                                                                Make sure backdrop layers don't tile. If they are big
-                                                                                enough, we'll leave it to the platform compositor to handle.
-
-                                                                                This also fixes a bug where if a layer changed from a backdrop
-                                                                                type to a tiled type, it would still retain its custom appearance
-                                                                                and we'd try to add children to the wrong layer.
-
-                                                                                Test: compositing/media-controls-bar-appearance-big.html
-
-                                                                                * platform/graphics/ca/GraphicsLayerCA.cpp:
-                                                                                (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
-                                                                                a layer needs a backdrop before checking if it needs to tile.
-
-                                                                        2015-05-12  Dana Burkart
-                                                                        Dana Burkart  &lt;dburkart@apple.com&gt;
-
-                                                                                Merge r183894. rdar://problem/20049088
-
-                                                                            2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
-
-                                                                                    Handle backdrop views that have to tile
-                                                                                    https://bugs.webkit.org/show_bug.cgi?id=142317
-                                                                                    &lt;rdar://problem/20049088&gt;
-
-                                                                                    Reviewed by Simon Fraser.
-
-                                                                                    Make sure backdrop layers don't tile. If they are big
-                                                                                    enough, we'll leave it to the platform compositor to handle.
-
-                                                                                    This also fixes a bug where if a layer changed from a backdrop
-                                                                                    type to a tiled type, it would still retain its custom appearance
-                                                                                    and we'd try to add children to the wrong layer.
-
-                                                                                    Test: compositing/media-controls-bar-appearance-big.html
-
-                                                                                    * platform/graphics/ca/GraphicsLayerCA.cpp:
-                                                                                    (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
-                                                                                    a layer needs a backdrop before checking if it needs to tile.
-
</del><span class="cx"> 2015-05-06  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Scroll-snap points do not handle margins and padding propertly
</span><span class="lines">@@ -809,32 +138,27 @@
</span><span class="cx">         * platform/spi/mac/NSFontSPI.h: Add [NSFont systemFontWithSize:weight:], and the proper NSFontWeight
</span><span class="cx">         constants.
</span><span class="cx"> 
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com&gt;
</del><ins>+2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</ins><span class="cx"> 
</span><del>-        Merge r183894. rdar://problem/20049088
</del><ins>+        Handle backdrop views that have to tile
+        https://bugs.webkit.org/show_bug.cgi?id=142317
+        &lt;rdar://problem/20049088&gt;
</ins><span class="cx"> 
</span><del>-    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</del><ins>+        Reviewed by Simon Fraser.
</ins><span class="cx"> 
</span><del>-            Handle backdrop views that have to tile
-            https://bugs.webkit.org/show_bug.cgi?id=142317
-            &lt;rdar://problem/20049088&gt;
</del><ins>+        Make sure backdrop layers don't tile. If they are big
+        enough, we'll leave it to the platform compositor to handle.
</ins><span class="cx"> 
</span><del>-            Reviewed by Simon Fraser.
</del><ins>+        This also fixes a bug where if a layer changed from a backdrop
+        type to a tiled type, it would still retain its custom appearance
+        and we'd try to add children to the wrong layer.
</ins><span class="cx"> 
</span><del>-            Make sure backdrop layers don't tile. If they are big
-            enough, we'll leave it to the platform compositor to handle.
</del><ins>+        Test: compositing/media-controls-bar-appearance-big.html
</ins><span class="cx"> 
</span><del>-            This also fixes a bug where if a layer changed from a backdrop
-            type to a tiled type, it would still retain its custom appearance
-            and we'd try to add children to the wrong layer.
</del><ins>+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
+        a layer needs a backdrop before checking if it needs to tile.
</ins><span class="cx"> 
</span><del>-            Test: compositing/media-controls-bar-appearance-big.html
-
-            * platform/graphics/ca/GraphicsLayerCA.cpp:
-            (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
-            a layer needs a backdrop before checking if it needs to tile.
-
</del><span class="cx"> 2015-05-06  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt; and Per Arne Vollan  &lt;peavo@outlook.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WinCairo] Compile error due to undefined symbols after r183868
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span><span class="lines">@@ -17,92 +15,88 @@
</span><span class="cx"> 
</span><span class="cx">             * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r184130. rdar://problem/20829494
</del><ins>+        Merge r184130. rdar://problem/20829494
</ins><span class="cx"> 
</span><del>-        2015-05-11  Timothy Hatcher  &lt;timothy@apple.com&gt;
</del><ins>+    2015-05-11  Timothy Hatcher  &lt;timothy@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Web Inspector: REGRESSION (Tabs): Issues reloading a resource with breakpoints
-                https://bugs.webkit.org/show_bug.cgi?id=144650
</del><ins>+            Web Inspector: REGRESSION (Tabs): Issues reloading a resource with breakpoints
+            https://bugs.webkit.org/show_bug.cgi?id=144650
</ins><span class="cx"> 
</span><del>-                Fix a number of issues with Debugger tab and navigation/reloading:
-                - Close old content views in the Debugger tab when main frame navigates.
-                - Prune old resource tree elements before attempting to restore a cookie that might match an old resource.
-                - Allow breakpoint selections to be restored from a saved cookie.
-                - Fix an assert when closing a content view that isn't the current index, but is the current view.
-                - Avoid calling closed() multiple times when a ContentView is in the back/forward list more than once.
-                - Make restoreStateFromCookie properly set and use the causedByNavigation argument for a longer restore delay.
-                - Create a new cookie object per tab instead of it being cumulative from the previous cookie.
</del><ins>+            Fix a number of issues with Debugger tab and navigation/reloading:
+            - Close old content views in the Debugger tab when main frame navigates.
+            - Prune old resource tree elements before attempting to restore a cookie that might match an old resource.
+            - Allow breakpoint selections to be restored from a saved cookie.
+            - Fix an assert when closing a content view that isn't the current index, but is the current view.
+            - Avoid calling closed() multiple times when a ContentView is in the back/forward list more than once.
+            - Make restoreStateFromCookie properly set and use the causedByNavigation argument for a longer restore delay.
+            - Create a new cookie object per tab instead of it being cumulative from the previous cookie.
</ins><span class="cx"> 
</span><del>-                Reviewed by Brian Burg.
</del><ins>+            Reviewed by Brian Burg.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Base/Main.js:
-                (WebInspector._mainResourceDidChange): Delay calling _restoreCookieForOpenTabs to give time for sidebars
-                and tabs to respond to the main resource change.
-                (WebInspector._restoreCookieForOpenTabs): Rename causedByReload to causedByNavigation. Nothing special about
-                reload since we restore on all navigation.
</del><ins>+            * UserInterface/Base/Main.js:
+            (WebInspector._mainResourceDidChange): Delay calling _restoreCookieForOpenTabs to give time for sidebars
+            and tabs to respond to the main resource change.
+            (WebInspector._restoreCookieForOpenTabs): Rename causedByReload to causedByNavigation. Nothing special about
+            reload since we restore on all navigation.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Views/ContentView.js:
-                (WebInspector.ContentView): Support Breakpoint as a represented object, which happens during a cookie restore.
-                (WebInspector.ContentView.isViewable): Ditto.
</del><ins>+            * UserInterface/Views/ContentView.js:
+            (WebInspector.ContentView): Support Breakpoint as a represented object, which happens during a cookie restore.
+            (WebInspector.ContentView.isViewable): Ditto.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Views/ContentViewContainer.js:
-                (WebInspector.ContentViewContainer.prototype.closeAllContentViews): Disassociate if the view is current and not just
-                the current entry index. This matches other close functions. This fixes an assert in _disassociateFromContentView.
-                (WebInspector.ContentViewContainer.prototype._disassociateFromContentView): Don't disassociate multiple times. This
-                avoids calling the closed() function on a view more than once.
</del><ins>+            * UserInterface/Views/ContentViewContainer.js:
+            (WebInspector.ContentViewContainer.prototype.closeAllContentViews): Disassociate if the view is current and not just
+            the current entry index. This matches other close functions. This fixes an assert in _disassociateFromContentView.
+            (WebInspector.ContentViewContainer.prototype._disassociateFromContentView): Don't disassociate multiple times. This
+            avoids calling the closed() function on a view more than once.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Views/DebuggerSidebarPanel.js:
-                (WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
-                (WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange): Renamed from _mainResourceChanged.
-                Close all content views if this is the main frame. Also prune all old resources. Doing this now avoids a flash
-                of having old and new resources in the tree caused by the default delay in NavigationSidebarPanel's _checkForOldResources.
</del><ins>+            * UserInterface/Views/DebuggerSidebarPanel.js:
+            (WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
+            (WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange): Renamed from _mainResourceChanged.
+            Close all content views if this is the main frame. Also prune all old resources. Doing this now avoids a flash
+            of having old and new resources in the tree caused by the default delay in NavigationSidebarPanel's _checkForOldResources.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Views/NavigationSidebarPanel.js:
-                (WebInspector.NavigationSidebarPanel): Set _autoPruneOldTopLevelResourceTreeElements for later.
-                (WebInspector.NavigationSidebarPanel.prototype.get contentTreeOutlineToAutoPrune): Deleted.
-                (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentView): Fix typo.
-                (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement): Fix whitespace.
-                (WebInspector.NavigationSidebarPanel.prototype.pruneOldResourceTreeElements): Added. Broken out from
-                _checkForOldResources.delayedWork so it can be called manually. Also check all visible tree outlines.
-                (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged): Pass treeElement in an array.
-                (WebInspector.NavigationSidebarPanel.prototype._checkForOldResourcesIfNeeded): Added.
-                (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources): Call pruneOldResourceTreeElements on a delay.
-                (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources.delayedWork): Deleted.
-                (WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie): Call _checkForOldResourcesIfNeeded.
-                (WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie): Remove array folding code.
</del><ins>+            * UserInterface/Views/NavigationSidebarPanel.js:
+            (WebInspector.NavigationSidebarPanel): Set _autoPruneOldTopLevelResourceTreeElements for later.
+            (WebInspector.NavigationSidebarPanel.prototype.get contentTreeOutlineToAutoPrune): Deleted.
+            (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentView): Fix typo.
+            (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement): Fix whitespace.
+            (WebInspector.NavigationSidebarPanel.prototype.pruneOldResourceTreeElements): Added. Broken out from
+            _checkForOldResources.delayedWork so it can be called manually. Also check all visible tree outlines.
+            (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged): Pass treeElement in an array.
+            (WebInspector.NavigationSidebarPanel.prototype._checkForOldResourcesIfNeeded): Added.
+            (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources): Call pruneOldResourceTreeElements on a delay.
+            (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources.delayedWork): Deleted.
+            (WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie): Call _checkForOldResourcesIfNeeded.
+            (WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie): Remove array folding code.
</ins><span class="cx"> 
</span><del>-                * UserInterface/Views/TabContentView.js:
-                (WebInspector.TabContentView.prototype.restoreStateFromCookie): Rename causedByReload to causedByNavigation.
-                (WebInspector.TabContentView.prototype.saveStateToCookie): Don't allow the cookie to build on the old cookie.
</del><ins>+            * UserInterface/Views/TabContentView.js:
+            (WebInspector.TabContentView.prototype.restoreStateFromCookie): Rename causedByReload to causedByNavigation.
+            (WebInspector.TabContentView.prototype.saveStateToCookie): Don't allow the cookie to build on the old cookie.
</ins><span class="cx"> 
</span><del>-        2015-05-12  Dana Burkart
-        Dana Burkart  &lt;dburkart@apple.com
-        dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Merge r184108. rdar://problem/20903134
</del><ins>+        Merge r184108. rdar://problem/20903134
</ins><span class="cx"> 
</span><del>-            2015-05-11  Timothy Hatcher  &lt;timothy@apple.com&gt;
</del><ins>+    2015-05-11  Timothy Hatcher  &lt;timothy@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                    Web Inspector: NavigationSidebarPanel leaks some event listeners
-                    https://bugs.webkit.org/show_bug.cgi?id=144523
</del><ins>+            Web Inspector: NavigationSidebarPanel leaks some event listeners
+            https://bugs.webkit.org/show_bug.cgi?id=144523
</ins><span class="cx"> 
</span><del>-                    Reviewed by Joseph Pecoraro.
</del><ins>+            Reviewed by Joseph Pecoraro.
</ins><span class="cx"> 
</span><del>-                    * UserInterface/Views/NavigationSidebarPanel.js:
-                    (WebInspector.NavigationSidebarPanel):
-                    (WebInspector.NavigationSidebarPanel.prototype.closed):
-                    * UserInterface/Views/ResourceSidebarPanel.js:
-                    (WebInspector.ResourceSidebarPanel.prototype.closed):
-                    * UserInterface/Views/SearchSidebarPanel.js:
-                    (WebInspector.SearchSidebarPanel.prototype.closed):
-                    * UserInterface/Views/StorageSidebarPanel.js:
-                    (WebInspector.StorageSidebarPanel.prototype.closed):
-                    * UserInterface/Views/TimelineSidebarPanel.js:
-                    (WebInspector.TimelineSidebarPanel.prototype.closed):
</del><ins>+            * UserInterface/Views/NavigationSidebarPanel.js:
+            (WebInspector.NavigationSidebarPanel):
+            (WebInspector.NavigationSidebarPanel.prototype.closed):
+            * UserInterface/Views/ResourceSidebarPanel.js:
+            (WebInspector.ResourceSidebarPanel.prototype.closed):
+            * UserInterface/Views/SearchSidebarPanel.js:
+            (WebInspector.SearchSidebarPanel.prototype.closed):
+            * UserInterface/Views/StorageSidebarPanel.js:
+            (WebInspector.StorageSidebarPanel.prototype.closed):
+            * UserInterface/Views/TimelineSidebarPanel.js:
+            (WebInspector.TimelineSidebarPanel.prototype.closed):
</ins><span class="cx"> 
</span><span class="cx"> 2015-05-06  Matt Baker  &lt;mattbaker@apple.com&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebKit/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span><span class="lines">@@ -19,68 +17,66 @@
</span><span class="cx">             * WebKit.vcxproj/WebKit/WebKit.vcxproj:
</span><span class="cx">             * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r183954. rdar://problem/20281886
</del><ins>+        Merge r183954. rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-        2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</del><ins>+    2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                New force-related DOM events should fire in WK1 views
-                https://bugs.webkit.org/show_bug.cgi?id=144663
-                -and corresponding-
-                rdar://problem/20281886
</del><ins>+            New force-related DOM events should fire in WK1 views
+            https://bugs.webkit.org/show_bug.cgi?id=144663
+            -and corresponding-
+            rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-                Reviewed by Sam Weinig.
</del><ins>+            Reviewed by Sam Weinig.
</ins><span class="cx"> 
</span><del>-                Pass the lastPressureEvent to WebCore.
-                * WebView/WebHTMLView.mm:
-                (-[WebHTMLView _updateMouseoverWithEvent:]):
-                (-[WebHTMLView rightMouseUp:]):
-                (-[WebHTMLView menuForEvent:]):
-                (-[WebHTMLView acceptsFirstMouse:]):
-                (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
-                (-[WebHTMLView mouseDown:mouseDown:]):
-                (-[WebHTMLView mouseDragged:]):
-                (-[WebHTMLView mouseUp:mouseUp:]):
</del><ins>+            Pass the lastPressureEvent to WebCore.
+            * WebView/WebHTMLView.mm:
+            (-[WebHTMLView _updateMouseoverWithEvent:]):
+            (-[WebHTMLView rightMouseUp:]):
+            (-[WebHTMLView menuForEvent:]):
+            (-[WebHTMLView acceptsFirstMouse:]):
+            (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
+            (-[WebHTMLView mouseDown:mouseDown:]):
+            (-[WebHTMLView mouseDragged:]):
+            (-[WebHTMLView mouseUp:mouseUp:]):
</ins><span class="cx"> 
</span><del>-                New NSRespnder method for pressure changes.
-                (-[WebHTMLView pressureChangeWithEvent:]):
</del><ins>+            New NSRespnder method for pressure changes.
+            (-[WebHTMLView pressureChangeWithEvent:]):
</ins><span class="cx"> 
</span><del>-                New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
-                default action. Get rid of willHandleMouseDown; now that the gesture recognizer
-                sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
-                * WebView/WebImmediateActionController.h:
-                * WebView/WebImmediateActionController.mm:
-                (-[WebImmediateActionController _clearImmediateActionState]):
</del><ins>+            New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
+            default action. Get rid of willHandleMouseDown; now that the gesture recognizer
+            sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
+            * WebView/WebImmediateActionController.h:
+            * WebView/WebImmediateActionController.mm:
+            (-[WebImmediateActionController _clearImmediateActionState]):
</ins><span class="cx"> 
</span><del>-                Set all of the immediateActionStages on EventHandler. This is critical to keep
-                link navigation happening at the right time now that
-                delaysPrimaryMouseButtonEvents is set to NO.
-                (-[WebImmediateActionController performHitTestAtPoint:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</del><ins>+            Set all of the immediateActionStages on EventHandler. This is critical to keep
+            link navigation happening at the right time now that
+            delaysPrimaryMouseButtonEvents is set to NO.
+            (-[WebImmediateActionController performHitTestAtPoint:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</ins><span class="cx"> 
</span><del>-                Use a dummy animation controller if the content prevents default.
-                (-[WebImmediateActionController _defaultAnimationController]):
-                (-[WebImmediateActionController _updateImmediateActionItem]):
-                (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</del><ins>+            Use a dummy animation controller if the content prevents default.
+            (-[WebImmediateActionController _defaultAnimationController]):
+            (-[WebImmediateActionController _updateImmediateActionItem]):
+            (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</ins><span class="cx"> 
</span><del>-                Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
-                we expect to.
-                * WebView/WebView.mm:
-                (-[WebView _commonInitializationWithFrameName:groupName:]):
</del><ins>+            Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
+            we expect to.
+            * WebView/WebView.mm:
+            (-[WebView _commonInitializationWithFrameName:groupName:]):
</ins><span class="cx"> 
</span><del>-                Cache the most recent pressure event so that we can send it to WebCore for all of
-                the mouse events.
-                (-[WebView _pressureEvent]):
-                (-[WebView _setPressureEvent:]):
-                * WebView/WebViewData.h:
-                * WebView/WebViewData.mm:
-                (-[WebViewPrivate dealloc]):
-                * WebView/WebViewInternal.h:
</del><ins>+            Cache the most recent pressure event so that we can send it to WebCore for all of
+            the mouse events.
+            (-[WebView _pressureEvent]):
+            (-[WebView _setPressureEvent:]):
+            * WebView/WebViewData.h:
+            * WebView/WebViewData.mm:
+            (-[WebViewPrivate dealloc]):
+            * WebView/WebViewInternal.h:
</ins><span class="cx"> 
</span><span class="cx"> 2015-04-27  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r183957. rdar://problem/20811128
</span><span class="cx"> 
</span><span class="lines">@@ -18,68 +16,66 @@
</span><span class="cx">             (-[WebImmediateActionController _animationControllerForDataDetectedLink]):
</span><span class="cx">             Null-check TextIndicators before dereferencing.
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r183954. rdar://problem/20281886
</del><ins>+        Merge r183954. rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-        2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</del><ins>+    2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                New force-related DOM events should fire in WK1 views
-                https://bugs.webkit.org/show_bug.cgi?id=144663
-                -and corresponding-
-                rdar://problem/20281886
</del><ins>+            New force-related DOM events should fire in WK1 views
+            https://bugs.webkit.org/show_bug.cgi?id=144663
+            -and corresponding-
+            rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-                Reviewed by Sam Weinig.
</del><ins>+            Reviewed by Sam Weinig.
</ins><span class="cx"> 
</span><del>-                Pass the lastPressureEvent to WebCore.
-                * WebView/WebHTMLView.mm:
-                (-[WebHTMLView _updateMouseoverWithEvent:]):
-                (-[WebHTMLView rightMouseUp:]):
-                (-[WebHTMLView menuForEvent:]):
-                (-[WebHTMLView acceptsFirstMouse:]):
-                (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
-                (-[WebHTMLView mouseDown:mouseDown:]):
-                (-[WebHTMLView mouseDragged:]):
-                (-[WebHTMLView mouseUp:mouseUp:]):
</del><ins>+            Pass the lastPressureEvent to WebCore.
+            * WebView/WebHTMLView.mm:
+            (-[WebHTMLView _updateMouseoverWithEvent:]):
+            (-[WebHTMLView rightMouseUp:]):
+            (-[WebHTMLView menuForEvent:]):
+            (-[WebHTMLView acceptsFirstMouse:]):
+            (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
+            (-[WebHTMLView mouseDown:mouseDown:]):
+            (-[WebHTMLView mouseDragged:]):
+            (-[WebHTMLView mouseUp:mouseUp:]):
</ins><span class="cx"> 
</span><del>-                New NSRespnder method for pressure changes.
-                (-[WebHTMLView pressureChangeWithEvent:]):
</del><ins>+            New NSRespnder method for pressure changes.
+            (-[WebHTMLView pressureChangeWithEvent:]):
</ins><span class="cx"> 
</span><del>-                New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
-                default action. Get rid of willHandleMouseDown; now that the gesture recognizer
-                sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
-                * WebView/WebImmediateActionController.h:
-                * WebView/WebImmediateActionController.mm:
-                (-[WebImmediateActionController _clearImmediateActionState]):
</del><ins>+            New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
+            default action. Get rid of willHandleMouseDown; now that the gesture recognizer
+            sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
+            * WebView/WebImmediateActionController.h:
+            * WebView/WebImmediateActionController.mm:
+            (-[WebImmediateActionController _clearImmediateActionState]):
</ins><span class="cx"> 
</span><del>-                Set all of the immediateActionStages on EventHandler. This is critical to keep
-                link navigation happening at the right time now that
-                delaysPrimaryMouseButtonEvents is set to NO.
-                (-[WebImmediateActionController performHitTestAtPoint:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
-                (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</del><ins>+            Set all of the immediateActionStages on EventHandler. This is critical to keep
+            link navigation happening at the right time now that
+            delaysPrimaryMouseButtonEvents is set to NO.
+            (-[WebImmediateActionController performHitTestAtPoint:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+            (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</ins><span class="cx"> 
</span><del>-                Use a dummy animation controller if the content prevents default.
-                (-[WebImmediateActionController _defaultAnimationController]):
-                (-[WebImmediateActionController _updateImmediateActionItem]):
-                (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</del><ins>+            Use a dummy animation controller if the content prevents default.
+            (-[WebImmediateActionController _defaultAnimationController]):
+            (-[WebImmediateActionController _updateImmediateActionItem]):
+            (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</ins><span class="cx"> 
</span><del>-                Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
-                we expect to.
-                * WebView/WebView.mm:
-                (-[WebView _commonInitializationWithFrameName:groupName:]):
</del><ins>+            Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
+            we expect to.
+            * WebView/WebView.mm:
+            (-[WebView _commonInitializationWithFrameName:groupName:]):
</ins><span class="cx"> 
</span><del>-                Cache the most recent pressure event so that we can send it to WebCore for all of
-                the mouse events.
-                (-[WebView _pressureEvent]):
-                (-[WebView _setPressureEvent:]):
-                * WebView/WebViewData.h:
-                * WebView/WebViewData.mm:
-                (-[WebViewPrivate dealloc]):
-                * WebView/WebViewInternal.h:
</del><ins>+            Cache the most recent pressure event so that we can send it to WebCore for all of
+            the mouse events.
+            (-[WebView _pressureEvent]):
+            (-[WebView _setPressureEvent:]):
+            * WebView/WebViewData.h:
+            * WebView/WebViewData.mm:
+            (-[WebViewPrivate dealloc]):
+            * WebView/WebViewInternal.h:
</ins><span class="cx"> 
</span><span class="cx"> 2015-04-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184139. rdar://problem/20125088
</span><span class="cx"> 
</span><span class="lines">@@ -17,205 +15,191 @@
</span><span class="cx">             argument I added. This is currently not used for anything on iOS.
</span><span class="cx">             * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm: Ditto.
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r184121. rdar://problem/20774613
</del><ins>+        Merge r184121. rdar://problem/20774613
</ins><span class="cx"> 
</span><del>-        2015-05-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</del><ins>+    2015-05-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Unreviewed build fix
</del><ins>+            Unreviewed build fix
</ins><span class="cx"> 
</span><del>-                Unreviewed.
</del><ins>+            Unreviewed.
</ins><span class="cx"> 
</span><del>-                * UIProcess/API/APIUserContentExtensionStore.cpp:
-                (API::compiledToFile):
</del><ins>+            * UIProcess/API/APIUserContentExtensionStore.cpp:
+            (API::compiledToFile):
</ins><span class="cx"> 
</span><del>-        2015-05-12  Dana Burkart
-        Dana Burkart  &lt;dburkart@apple.com
-        dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Merge r184116. rdar://problem/20774613
</del><ins>+        Merge r184116. rdar://problem/20774613
</ins><span class="cx"> 
</span><del>-            2015-05-11  Alex Christensen  &lt;achristensen@webkit.org&gt;
</del><ins>+    2015-05-11  Alex Christensen  &lt;achristensen@webkit.org&gt;
</ins><span class="cx"> 
</span><del>-                    [Content Extensions] Support domain-specific rules and exceptions.
-                    https://bugs.webkit.org/show_bug.cgi?id=144833
</del><ins>+            [Content Extensions] Support domain-specific rules and exceptions.
+            https://bugs.webkit.org/show_bug.cgi?id=144833
</ins><span class="cx"> 
</span><del>-                    Reviewed by Darin Adler.
</del><ins>+            Reviewed by Darin Adler.
</ins><span class="cx"> 
</span><del>-                    * Shared/WebCompiledContentExtension.cpp:
-                    (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
-                    (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
-                    (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
-                    (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
-                    (WebKit::WebCompiledContentExtension::domainFiltersBytecode):
-                    (WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
-                    (WebKit::WebCompiledContentExtension::bytecode): Deleted.
-                    (WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
-                    * Shared/WebCompiledContentExtension.h:
-                    * Shared/WebCompiledContentExtensionData.cpp:
-                    (WebKit::WebCompiledContentExtensionData::encode):
-                    (WebKit::WebCompiledContentExtensionData::decode):
-                    * Shared/WebCompiledContentExtensionData.h:
-                    (WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
-                    * UIProcess/API/APIUserContentExtensionStore.cpp:
-                    (API::ContentExtensionMetaData::fileSize):
-                    (API::encodeContentExtensionMetaData):
-                    (API::decodeContentExtensionMetaData):
-                    (API::compiledToFile):
-                    (API::createExtension):
-                    Keep track of 3 different types of bytecode to be able to handle domain-specific rules.
</del><ins>+            * Shared/WebCompiledContentExtension.cpp:
+            (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
+            (WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
+            (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
+            (WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
+            (WebKit::WebCompiledContentExtension::domainFiltersBytecode):
+            (WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
+            (WebKit::WebCompiledContentExtension::bytecode): Deleted.
+            (WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
+            * Shared/WebCompiledContentExtension.h:
+            * Shared/WebCompiledContentExtensionData.cpp:
+            (WebKit::WebCompiledContentExtensionData::encode):
+            (WebKit::WebCompiledContentExtensionData::decode):
+            * Shared/WebCompiledContentExtensionData.h:
+            (WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
+            * UIProcess/API/APIUserContentExtensionStore.cpp:
+            (API::ContentExtensionMetaData::fileSize):
+            (API::encodeContentExtensionMetaData):
+            (API::decodeContentExtensionMetaData):
+            (API::compiledToFile):
+            (API::createExtension):
+            Keep track of 3 different types of bytecode to be able to handle domain-specific rules.
</ins><span class="cx"> 
</span><del>-            2015-05-12  Dana Burkart
-            Dana Burkart  &lt;dburkart@apple.com
-            dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                    Merge r184026. rdar://problem/20757196
</del><ins>+        Merge r184026. rdar://problem/20757196
</ins><span class="cx"> 
</span><del>-                2015-05-08  Dan Bernstein  &lt;mitz@apple.com&gt;
</del><ins>+    2015-05-08  Dan Bernstein  &lt;mitz@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                        &lt;rdar://problem/20757196&gt; NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
-                        https://bugs.webkit.org/show_bug.cgi?id=144818
</del><ins>+            &lt;rdar://problem/20757196&gt; NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
+            https://bugs.webkit.org/show_bug.cgi?id=144818
</ins><span class="cx"> 
</span><del>-                        Reviewed by Anders Carlsson.
</del><ins>+            Reviewed by Anders Carlsson.
</ins><span class="cx"> 
</span><del>-                        Allow NSString instances that contain unpaired surrogates to be encoded by
-                        WKRemoteObjectCoder by encoding them directly rather than using
-                        -[NSString encodeWithCoder:].
</del><ins>+            Allow NSString instances that contain unpaired surrogates to be encoded by
+            WKRemoteObjectCoder by encoding them directly rather than using
+            -[NSString encodeWithCoder:].
</ins><span class="cx"> 
</span><del>-                        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
-                        (encodeString): Added. Sets an API::String as the object to encode.
-                        (encodeObject): Changed to use encodeString for NSString instances.
-                        (decodeString): Added. Gets an API::String from the dictionary and returns it as an
-                        NSString.
-                        (decodeObject): Changed to use decodeString for NSString instances.
</del><ins>+            * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+            (encodeString): Added. Sets an API::String as the object to encode.
+            (encodeObject): Changed to use encodeString for NSString instances.
+            (decodeString): Added. Gets an API::String from the dictionary and returns it as an
+            NSString.
+            (decodeObject): Changed to use decodeString for NSString instances.
</ins><span class="cx"> 
</span><del>-                2015-05-12  Dana Burkart
-                Dana Burkart  &lt;dburkart@apple.com
-                dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                        Merge r183937. rdar://problem/20458697
</del><ins>+        Merge r183937. rdar://problem/20458697
</ins><span class="cx"> 
</span><del>-                    2015-05-07  Jer Noble  &lt;jer.noble@apple.com&gt;
</del><ins>+    2015-05-07  Jer Noble  &lt;jer.noble@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                            [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
-                            https://bugs.webkit.org/show_bug.cgi?id=144744
</del><ins>+            [WK2][Fullscreen] Fullscreen video does not enter low-power mode.
+            https://bugs.webkit.org/show_bug.cgi?id=144744
</ins><span class="cx"> 
</span><del>-                            Reviewed by Darin Adler.
</del><ins>+            Reviewed by Darin Adler.
</ins><span class="cx"> 
</span><del>-                            One of the requirements of entering low-power compositing mode is that no masking layers
-                            are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
-                            transition animation completes, remove the mask layer entirely from our clipping layer.
-                            This means it needs to be re-created and added when entering fullscreen, rather than just
-                            at initialization time.
</del><ins>+            One of the requirements of entering low-power compositing mode is that no masking layers
+            are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
+            transition animation completes, remove the mask layer entirely from our clipping layer.
+            This means it needs to be re-created and added when entering fullscreen, rather than just
+            at initialization time.
</ins><span class="cx"> 
</span><del>-                            * UIProcess/mac/WKFullScreenWindowController.mm:
-                            (-[WKFullScreenWindowController initWithWindow:webView:]):
-                            (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
-                            (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
</del><ins>+            * UIProcess/mac/WKFullScreenWindowController.mm:
+            (-[WKFullScreenWindowController initWithWindow:webView:]):
+            (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+            (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
</ins><span class="cx"> 
</span><del>-                    2015-05-12  Dana Burkart
-                    Dana Burkart  &lt;dburkart@apple.com
-                    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                            Merge r183911. rdar://problem/20702435
</del><ins>+        Merge r183911. rdar://problem/20702435
</ins><span class="cx"> 
</span><del>-                        2015-05-06  Jer Noble  &lt;jer.noble@apple.com&gt;
</del><ins>+    2015-05-06  Jer Noble  &lt;jer.noble@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
-                                https://bugs.webkit.org/show_bug.cgi?id=144716
</del><ins>+            [WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
+            https://bugs.webkit.org/show_bug.cgi?id=144716
</ins><span class="cx"> 
</span><del>-                                Reviewed by Darin Adler.
</del><ins>+            Reviewed by Darin Adler.
</ins><span class="cx"> 
</span><del>-                                We create a mask animation for the transition between windowed and fullscreen modes, on the
-                                assumption that the element being taken into fullscreen mode does not have visible children
-                                who extend beyond that elements bounds. This assumption breaks down in the case where div
-                                with absolutely positioned children is taken fullscreen. While we can't necessarily make the
-                                transition look correct in this case, we can remove the mask after the transition completes.
</del><ins>+            We create a mask animation for the transition between windowed and fullscreen modes, on the
+            assumption that the element being taken into fullscreen mode does not have visible children
+            who extend beyond that elements bounds. This assumption breaks down in the case where div
+            with absolutely positioned children is taken fullscreen. While we can't necessarily make the
+            transition look correct in this case, we can remove the mask after the transition completes.
</ins><span class="cx"> 
</span><del>-                                * UIProcess/mac/WKFullScreenWindowController.mm:
-                                (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
-                                * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
-                                (WebKit::removeAllMediaKeyStorageForOriginPath):
</del><ins>+            * UIProcess/mac/WKFullScreenWindowController.mm:
+            (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+            * WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+            (WebKit::removeAllMediaKeyStorageForOriginPath):
</ins><span class="cx"> 
</span><del>-                        2015-05-12  Dana Burkart
-                        Dana Burkart  &lt;dburkart@apple.com
-                        dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                Merge r183909. rdar://problem/18894598
</del><ins>+        Merge r183909. rdar://problem/18894598
</ins><span class="cx"> 
</span><del>-                            2015-05-06  Daniel Bates  &lt;dabates@apple.com&gt;
</del><ins>+    2015-05-06  Daniel Bates  &lt;dabates@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                    [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
-                                    https://bugs.webkit.org/show_bug.cgi?id=144657
-                                    &lt;rdar://problem/18894598&gt;
</del><ins>+            [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+            https://bugs.webkit.org/show_bug.cgi?id=144657
+            &lt;rdar://problem/18894598&gt;
</ins><span class="cx"> 
</span><del>-                                    Reviewed by Andy Estes.
</del><ins>+            Reviewed by Andy Estes.
</ins><span class="cx"> 
</span><del>-                                    Pause and resume the database thread when the UIProcess enters and leaves the background,
-                                    respectively, so that we avoid WebProcess termination due to holding a locked SQLite
-                                    database file when the WebProcess is suspended. This behavior matches the analagous
-                                    behavior in Legacy WebKit.
</del><ins>+            Pause and resume the database thread when the UIProcess enters and leaves the background,
+            respectively, so that we avoid WebProcess termination due to holding a locked SQLite
+            database file when the WebProcess is suspended. This behavior matches the analagous
+            behavior in Legacy WebKit.
</ins><span class="cx"> 
</span><del>-                                    * UIProcess/WebPageProxy.h:
-                                    * UIProcess/ios/WKContentView.mm:
-                                    (-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
-                                    when the UIProcess enters the background.
-                                    * UIProcess/ios/WebPageProxyIOS.mm:
-                                    (WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
-                                    We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
-                                    WebProcess is running to receive it. We'll release this assertion when the WebProcess replies that it received the
-                                    notification.
-                                    * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
-                                    (WebKit::WebDatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseManager::setPauseAllDatabases().
-                                    * WebProcess/WebCoreSupport/WebDatabaseManager.h:
-                                    * WebProcess/WebPage/WebPage.h:
-                                    * WebProcess/WebPage/WebPage.messages.in: Add message ApplicationDidEnterBackground(). Also,
-                                    add empty lines to help demarcate this message and the other UIKit application lifecycle-related
-                                    messages from the rest of the list of messages.
-                                    * WebProcess/WebPage/ios/WebPageIOS.mm:
-                                    (WebKit::WebPage::applicationWillEnterForeground): Resume the database thread.
-                                    (WebKit::WebPage::applicationDidEnterBackground): Pause the database thread.
</del><ins>+            * UIProcess/WebPageProxy.h:
+            * UIProcess/ios/WKContentView.mm:
+            (-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
+            when the UIProcess enters the background.
+            * UIProcess/ios/WebPageProxyIOS.mm:
+            (WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
+            We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
+            WebProcess is running to receive it. We'll release this assertion when the WebProcess replies that it received the
+            notification.
+            * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+            (WebKit::WebDatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseManager::setPauseAllDatabases().
+            * WebProcess/WebCoreSupport/WebDatabaseManager.h:
+            * WebProcess/WebPage/WebPage.h:
+            * WebProcess/WebPage/WebPage.messages.in: Add message ApplicationDidEnterBackground(). Also,
+            add empty lines to help demarcate this message and the other UIKit application lifecycle-related
+            messages from the rest of the list of messages.
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::applicationWillEnterForeground): Resume the database thread.
+            (WebKit::WebPage::applicationDidEnterBackground): Pause the database thread.
</ins><span class="cx"> 
</span><del>-                            2015-05-12  Dana Burkart
-                            Dana Burkart  &lt;dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                    Merge r183942. rdar://problem/20049088
</del><ins>+        Merge r183942. rdar://problem/20049088
</ins><span class="cx"> 
</span><del>-                                2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</del><ins>+    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                        Handle backdrop views that have to tile
-                                        https://bugs.webkit.org/show_bug.cgi?id=142317
-                                        &lt;rdar://problem/20049088&gt;
</del><ins>+            Handle backdrop views that have to tile
+            https://bugs.webkit.org/show_bug.cgi?id=142317
+            &lt;rdar://problem/20049088&gt;
</ins><span class="cx"> 
</span><del>-                                        Reviewed by Simon Fraser.
</del><ins>+            Reviewed by Simon Fraser.
</ins><span class="cx"> 
</span><del>-                                        Take 2 - this was rolled out because Mavericks was crashing.
</del><ins>+            Take 2 - this was rolled out because Mavericks was crashing.
</ins><span class="cx"> 
</span><del>-                                        Add some better logging for custom appearance.
</del><ins>+            Add some better logging for custom appearance.
</ins><span class="cx"> 
</span><del>-                                        * Shared/mac/RemoteLayerTreeTransaction.mm:
-                                        (WebKit::RemoteLayerTreeTextStream::operator&lt;&lt;):
</del><ins>+            * Shared/mac/RemoteLayerTreeTransaction.mm:
+            (WebKit::RemoteLayerTreeTextStream::operator&lt;&lt;):
</ins><span class="cx"> 
</span><del>-                                2015-05-12  Dana Burkart
-                                Dana Burkart  &lt;dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                        Merge r183894. rdar://problem/20049088
</del><ins>+        Merge r183894. rdar://problem/20049088
</ins><span class="cx"> 
</span><del>-                                    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</del><ins>+    2015-05-06  Dean Jackson  &lt;dino@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                                            Handle backdrop views that have to tile
-                                            https://bugs.webkit.org/show_bug.cgi?id=142317
-                                            &lt;rdar://problem/20049088&gt;
</del><ins>+            Handle backdrop views that have to tile
+            https://bugs.webkit.org/show_bug.cgi?id=142317
+            &lt;rdar://problem/20049088&gt;
</ins><span class="cx"> 
</span><del>-                                            Reviewed by Simon Fraser.
</del><ins>+            Reviewed by Simon Fraser.
</ins><span class="cx"> 
</span><del>-                                            Add some better logging for custom appearance.
</del><ins>+            Add some better logging for custom appearance.
</ins><span class="cx"> 
</span><del>-                                            * Shared/mac/RemoteLayerTreeTransaction.mm:
-                                            (WebKit::RemoteLayerTreeTextStream::operator&lt;&lt;):
</del><ins>+            * Shared/mac/RemoteLayerTreeTransaction.mm:
+            (WebKit::RemoteLayerTreeTextStream::operator&lt;&lt;):
</ins><span class="cx"> 
</span><span class="cx"> 2015-05-11  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601132branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184268 => 184269)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/ChangeLog        2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog        2015-05-13 05:34:21 UTC (rev 184269)
</span><span class="lines">@@ -1,6 +1,4 @@
</span><del>-2015-05-12  Dana Burkart
-Dana Burkart  &lt;dburkart@apple.com
-dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><span class="cx">         Merge r184137. rdar://problem/20707307
</span><span class="cx"> 
</span><span class="lines">@@ -26,49 +24,45 @@
</span><span class="cx">             * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
</span><span class="cx">             * WinLauncher/stdafx.h:
</span><span class="cx"> 
</span><del>-    2015-05-12  Dana Burkart
-    Dana Burkart  &lt;dburkart@apple.com
-    dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-            Merge r184116. rdar://problem/20774613
</del><ins>+        Merge r184116. rdar://problem/20774613
</ins><span class="cx"> 
</span><del>-        2015-05-11  Alex Christensen  &lt;achristensen@webkit.org&gt;
</del><ins>+    2015-05-11  Alex Christensen  &lt;achristensen@webkit.org&gt;
</ins><span class="cx"> 
</span><del>-                [Content Extensions] Support domain-specific rules and exceptions.
-                https://bugs.webkit.org/show_bug.cgi?id=144833
</del><ins>+            [Content Extensions] Support domain-specific rules and exceptions.
+            https://bugs.webkit.org/show_bug.cgi?id=144833
</ins><span class="cx"> 
</span><del>-                Reviewed by Darin Adler.
</del><ins>+            Reviewed by Darin Adler.
</ins><span class="cx"> 
</span><del>-                * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
-                (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
-                (TestWebKitAPI::InMemoryCompiledContentExtension::create):
-                (TestWebKitAPI::InMemoryCompiledContentExtension::InMemoryCompiledContentExtension):
-                Moved CompiledContentExtensionData from ContentExtensionCompiler.h because it is only used for testing.
-                (TestWebKitAPI::mainDocumentRequest):
-                (TestWebKitAPI::subResourceRequest):
-                (TestWebKitAPI::TEST_F):
-                (TestWebKitAPI::checkCompilerError):
-                Added tests for parsing and functionality of if-domain and unless-domain.
</del><ins>+            * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+            (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
+            (TestWebKitAPI::InMemoryCompiledContentExtension::create):
+            (TestWebKitAPI::InMemoryCompiledContentExtension::InMemoryCompiledContentExtension):
+            Moved CompiledContentExtensionData from ContentExtensionCompiler.h because it is only used for testing.
+            (TestWebKitAPI::mainDocumentRequest):
+            (TestWebKitAPI::subResourceRequest):
+            (TestWebKitAPI::TEST_F):
+            (TestWebKitAPI::checkCompilerError):
+            Added tests for parsing and functionality of if-domain and unless-domain.
</ins><span class="cx"> 
</span><del>-        2015-05-12  Dana Burkart
-        Dana Burkart  &lt;dburkart@apple.com
-        dburkart@apple.com&gt;
</del><ins>+2015-05-12  Dana Burkart &lt;dburkart@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                Merge r183954. rdar://problem/20281886
</del><ins>+        Merge r183954. rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-            2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</del><ins>+    2015-05-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</ins><span class="cx"> 
</span><del>-                    New force-related DOM events should fire in WK1 views
-                    https://bugs.webkit.org/show_bug.cgi?id=144663
-                    -and corresponding-
-                    rdar://problem/20281886
</del><ins>+            New force-related DOM events should fire in WK1 views
+            https://bugs.webkit.org/show_bug.cgi?id=144663
+            -and corresponding-
+            rdar://problem/20281886
</ins><span class="cx"> 
</span><del>-                    Reviewed by Sam Weinig.
</del><ins>+            Reviewed by Sam Weinig.
</ins><span class="cx"> 
</span><del>-                    PlatformEventFactory::createPlatformMouseEvent() takes the last pressure event
-                    now. Just send nil.
-                    * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
-                    (TestWebKitAPI::buildAndPerformTest):
</del><ins>+            PlatformEventFactory::createPlatformMouseEvent() takes the last pressure event
+            now. Just send nil.
+            * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
+            (TestWebKitAPI::buildAndPerformTest):
</ins><span class="cx"> 
</span><span class="cx"> 2015-05-06  Matt Baker  &lt;mattbaker@apple.com&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>