<!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>[186364] tags/Safari-601.1.38.1/Source/WebKit2</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/186364">186364</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 11:36:59 -0700 (Mon, 06 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186148">r186148</a>. rdar://problem/20655729</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011381SourceWebKit2ChangeLog">tags/Safari-601.1.38.1/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari6011381SourceWebKit2PlatformspiiosUIKitSPIh">tags/Safari-601.1.38.1/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#tagsSafari6011381SourceWebKit2SharedWebEventh">tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEvent.h</a></li>
<li><a href="#tagsSafari6011381SourceWebKit2SharedWebEventConversioncpp">tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEventConversion.cpp</a></li>
<li><a href="#tagsSafari6011381SourceWebKit2SharediosNativeWebTouchEventIOSmm">tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm</a></li>
<li><a href="#tagsSafari6011381SourceWebKit2SharediosWebTouchEventIOScpp">tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011381SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/ChangeLog (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/ChangeLog        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/ChangeLog        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-06  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r186148. rdar://problem/20655729
+
+    2015-06-30  Enrica Casucci  &lt;enrica@apple.com&gt;
+
+            &lt;rdar://problem/20655729&gt; WebKit should heuristically exclude scrolling touch events from the user gesture category
+
+            Reviewed by Benjamin Poulain.
+
+            * Platform/spi/ios/UIKitSPI.h:
+            * Shared/WebEvent.h:
+            (WebKit::WebTouchEvent::WebTouchEvent):
+            (WebKit::WebTouchEvent::position):
+            (WebKit::WebTouchEvent::isPotentialTap):
+            (WebKit::WebTouchEvent::isGesture):
+            (WebKit::WebTouchEvent::gestureScale):
+            (WebKit::WebTouchEvent::gestureRotation):
+            * Shared/WebEventConversion.cpp:
+            (WebKit::WebKit2PlatformTouchEvent::WebKit2PlatformTouchEvent):
+            * Shared/ios/NativeWebTouchEventIOS.mm:
+            (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+            * Shared/ios/WebTouchEventIOS.cpp:
+            (WebKit::WebTouchEvent::encode):
+            (WebKit::WebTouchEvent::decode):
+            Pipe isPotentialTap through.
+
</ins><span class="cx"> 2015-07-01  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Roll out r185936.
</span><span class="lines">@@ -141,7 +168,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=146422
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Joseph Pecoraro.
</span><del>-        
</del><ins>+
</ins><span class="cx">         When inspecting espn.com, MobileSafari sometimes crashes, because
</span><span class="cx">         highlight.quads is empty. I was not able to quickly determine why.
</span><span class="cx"> 
</span><span class="lines">@@ -172,7 +199,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Enrica Casucci and Simon Fraser.
</span><span class="cx"> 
</span><del>-        For links, get the TextQuads from the Range, and for images, look at the 
</del><ins>+        For links, get the TextQuads from the Range, and for images, look at the
</ins><span class="cx">         absoluteContentQuad(). All other items can continue to use absoluteBoundingBox.
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span><span class="cx">         (WebKit::WebPage::getPositionInformation):
</span><span class="lines">@@ -745,21 +772,21 @@
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Tim Horton.
</span><span class="cx"> 
</span><del>-        As Dan pointed out in https://bugs.webkit.org/show_bug.cgi?id=146350 , this way of  
-        getting the screen size was problematic on multiple counts. Fixed here by using 
-        UIScreen. 
</del><ins>+        As Dan pointed out in https://bugs.webkit.org/show_bug.cgi?id=146350 , this way of
+        getting the screen size was problematic on multiple counts. Fixed here by using
+        UIScreen.
</ins><span class="cx">         * UIProcess/WKImagePreviewViewController.mm:
</span><span class="cx">         (-[WKImagePreviewViewController initWithCGImage:]):
</span><span class="cx"> 
</span><span class="cx"> 2015-06-26  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        WebPage::getPositionInformation() should not copy an image that is larger than the  
</del><ins>+        WebPage::getPositionInformation() should not copy an image that is larger than the
</ins><span class="cx">         screen
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=146367
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Maintain aspectRatio, but scale down the buffer size if the image is larger than 
</del><ins>+        Maintain aspectRatio, but scale down the buffer size if the image is larger than
</ins><span class="cx">         the screen.
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span><span class="cx">         (WebKit::WebPage::getPositionInformation):
</span><span class="lines">@@ -828,7 +855,7 @@
</span><span class="cx">         * UIProcess/ios/WKContentViewInteraction.h:
</span><span class="cx">         * UIProcess/ios/WKContentViewInteraction.mm:
</span><span class="cx"> 
</span><del>-        Only apply the http restriction to non-image links since we can still preview the 
</del><ins>+        Only apply the http restriction to non-image links since we can still preview the
</ins><span class="cx">         image of a non-http image link.
</span><span class="cx">         (-[WKContentView gestureRecognizerShouldBegin:]):
</span><span class="cx"> 
</span><span class="lines">@@ -841,7 +868,7 @@
</span><span class="cx">         New files.
</span><span class="cx">         * WebKit2.xcodeproj/project.pbxproj:
</span><span class="cx"> 
</span><del>-        Just use the actual image in the PositionInformation for image elements rather 
</del><ins>+        Just use the actual image in the PositionInformation for image elements rather
</ins><span class="cx">         than taking a screen shot.
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span><span class="cx">         (WebKit::WebPage::getPositionInformation):
</span><span class="lines">@@ -895,11 +922,11 @@
</span><span class="cx">         rdar://problem/21233010
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         When doing a back swipe, views interposed between the WKWebView and the WKContentView
</span><span class="cx">         get positions and animations for the swipe. This -_updateVisibleContentRects to
</span><span class="cx">         compute bad visible and unobscured rects, so we lose tiles.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by &quot;freezing&quot; the visible and unobscured content rects in the view being
</span><span class="cx">         swiped for the duration of the navigation gesture. When swiping the main view,
</span><span class="cx">         we just plumb through navigationGestureDidEnd(). When Reader is showing and the
</span><span class="lines">@@ -1195,13 +1222,13 @@
</span><span class="cx">         &lt;rdar://problem/20297182&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><del>-        
</del><ins>+
</ins><span class="cx">         The default value of [NSPopUpButtonCell altersStateOfSelectedItem] is YES.
</span><span class="cx">         This makes the popup menu items checkable by default. We need to change the
</span><span class="cx">         value of this attribute to NO when creating the popup menu, so the items
</span><span class="cx">         are uncheckable. The value of this property needs to change back to YES
</span><span class="cx">         if context menu is about selecting an option and not executing a command.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/mac/WebContextMenuProxyMac.mm:
</span><span class="cx">         (WebKit::WebContextMenuProxyMac::populate):
</span><span class="cx"> 
</span><span class="lines">@@ -1363,7 +1390,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><del>-        Add _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering and 
</del><ins>+        Add _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering and
</ins><span class="cx">         _WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering to the private
</span><span class="cx">         header, and convert them to/from WebCore milestones.
</span><span class="cx"> 
</span><span class="lines">@@ -1725,7 +1752,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><span class="cx"> 
</span><del>-        We only ever create connections whose messages are dispatched to the main run loop, so we can 
</del><ins>+        We only ever create connections whose messages are dispatched to the main run loop, so we can
</ins><span class="cx">         vastly simplify the code by only allowing messages to be dispatched there.
</span><span class="cx"> 
</span><span class="cx">         * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
</span><span class="lines">@@ -3044,13 +3071,13 @@
</span><span class="cx">         rdar://problem/19448439
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Benjamin Poulain.
</span><del>-        
-        When in the middle of a rubber-band (UIScrollView bounce), we could send a bad 
</del><ins>+
+        When in the middle of a rubber-band (UIScrollView bounce), we could send a bad
</ins><span class="cx">         fixed position rect down to WebCore, causing 100% height elements to get laid out
</span><span class="cx">         at the wrong height, possible too short. This occurred when -_updateVisibleContentRects
</span><span class="cx">         said we were in a stable state, but the rubber-band offset caused WebPageProxy::computeCustomFixedPositionRect()
</span><span class="cx">         to compute a bad rect via constrainedUnobscuredRect.intersect(documentRect).
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by not claiming to be in a stable state during rubber-banding. Added _scrollViewIsRubberBanding
</span><span class="cx">         to compute that, taking care with floating point comparisons for 3x devices.
</span><span class="cx"> 
</span><span class="lines">@@ -3394,11 +3421,11 @@
</span><span class="cx"> 
</span><span class="cx">         - Use SecurityOrigin instead of SecurityOriginData; It's not possible to pass SecurityOriginData
</span><span class="cx">         safely between threads.
</span><del>-        
</del><ins>+
</ins><span class="cx">         - Use std::chrono instead of double for modification times.
</span><del>-        
</del><ins>+
</ins><span class="cx">         - Get rid of endTime since it's not used.
</span><del>-        
</del><ins>+
</ins><span class="cx">         - Change deleteIndexedDatabaseEntriesForOrigin to deleteIndexedDatabaseEntriesForOrigins and make it take
</span><span class="cx">         a vector of origins instead of a single one.
</span><span class="cx"> 
</span><span class="lines">@@ -3455,10 +3482,10 @@
</span><span class="cx">         rdar://problem/18364939
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><del>-        
</del><ins>+
</ins><span class="cx">         On iOS, AVPlayerLayers are contained inside a WebVideoContainerLayer, but
</span><span class="cx">         the layer type is still LayerTypeAVPlayerLayer.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Avoid throwing exceptions when cloning such layers by checking the layer class.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
</span><span class="lines">@@ -3977,7 +4004,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=145863
</span><span class="cx"> 
</span><span class="cx">         Disable web touch event recognizer on link preview. We do the same when finding nodes in inspector or when long press gesture
</span><del>-        is recognized (by _cancelAllTouches). 
</del><ins>+        is recognized (by _cancelAllTouches).
</ins><span class="cx"> 
</span><span class="cx">         Reviewed by Beth Dakin.
</span><span class="cx"> 
</span><span class="lines">@@ -5188,25 +5215,25 @@
</span><span class="cx"> 
</span><span class="cx">         WebKit policy delegate should suggest if a navigation should be allowed to open URLs externally.
</span><span class="cx">         rdar://problem/21025301 and https://bugs.webkit.org/show_bug.cgi?id=145280
</span><del>-        
</del><ins>+
</ins><span class="cx">         Reviewed by Alex Christensen.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Plugins/PDF/PDFPlugin.mm:
</span><span class="cx">         (WebKit::PDFPlugin::clickedLink):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/Plugins/PluginView.cpp:
</span><span class="cx">         (WebKit::PluginView::performFrameLoadURLRequest):
</span><span class="cx">         (WebKit::PluginView::loadURL):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
</span><span class="cx">         (WebKit::WebContextMenuClient::searchWithGoogle):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
</span><span class="cx">         (WebKit::WebFrameLoaderClient::dispatchCreatePage):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/WebInspector.cpp:
</span><span class="cx">         (WebKit::WebInspector::openInNewTab):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::loadURLInFrame):
</span><span class="cx">         (WebKit::WebPage::loadRequest):
</span><span class="lines">@@ -5271,7 +5298,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><span class="cx"> 
</span><del>-        Use xpc_connection_set_oneshot_instance where possible; this will make sure that the 
</del><ins>+        Use xpc_connection_set_oneshot_instance where possible; this will make sure that the
</ins><span class="cx">         web process instances go away when the web process exits.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
</span><span class="lines">@@ -5303,8 +5330,8 @@
</span><span class="cx">         * UIProcess/API/C/WKPage.cpp:
</span><span class="cx">         (WKPageLoadURLWithShouldOpenExternalURLsPolicy):
</span><span class="cx">         * UIProcess/API/C/WKPagePrivate.h:
</span><del>-        
-        Expose the bit on NavigationAction for the policy delegate:        
</del><ins>+
+        Expose the bit on NavigationAction for the policy delegate:
</ins><span class="cx">         * WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp:
</span><span class="cx">         (WKBundleNavigationActionGetShouldOpenExternalURLs):
</span><span class="cx">         * WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h: Copied from Tools/WebKitTestRunner/WorkQueueManager.h.
</span><span class="lines">@@ -5313,7 +5340,7 @@
</span><span class="cx">         (WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):
</span><span class="cx">         * WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
</span><span class="cx">         (WebKit::InjectedBundleNavigationAction::shouldOpenExternalURLs):
</span><del>-    
</del><ins>+
</ins><span class="cx">         * WebKit2.xcodeproj/project.pbxproj:
</span><span class="cx"> 
</span><span class="cx"> 2015-06-01  Gavin Barraclough  &lt;barraclough@apple.com&gt;
</span><span class="lines">@@ -5543,7 +5570,7 @@
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="cx">         (-[WKWebView loadRequest:]):
</span><del>-        (-[WKWebView loadRequest:withOptions:]): Take an options dictionary that, for now, 
</del><ins>+        (-[WKWebView loadRequest:withOptions:]): Take an options dictionary that, for now,
</ins><span class="cx">           only supports one option.
</span><span class="cx">         * UIProcess/API/Cocoa/WKWebViewPrivate.h:
</span><span class="cx"> 
</span><span class="lines">@@ -5740,7 +5767,7 @@
</span><span class="cx">         (-[NSMutableURLRequest _web_setShouldOpenExternalURLs:]):
</span><span class="cx">         (-[NSURLRequest _web_isUserInitiated]): Deleted.
</span><span class="cx">         (-[NSMutableURLRequest _web_setIsUserInitiated:]): Deleted.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Hold the new flag as a bool, and encode/decode it across IPC:
</span><span class="cx">         * Shared/NavigationActionData.cpp:
</span><span class="cx">         (WebKit::NavigationActionData::encode):
</span><span class="lines">@@ -5772,7 +5799,7 @@
</span><span class="cx">         * UIProcess/WebPageProxy.h:
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
</span><del>-        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Translate 
</del><ins>+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Translate
</ins><span class="cx">           the NavigationAction flag to a bool in the NavigationActionData object.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="lines">@@ -6222,7 +6249,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Match what Lookup already does for their popover and dismiss our popovers on 
</del><ins>+        Match what Lookup already does for their popover and dismiss our popovers on
</ins><span class="cx">         scroll.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView scrollWheel:]):
</span><span class="lines">@@ -6305,7 +6332,7 @@
</span><span class="cx">         Also, leave SPI that used to be shared between immediate actions and
</span><span class="cx">         action menus intact, even if it had &quot;action menu&quot; in the name. We can
</span><span class="cx">         deprecate and rename in another patch... except for the very recently-added
</span><del>-        support from r184106, which we'll revert entirely, removing WKBundlePageOverlayV2, 
</del><ins>+        support from r184106, which we'll revert entirely, removing WKBundlePageOverlayV2,
</ins><span class="cx">         which was not adopted by any clients.
</span><span class="cx"> 
</span><span class="cx"> 2015-05-22  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="lines">@@ -6678,7 +6705,7 @@
</span><span class="cx"> 
</span><span class="cx">         Make sure that we always return a process pool. If we're a legacy C SPI per-context data store,
</span><span class="cx">         find the process pool we're a part of and use that. Otherwise, create a new one.
</span><del>-    
</del><ins>+
</ins><span class="cx">         * UIProcess/WebsiteData/WebsiteDataStore.cpp:
</span><span class="cx">         (WebKit::WebsiteDataStore::processPools):
</span><span class="cx"> 
</span><span class="lines">@@ -6901,7 +6928,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-05-19  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><del>-        REGRESSION(142590): Part 2: Scroll-snap points are improperly snapping to earlier index values (Scrolling Thread) 
</del><ins>+        REGRESSION(142590): Part 2: Scroll-snap points are improperly snapping to earlier index values (Scrolling Thread)
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=145175
</span><span class="cx">         &lt;rdar://problem/21023785&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -7052,44 +7079,44 @@
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><span class="cx">         There's a few issues here.
</span><del>-        
</del><ins>+
</ins><span class="cx">         1 - When the NetworkProcessProxy goes away, it takes its process assertion with it. This causes
</span><span class="cx">             the Network process to suspend indefinitely, unable to ever respond to IPC::Connection callbacks.
</span><span class="cx">             We already solved this with WebProcess with a watchdog timer keeping both the process assertion
</span><span class="cx">             and xpc_connection alive while the process shuts down. This patch expands that to the network
</span><span class="cx">             process, and it will be easy to expand that to database and plugin processes doing forward.
</span><del>-        
</del><ins>+
</ins><span class="cx">         2 - All of our child processes either decide to self-terminate or listen for their connection to
</span><span class="cx">             close at which point they terminate. This leads to various races. We should
</span><del>-            move to a model where the UI process explicitly tells them to shutdown, and this patch starts us 
</del><ins>+            move to a model where the UI process explicitly tells them to shutdown, and this patch starts us
</ins><span class="cx">             down that path.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * CMakeLists.txt:
</span><span class="cx">         * DerivedSources.make:
</span><span class="cx">         * WebKit2.xcodeproj/project.pbxproj:
</span><del>-        
</del><ins>+
</ins><span class="cx">         * NetworkProcess/NetworkProcess.cpp:
</span><span class="cx">         (WebKit::NetworkProcess::didReceiveMessage): Send ChildProcess messages to ChildProcess.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/ChildProcess.cpp:
</span><span class="cx">         (WebKit::ChildProcess::shutDown): For now, just terminate the process. In the future have the
</span><span class="cx">           process do cleanup work before it is terminated.
</span><span class="cx">         * Shared/ChildProcess.h:
</span><span class="cx">         * Shared/ChildProcess.messages.in: Added.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/ChildProcessProxy.cpp:
</span><del>-        (WebKit::ChildProcessProxy::shutDownProcess): Set a watchdog and - if possible - explicitly message 
</del><ins>+        (WebKit::ChildProcessProxy::shutDownProcess): Set a watchdog and - if possible - explicitly message
</ins><span class="cx">           the process to ShutDown.
</span><span class="cx">         (WebKit::ChildProcessProxy::abortProcessLaunchIfNeeded): Deleted.
</span><span class="cx">         * Shared/ChildProcessProxy.h:
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/WebProcessPool.cpp:
</span><span class="cx">         (WebKit::WebProcessPool::~WebProcessPool): Explicitly tell the network process to shut down.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/WebProcessProxy.cpp:
</span><span class="cx">         (WebKit::WebProcessProxy::removeWebPage): Move abortProcessLaunchIfNeeded() and the watchdog timer
</span><span class="cx">           code to ChildProcessProxy::shutDownProcess.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebProcess.cpp:
</span><span class="cx">         (WebKit::WebProcess::didReceiveMessage): Send ChildProcess messages to ChildProcess::didReceiveMessage.
</span><span class="cx"> 
</span><span class="lines">@@ -7168,7 +7195,7 @@
</span><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="cx">         (-[WKWebView scrollViewWillEndDragging:withVelocity:targetContentOffset:]): Retrieve the proper
</span><span class="cx">         computed content inset for the view and incorporate into any scroll snap point adjustments.
</span><del>-        (-[WKWebView _updateVisibleContentRects]): If we have active scroll snap points, 
</del><ins>+        (-[WKWebView _updateVisibleContentRects]): If we have active scroll snap points,
</ins><span class="cx">         * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
</span><span class="cx">         * UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
</span><span class="cx">         (WebKit::RemoteScrollingCoordinatorProxy::adjustTargetContentOffsetForSnapping): Update to account
</span><span class="lines">@@ -7574,7 +7601,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="cx"> 
</span><del>-        Make scrollbarOverlayStyle a part of the creation parameters. 
</del><ins>+        Make scrollbarOverlayStyle a part of the creation parameters.
</ins><span class="cx">         * Shared/WebPageCreationParameters.cpp:
</span><span class="cx">         (WebKit::WebPageCreationParameters::encode):
</span><span class="cx">         (WebKit::WebPageCreationParameters::decode):
</span><span class="lines">@@ -7601,7 +7628,7 @@
</span><span class="cx">         (WebKit::WebChromeClient::preferredScrollbarOverlayStyle):
</span><span class="cx">         * WebProcess/WebCoreSupport/WebChromeClient.h:
</span><span class="cx"> 
</span><del>-        Cache the scrollbarOverlayStyle() here for the WebProcess. 
</del><ins>+        Cache the scrollbarOverlayStyle() here for the WebProcess.
</ins><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::WebPage):
</span><span class="cx">         (WebKit::WebPage::setScrollbarOverlayStyle):
</span><span class="lines">@@ -7777,7 +7804,7 @@
</span><span class="cx">         * UIProcess/ProcessThrottler.h: Ditto.
</span><span class="cx">         * UIProcess/WebProcessProxy.cpp:
</span><span class="cx">         (WebKit::WebProcessProxy::WebProcessProxy): Update code to work now that m_throttler is an
</span><del>-        instance of ProcessThrottler instead of a smart pointer to a ProcessThrottler instance. 
</del><ins>+        instance of ProcessThrottler instead of a smart pointer to a ProcessThrottler instance.
</ins><span class="cx">         (WebKit::WebProcessProxy::didFinishLaunching): Update code to access functions of
</span><span class="cx">         m_throttler by reference instead of by pointer.
</span><span class="cx">         (WebKit::WebProcessProxy::processReadyToSuspend): Ditto.
</span><span class="lines">@@ -8133,7 +8160,7 @@
</span><span class="cx">         (WebKit::ProcessThrottler::assertionWillExpireImminently): Added; implements the ProcessAssertionClient
</span><span class="cx">         interface. Notify the process throttler clients that the assertion is near expiration.
</span><span class="cx">         * UIProcess/ProcessThrottler.h:
</span><del>-        * UIProcess/ProcessThrottlerClient.h: Added 
</del><ins>+        * UIProcess/ProcessThrottlerClient.h: Added
</ins><span class="cx">         * UIProcess/WebProcessProxy.cpp:
</span><span class="cx">         (WebKit::WebProcessProxy::sendProcessWillSuspendImminently): Added. Sends the message
</span><span class="cx">         ProcessWillSuspendImminently to the WebProcess.
</span><span class="lines">@@ -8467,7 +8494,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey Proskuryakov.
</span><span class="cx"> 
</span><del>-        Web* is traditionally a WK1 prefix, so use the WK2 prefix instead in WK2 so that 
</del><ins>+        Web* is traditionally a WK1 prefix, so use the WK2 prefix instead in WK2 so that
</ins><span class="cx">         we don’t have two classes with the same name in the two projects.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController _defaultAnimationController]):
</span><span class="lines">@@ -8922,8 +8949,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><del>-        This patch adds a layer on top of the UniqueIDBDatabase request map to catch this coding mistake in the future. 

</del><ins>+        This patch adds a layer on top of the UniqueIDBDatabase request map to catch this coding mistake in the future.
+
</ins><span class="cx">          * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
</span><span class="cx">         (WebKit::UniqueIDBDatabase::didCompleteBoolRequest): Get rid of the ASSERT and the temporary variable,
</span><span class="cx">           make it a single line which reads better.
</span><span class="lines">@@ -9118,7 +9145,7 @@
</span><span class="cx">         * UIProcess/API/C/WKLayoutMode.h:
</span><span class="cx">         * UIProcess/API/Cocoa/_WKLayoutMode.h:
</span><span class="cx">         Add the new layout mode, and documentation for the two complicated ones.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="cx">         (-[WKWebView _layoutMode]):
</span><span class="cx">         (-[WKWebView _setLayoutMode:]):
</span><span class="lines">@@ -9666,7 +9693,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span><span class="cx"> 
</span><del>-        Update the indicator style whenever the background color changes.  
</del><ins>+        Update the indicator style whenever the background color changes.
</ins><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="cx">         (-[WKWebView _updateScrollViewBackground]):
</span><span class="cx"> 
</span><span class="lines">@@ -9768,7 +9795,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=144413
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Allow the Test Netscape Plug-in to pretend to handle wheel events,
</span><span class="cx">         so layout tests can use it.
</span><span class="cx"> 
</span><span class="lines">@@ -10080,10 +10107,10 @@
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Plugins/PluginView.cpp:
</span><span class="cx">         (WebKit::PluginView::loadURL):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
</span><span class="cx">         (WebKit::WebFrameLoaderClient::dispatchCreatePage):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/WebInspector.cpp:
</span><span class="cx">         (WebKit::WebInspector::openInNewTab):
</span><span class="cx"> 
</span><span class="lines">@@ -10271,7 +10298,7 @@
</span><span class="cx">         that the current PDFLayerControler's current page was correct, but this will
</span><span class="cx">         not be true if you zoom the PDF out so that several pages are displayed at
</span><span class="cx">         once. Each selection keeps track of the page it is referenced against.
</span><del>-        
</del><ins>+
</ins><span class="cx">         2. Revise the offsets calculated for the TextIndicator to take into account
</span><span class="cx">         the font descender (as well as the ascender), and to adjust by the scaled
</span><span class="cx">         amount of margin around the selected text.
</span><span class="lines">@@ -10490,19 +10517,19 @@
</span><span class="cx"> 
</span><span class="cx">         * Shared/API/c/WKSharedAPICast.h:
</span><span class="cx">         (WebKit::toAPI):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/NavigationActionData.cpp:
</span><span class="cx">         (WebKit::NavigationActionData::NavigationActionData):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKNavigationAction.mm:
</span><span class="cx">         (toWKNavigationType):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/gtk/WebKitPrivate.cpp:
</span><span class="cx">         (toWebKitNavigationType):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
</span><span class="cx">         (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/WebInspector.cpp:
</span><span class="cx">         (WebKit::WebInspector::openInNewTab):
</span><span class="cx"> 
</span><span class="lines">@@ -10715,7 +10742,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=144179
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dean Jackson.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Remote layers can make their backing store volatile, so the backing only contributes
</span><span class="cx">         to reported memory use when attached.
</span><span class="cx"> 
</span><span class="lines">@@ -10750,7 +10777,7 @@
</span><span class="cx">         step where the font ascent was used to adjust the origin used for the TextIndicator. This
</span><span class="cx">         patch determines the correct ascent for the range of characters in the selection, and
</span><span class="cx">         adjusts the offset by the difference between the ascent and the height of the selection rect.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Also, since the PDFSelection only supplies the bounding rect for the selection, I calculate
</span><span class="cx">         an equivalent text bounding box by insetting the rect by half the size of the ascent.
</span><span class="cx"> 
</span><span class="lines">@@ -10871,7 +10898,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Tested by TestWebKitAPI 
</del><ins>+        Tested by TestWebKitAPI
</ins><span class="cx"> 
</span><span class="cx">         The 'lookupTextAtLocation' method was not converting the NSEvent coordinates it
</span><span class="cx">         was receiving from root view to the plugin view. Consequently, full page PDFs
</span><span class="lines">@@ -10920,7 +10947,7 @@
</span><span class="cx"> 
</span><span class="cx">         Immediate action not functional for embedded PDFs
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143952
</span><del>-        &lt;rdar://problem/19842365&gt;        
</del><ins>+        &lt;rdar://problem/19842365&gt;
</ins><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><span class="lines">@@ -10940,7 +10967,7 @@
</span><span class="cx">         * WebProcess/Plugins/Plugin.h:
</span><span class="cx">         * WebProcess/Plugins/PluginProxy.cpp: Initialize plugin type.
</span><span class="cx">         * WebProcess/Plugins/PluginProxy.h: Add stub.
</span><del>-        * WebProcess/Plugins/PluginView.cpp: 
</del><ins>+        * WebProcess/Plugins/PluginView.cpp:
</ins><span class="cx">         (WebKit::PluginView::viewRectForSelection): Added.
</span><span class="cx">         * WebProcess/Plugins/PluginView.h:
</span><span class="cx">         * WebProcess/WebPage/WebPage.h:
</span><span class="lines">@@ -11135,7 +11162,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=144140
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         This changes makes it possible to denote a GraphicsLayerCA's backing store
</span><span class="cx">         as &quot;attached&quot; or not. When not attached, the backing store is made volatile
</span><span class="cx">         and can be purged. This will be used in a future patch.
</span><span class="lines">@@ -11194,7 +11221,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=144123
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Drive-by fix: use the FrameView&amp; that we have already.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span><span class="lines">@@ -12015,15 +12042,15 @@
</span><span class="cx">         rdar://problem/20596328
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><del>-        
</del><ins>+
</ins><span class="cx">         After r181656, all requestAnimationFrame was falling back to timers, and not
</span><span class="cx">         using the platform's DisplayRefreshMonitor, because of a Nullopt vs nullptr
</span><span class="cx">         fumble.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Replace this confusing Optional&lt;&gt; code with simpler code that just forces the
</span><span class="cx">         clients to make a DisplayRefreshMonitor if they can, first asking
</span><span class="cx">         ChromeClient, and then falling back to createDefaultDisplayRefreshMonitor().
</span><del>-        
</del><ins>+
</ins><span class="cx">         Make lots of things into references, and use C++11 initialization in some places.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebCoreSupport/WebChromeClient.cpp:
</span><span class="lines">@@ -12143,11 +12170,11 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dean Jackson.
</span><span class="cx"> 
</span><del>-        This patch makes pressureChangeWithEvent create NativeWebMouseEvents with the 
</del><ins>+        This patch makes pressureChangeWithEvent create NativeWebMouseEvents with the
</ins><span class="cx">         NSEventTypePressures that is gets and sends those down to the web process.
</span><span class="cx"> 
</span><del>-        Re-name pressureEvent to lastPressureEvent. Now that event can sometimes be an 
-        NSEventTypePressure, the new name makes it clear how the second parameter differs 
</del><ins>+        Re-name pressureEvent to lastPressureEvent. Now that event can sometimes be an
+        NSEventTypePressure, the new name makes it clear how the second parameter differs
</ins><span class="cx">         from the first.
</span><span class="cx">         * Shared/NativeWebMouseEvent.h:
</span><span class="cx"> 
</span><span class="lines">@@ -12159,7 +12186,7 @@
</span><span class="cx">         (WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
</span><span class="cx">         * Shared/mac/WebEventFactory.h:
</span><span class="cx"> 
</span><del>-        All of the square-peg, round-hole problems of massaging the NSEventTypePressures 
</del><ins>+        All of the square-peg, round-hole problems of massaging the NSEventTypePressures
</ins><span class="cx">         events into WebMouseEvents is taken care of here.
</span><span class="cx">         * Shared/mac/WebEventFactory.mm:
</span><span class="cx">         (WebKit::mouseButtonForEvent):
</span><span class="lines">@@ -12167,7 +12194,7 @@
</span><span class="cx">         (WebKit::pointForEvent):
</span><span class="cx">         (WebKit::WebEventFactory::createWebMouseEvent):
</span><span class="cx"> 
</span><del>-        Instead of calling the old inputDeviceForceDidChange, create a NativeWebMouseEvent 
</del><ins>+        Instead of calling the old inputDeviceForceDidChange, create a NativeWebMouseEvent
</ins><span class="cx">         and handle it.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView pressureChangeWithEvent:]):
</span><span class="lines">@@ -12353,8 +12380,8 @@
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Tim Horton.
</span><span class="cx"> 
</span><del>-        Fixing a small mistake in http://trac.webkit.org/changeset/182912 which should 
-        make sure to use the most up-to-date pressure information when setting the force 
</del><ins>+        Fixing a small mistake in http://trac.webkit.org/changeset/182912 which should
+        make sure to use the most up-to-date pressure information when setting the force
</ins><span class="cx">         on a WebMouseEvent.
</span><span class="cx"> 
</span><span class="cx">         * Shared/mac/WebEventFactory.mm:
</span><span class="lines">@@ -12400,7 +12427,7 @@
</span><span class="cx">             a new model and interface object.
</span><span class="cx">         (WebKit::WebVideoFullscreenManagerProxy::ensureModel): Return the model half of ensureModelAndInterface().
</span><span class="cx">         (WebKit::WebVideoFullscreenManagerProxy::ensureInterface): Return the interface half of ensureModelAndInterface().
</span><del>-        (WebKit::WebVideoFullscreenManagerProxy::enterFullscreen): Walk through the outstanding interface objects, and if 
</del><ins>+        (WebKit::WebVideoFullscreenManagerProxy::enterFullscreen): Walk through the outstanding interface objects, and if
</ins><span class="cx">             any have a fullscreen mode which matches the about-to-be-fullscreen interface, request that that other interface
</span><span class="cx">             exit fullscreen.
</span><span class="cx">         * WebProcess/ios/WebVideoFullscreenManager.mm:
</span><span class="lines">@@ -12564,11 +12591,11 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dean Jackson.
</span><span class="cx"> 
</span><del>-        This patch makes pressureChangeWithEvent create NativeWebMouseEvents with the 
</del><ins>+        This patch makes pressureChangeWithEvent create NativeWebMouseEvents with the
</ins><span class="cx">         NSEventTypePressures that is gets and sends those down to the web process.
</span><span class="cx"> 
</span><del>-        Re-name pressureEvent to lastPressureEvent. Now that event can sometimes be an 
-        NSEventTypePressure, the new name makes it clear how the second parameter differs 
</del><ins>+        Re-name pressureEvent to lastPressureEvent. Now that event can sometimes be an
+        NSEventTypePressure, the new name makes it clear how the second parameter differs
</ins><span class="cx">         from the first.
</span><span class="cx">         * Shared/NativeWebMouseEvent.h:
</span><span class="cx"> 
</span><span class="lines">@@ -12580,7 +12607,7 @@
</span><span class="cx">         (WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
</span><span class="cx">         * Shared/mac/WebEventFactory.h:
</span><span class="cx"> 
</span><del>-        All of the square-peg, round-hole problems of massaging the NSEventTypePressures 
</del><ins>+        All of the square-peg, round-hole problems of massaging the NSEventTypePressures
</ins><span class="cx">         events into WebMouseEvents is taken care of here.
</span><span class="cx">         * Shared/mac/WebEventFactory.mm:
</span><span class="cx">         (WebKit::mouseButtonForEvent):
</span><span class="lines">@@ -12588,7 +12615,7 @@
</span><span class="cx">         (WebKit::pointForEvent):
</span><span class="cx">         (WebKit::WebEventFactory::createWebMouseEvent):
</span><span class="cx"> 
</span><del>-        Instead of calling the old inputDeviceForceDidChange, create a NativeWebMouseEvent 
</del><ins>+        Instead of calling the old inputDeviceForceDidChange, create a NativeWebMouseEvent
</ins><span class="cx">         and handle it.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView pressureChangeWithEvent:]):
</span><span class="lines">@@ -12782,7 +12809,7 @@
</span><span class="cx"> 
</span><span class="cx">         Rename the current _WKWebsiteDataStore to WKWebsiteDataStore. Make init unavailable and tighten up the
</span><span class="cx">         types of the defaultDataStore and nonPersistentDataStore class methods.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Add a new _WKWebsiteDataStore @interface and @implementation that derives from WKWebsiteDataStore
</span><span class="cx">         and forwards the defaultDataStore and nonPersistentDataStore method calls.
</span><span class="cx"> 
</span><span class="lines">@@ -13342,7 +13369,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-04-13  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
</span><span class="cx"> 
</span><del>-        [EFL][GTK] Fix build break after r182753 
</del><ins>+        [EFL][GTK] Fix build break after r182753
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143689
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="lines">@@ -13465,7 +13492,7 @@
</span><span class="cx">         as the frame of the view scaled by the inverse of the view scale. This
</span><span class="cx">         makes it very easy to maintain a WK(Web)View that is scaled down by
</span><span class="cx">         a constant amount, but is laid out as if it were not.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
</span><span class="cx">         (WebKit::TiledCoreAnimationDrawingArea::adjustTransientZoom):
</span><span class="cx">         (WebKit::TiledCoreAnimationDrawingArea::commitTransientZoom):
</span><span class="lines">@@ -13716,11 +13743,11 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><del>-        In order to accommodate adding force to all PlatformMouseEvents, we have to add it 
-        to pass a caches pressure event to NativeWebMouseEvent and add force to 
</del><ins>+        In order to accommodate adding force to all PlatformMouseEvents, we have to add it
+        to pass a caches pressure event to NativeWebMouseEvent and add force to
</ins><span class="cx">         WebMouseEvent.
</span><span class="cx"> 
</span><del>-        NativeWebMouseEvent now requires a second NSEvent for the pressureEvent. 
</del><ins>+        NativeWebMouseEvent now requires a second NSEvent for the pressureEvent.
</ins><span class="cx">         * Shared/NativeWebMouseEvent.h:
</span><span class="cx"> 
</span><span class="cx">         WebMouseEvent takes a force parameter.
</span><span class="lines">@@ -13738,7 +13765,7 @@
</span><span class="cx">         * Shared/mac/WebEventFactory.mm:
</span><span class="cx">         (WebKit::WebEventFactory::createWebMouseEvent):
</span><span class="cx"> 
</span><del>-        Cache the most recent pressureEvent in _data so that it can be sent along to the 
</del><ins>+        Cache the most recent pressureEvent in _data so that it can be sent along to the
</ins><span class="cx">         NativeWebMouseEvent constructor.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView pressureChangeWithEvent:]):
</span><span class="lines">@@ -13762,7 +13789,7 @@
</span><span class="cx">         (WebKit::WebPage::simulateMouseUp):
</span><span class="cx">         (WebKit::WebPage::simulateMouseMotion):
</span><span class="cx"> 
</span><del>-        The functions that dispatch the force events no longer take a PlatformMouseEvent 
</del><ins>+        The functions that dispatch the force events no longer take a PlatformMouseEvent
</ins><span class="cx">         as a parameter.
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::inputDeviceForceDidChange):
</span><span class="lines">@@ -13957,7 +13984,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-04-10  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
</span><span class="cx"> 
</span><del>-        Fix some minor typos related to the WebProcessCreationParameter. 
</del><ins>+        Fix some minor typos related to the WebProcessCreationParameter.
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143598
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Csaba Osztrogonác.
</span><span class="lines">@@ -13993,7 +14020,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-04-09  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
</span><span class="cx"> 
</span><del>-        Use modern loops in WebProcess 
</del><ins>+        Use modern loops in WebProcess
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143302
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="lines">@@ -14298,7 +14325,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        We no longer need m_lastActionMenuHitTestPreventsDefault since we’ll always 
</del><ins>+        We no longer need m_lastActionMenuHitTestPreventsDefault since we’ll always
</ins><span class="cx">         dispatch the events to Element.
</span><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::WebPage):
</span><span class="lines">@@ -14386,7 +14413,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143495
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Exposed the antialiasedFontDilationEnabled setting via WK C SPI and Objective-C SPI.
</span><span class="cx"> 
</span><span class="cx">         * Shared/WebPreferencesDefinitions.h:
</span><span class="lines">@@ -14410,7 +14437,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        We only care about the changed, began, and ended phases. 
</del><ins>+        We only care about the changed, began, and ended phases.
</ins><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView pressureChangeWithEvent:]):
</span><span class="cx"> 
</span><span class="lines">@@ -14562,8 +14589,8 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-04-06  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        https://trac.webkit.org/changeset/182338 introduced a build failure that I 
-        attempted to fix with https://trac.webkit.org/changeset/182341 , but that disabled 
</del><ins>+        https://trac.webkit.org/changeset/182338 introduced a build failure that I
+        attempted to fix with https://trac.webkit.org/changeset/182341 , but that disabled
</ins><span class="cx">         the feature accidentally.  This should do the right thing.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="lines">@@ -14852,13 +14879,13 @@
</span><span class="cx">         rdar://problem/20382734, rdar://problem/20395497
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Calling computeNonFastScrollableRegion() eagerly when scrollable areas come and go
</span><span class="cx">         is bad, because it can cause FrameView::layout() to get called in the middle of
</span><span class="cx">         RenderObject destruction, which leaves the render tree in a bad state.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by calling computeNonFastScrollableRegion() lazily, just before scrolling tree commit.
</span><del>-        
</del><ins>+
</ins><span class="cx">         AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged() now just sets
</span><span class="cx">         a flag to say that the non-fast region needs to be recomputed, and that schedules
</span><span class="cx">         a scrolling tree commit. When the commit happens, we recompute the region. If the
</span><span class="lines">@@ -14881,7 +14908,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143394
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         A client reshuffle at some point broke the dispatch of the ReachedSessionRestorationRenderTreeSizeThreshold
</span><span class="cx">         milestone. Fix by using WebPageProxy::didLayout() to fire the milestone.
</span><span class="cx"> 
</span><span class="lines">@@ -14900,12 +14927,12 @@
</span><span class="cx"> 
</span><span class="cx">         This patch:
</span><span class="cx">         1. Dispatches webkitmouseforceup and webkitmouseforceclick at the right time.
</span><del>-        2. Dispatches webkitmouseforcechanged from mousedown all the way through through 
</del><ins>+        2. Dispatches webkitmouseforcechanged from mousedown all the way through through
</ins><span class="cx">         mouseup.
</span><del>-        3. Uses force values from pressureChangeWithEvent instead of the immediate action 
</del><ins>+        3. Uses force values from pressureChangeWithEvent instead of the immediate action
</ins><span class="cx">         gesture recognizer.
</span><span class="cx"> 
</span><del>-        Listen for this NSResponder method, and pass the relevant info to WebPageProxy to 
</del><ins>+        Listen for this NSResponder method, and pass the relevant info to WebPageProxy to
</ins><span class="cx">         dispatch to the web process.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView pressureChangeWithEvent:]):
</span><span class="lines">@@ -14914,30 +14941,30 @@
</span><span class="cx">         (WebKit::WebPageProxy::immediateActionDidUpdate):
</span><span class="cx">         * UIProcess/WebPageProxy.h:
</span><span class="cx"> 
</span><del>-        The web process still needs to know when the immediate action gesture recognizer 
-        is updating, but it doesn’t need the force information. That will come from 
</del><ins>+        The web process still needs to know when the immediate action gesture recognizer
+        is updating, but it doesn’t need the force information. That will come from
</ins><span class="cx">         pressureChangeWithEvent.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
</span><span class="cx"> 
</span><del>-        Cache m_lastForceStage so that we can determine if we are 
</del><ins>+        Cache m_lastForceStage so that we can determine if we are
</ins><span class="cx">         transitioning to a new stage.
</span><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::WebPage):
</span><span class="cx">         * WebProcess/WebPage/WebPage.h:
</span><span class="cx"> 
</span><del>-        New message for InputDeviceForceDidChange and modified message for 
</del><ins>+        New message for InputDeviceForceDidChange and modified message for
</ins><span class="cx">         ImmediateActionDidUpdate
</span><span class="cx">         * WebProcess/WebPage/WebPage.messages.in:
</span><span class="cx"> 
</span><del>-        inputDeviceForceDidChange now takes care of dispatching mouseforcechanged, 
</del><ins>+        inputDeviceForceDidChange now takes care of dispatching mouseforcechanged,
</ins><span class="cx">         mouseforcedown, mouseforceup, and mouseforceclick.
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::inputDeviceForceDidChange):
</span><span class="cx"> 
</span><del>-        We still need to keep track of the ImmediateActionStages in WebCore::EventHandler 
-        so that we can have the right default behavior on mouseup based on whether or not 
-        that action began and was completed. (In other words, to ensure we don’t navigate 
</del><ins>+        We still need to keep track of the ImmediateActionStages in WebCore::EventHandler
+        so that we can have the right default behavior on mouseup based on whether or not
+        that action began and was completed. (In other words, to ensure we don’t navigate
</ins><span class="cx">         to a link after force clicking it.)
</span><span class="cx">         (WebKit::WebPage::immediateActionDidUpdate):
</span><span class="cx">         (WebKit::WebPage::immediateActionDidComplete):
</span><span class="lines">@@ -15446,7 +15473,7 @@
</span><span class="cx">         Remove the wheel event counting that Document does, and passes into the scrolling tree.
</span><span class="cx">         The ScrollingTree now just uses the non-fast scrollable region to determine when to
</span><span class="cx">         fast scroll on pages with wheel event handlers.
</span><del>-        
</del><ins>+
</ins><span class="cx">         If a handler includes position:fixed renderers, we just cover the whole document
</span><span class="cx">         with the slow-scrolling region currently. This could be improved.
</span><span class="cx"> 
</span><span class="lines">@@ -15610,7 +15637,7 @@
</span><span class="cx">         * UIProcess/WebPageProxy.h:
</span><span class="cx">         Add and plumb didChangeBackgroundColor, which calls
</span><span class="cx">         _updateScrollViewBackground on iOS.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/ios/ViewGestureControllerIOS.mm:
</span><span class="cx">         (WebKit::ViewGestureController::endSwipeGesture):
</span><span class="cx">         Hide the content of the drawing area until the next commit. This way,
</span><span class="lines">@@ -15822,21 +15849,21 @@
</span><span class="cx">         Helper to run the content extension compiler and write it to disk. It first
</span><span class="cx">         writes it to a temporary file and then does an atomic rename operation to put
</span><span class="cx">         the file in the final location. Doing this means that if the process crashes while
</span><del>-        the compile is taking place, the partially written file won't end up in the cache, 
</del><ins>+        the compile is taking place, the partially written file won't end up in the cache,
</ins><span class="cx">         but rather, will be cleaned up by the OS.
</span><del>- 
</del><ins>+
</ins><span class="cx">         (API::UserContentExtensionStore::lookupContentExtension):
</span><span class="cx">         API entry point to lookup an extension that has been compiled to disk. On a background queue,
</span><span class="cx">         it attempts to open and map the extension (based on the identifier passed in) and return it
</span><span class="cx">         to the caller via the callback function passed in.
</span><del>-        
</del><ins>+
</ins><span class="cx">         (API::UserContentExtensionStore::compileContentExtension):
</span><del>-        API entry point to compile an extension and write it to store. On a background queue, it 
</del><ins>+        API entry point to compile an extension and write it to store. On a background queue, it
</ins><span class="cx">         compiles the file to disk and if successful, returns the memory mapped data via the callback
</span><span class="cx">         function passed in.
</span><span class="cx"> 
</span><span class="cx">         (API::UserContentExtensionStore::removeContentExtension):
</span><del>-        API entry point to remove an extension from the store. On a background queue, it 
</del><ins>+        API entry point to remove an extension from the store. On a background queue, it
</ins><span class="cx">         unlinks the extension (based on the identifier passed in) and tells the caller it completed
</span><span class="cx">         the action vial the callback function passed in.
</span><span class="cx"> 
</span><span class="lines">@@ -15974,7 +16001,7 @@
</span><span class="cx">         for active loads to finish, and for the scroll position to be restored.
</span><span class="cx">         This brings the iOS implementation in line with the slightly better Mac
</span><span class="cx">         implementation, and also sets the stage for deduplication of all of this code.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/mac/ViewGestureController.h:
</span><span class="cx">         * UIProcess/mac/ViewGestureControllerMac.mm:
</span><span class="cx">         (WebKit::ViewGestureController::ViewGestureController):
</span><span class="lines">@@ -16039,7 +16066,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143110
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dean Jackson.
</span><del>-        
</del><ins>+
</ins><span class="cx">         When we destroy the drawing area after a web process crash, we also need to destroy
</span><span class="cx">         the scrollingPerformanceData which has a reference to the drawing area.
</span><span class="cx"> 
</span><span class="lines">@@ -16218,7 +16245,7 @@
</span><span class="cx">         (-[WKWebView _findString:options:maxCount:]):
</span><span class="cx">         (-[WKWebView _hideFindUI]):
</span><span class="cx">         If we have a custom content view, forward find-in-page methods to it.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKWebViewPrivate.h:
</span><span class="cx">         * UIProcess/API/Cocoa/_WKFindOptions.h:
</span><span class="cx">         Move _WKFindOptions into its own file.
</span><span class="lines">@@ -16307,7 +16334,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143149
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         MobileSafari and WebKit need to collect scrollperf data using the same timebase;
</span><span class="cx">         MobileSafari can't call WTF::monotonicallyIncreasingTime(), so use CFAbsoluteTimeGetCurrent()
</span><span class="cx">         everywhere.
</span><span class="lines">@@ -16796,10 +16823,10 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        The TextIndicator was getting set to nil by the call to 
-        _dismissContentRelativeChildWindows in mouseDown. That line of code was added by 
-        http://trac.webkit.org/changeset/177242 to work around a bug in another component 
-        that has now been resolved, so it no longer appears to be necessary. 
</del><ins>+        The TextIndicator was getting set to nil by the call to
+        _dismissContentRelativeChildWindows in mouseDown. That line of code was added by
+        http://trac.webkit.org/changeset/177242 to work around a bug in another component
+        that has now been resolved, so it no longer appears to be necessary.
</ins><span class="cx"> 
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView mouseDown:]):
</span><span class="lines">@@ -16882,7 +16909,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-03-25  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        REGRESSION (r181660): Safari navigates to link after a starting and canceling a 
</del><ins>+        REGRESSION (r181660): Safari navigates to link after a starting and canceling a
</ins><span class="cx">         force preview
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=143057
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -16890,7 +16917,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Always call _page-&gt;immediateActionDidUpdate() so that the EventHandler’s 
</del><ins>+        Always call _page-&gt;immediateActionDidUpdate() so that the EventHandler’s
</ins><span class="cx">         ImmediateActionStage is appropriately updated.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
</span><span class="lines">@@ -17100,8 +17127,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dean Jackson.
</span><span class="cx"> 
</span><del>-        ActionMenuHitTestResult has a new bool indicating whether to not the HitTestResult 
-        will prevent default. 
</del><ins>+        ActionMenuHitTestResult has a new bool indicating whether to not the HitTestResult
+        will prevent default.
</ins><span class="cx">         * Shared/mac/ActionMenuHitTestResult.h:
</span><span class="cx">         * Shared/mac/ActionMenuHitTestResult.mm:
</span><span class="cx">         (WebKit::ActionMenuHitTestResult::encode):
</span><span class="lines">@@ -17112,7 +17139,7 @@
</span><span class="cx">         (WebKit::WebPageProxy::immediateActionDidUpdate):
</span><span class="cx">         * UIProcess/WebPageProxy.h:
</span><span class="cx"> 
</span><del>-        We need a dummy animation controller when web content is overriding the default 
</del><ins>+        We need a dummy animation controller when web content is overriding the default
</ins><span class="cx">         behavior.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx"> 
</span><span class="lines">@@ -17123,7 +17150,7 @@
</span><span class="cx">         (-[WKImmediateActionController _defaultAnimationController]):
</span><span class="cx">         (-[WKImmediateActionController _updateImmediateActionItem]):
</span><span class="cx"> 
</span><del>-        Keep track of whether m_lastActionMenuHitTes prevented the default immediate 
</del><ins>+        Keep track of whether m_lastActionMenuHitTes prevented the default immediate
</ins><span class="cx">         action behavior.
</span><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::WebPage):
</span><span class="lines">@@ -17504,7 +17531,7 @@
</span><span class="cx"> 
</span><span class="cx">         (WebKit::WebsiteDataStore::fetchData):
</span><span class="cx">         Fetch database origins.
</span><del>-    
</del><ins>+
</ins><span class="cx">         (WebKit::WebsiteDataStore::removeData):
</span><span class="cx">         Remove databases.
</span><span class="cx"> 
</span><span class="lines">@@ -18012,7 +18039,7 @@
</span><span class="cx">         rdar://problem/20130207
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Don't push a scale factor onto the PDF layer controller if it hasn't
</span><span class="cx">         changed, since doing so causes a repaint.
</span><span class="cx"> 
</span><span class="lines">@@ -18260,7 +18287,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-03-17  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        DOM mouse events have weird timing for force clickable elements in Safari 8.0.3 on 
</del><ins>+        DOM mouse events have weird timing for force clickable elements in Safari 8.0.3 on
</ins><span class="cx">         10.10.2
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142700
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -18268,17 +18295,17 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        No need to tell the WKImmediateActionController about mouse down any more since we 
</del><ins>+        No need to tell the WKImmediateActionController about mouse down any more since we
</ins><span class="cx">         are expecting it at the beginning of an immediate action interaction.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView mouseDown:]):
</span><span class="cx"> 
</span><del>-        Set the delaysPrimaryMouseButtonEvents to NO for the 
-        _immediateActionGestureRecognizer. This will cause AppKit to send up the mouse 
</del><ins>+        Set the delaysPrimaryMouseButtonEvents to NO for the
+        _immediateActionGestureRecognizer. This will cause AppKit to send up the mouse
</ins><span class="cx">         events at the expected time.
</span><span class="cx">         (-[WKView initWithFrame:processPool:configuration:webView:]):
</span><span class="cx"> 
</span><del>-        WebCore::EventHandler now needs to know if an immediate action cancelled or 
</del><ins>+        WebCore::EventHandler now needs to know if an immediate action cancelled or
</ins><span class="cx">         completed. This plumbs that information down.
</span><span class="cx">         * UIProcess/WebPageProxy.cpp:
</span><span class="cx">         (WebKit::WebPageProxy::immediateActionDidCancel):
</span><span class="lines">@@ -18647,7 +18674,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142704
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey Proskuryakov.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Pass UseTransforms explicitly to localToContainerPoint()
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span><span class="lines">@@ -18667,7 +18694,7 @@
</span><span class="cx">         (2) It was then selecting a scaled snap point coordinate and passing it back to UIKit
</span><span class="cx">         to animate the snap. This caused it to select a target point beyond the 'screen' pixel
</span><span class="cx">         we want to hit.
</span><del>-        
</del><ins>+
</ins><span class="cx">         The solution to both problems are to scale the scroll destination UIKit suggests so that
</span><span class="cx">         we search among the scaled points with a valid value. Then, we need to scale the returned
</span><span class="cx">         value back to screen units before handing it back to UIKit to process.
</span><span class="lines">@@ -19478,7 +19505,7 @@
</span><span class="cx">         * WebProcess/WebPage/WebFrame.cpp:
</span><span class="cx">         (WebKit::WebFrame::setAccessibleName):
</span><span class="cx">         * WebProcess/WebPage/WebFrame.h:
</span><del>-        Add SPI to set a frame's accessible name. This matches the Legacy WebKit SPI -[WebFrame setAccessibleName:]. 
</del><ins>+        Add SPI to set a frame's accessible name. This matches the Legacy WebKit SPI -[WebFrame setAccessibleName:].
</ins><span class="cx"> 
</span><span class="cx"> 2015-03-08  Sam Weinig  &lt;sam@webkit.org&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -19510,7 +19537,7 @@
</span><span class="cx">         (WebKit::WebCompiledContentExtension::actions):
</span><span class="cx">         (WebKit::WebCompiledContentExtension::actionsLength):
</span><span class="cx">         Convert to work with the new WebCompiledContentExtension format.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/C/WKUserContentFilterRef.cpp:
</span><span class="cx">         (WKUserContentFilterCreate):
</span><span class="cx">         * UIProcess/API/Cocoa/_WKUserContentFilter.mm:
</span><span class="lines">@@ -19689,8 +19716,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch has the WKImmediateActionController keep track of whether or not it has 
-        an active immediate action. Then we only call into Lookup and DD if the window is 
</del><ins>+        This patch has the WKImmediateActionController keep track of whether or not it has
+        an active immediate action. Then we only call into Lookup and DD if the window is
</ins><span class="cx">         key OR if the WKView’s immediateActionController has an active action.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView _dismissContentRelativeChildWindows]):
</span><span class="lines">@@ -19835,7 +19862,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="cx"> 
</span><del>-        Move everything to NetworkCache namespace. 
</del><ins>+        Move everything to NetworkCache namespace.
</ins><span class="cx"> 
</span><span class="cx"> 2015-03-05  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -19961,7 +19988,7 @@
</span><span class="cx"> 
</span><span class="cx">         &quot;Download Linked File&quot; crashes because of null-pointer exception of Download Job.
</span><span class="cx">         Due to architectural difficulties, easy fix is not possible (EwkView is needed in
</span><del>-        DownloadManager to create DownloadJobs and it is only used to notify the client 
</del><ins>+        DownloadManager to create DownloadJobs and it is only used to notify the client
</ins><span class="cx">         about download (finished, error, cancel) via smart callback using EwkView (Evas_Object).
</span><span class="cx"> 
</span><span class="cx">         Propose a new callbacks which are view independent and detach EFL's DownloadManager
</span><span class="lines">@@ -20042,10 +20069,10 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Andreas Kling.
</span><span class="cx"> 
</span><del>-        This patch un-ifdefs the didChangeContentSize message so that we can use it on Mac 
-        as well. 
</del><ins>+        This patch un-ifdefs the didChangeContentSize message so that we can use it on Mac
+        as well.
</ins><span class="cx"> 
</span><del>-        New private method that subclasses can override when they need to do something 
</del><ins>+        New private method that subclasses can override when they need to do something
</ins><span class="cx">         with contentSize changes.
</span><span class="cx">         * UIProcess/API/Cocoa/WKViewPrivate.h:
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="lines">@@ -20585,7 +20612,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138684
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Support encode/decode for WebCore Path objects, which is done by traversing
</span><span class="cx">         the path.
</span><span class="cx"> 
</span><span class="lines">@@ -20727,7 +20754,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-02-27  Hunseop Jeong  &lt;hs85.jeong@samsung.com&gt;
</span><span class="cx"> 
</span><del>-        [EFL][GTK] Fix build break after r180790,180798 
</del><ins>+        [EFL][GTK] Fix build break after r180790,180798
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142127
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Gyuyoung Kim.
</span><span class="lines">@@ -20842,7 +20869,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Until rdar://problem/13875766 is resolved, we should only call into Lookup and 
</del><ins>+        Until rdar://problem/13875766 is resolved, we should only call into Lookup and
</ins><span class="cx">         DataDetectors for key windows.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView _dismissContentRelativeChildWindows]):
</span><span class="lines">@@ -21098,24 +21125,24 @@
</span><span class="cx"> 
</span><span class="cx">         ScrollableArea/ScrollView/FrameView had some confusing terminology around
</span><span class="cx">         contentsResized/visibleContentsResized/fixedLayoutSizeChanged.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Clarify this by distinguishing between:
</span><span class="cx">         1. Available size changes because of
</span><span class="cx">             i) non-overlay scrollbar presence
</span><span class="cx">            ii) ScrollableArea frame change
</span><span class="cx">         2. Removing fixedLayoutSizeChanged() and just treating it like an
</span><span class="cx">            available size change.
</span><del>-           
</del><ins>+
</ins><span class="cx">         contentsResized() is relegated to simply being a hook that allows Mac to
</span><span class="cx">         flash overlay scrollbars.
</span><del>-        
</del><ins>+
</ins><span class="cx">         The confusingly named visibleContentsResized() is now updateContentsSize(),
</span><span class="cx">         and is the way that a ScrollableArea tells its subclasss that it should recompute
</span><span class="cx">         the size of the contents (i.e. do a layout).
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Plugins/PDF/PDFPlugin.mm:
</span><span class="cx">         (WebKit::PDFPlugin::scrollbarStyleChanged): Call the base class method,
</span><del>-        which takes care of 
</del><ins>+        which takes care of
</ins><span class="cx"> 
</span><span class="cx"> 2015-02-24  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -21123,9 +21150,9 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141985
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Beth Dakin.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Switch to an enum class for the scrollbar style (normal or overlay).
</span><del>-        
</del><ins>+
</ins><span class="cx">         Sadly it still has to be passed as an int across the process boundary.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/PageClient.h:
</span><span class="lines">@@ -21287,7 +21314,7 @@
</span><span class="cx">         (WebKit::WebsiteData::decode):
</span><span class="cx">         * Shared/WebsiteData/WebsiteData.h: Added.
</span><span class="cx">         Add a new WebsiteData class that will store website data. Currently it only stores
</span><del>-        origin + website data type, but in the future it is going to store more things, like 
</del><ins>+        origin + website data type, but in the future it is going to store more things, like
</ins><span class="cx">         host names that have cookies associated.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/WebProcessProxy.cpp:
</span><span class="lines">@@ -21700,7 +21727,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141855
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Change users of the scrollAnimator() method to expect a reference instead of a pointer.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Plugins/PDF/PDFPlugin.mm:
</span><span class="lines">@@ -22165,7 +22192,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Move the runtime-application check to the point where the gesture recognizer is 
</del><ins>+        Move the runtime-application check to the point where the gesture recognizer is
</ins><span class="cx">         created so that we can avoid doing so.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView initWithFrame:processPool:configuration:webView:]):
</span><span class="lines">@@ -22455,7 +22482,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-02-16  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Update SPI availability annotations 
</del><ins>+        Update SPI availability annotations
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141588
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="lines">@@ -22580,7 +22607,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-02-14  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        REGRESSION: Page opens with enlarged font after visiting PDF, navigating back, 
</del><ins>+        REGRESSION: Page opens with enlarged font after visiting PDF, navigating back,
</ins><span class="cx">         then doing a process swap
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141584
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -22588,9 +22615,9 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch keeps the plugin zoom/scale factors separate from page zoom/scale 
-        factors in the UI process since they are used for slightly different purposes for 
-        plugins (i.e., PDFs) than they are for normal pages. Keeping track of the right 
</del><ins>+        This patch keeps the plugin zoom/scale factors separate from page zoom/scale
+        factors in the UI process since they are used for slightly different purposes for
+        plugins (i.e., PDFs) than they are for normal pages. Keeping track of the right
</ins><span class="cx">         factor for the right type of document will ensure that we don’t use the wrong one.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/WebPageProxy.cpp:
</span><span class="lines">@@ -22700,7 +22727,7 @@
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/WebPageProxy.cpp:
</span><span class="cx">         (WebKit::WebPageProxy::creationParameters): We do not
</span><del>-        want to do this on iOS. 
</del><ins>+        want to do this on iOS.
</ins><span class="cx">         * UIProcess/WebPageProxy.h: No need to expose function
</span><span class="cx">         on iOS (only Mac).
</span><span class="cx"> 
</span><span class="lines">@@ -22732,7 +22759,7 @@
</span><span class="cx">         Part of rdar://problem/18445733.
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Use FrameTree::traverseNextRendered() to avoid doing things in unrendered frames
</span><span class="cx">         which are not guaranteed to have been laid out.
</span><span class="cx"> 
</span><span class="lines">@@ -23855,12 +23882,12 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=141228
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         With UI-side compositing, it was possible for layers to get created and
</span><span class="cx">         destroyed in the same transaction (e.g. two layouts before a single layer
</span><span class="cx">         tree commit). When that happened we would encode layer creation properties
</span><span class="cx">         but not encode layer properties, since the layer would be unreachable.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by removing deleted layers from the created layers list, which is
</span><span class="cx">         converted into a map for easy searching.
</span><span class="cx"> 
</span><span class="lines">@@ -23900,11 +23927,11 @@
</span><span class="cx">         a scrolling layer or not requires having properties; they are missing, so we
</span><span class="cx">         create a normal layer, but then the scrolling tree commit asserts that we
</span><span class="cx">         should have a scrolling layer.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by making scrolling layers have a corresponding layer type, which is
</span><span class="cx">         stored in layer creation properties. This required exposing layer types
</span><span class="cx">         up through GraphicsLayer, but that allows for some nice cleanup:
</span><del>-        
</del><ins>+
</ins><span class="cx">         1. No need to have the hokey shouldUseTiledBacking() GraphicsLayerClient hack
</span><span class="cx">            for creating the page tiled layer.
</span><span class="cx">         2. The notion of &quot;custom behaviors&quot; can be removed from GraphicsLayer entirely.
</span><span class="lines">@@ -24023,7 +24050,7 @@
</span><span class="cx">         * UIProcess/API/C/WKPage.h:
</span><span class="cx">         Add WKPageSetPageNavigationClient, which connects API::NavigationClient to
</span><span class="cx">         the new WKPageNavigationClient C SPI.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/C/WKPageNavigationClient.h: Added.
</span><span class="cx">         Add WKPageNavigationClient, which one can use in place of WKPageLoaderClient
</span><span class="cx">         and WKPagePolicyClient and which has the same semantics as the Modern ObjC API
</span><span class="lines">@@ -24646,8 +24673,8 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-01-29  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Another follow-on, spotted this mistake. This used to be 
-        #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090 , so it should now be 
</del><ins>+        Another follow-on, spotted this mistake. This used to be
+        #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090 , so it should now be
</ins><span class="cx">         COCOA.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
</span><span class="lines">@@ -24655,7 +24682,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-01-29  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Follow-on, fixing a bad merge from my last change. 
</del><ins>+        Follow-on, fixing a bad merge from my last change.
</ins><span class="cx"> 
</span><span class="cx">         * Shared/WebPreferencesDefinitions.h:
</span><span class="cx"> 
</span><span class="lines">@@ -24738,7 +24765,7 @@
</span><span class="cx">         (WKPreferencesSetScreenFontSubstitutionEnabled):
</span><span class="cx">         (WKPreferencesGetScreenFontSubstitutionEnabled):
</span><span class="cx">         Move now empty preferences SPI to WKDeprecatedFunctions.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/WebPreferencesDefinitions.h:
</span><span class="cx">         * Shared/WebProcessCreationParameters.cpp:
</span><span class="cx">         (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
</span><span class="lines">@@ -24769,7 +24796,7 @@
</span><span class="cx"> 
</span><span class="cx">         Split PluginService.Development into 32-bit and 64-bit variants, to better match
</span><span class="cx">         production variant. When building FAT, we'll have the right architecture from
</span><del>-        the start now, so no need to re-exec into a different architecture.        
</del><ins>+        the start now, so no need to re-exec into a different architecture.
</ins><span class="cx"> 
</span><span class="cx">         * Configurations/PluginService.Development.xcconfig: Removed.
</span><span class="cx">         * Configurations/PluginService.32.Development.xcconfig: Copied from Source/WebKit2/Configurations/PluginService.Development.xcconfig.
</span><span class="lines">@@ -25023,7 +25050,7 @@
</span><span class="cx">         * Platform/IPC/MessageRecorderProbes.d: Added.
</span><span class="cx">         Add a DTrace provider source file with two probes, message_sent and message_received.
</span><span class="cx">         The struct must match the struct in MessageRecorder.h.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Platform/IPC/ProcessType.h: Added.
</span><span class="cx">         Add an enum of process types.
</span><span class="cx"> 
</span><span class="lines">@@ -25046,7 +25073,7 @@
</span><span class="cx">         * PluginProcess/PluginProcess.h:
</span><span class="cx">         * PluginProcess/WebProcessConnection.h:
</span><span class="cx">         Annotate Connection::Clients with process types.
</span><del>-        
</del><ins>+
</ins><span class="cx"> 2015-01-28  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Crash closing inspected page with frequent activity
</span><span class="lines">@@ -25055,7 +25082,7 @@
</span><span class="cx">         Reviewed by Timothy Hatcher.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/WebInspector.h:
</span><del>-        (WebKit::WebInspector::disconnectFromPage):        
</del><ins>+        (WebKit::WebInspector::disconnectFromPage):
</ins><span class="cx">         * WebProcess/WebPage/WebPage.cpp:
</span><span class="cx">         (WebKit::WebPage::close):
</span><span class="cx">         Be sure to close the WebInspector connection through the page
</span><span class="lines">@@ -25150,18 +25177,18 @@
</span><span class="cx"> 
</span><span class="cx">         * Shared/API/APIObject.h:
</span><span class="cx">         Add VisitedLinkProvider type.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/Cocoa/APIObject.mm:
</span><span class="cx">         (API::Object::newObject):
</span><span class="cx">         Allocate WebPreferences and VisitedLinkProvider as their Objective-C counterpart.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKPreferences.mm:
</span><span class="cx">         (-[WKPreferences init]):
</span><span class="cx">         Switch to constructInWrapper.
</span><span class="cx"> 
</span><span class="cx">         (-[WKPreferences dealloc]):
</span><span class="cx">         Call the WebPreferences destructor.
</span><del>-        
</del><ins>+
</ins><span class="cx">         (-[WKPreferences _apiObject]):
</span><span class="cx">         Add implementation of the WKObject protocol.
</span><span class="cx"> 
</span><span class="lines">@@ -25310,7 +25337,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        We should add (or remove) the gesture recognizer in viewDidMoveToWindow because 
</del><ins>+        We should add (or remove) the gesture recognizer in viewDidMoveToWindow because
</ins><span class="cx">         initWithFrame it too early and IB might mess with it.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView viewDidMoveToWindow]):
</span><span class="lines">@@ -25325,8 +25352,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Calling _page-&gt;setMaintainsInactiveSelection(false) in complete is often 
-        too soon. Instead, call it in dismissContentRelativeChildWindows. This is more 
</del><ins>+        Calling _page-&gt;setMaintainsInactiveSelection(false) in complete is often
+        too soon. Instead, call it in dismissContentRelativeChildWindows. This is more
</ins><span class="cx">         similar to the timing for the TextIndicator.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController dismissContentRelativeChildWindows]):
</span><span class="lines">@@ -25387,7 +25414,7 @@
</span><span class="cx">         rdar://problem/19198492
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><del>-        
</del><ins>+
</ins><span class="cx">         When handling the OwnerWasInvalidated case in -[WKWebView evaluateJavaScript:completionHandler:],
</span><span class="cx">         the block passed to dispatch_async() needs to be retained. Fix by passing the RefPtr
</span><span class="cx">         to the lambda.
</span><span class="lines">@@ -25797,7 +25824,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Retain the NSImmediateActionGestureRecognizer. This should not be necessary, but 
</del><ins>+        Retain the NSImmediateActionGestureRecognizer. This should not be necessary, but
</ins><span class="cx">         it is because interface builder can mess with our views.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.h:
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="lines">@@ -26233,12 +26260,12 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140474
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Add a private method to enable scrolling data collection to WKWebView. When enabled, create
</span><span class="cx">         a RemoteLayerTreeScrollingPerformanceData object that collects &quot;blank pixel&quot; data on
</span><span class="cx">         every layer tree commit and scroll, and stores them in a vector. A second SPI call
</span><span class="cx">         allows retrieval of an NSArray of this data.
</span><del>-        
</del><ins>+
</ins><span class="cx">         To allow RemoteLayerTreeScrollingPerformanceData to find the correct layer which
</span><span class="cx">         contains the main tile grid, we set a layer name on the appropriate layer (even
</span><span class="cx">         in release builds).
</span><span class="lines">@@ -26454,7 +26481,7 @@
</span><span class="cx"> 
</span><span class="cx">         * Shared/Cocoa/APIObject.mm:
</span><span class="cx">         (API::Object::newObject):
</span><del>-        Create the API::ProcessPoolConfigurations using [_WKProcessPoolConfiguration alloc] as its 
</del><ins>+        Create the API::ProcessPoolConfigurations using [_WKProcessPoolConfiguration alloc] as its
</ins><span class="cx">         storage..
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/APIProcessPoolConfiguration.cpp:
</span><span class="lines">@@ -26499,7 +26526,7 @@
</span><span class="cx">         (-[WKProcessPool _configuration]):
</span><span class="cx">         Change to pull the configuration from the underlying API::Object and call the new
</span><span class="cx">         copy() helper on it.
</span><del>-        
</del><ins>+
</ins><span class="cx">         (-[WKProcessPool _initWithConfiguration:]):
</span><span class="cx">         Convert to be a simple pass through to API::Object::constructInWrapper.
</span><span class="cx"> 
</span><span class="lines">@@ -26508,7 +26535,7 @@
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/Cocoa/WKProcessPoolInternal.h:
</span><span class="cx">         Removes the _WKProcessPoolConfiguration member, now that it is stored on the WebProcessPool.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
</span><span class="cx">         (-[_WKProcessPoolConfiguration init]):
</span><span class="cx">         (-[_WKProcessPoolConfiguration dealloc]):
</span><span class="lines">@@ -26994,7 +27021,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        _cancelImmediateActionIfNeeded will cancel the immediate action if there is no 
</del><ins>+        _cancelImmediateActionIfNeeded will cancel the immediate action if there is no
</ins><span class="cx">         animation controller or if the DDActionContext doesn’t want to use its actions.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController _cancelImmediateActionIfNeeded]):
</span><span class="lines">@@ -27113,7 +27140,7 @@
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><span class="cx">         Rename processWillCloseConnection to processDidCloseConnection and pass connections
</span><del>-        to both functions since in the near future we won't be able to get the connection from 
</del><ins>+        to both functions since in the near future we won't be able to get the connection from
</ins><span class="cx">         the web process proxy in these scenarios.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/Storage/StorageManager.cpp:
</span><span class="lines">@@ -28122,7 +28149,7 @@
</span><span class="cx">         (API::Navigation::navigationID):
</span><span class="cx">         Have each Navigation store its navigationID and generate it via the WebNavigationState
</span><span class="cx">         that is passed to the constructor.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="cx">         (-[WKWebView loadRequest:]):
</span><span class="cx">         (-[WKWebView loadFileURL:allowingReadAccessToURL:]):
</span><span class="lines">@@ -28667,7 +28694,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140221
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Applications should not be toggling WebKitAcceleratedDrawingEnabled; it's really only
</span><span class="cx">         useful to toggle for debugging, so make it a debug pref.
</span><span class="cx"> 
</span><span class="lines">@@ -28757,7 +28784,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2015-01-07  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the 
</del><ins>+        Adopt delegate callbacks so that standardQuickLookMenuItem does not obscure the
</ins><span class="cx">         link
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140206
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -28769,7 +28796,7 @@
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController menuItem:itemFrameForPoint:]):
</span><span class="cx"> 
</span><del>-        For now use a max size that is smaller than the WKView, with the screen’s aspect 
</del><ins>+        For now use a max size that is smaller than the WKView, with the screen’s aspect
</ins><span class="cx">         ratio, and scaled down.
</span><span class="cx">         (-[WKImmediateActionController menuItem:maxSizeForPoint:]):
</span><span class="cx"> 
</span><span class="lines">@@ -30082,7 +30109,7 @@
</span><span class="cx">         This makes it possible to tell the difference between page and frame handles that
</span><span class="cx">         should be converted to their respective UI or web process object representations
</span><span class="cx">         and handles that should stay the same (for the modern API for example).
</span><del>-        
</del><ins>+
</ins><span class="cx">         * Shared/API/APIFrameHandle.cpp:
</span><span class="cx">         (API::FrameHandle::create):
</span><span class="cx">         (API::FrameHandle::createAutoconverting):
</span><span class="lines">@@ -30312,7 +30339,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-12-23  Gyuyoung Kim  &lt;gyuyoung.kim@samsung.com&gt;
</span><span class="cx"> 
</span><del>-        [EFL][WK2] Fix a lot of build break since r177692 
</del><ins>+        [EFL][WK2] Fix a lot of build break since r177692
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139932
</span><span class="cx"> 
</span><span class="cx">         Unreviewed EFL build fix.
</span><span class="lines">@@ -31062,7 +31089,7 @@
</span><span class="cx"> 
</span><span class="cx">         - Renames API::HistoryClient to API::LegacyContextHistoryClient to make it clear what it is for.
</span><span class="cx">         - Re-routes the history client functions from the WebProcessProxy to the WebPageProxy.
</span><del>-        - Add history client functions to API::LoaderClient and implement them for NavigationState's 
</del><ins>+        - Add history client functions to API::LoaderClient and implement them for NavigationState's
</ins><span class="cx">           LoaderClient subclass. Removes the need for WKProcessPool to have to setup a history client and
</span><span class="cx">           forward to the NavigationState.
</span><span class="cx"> 
</span><span class="lines">@@ -31400,8 +31427,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch addresses the case where the link is so large that there is no 
-        available space on any side once you factor in screen padding. In that case, we 
</del><ins>+        This patch addresses the case where the link is so large that there is no
+        available space on any side once you factor in screen padding. In that case, we
</ins><span class="cx">         should give up early on not obscuring the link.
</span><span class="cx">         * UIProcess/mac/WKPreviewPopoverAnimationController.mm:
</span><span class="cx">         (-[WKPreviewPopoverAnimationController _targetSizeForPagePreview]):
</span><span class="lines">@@ -31814,9 +31841,9 @@
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView initWithFrame:context:configuration:webView:]):
</span><span class="cx"> 
</span><del>-        performActionMenuHitTest already takes a parameter indicating whether the hit test 
-        is for an immediate action or not. The callback didPerformActionMenuHitTest needs 
-        that information too so that it knows whether to call into the 
</del><ins>+        performActionMenuHitTest already takes a parameter indicating whether the hit test
+        is for an immediate action or not. The callback didPerformActionMenuHitTest needs
+        that information too so that it knows whether to call into the
</ins><span class="cx">         ActionMenuController or the ImmediateActionController.
</span><span class="cx">         (-[WKView _didPerformActionMenuHitTest:forImmediateAction:userData:]):
</span><span class="cx">         (-[WKView _didPerformActionMenuHitTest:userData:]): Deleted.
</span><span class="lines">@@ -32083,7 +32110,7 @@
</span><span class="cx">         Page previews are sometimes sized much smaller than it seems they should be
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139754
</span><span class="cx">         -and corresponding-
</span><del>-        rdar://problem/19286550        
</del><ins>+        rdar://problem/19286550
</ins><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><span class="lines">@@ -32711,7 +32738,7 @@
</span><span class="cx">         rdar://problem/18083882
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Benjamin Poulain.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Null out the internal delegate on the WKScrollView when the WKWebView goes away, since
</span><span class="cx">         it's possible for a client to set its own scroll view delegate, forcing the creation of
</span><span class="cx">         a WKScrollViewDelegateForwarder, and then retain the UIScrollView past the lifetime of
</span><span class="lines">@@ -32747,15 +32774,15 @@
</span><span class="cx">         (-[WKActionMenuController _createActionMenuItemForTag:]):
</span><span class="cx">         (-[WKActionMenuController _lookupText:]): Deleted.
</span><span class="cx"> 
</span><del>-        Set the defaultAnimationController to the lookup-provided animation controller 
</del><ins>+        Set the defaultAnimationController to the lookup-provided animation controller
</ins><span class="cx">         when appropriate.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm:
</span><span class="cx">         (-[WKImmediateActionController _defaultAnimationController]):
</span><span class="cx">         (-[WKImmediateActionController _animationControllerForText]):
</span><span class="cx"> 
</span><del>-        Re-factor performDictionaryLookupForRange() so that most of the work is done in a 
-        new function called dictionaryPopupInfoForRange(). This was that code can be used 
-        for both performing a dictionary lookup and just getting the DictionaryPopupInfo 
</del><ins>+        Re-factor performDictionaryLookupForRange() so that most of the work is done in a
+        new function called dictionaryPopupInfoForRange(). This was that code can be used
+        for both performing a dictionary lookup and just getting the DictionaryPopupInfo
</ins><span class="cx">         for the ActionMenuHitTest.
</span><span class="cx">         * WebProcess/WebPage/WebPage.h:
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="lines">@@ -33241,7 +33268,7 @@
</span><span class="cx">         Expose _dismissContentRelativeChildWindows instead of _dismissActionMenuPopovers;
</span><span class="cx">         for all existing clients, it makes more sense to dismiss all view-relative subwindows
</span><span class="cx">         than just a subset of them.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/WebPageProxy.cpp:
</span><span class="cx">         (WebKit::WebPageProxy::didCommitLoadForFrame):
</span><span class="cx">         (WebKit::WebPageProxy::pageDidScroll):
</span><span class="lines">@@ -33366,7 +33393,7 @@
</span><span class="cx">         rdar://problem/18007746
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Return nil if the color is invalid, to remove the color from the layer's
</span><span class="cx">         border or background.
</span><span class="cx"> 
</span><span class="lines">@@ -33832,9 +33859,9 @@
</span><span class="cx">         (-[WKView initWithFrame:context:configuration:webView:]):
</span><span class="cx">         (-[WKView _didPerformActionMenuHitTest:userData:]):
</span><span class="cx"> 
</span><del>-        This basic implementation of the controller will use the delegate methods to 
-        perform an ActionMenuHitTest when relevant. Future patches will patch 
-        _updateImmediateActionItem to use the hit test result to determine if there is any 
</del><ins>+        This basic implementation of the controller will use the delegate methods to
+        perform an ActionMenuHitTest when relevant. Future patches will patch
+        _updateImmediateActionItem to use the hit test result to determine if there is any
</ins><span class="cx">         immediate action that should be taken.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.h: Added.
</span><span class="cx">         * UIProcess/mac/WKImmediateActionController.mm: Added.
</span><span class="lines">@@ -34044,7 +34071,7 @@
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Storage/StorageAreaMap.cpp:
</span><span class="cx">         (WebKit::StorageAreaMap::StorageAreaMap):
</span><del>-        If we have a local storage namespace with a non-null top-level origin, create a 
</del><ins>+        If we have a local storage namespace with a non-null top-level origin, create a
</ins><span class="cx">         transient local storage map.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Storage/StorageNamespaceImpl.cpp:
</span><span class="lines">@@ -34348,8 +34375,8 @@
</span><span class="cx">         this case.
</span><span class="cx"> 
</span><span class="cx">         Test: http/tests/notifications/legacy/notification-request-permission-then-navigate.html
</span><del>-        
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx">         * WebProcess/Notifications/NotificationPermissionRequestManager.cpp:
</span><span class="cx">         (WebKit::NotificationPermissionRequestManager::didReceiveNotificationPermissionDecision):
</span><span class="cx"> 
</span><span class="lines">@@ -34472,7 +34499,7 @@
</span><span class="cx">         update the fullscreen mode and a new standard-and-optimized-fullscreen mode.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><del>-        (-[WKWebView _isPlayingFullscreenOptimizedVideo]): 
</del><ins>+        (-[WKWebView _isPlayingFullscreenOptimizedVideo]):
</ins><span class="cx">         Treat new standard-and-optimized as a kind of optimized.
</span><span class="cx">         * UIProcess/ios/WebVideoFullscreenManagerProxy.h: IPC fullscreen mode changes
</span><span class="cx">         * UIProcess/ios/WebVideoFullscreenManagerProxy.mm: ditto
</span><span class="lines">@@ -35296,9 +35323,9 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        By default, we will keep a single item in the action menu up until the point where 
-        _state == ActionMenuState::Ready. So by checking _state here, we are preventing 
-        clients from opting out of our choice to wait. Ideally we would always still wait 
</del><ins>+        By default, we will keep a single item in the action menu up until the point where
+        _state == ActionMenuState::Ready. So by checking _state here, we are preventing
+        clients from opting out of our choice to wait. Ideally we would always still wait
</ins><span class="cx">         for the Ready state, but this will get the best behavior in the mean time.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController _updateActionMenuItems]):
</span><span class="lines">@@ -35475,9 +35502,9 @@
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItems]):
</span><span class="cx"> 
</span><del>-        We should disallow shadow content in the hit test. This is the default and it is 
-        how context menus behave. We originally wanted to text inside shadow content so 
-        that we could find the text, but the new function I added to HitTestResult will 
</del><ins>+        We should disallow shadow content in the hit test. This is the default and it is
+        how context menus behave. We originally wanted to text inside shadow content so
+        that we could find the text, but the new function I added to HitTestResult will
</ins><span class="cx">         allow that.
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx"> 
</span><span class="lines">@@ -35793,14 +35820,14 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="cx"> 
</span><del>-        New SPI will allow clients to opt-out of the standardQuickLookMenuItem. By 
</del><ins>+        New SPI will allow clients to opt-out of the standardQuickLookMenuItem. By
</ins><span class="cx">         default, opt in.
</span><span class="cx">         * UIProcess/API/Cocoa/WKViewPrivate.h:
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView _shouldUseStandardQuickLookPreview]):
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx"> 
</span><del>-        Use [NSMenuItem standardQuickLookMenuItem] unless the client has requested 
</del><ins>+        Use [NSMenuItem standardQuickLookMenuItem] unless the client has requested
</ins><span class="cx">         otherwise.
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItemsForLink]):
</span><span class="cx"> 
</span><span class="lines">@@ -36067,7 +36094,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139021
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Add WKRenderLayerGetFrameContentsLayer which returns a WKRenderLayerRef for
</span><span class="cx">         the content document of a RenderWidget, if its has one (e.g. frames, iframes
</span><span class="cx">         and &lt;object&gt; with document contents).
</span><span class="lines">@@ -36149,7 +36176,7 @@
</span><span class="cx">         (WebKit::WebPage::WebPage):
</span><span class="cx">         Create the WebPageGroupProxy before creating the page so we can get its user content controller and
</span><span class="cx">         pass it to the page configuration if necessary.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/WebPageGroupProxy.cpp:
</span><span class="cx">         (WebKit::WebPageGroupProxy::userContentController):
</span><span class="cx">         New function that lazily creates a user content controller. We don't want to create this eagerly since
</span><span class="lines">@@ -36338,10 +36365,10 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139006
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Implement WKRenderLayerGetBackingStoreMemoryEstimate,
</span><span class="cx">         WKRenderObjectCopyTextSnippet and WKRenderObjectGetTextLength for improved
</span><del>-        RenderLayer and RenderTree display in clients of the C SPI.        
</del><ins>+        RenderLayer and RenderTree display in clients of the C SPI.
</ins><span class="cx"> 
</span><span class="cx">         * Shared/API/c/WKRenderLayer.cpp:
</span><span class="cx">         (WKRenderLayerGetBackingStoreMemoryEstimate):
</span><span class="lines">@@ -36594,7 +36621,7 @@
</span><span class="cx">         (IPC::ArgumentCoder&lt;TextIndicatorData&gt;::decode):
</span><span class="cx">         Add argument coders for TextIndicatorData.
</span><span class="cx"> 
</span><del>-        * Shared/DictionaryPopupInfo.h:        
</del><ins>+        * Shared/DictionaryPopupInfo.h:
</ins><span class="cx">         * Shared/mac/ActionMenuHitTestResult.h:
</span><span class="cx">         * Shared/mac/ActionMenuHitTestResult.mm:
</span><span class="cx">         * UIProcess/API/gtk/PageClientImpl.h:
</span><span class="lines">@@ -36847,10 +36874,10 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch enforces minimum and maximum popover sizes. If the popover needs to be 
-        sized up to be above the minimum, it will end up covering some of the 
-        _hitTestResult, so we should compute a new origin rect based on the original 
-        event location. 
</del><ins>+        This patch enforces minimum and maximum popover sizes. If the popover needs to be
+        sized up to be above the minimum, it will end up covering some of the
+        _hitTestResult, so we should compute a new origin rect based on the original
+        event location.
</ins><span class="cx">         * UIProcess/mac/WKActionMenuController.h:
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController prepareForMenu:withEvent:]):
</span><span class="lines">@@ -37226,7 +37253,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-11-19  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Data detected results with no menu items should not fall through to regular text 
</del><ins>+        Data detected results with no menu items should not fall through to regular text
</ins><span class="cx">         action menus
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138887
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -37281,7 +37308,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138877
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         These data members are unused on Mac, but still encoded, so initialize them with
</span><span class="cx">         reasonable values.
</span><span class="cx"> 
</span><span class="lines">@@ -37336,10 +37363,10 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138876
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Beth Dakin.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix the position of the tiled scrolling indicator in MiniBrowser by taking top
</span><span class="cx">         content offset into account.
</span><del>-        
</del><ins>+
</ins><span class="cx">         On Mac, pass the current scroll position back to the UI process via the RemoteLayerTreeTransaction
</span><span class="cx">         so that we can use it to show the correctly scroll offset in the indicator. This is temporary until
</span><span class="cx">         Mac does UI-side scrolling.
</span><span class="lines">@@ -37574,7 +37601,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138787
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><del>-        
</del><ins>+
</ins><span class="cx">         &quot;allowsAlternateFullscreen&quot; doesn't need to be in the public WKWebView header.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/Cocoa/WKWebView.mm:
</span><span class="lines">@@ -37817,7 +37844,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-11-17  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Whitespace action menus should focus the HitTestResult and create an insertion 
</del><ins>+        Whitespace action menus should focus the HitTestResult and create an insertion
</ins><span class="cx">         point
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138786
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -37825,7 +37852,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Whitespace menus should cause the HitTestResult to be focused, and they should set 
</del><ins>+        Whitespace menus should cause the HitTestResult to be focused, and they should set
</ins><span class="cx">         the selection based on the HitTest location.
</span><span class="cx">         * UIProcess/WebPageProxy.cpp:
</span><span class="cx">         (WebKit::WebPageProxy::focusAndSelectLastActionMenuHitTestResult):
</span><span class="lines">@@ -38033,7 +38060,7 @@
</span><span class="cx">         Since PDFPlugin can't trivially repaint the required part of the PDF,
</span><span class="cx">         we don't build a TextIndicator. This will result in PDFPlugin continuing
</span><span class="cx">         to use Lookup's built-in highlight.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::performDictionaryLookupForRange):
</span><span class="cx">         Build a TextIndicator from the Lookup range and pass it along with
</span><span class="lines">@@ -38236,8 +38263,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        If the video cannot be downloaded, that is also an indication that the URL of the 
-        video will not be valid on its own. In these cases, we should share or copy the 
</del><ins>+        If the video cannot be downloaded, that is also an indication that the URL of the
+        video will not be valid on its own. In these cases, we should share or copy the
</ins><span class="cx">         main page’s URL.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItemsForVideo]):
</span><span class="lines">@@ -38292,7 +38319,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-11-13  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Context menus should not offer the &quot;Download video&quot; option for videos that cannot 
</del><ins>+        Context menus should not offer the &quot;Download video&quot; option for videos that cannot
</ins><span class="cx">         be downloaded
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138530
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -38327,7 +38354,7 @@
</span><span class="cx">         rdar://problem/16033854
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Add a session-restore layout milestone which fires after restoring a session,
</span><span class="cx">         when the render tree size reaches 50% of the size saved in the session state.
</span><span class="cx"> 
</span><span class="lines">@@ -38393,7 +38420,7 @@
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/WebPage.h:
</span><span class="cx">         * WebProcess/WebPage/WebPage.messages.in:
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::performActionMenuHitTestAtLocation):
</span><span class="cx">         Give all of the WebPageOverlays the first shot at data detection; if none of them
</span><span class="lines">@@ -38964,7 +38991,7 @@
</span><span class="cx">         rdar://problem/18872688
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Andreas Kling.
</span><del>-        
</del><ins>+
</ins><span class="cx">         I reported a crash when reloading a page after inspecting it, possibly caused by
</span><span class="cx">         r172864. Speculatively fix by null-checking the main frame.
</span><span class="cx"> 
</span><span class="lines">@@ -38991,10 +39018,10 @@
</span><span class="cx">         rdar://problem/18715303
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Benjamin Poulain.
</span><del>-        
</del><ins>+
</ins><span class="cx">         The CSS Snap Points code incorrectly set the WKScrollView's deceleration rate,
</span><span class="cx">         overriding the custom value that UIWebScrollView sets.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Fix by having WKScrollView store the custom rate at init time, and
</span><span class="cx">         using that value in -scrollViewWillBeginDragging:.
</span><span class="cx"> 
</span><span class="lines">@@ -39023,9 +39050,9 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        WK1 now needs to do a lot of dictionary lookup operations that it did not 
-        previously have to handle. So this patch takes a lot of that functionality, which 
-        was implemented as static functions in WebPageMac for WK2 and moves it into 
</del><ins>+        WK1 now needs to do a lot of dictionary lookup operations that it did not
+        previously have to handle. So this patch takes a lot of that functionality, which
+        was implemented as static functions in WebPageMac for WK2 and moves it into
</ins><span class="cx">         WebCore.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
</span><span class="lines">@@ -39185,7 +39212,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-11-08  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        WKActionMenuController methods should be more careful to use the best 
</del><ins>+        WKActionMenuController methods should be more careful to use the best
</ins><span class="cx">         WebHitTestResult
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138536
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -39193,10 +39220,10 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch re-names _hitTestResultForStage to _webHitTestResult. The method no 
-        longer takes a stage since that value is really not necessary to determine the 
-        correct WebHitTestResult. This patch also makes all spots in this file that access 
-        a WebHitTestResult go through _webHitTestResult to ensure that they get the most 
</del><ins>+        This patch re-names _hitTestResultForStage to _webHitTestResult. The method no
+        longer takes a stage since that value is really not necessary to determine the
+        correct WebHitTestResult. This patch also makes all spots in this file that access
+        a WebHitTestResult go through _webHitTestResult to ensure that they get the most
</ins><span class="cx">         up-to-date option.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController willOpenMenu:withEvent:]):
</span><span class="lines">@@ -39233,7 +39260,7 @@
</span><span class="cx">         * Shared/WebHitTestResult.h:
</span><span class="cx">         (WebKit::WebHitTestResult::isMediaThatCanBeDownloaded):
</span><span class="cx"> 
</span><del>-        Re-name _canAddImageToPhotos to _canAddMediaToPhotos, which is more accurate. We 
</del><ins>+        Re-name _canAddImageToPhotos to _canAddMediaToPhotos, which is more accurate. We
</ins><span class="cx">         might use this method for videos some day, so now it has an accurate name.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx"> 
</span><span class="lines">@@ -39248,7 +39275,7 @@
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItems:]):
</span><span class="cx">         (-[WKActionMenuController _canAddImageToPhotos]): Deleted.
</span><span class="cx"> 
</span><del>-        We hit test including shadow content to get the desired result for editable text 
</del><ins>+        We hit test including shadow content to get the desired result for editable text
</ins><span class="cx">         regions. But for media, we want to re-set to the shadow root.
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::performActionMenuHitTestAtLocation):
</span><span class="lines">@@ -39336,8 +39363,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch re-names dismissActionMenuDataDetectorPopovers() to 
-        dismissActionMenuPopovers() and also calls _clearPreviewPopover from that method 
</del><ins>+        This patch re-names dismissActionMenuDataDetectorPopovers() to
+        dismissActionMenuPopovers() and also calls _clearPreviewPopover from that method
</ins><span class="cx">         as well.
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="cx">         (-[WKView viewDidMoveToWindow]):
</span><span class="lines">@@ -39519,7 +39546,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        This patch makes the popover maintain aspect ratio, and it uses the final scale of 
</del><ins>+        This patch makes the popover maintain aspect ratio, and it uses the final scale of
</ins><span class="cx">         that popover to scale the preview view as well.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="lines">@@ -39927,9 +39954,9 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="cx"> 
</span><del>-        Instead of keeping the preferred size in the controller, keep the main view’s 
-        size, and then scale the bounds of the popover’s view using that and the scale 
-        factor as a constant. Set the size of the popover explicitly so that it doesn’t 
</del><ins>+        Instead of keeping the preferred size in the controller, keep the main view’s
+        size, and then scale the bounds of the popover’s view using that and the scale
+        factor as a constant. Set the size of the popover explicitly so that it doesn’t
</ins><span class="cx">         get the view’s size. This will cause it to scale the WKWebView.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKPagePreviewViewController initWithPageURL:]):
</span><span class="lines">@@ -40048,7 +40075,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-11-05  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        Action menu URL preview should &quot;peek,&quot; i.e. appear when the menu item is 
</del><ins>+        Action menu URL preview should &quot;peek,&quot; i.e. appear when the menu item is
</ins><span class="cx">         highlighted
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138432
</span><span class="cx">         -and corresponding-
</span><span class="lines">@@ -40056,7 +40083,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Anders Carlsson.
</span><span class="cx"> 
</span><del>-        New ivars. Keep a reference to the popover, and a BOOL that indicates whether we 
</del><ins>+        New ivars. Keep a reference to the popover, and a BOOL that indicates whether we
</ins><span class="cx">         should close the popover when the menu goes away.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.h:
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="lines">@@ -40064,7 +40091,7 @@
</span><span class="cx">         Re-set the preview bool to NO whenever we are about to pop up a new menu.
</span><span class="cx">         (-[WKActionMenuController prepareForMenu:withEvent:]):
</span><span class="cx"> 
</span><del>-        Close the popover when the menu closes unless _shouldKeepPreviewPopoverOpen has 
</del><ins>+        Close the popover when the menu closes unless _shouldKeepPreviewPopoverOpen has
</ins><span class="cx">         been set.
</span><span class="cx">         (-[WKActionMenuController didCloseMenu:withEvent:]):
</span><span class="cx"> 
</span><span class="lines">@@ -40078,13 +40105,13 @@
</span><span class="cx">         Now call _previewURLFromActionMenu on menu item highlight.
</span><span class="cx">         (-[WKActionMenuController menu:willHighlightItem:]):
</span><span class="cx"> 
</span><del>-        NSPopover delegate method so that we can keep our BOOL and ivar accurate in the 
-        case where the popover is closed by some other mechanism than the action menu 
</del><ins>+        NSPopover delegate method so that we can keep our BOOL and ivar accurate in the
+        case where the popover is closed by some other mechanism than the action menu
</ins><span class="cx">         going away.
</span><span class="cx">         (-[WKActionMenuController popoverWillClose:]):
</span><span class="cx"> 
</span><del>-        New selector for the preview. Now when this item is actually selected, we just 
-        want to set the BOOL _shouldKeepPreviewPopoverOpen to YES so that we keep the 
</del><ins>+        New selector for the preview. Now when this item is actually selected, we just
+        want to set the BOOL _shouldKeepPreviewPopoverOpen to YES so that we keep the
</ins><span class="cx">         preview open.
</span><span class="cx">         (-[WKActionMenuController _createActionMenuItemForTag:]):
</span><span class="cx"> 
</span><span class="lines">@@ -40215,8 +40242,8 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        Whenever we dismiss the dictionary popover, and on scroll, we should try to 
-        dismiss the data detector popovers. Right now we don’t have the ability to know if 
</del><ins>+        Whenever we dismiss the dictionary popover, and on scroll, we should try to
+        dismiss the data detector popovers. Right now we don’t have the ability to know if
</ins><span class="cx">         a dismiss succeeded, so we will settle for un-anchoring the popover.
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/API/mac/WKView.mm:
</span><span class="lines">@@ -40298,7 +40325,7 @@
</span><span class="cx"> 
</span><span class="cx">         (WebKit::WebPageOverlay::prepareForActionMenu):
</span><span class="cx">         Forward prepareForActionMenu to the client.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::performActionMenuHitTestAtLocation):
</span><span class="cx">         Iterate through the overlays and let them prepareForActionMenu;
</span><span class="lines">@@ -40473,7 +40500,7 @@
</span><span class="cx">         * UIProcess/WebPageProxy.messages.in:
</span><span class="cx">         Create a TextIndicator from the TextIndicator::Data.
</span><span class="cx">         Add an explicit ClearTextIndicator message instead of sending empty Data.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/mac/WKActionMenuController.h:
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController prepareForMenu:withEvent:]):
</span><span class="lines">@@ -40485,7 +40512,7 @@
</span><span class="cx">         (-[WKActionMenuController didCloseMenu:withEvent:]):
</span><span class="cx">         Hide the text indicator when the menu closes, unless we only had one item.
</span><span class="cx">         Then, we'll hide it in the DDActionContext completionHandler block.
</span><del>-        
</del><ins>+
</ins><span class="cx">         (-[WKActionMenuController _showTextIndicator]):
</span><span class="cx">         (-[WKActionMenuController _hideTextIndicator]):
</span><span class="cx">         Added. Show and hide the text indicator based on the TextIndicator
</span><span class="lines">@@ -40644,9 +40671,9 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138342
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Expose WKDebugOverlayRegions via the C SPI.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/C/WKPreferences.cpp:
</span><span class="cx">         (WKPreferencesSetVisibleDebugOverlayRegions):
</span><span class="cx">         (WKPreferencesGetVisibleDebugOverlayRegions):
</span><span class="lines">@@ -40679,7 +40706,7 @@
</span><span class="cx">         (-[WKActionMenuController isMenuForTextContent]):
</span><span class="cx">         (-[WKActionMenuController willOpenMenu:withEvent:]):
</span><span class="cx"> 
</span><del>-        Spelling suggestions are presented in a sub-menu and will replace the selection 
</del><ins>+        Spelling suggestions are presented in a sub-menu and will replace the selection
</ins><span class="cx">         when chosen.
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItemsForEditableTextWithSuggestions:]):
</span><span class="cx">         (-[WKActionMenuController _changeSelectionToSuggestion:]):
</span><span class="lines">@@ -40698,7 +40725,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138257
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Add private prefs to control visibility of debug-related page region overlays.
</span><span class="cx"> 
</span><span class="cx">         * Shared/WebPreferencesDefinitions.h:
</span><span class="lines">@@ -40845,8 +40872,8 @@
</span><span class="cx">         * Shared/API/c/WKActionMenuTypes.h:
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx"> 
</span><del>-        willOpenMenu should select text for both regular text menus and editable text 
-        menus. 
</del><ins>+        willOpenMenu should select text for both regular text menus and editable text
+        menus.
</ins><span class="cx">         (-[WKActionMenuController willOpenMenu:withEvent:]):
</span><span class="cx"> 
</span><span class="cx">         Default items for editable text.
</span><span class="lines">@@ -40854,12 +40881,12 @@
</span><span class="cx">         (-[WKActionMenuController _paste:]):
</span><span class="cx">         (-[WKActionMenuController _createActionMenuItemForTag:]):
</span><span class="cx"> 
</span><del>-        New method _hitTestResultForStage:(MenuUpdateStage)stage will figure out whether 
-        we can use the WebHitTestResult from the ActionMenuHitTestResult or if we have to 
-        use the potentially out-of-date WebHitTestResult that is cached on WebPageProxy. 
-        An important difference between these results is that the ActionMenuHitTest 
-        result, in addition to being more recent and accurate, also now includes shadow 
-        content, which affects some editable regions on important sites such as 
</del><ins>+        New method _hitTestResultForStage:(MenuUpdateStage)stage will figure out whether
+        we can use the WebHitTestResult from the ActionMenuHitTestResult or if we have to
+        use the potentially out-of-date WebHitTestResult that is cached on WebPageProxy.
+        An important difference between these results is that the ActionMenuHitTest
+        result, in addition to being more recent and accurate, also now includes shadow
+        content, which affects some editable regions on important sites such as
</ins><span class="cx">         bugs.webkit.org and nytimes.com.
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItems:]):
</span><span class="cx">         (-[WKActionMenuController _updateActionMenuItemsForStage:]):
</span><span class="lines">@@ -41000,7 +41027,7 @@
</span><span class="cx">         (WebKit::ActionMenuHitTestResult::encode):
</span><span class="cx">         (WebKit::ActionMenuHitTestResult::decode):
</span><span class="cx">         Adds the WebHitTestResult and the original hit test request location.
</span><del>-        
</del><ins>+
</ins><span class="cx">         * UIProcess/API/Cocoa/WKViewPrivate.h:
</span><span class="cx">         Adds a new version of _actionMenuItemsForHitTestResult that passes userData along.
</span><span class="cx"> 
</span><span class="lines">@@ -41360,7 +41387,7 @@
</span><span class="cx">         (WebKit::WebPageProxy::selectLookupTextAtLocation):
</span><span class="cx">         * UIProcess/WebPageProxy.h:
</span><span class="cx"> 
</span><del>-        At willOpenMenu time, text menus should select text so that it is clear what the 
</del><ins>+        At willOpenMenu time, text menus should select text so that it is clear what the
</ins><span class="cx">         menu actions will apply to.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.h:
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="lines">@@ -41379,20 +41406,20 @@
</span><span class="cx">         * WebProcess/WebPage/WebPage.h:
</span><span class="cx">         * WebProcess/WebPage/WebPage.messages.in:
</span><span class="cx"> 
</span><del>-        Re-factor performDictionaryLookupAtLocation() to re-use the code that finds the 
-        Range for the dictionary lookup. That code now lives in 
-        rangeForDictionaryLookupAtHitTestResult() and can be used by 
-        performDictionaryLookupAtLocation() and our new function 
</del><ins>+        Re-factor performDictionaryLookupAtLocation() to re-use the code that finds the
+        Range for the dictionary lookup. That code now lives in
+        rangeForDictionaryLookupAtHitTestResult() and can be used by
+        performDictionaryLookupAtLocation() and our new function
</ins><span class="cx">         selectLookupTextAtLocation().
</span><span class="cx">         * WebProcess/WebPage/mac/WebPageMac.mm:
</span><span class="cx">         (WebKit::WebPage::rangeForDictionaryLookupAtHitTestResult):
</span><span class="cx">         (WebKit::WebPage::performDictionaryLookupAtLocation):
</span><span class="cx"> 
</span><del>-        Since the action menu text is always selected, when the lookup action is chosen, 
</del><ins>+        Since the action menu text is always selected, when the lookup action is chosen,
</ins><span class="cx">         we can just lookup the current selection.
</span><span class="cx">         (WebKit::WebPage::performDictionaryLookupOfCurrentSelection):
</span><span class="cx"> 
</span><del>-        Uses the new function rangeForDictionaryLookupAtHitTestResult() to get a lookup 
</del><ins>+        Uses the new function rangeForDictionaryLookupAtHitTestResult() to get a lookup
</ins><span class="cx">         range and then select it.
</span><span class="cx">         (WebKit::WebPage::selectLookupTextAtLocation):
</span><span class="cx"> 
</span><span class="lines">@@ -41428,7 +41455,7 @@
</span><span class="cx">         (WebKit::CoordinatedDrawingAreaProxy::incorporateUpdate):
</span><span class="cx">         * UIProcess/CoordinatedGraphics/CoordinatedGraphicsScene.cpp: Use a modern for loop.
</span><span class="cx">         (WebCore::CoordinatedGraphicsScene::setLayerChildrenIfNeeded):
</span><del>-        (WebCore::CoordinatedGraphicsScene::createLayers): changed the name of argument to be equal with deleteLayer(). 
</del><ins>+        (WebCore::CoordinatedGraphicsScene::createLayers): changed the name of argument to be equal with deleteLayer().
</ins><span class="cx">         (WebCore::CoordinatedGraphicsScene::deleteLayers):
</span><span class="cx">         (WebCore::CoordinatedGraphicsScene::createTilesIfNeeded):
</span><span class="cx">         (WebCore::CoordinatedGraphicsScene::removeTilesIfNeeded):
</span><span class="lines">@@ -41864,7 +41891,7 @@
</span><span class="cx"> 
</span><span class="cx"> 2014-10-24  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><del>-        _actionMenuItemsForHitTestResult should also take a type indicating what the menu 
</del><ins>+        _actionMenuItemsForHitTestResult should also take a type indicating what the menu
</ins><span class="cx">         was built for
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=138063
</span><span class="cx"> 
</span><span class="lines">@@ -41882,7 +41909,7 @@
</span><span class="cx">         Now keep an ivar for the type.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.h:
</span><span class="cx"> 
</span><del>-        Create a category for the old SPI so that we can still call it if clients have 
</del><ins>+        Create a category for the old SPI so that we can still call it if clients have
</ins><span class="cx">         implemented it.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController initWithPage:view:]):
</span><span class="lines">@@ -41989,7 +42016,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><span class="cx"> 
</span><del>-        If the HitTestResult failed to create and image, then don’t go for the image 
</del><ins>+        If the HitTestResult failed to create and image, then don’t go for the image
</ins><span class="cx">         action menu.
</span><span class="cx">         * UIProcess/mac/WKActionMenuController.mm:
</span><span class="cx">         (-[WKActionMenuController _defaultMenuItems]):
</span><span class="lines">@@ -43062,7 +43089,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><del>-        Use is&lt;&gt;() / downcast&lt;&gt;() for all remaining RenderObject subclasses and 
</del><ins>+        Use is&lt;&gt;() / downcast&lt;&gt;() for all remaining RenderObject subclasses and
</ins><span class="cx">         clean up the surrounding code.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/Plugins/PluginView.cpp:
</span><span class="lines">@@ -43155,7 +43182,7 @@
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=137806
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><del>-        
</del><ins>+
</ins><span class="cx">         Confusingly, WKPreferencesSetTextAutosizingEnabled() does nothing on iOS.
</span><span class="cx">         Instead, we have to add WKPreferencesSetMinimumZoomFontSize() and set it to 0
</span><span class="cx">         to disable font autosizing.
</span><span class="lines">@@ -43287,7 +43314,7 @@
</span><span class="cx">         rdar://problem/18547565
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tim Horton.
</span><del>-        
</del><ins>+
</ins><span class="cx">         CA can call our animation delegate after the RemoteLayerTreeHost has been
</span><span class="cx">         destroyed. CAAnimation retains its delegate, so it's safe for us to null out
</span><span class="cx">         the WKAnimationDelegate's pointer to the RemoteLayerTreeHost when tearing down
</span><span class="lines">@@ -43531,7 +43558,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon Fraser.
</span><span class="cx"> 
</span><del>-        Use is&lt;&gt;() / downcast&lt;&gt;() for PlatformCALayer subclasses and clean up 
</del><ins>+        Use is&lt;&gt;() / downcast&lt;&gt;() for PlatformCALayer subclasses and clean up
</ins><span class="cx">         the surrounding code.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
</span><span class="lines">@@ -43884,7 +43911,7 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span><span class="cx"> 
</span><del>-        Use is&lt;&gt;() / downcast&lt;&gt;() for RenderBlock objects and clean up the 
</del><ins>+        Use is&lt;&gt;() / downcast&lt;&gt;() for RenderBlock objects and clean up the
</ins><span class="cx">         surrounding code.
</span><span class="cx"> 
</span><span class="cx">         * WebProcess/WebPage/ios/WebPageIOS.mm:
</span></span></pre></div>
<a id="tagsSafari6011381SourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/Platform/spi/ios/UIKitSPI.h        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/Platform/spi/ios/UIKitSPI.h        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -586,6 +586,10 @@
</span><span class="cx"> 
</span><span class="cx">     struct _UIWebTouchPoint* touchPoints;
</span><span class="cx">     unsigned touchPointCount;
</span><ins>+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 90000
+    bool isPotentialTap;
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> @protocol UIWebTouchEventsGestureRecognizerDelegate
</span></span></pre></div>
<a id="tagsSafari6011381SourceWebKit2SharedWebEventh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEvent.h (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEvent.h        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEvent.h        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -325,11 +325,12 @@
</span><span class="cx"> class WebTouchEvent : public WebEvent {
</span><span class="cx"> public:
</span><span class="cx">     WebTouchEvent() { }
</span><del>-    WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector&lt;WebPlatformTouchPoint&gt;&amp; touchPoints, WebCore::IntPoint position, bool isGesture, float gestureScale, float gestureRotation)
</del><ins>+    WebTouchEvent(WebEvent::Type type, Modifiers modifiers, double timestamp, const Vector&lt;WebPlatformTouchPoint&gt;&amp; touchPoints, WebCore::IntPoint position, bool isPotentialTap, bool isGesture, float gestureScale, float gestureRotation)
</ins><span class="cx">         : WebEvent(type, modifiers, timestamp)
</span><span class="cx">         , m_touchPoints(touchPoints)
</span><span class="cx">         , m_position(position)
</span><span class="cx">         , m_canPreventNativeGestures(true)
</span><ins>+        , m_isPotentialTap(isPotentialTap)
</ins><span class="cx">         , m_isGesture(isGesture)
</span><span class="cx">         , m_gestureScale(gestureScale)
</span><span class="cx">         , m_gestureRotation(gestureRotation)
</span><span class="lines">@@ -341,6 +342,8 @@
</span><span class="cx"> 
</span><span class="cx">     WebCore::IntPoint position() const { return m_position; }
</span><span class="cx"> 
</span><ins>+    bool isPotentialTap() const { return m_isPotentialTap; }
+
</ins><span class="cx">     bool isGesture() const { return m_isGesture; }
</span><span class="cx">     float gestureScale() const { return m_gestureScale; }
</span><span class="cx">     float gestureRotation() const { return m_gestureRotation; }
</span><span class="lines">@@ -358,6 +361,7 @@
</span><span class="cx">     
</span><span class="cx">     WebCore::IntPoint m_position;
</span><span class="cx">     bool m_canPreventNativeGestures;
</span><ins>+    bool m_isPotentialTap;
</ins><span class="cx">     bool m_isGesture;
</span><span class="cx">     float m_gestureScale;
</span><span class="cx">     float m_gestureRotation;
</span></span></pre></div>
<a id="tagsSafari6011381SourceWebKit2SharedWebEventConversioncpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEventConversion.cpp (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEventConversion.cpp        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/Shared/WebEventConversion.cpp        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -332,6 +332,7 @@
</span><span class="cx">         m_gestureRotation = webEvent.gestureRotation();
</span><span class="cx">         m_canPreventNativeGestures = webEvent.canPreventNativeGestures();
</span><span class="cx">         m_isGesture = webEvent.isGesture();
</span><ins>+        m_isPotentialTap = webEvent.isPotentialTap();
</ins><span class="cx">         m_position = webEvent.position();
</span><span class="cx">         m_globalPosition = webEvent.position();
</span><span class="cx"> #else
</span></span></pre></div>
<a id="tagsSafari6011381SourceWebKit2SharediosNativeWebTouchEventIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -96,7 +96,20 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
</span><del>-    : WebTouchEvent(webEventTypeForUIWebTouchEventType(event-&gt;type), static_cast&lt;Modifiers&gt;(0), event-&gt;timestamp, extractWebTouchPoint(event), positionForCGPoint(event-&gt;locationInDocumentCoordinates), event-&gt;inJavaScriptGesture, event-&gt;scale, event-&gt;rotation)
</del><ins>+    : WebTouchEvent(
+        webEventTypeForUIWebTouchEventType(event-&gt;type),
+        static_cast&lt;Modifiers&gt;(0),
+        event-&gt;timestamp,
+        extractWebTouchPoint(event),
+        positionForCGPoint(event-&gt;locationInDocumentCoordinates),
+#if __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 90000
+        event-&gt;isPotentialTap,
+#else
+        true,
+#endif
+        event-&gt;inJavaScriptGesture,
+        event-&gt;scale,
+        event-&gt;rotation)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari6011381SourceWebKit2SharediosWebTouchEventIOScpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp (186363 => 186364)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp        2015-07-06 18:14:18 UTC (rev 186363)
+++ tags/Safari-601.1.38.1/Source/WebKit2/Shared/ios/WebTouchEventIOS.cpp        2015-07-06 18:36:59 UTC (rev 186364)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">     encoder &lt;&lt; m_touchPoints;
</span><span class="cx">     encoder &lt;&lt; m_position;
</span><span class="cx">     encoder &lt;&lt; m_canPreventNativeGestures;
</span><ins>+    encoder &lt;&lt; m_isPotentialTap;
</ins><span class="cx">     encoder &lt;&lt; m_isGesture;
</span><span class="cx">     encoder &lt;&lt; m_gestureScale;
</span><span class="cx">     encoder &lt;&lt; m_gestureRotation;
</span><span class="lines">@@ -57,6 +58,8 @@
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(result.m_canPreventNativeGestures))
</span><span class="cx">         return false;
</span><ins>+    if (!decoder.decode(result.m_isPotentialTap))
+        return false;
</ins><span class="cx">     if (!decoder.decode(result.m_isGesture))
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(result.m_gestureScale))
</span></span></pre>
</div>
</div>

</body>
</html>