<!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>[168325] trunk/Source</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/168325">168325</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-05 16:14:43 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need a delegate that informs the UI process when the page's pin state changes
https://bugs.webkit.org/show_bug.cgi?id=132583
-and corresponding-
<rdar://problem/16806231>
Reviewed by Anders Carlsson.
Source/WebCore:
We should default all of these pin-state value to true.
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::ScrollingTree):
Source/WebKit2:
New UIClient function pinnedStateDidChange.
* UIProcess/API/APIUIClient.h:
(API::UIClient::pinnedStateDidChange):
Create WKPageUIClientV3 to add this function.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPageUIClient.h:
Change default initialization to true instead of false, which makes more sense for
this API.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::didCommitLoadForFrame):
(WebKit::WebPageProxy::resetState):
(WebKit::WebPageProxy::didChangeScrollOffsetPinningForMainFrame):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebCore/ChangeLog 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-05 Beth Dakin <bdakin@apple.com>
+
+ Need a delegate that informs the UI process when the page's pin state changes
+ https://bugs.webkit.org/show_bug.cgi?id=132583
+ -and corresponding-
+ <rdar://problem/16806231>
+
+ Reviewed by Anders Carlsson.
+
+ We should default all of these pin-state value to true.
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::ScrollingTree):
+
</ins><span class="cx"> 2014-05-05 Christophe Dumez <ch.dumez@samsung.com>
</span><span class="cx">
</span><span class="cx"> Named element cache can become invalid during HTMLCollection::updateNamedElementCache()
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> , m_rubberBandsAtRight(true)
</span><span class="cx"> , m_rubberBandsAtTop(true)
</span><span class="cx"> , m_rubberBandsAtBottom(true)
</span><del>- , m_mainFramePinnedToTheLeft(false)
- , m_mainFramePinnedToTheRight(false)
- , m_mainFramePinnedToTheTop(false)
- , m_mainFramePinnedToTheBottom(false)
</del><ins>+ , m_mainFramePinnedToTheLeft(true)
+ , m_mainFramePinnedToTheRight(true)
+ , m_mainFramePinnedToTheTop(true)
+ , m_mainFramePinnedToTheBottom(true)
</ins><span class="cx"> , m_mainFrameIsRubberBanding(false)
</span><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_latchedNode(0)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-05-05 Beth Dakin <bdakin@apple.com>
+
+ Need a delegate that informs the UI process when the page's pin state changes
+ https://bugs.webkit.org/show_bug.cgi?id=132583
+ -and corresponding-
+ <rdar://problem/16806231>
+
+ Reviewed by Anders Carlsson.
+
+ New UIClient function pinnedStateDidChange.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::pinnedStateDidChange):
+
+ Create WKPageUIClientV3 to add this function.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/API/C/WKPageUIClient.h:
+
+ Change default initialization to true instead of false, which makes more sense for
+ this API.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+ (WebKit::WebPageProxy::resetState):
+ (WebKit::WebPageProxy::didChangeScrollOffsetPinningForMainFrame):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+
</ins><span class="cx"> 2014-05-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add SPI to provide the WebCrypto master key
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -133,6 +133,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldInterruptJavaScript(WebKit::WebPageProxy*) { return false; }
</span><span class="cx">
</span><ins>+ virtual void pinnedStateDidChange(WebKit::WebPageProxy&) { }
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return std::move(defaultActions); }
</span><span class="cx"> virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ClientTraits<WKPageUIClientBase> {
</span><del>- typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions;
</del><ins>+ typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2, WKPageUIClientV3> Versions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1538,6 +1538,14 @@
</span><span class="cx">
</span><span class="cx"> return m_client.shouldInterruptJavaScript(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><ins>+
+ virtual void pinnedStateDidChange(WebPageProxy& page) override
+ {
+ if (!m_client.pinnedStateDidChange)
+ return;
+
+ m_client.pinnedStateDidChange(toAPI(&page), m_client.base.clientInfo);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> toImpl(pageRef)->setUIClient(std::make_unique<UIClient>(wkClient));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> typedef void (*WKPageShowColorPickerCallback)(WKPageRef page, WKStringRef initialColor, WKColorPickerResultListenerRef listener, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageHideColorPickerCallback)(WKPageRef page, const void* clientInfo);
</span><span class="cx"> typedef void (*WKPageUnavailablePluginButtonClickedCallback)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKDictionaryRef pluginInfoDictionary, const void* clientInfo);
</span><ins>+typedef void (*WKPagePinnedStateDidChangeCallback)(WKPageRef page, const void* clientInfo);
</ins><span class="cx">
</span><span class="cx"> // Deprecated
</span><span class="cx"> typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
</span><span class="lines">@@ -249,6 +250,65 @@
</span><span class="cx"> WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
</span><span class="cx"> } WKPageUIClientV2;
</span><span class="cx">
</span><ins>+typedef struct WKPageUIClientV3 {
+ WKPageUIClientBase base;
+
+ // Version 0.
+ WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0;
+ WKPageUIClientCallback showPage;
+ WKPageUIClientCallback close;
+ WKPageTakeFocusCallback takeFocus;
+ WKPageFocusCallback focus;
+ WKPageUnfocusCallback unfocus;
+ WKPageRunJavaScriptAlertCallback runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback runJavaScriptPrompt;
+ WKPageSetStatusTextCallback setStatusText;
+ WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
+ WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
+ WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent;
+ WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent;
+ WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible;
+ WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible;
+ WKPageGetMenuBarIsVisibleCallback menuBarIsVisible;
+ WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible;
+ WKPageGetStatusBarIsVisibleCallback statusBarIsVisible;
+ WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible;
+ WKPageGetIsResizableCallback isResizable;
+ WKPageSetIsResizableCallback setIsResizable;
+ WKPageGetWindowFrameCallback getWindowFrame;
+ WKPageSetWindowFrameCallback setWindowFrame;
+ WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
+ WKPageUIClientCallback didDraw;
+ WKPageUIClientCallback pageDidScroll;
+ WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
+ WKPageRunOpenPanelCallback runOpenPanel;
+ WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest;
+ WKPageHeaderHeightCallback headerHeight;
+ WKPageFooterHeightCallback footerHeight;
+ WKPageDrawHeaderCallback drawHeader;
+ WKPageDrawFooterCallback drawFooter;
+ WKPagePrintFrameCallback printFrame;
+ WKPageUIClientCallback runModal;
+ void* unused1; // Used to be didCompleteRubberBandForMainFrame
+ WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
+ WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript;
+
+ // Version 1.
+ WKPageCreateNewPageCallback createNewPage;
+ WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
+ WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
+ WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
+
+ // Version 2.
+ WKPageShowColorPickerCallback showColorPicker;
+ WKPageHideColorPickerCallback hideColorPicker;
+ WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
+
+ // Version 3.
+ WKPagePinnedStateDidChangeCallback pinnedStateDidChange;
+} WKPageUIClientV3;
+
</ins><span class="cx"> enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
</span><span class="cx"> typedef struct WKPageUIClient {
</span><span class="cx"> int version;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -334,10 +334,10 @@
</span><span class="cx"> , m_mainFrameHasHorizontalScrollbar(false)
</span><span class="cx"> , m_mainFrameHasVerticalScrollbar(false)
</span><span class="cx"> , m_canShortCircuitHorizontalWheelEvents(true)
</span><del>- , m_mainFrameIsPinnedToLeftSide(false)
- , m_mainFrameIsPinnedToRightSide(false)
- , m_mainFrameIsPinnedToTopSide(false)
- , m_mainFrameIsPinnedToBottomSide(false)
</del><ins>+ , m_mainFrameIsPinnedToLeftSide(true)
+ , m_mainFrameIsPinnedToRightSide(true)
+ , m_mainFrameIsPinnedToTopSide(true)
+ , m_mainFrameIsPinnedToBottomSide(true)
</ins><span class="cx"> , m_shouldUseImplicitRubberBandControl(false)
</span><span class="cx"> , m_rubberBandsAtLeft(true)
</span><span class="cx"> , m_rubberBandsAtRight(true)
</span><span class="lines">@@ -2457,6 +2457,8 @@
</span><span class="cx"> m_mainFrameIsPinnedToRightSide = true;
</span><span class="cx"> m_mainFrameIsPinnedToTopSide = true;
</span><span class="cx"> m_mainFrameIsPinnedToBottomSide = true;
</span><ins>+
+ m_uiClient->pinnedStateDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx"> m_pageClient.didCommitLoadForMainFrame(mimeType, frameHasCustomContentProvider);
</span><span class="cx"> }
</span><span class="lines">@@ -4150,10 +4152,10 @@
</span><span class="cx"> m_mainFrameHasHorizontalScrollbar = false;
</span><span class="cx"> m_mainFrameHasVerticalScrollbar = false;
</span><span class="cx">
</span><del>- m_mainFrameIsPinnedToLeftSide = false;
- m_mainFrameIsPinnedToRightSide = false;
- m_mainFrameIsPinnedToTopSide = false;
- m_mainFrameIsPinnedToBottomSide = false;
</del><ins>+ m_mainFrameIsPinnedToLeftSide = true;
+ m_mainFrameIsPinnedToRightSide = true;
+ m_mainFrameIsPinnedToTopSide = true;
+ m_mainFrameIsPinnedToBottomSide = true;
</ins><span class="cx">
</span><span class="cx"> m_visibleScrollerThumbRect = IntRect();
</span><span class="cx">
</span><span class="lines">@@ -4486,6 +4488,8 @@
</span><span class="cx"> m_mainFrameIsPinnedToRightSide = pinnedToRightSide;
</span><span class="cx"> m_mainFrameIsPinnedToTopSide = pinnedToTopSide;
</span><span class="cx"> m_mainFrameIsPinnedToBottomSide = pinnedToBottomSide;
</span><ins>+
+ m_uiClient->pinnedStateDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didChangePageCount(unsigned pageCount)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (168324 => 168325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-05 23:09:58 UTC (rev 168324)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-05 23:14:43 UTC (rev 168325)
</span><span class="lines">@@ -276,10 +276,10 @@
</span><span class="cx"> , m_canRunBeforeUnloadConfirmPanel(parameters.canRunBeforeUnloadConfirmPanel)
</span><span class="cx"> , m_canRunModal(parameters.canRunModal)
</span><span class="cx"> , m_isRunningModal(false)
</span><del>- , m_cachedMainFrameIsPinnedToLeftSide(false)
- , m_cachedMainFrameIsPinnedToRightSide(false)
- , m_cachedMainFrameIsPinnedToTopSide(false)
- , m_cachedMainFrameIsPinnedToBottomSide(false)
</del><ins>+ , m_cachedMainFrameIsPinnedToLeftSide(true)
+ , m_cachedMainFrameIsPinnedToRightSide(true)
+ , m_cachedMainFrameIsPinnedToTopSide(true)
+ , m_cachedMainFrameIsPinnedToBottomSide(true)
</ins><span class="cx"> , m_canShortCircuitHorizontalWheelEvents(false)
</span><span class="cx"> , m_numWheelEventHandlers(0)
</span><span class="cx"> , m_cachedPageCount(0)
</span></span></pre>
</div>
</div>
</body>
</html>