Changeset 163836 in webkit

Timestamp:

Feb 10, 2014 4:24:55 PM (10 years ago)

Author:

Simon Fraser

Message:

Put a delegatesScrolling flag on WebPageProxy so that the UI process knows when scrolling is delegated
​https://bugs.webkit.org/show_bug.cgi?id=128429

Reviewed by Sam Weinig.

Add delegatesScrolling() which defaults to false, but is set to true for iOS
by WKContentView.

• UIProcess/API/ios/WKContentView.mm:

(-[WKContentView initWithFrame:configuration:]):
(-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::setDelegatesScrolling):
(WebKit::WebPageProxy::delegatesScrolling):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/ios/WKContentView.mm (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Put a delegatesScrolling flag on WebPageProxy so that the UI process knows when scrolling is delegated
+        https://bugs.webkit.org/show_bug.cgi?id=128429
+
+        Reviewed by Sam Weinig.
+        
+        Add delegatesScrolling() which defaults to false, but is set to true for iOS
+        by WKContentView.
+
+        * UIProcess/API/ios/WKContentView.mm:
+        (-[WKContentView initWithFrame:configuration:]):
+        (-[WKContentView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::setDelegatesScrolling):
+        (WebKit::WebPageProxy::delegatesScrolling):
+
 2014-02-10  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

@@ -112 +112 @@
     _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);
     _page->setUseFixedLayout(true);
+    _page->setDelegatesScrolling(true);
 
     WebContext::statistics().wkViewCount++;
@@ -264 +265 @@
     _page->setIntrinsicDeviceScaleFactor([UIScreen mainScreen].scale);
     _page->setUseFixedLayout(true);
+    _page->setDelegatesScrolling(true);
 
     WebContext::statistics().wkViewCount++;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -310 +310 @@
     , m_hasSpellDocumentTag(false)
     , m_pendingLearnOrIgnoreWordMessageCount(0)
+    , m_delegatesScrolling(false)
     , m_mainFrameHasHorizontalScrollbar(false)
     , m_mainFrameHasVerticalScrollbar(false)

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -437 +437 @@
     bool canScrollView();
     void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
+    
+    void setDelegatesScrolling(bool delegatesScrolling) { m_delegatesScrolling = delegatesScrolling; }
+    bool delegatesScrolling() const { return m_delegatesScrolling; }
 
     enum class WantsReplyOrNot { DoesNotWantReply, DoesWantReply };
@@ -1367 +1370 @@
 
     PageLoadState m_pageLoadState;
+    
+    bool m_delegatesScrolling;
 
     bool m_mainFrameHasHorizontalScrollbar;