Changeset 138991 in webkit

Timestamp:

Jan 7, 2013 2:12:47 PM (11 years ago)

Author:

wangxianzhu@chromium.org

Message:

Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths
​https://bugs.webkit.org/show_bug.cgi?id=105546

Reviewed by James Robinson.

.:

Export the new symbol.

• Source/autotools/symbols.filter:

Source/WebCore:

No new tests. Added test API for new tests of other bugs.

• WebCore.exp.in:
• page/Page.cpp:

(WebCore::Page::nonFastScrollableRects):
(WebCore):

• page/Page.h:

(WebCore):
(Page):

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Change to public to allow Page::nonFastScrollableRects to access.

• page/scrolling/ScrollingCoordinator.h:

(ScrollingCoordinator):

• testing/Internals.cpp:

(WebCore::Internals::nonFastScrollableRects):
(WebCore):

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit2:

Export the new symbol.

• win/WebKit2.def.in:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (2 diffs)
• Source/WebCore/page/Page.h (modified) (2 diffs)
• Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit/win/WebKit.vcproj/WebKit.def.in (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/autotools/symbols.filter (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-01-07  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths
+        https://bugs.webkit.org/show_bug.cgi?id=105546
+
+        Reviewed by James Robinson.
+
+        Export the new symbol.
+
+        * Source/autotools/symbols.filter:
+
 2013-01-04  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths
+        https://bugs.webkit.org/show_bug.cgi?id=105546
+
+        Reviewed by James Robinson.
+
+        No new tests. Added test API for new tests of other bugs.
+
+        * WebCore.exp.in:
+        * page/Page.cpp:
+        (WebCore::Page::nonFastScrollableRects):
+        (WebCore):
+        * page/Page.h:
+        (WebCore):
+        (Page):
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Change to public to allow Page::nonFastScrollableRects to access.
+        * page/scrolling/ScrollingCoordinator.h:
+        (ScrollingCoordinator):
+        * testing/Internals.cpp:
+        (WebCore::Internals::nonFastScrollableRects):
+        (WebCore):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2013-01-07  Tom Sepez  <tsepez@chromium.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -762 +762 @@
 __ZN7WebCore4Page21markAllMatchesForTextERKN3WTF6StringEjbj
 __ZN7WebCore4Page22allVisitedStateChangedEPNS_9PageGroupE
+__ZN7WebCore4Page22nonFastScrollableRectsEPKNS_5FrameE
 __ZN7WebCore4Page23clearUndoRedoOperationsEv
 __ZN7WebCore4Page24resumeScriptedAnimationsEv

trunk/Source/WebCore/page/Page.cpp

@@ -26 +26 @@
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "ClientRectList.h"
 #include "ContextMenuClient.h"
 #include "ContextMenuController.h"
@@ -270 +271 @@
 }
 
+PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
+{
+    if (Document* document = m_mainFrame->document())
+        document->updateLayout();
+
+    Vector<IntRect> rects;
+    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+        rects = scrollingCoordinator->computeNonFastScrollableRegion(frame, IntPoint()).rects();
+
+    Vector<FloatQuad> quads(rects.size());
+    for (size_t i = 0; i < rects.size(); ++i)
+        quads[i] = FloatRect(rects[i]);
+    return ClientRectList::create(quads);
+}
+
 struct ViewModeInfo {
     const char* name;

trunk/Source/WebCore/page/Page.h

@@ -58 +58 @@
     class Chrome;
     class ChromeClient;
+    class ClientRectList;
 #if ENABLE(CONTEXT_MENUS)
     class ContextMenuClient;
@@ -201 +202 @@
         String scrollingStateTreeAsText();
         String mainThreadScrollingReasonsAsText();
+        PassRefPtr<ClientRectList> nonFastScrollableRects(const Frame*);
 
         Settings* settings() const { return m_settings.get(); }

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -137 +137 @@
 }
 
-Region ScrollingCoordinator::computeNonFastScrollableRegion(Frame* frame, const IntPoint& frameLocation)
+Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame, const IntPoint& frameLocation) const
 {
     Region nonFastScrollableRegion;

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

@@ -161 +161 @@
     String mainThreadScrollingReasonsAsText() const;
 
+    Region computeNonFastScrollableRegion(const Frame*, const IntPoint& frameLocation) const;
+
 protected:
     explicit ScrollingCoordinator(Page*);
 
-    Region computeNonFastScrollableRegion(Frame*, const IntPoint& frameLocation);
     unsigned computeCurrentWheelEventHandlerCount();
     GraphicsLayer* scrollLayerForFrameView(FrameView*);

trunk/Source/WebCore/testing/Internals.cpp

@@ -1559 +1559 @@
 }
 
+PassRefPtr<ClientRectList> Internals::nonFastScrollableRects(Document* document, ExceptionCode& ec) const
+{
+    if (!document || !document->frame()) {
+        ec = INVALID_ACCESS_ERR;
+        return 0;
+    }
+
+    Page* page = document->page();
+    if (!page)
+        return 0;
+
+    return page->nonFastScrollableRects(document->frame());
+}
+
 void Internals::garbageCollectDocumentResources(Document* document, ExceptionCode& ec) const
 {

trunk/Source/WebCore/testing/Internals.h

@@ -216 +216 @@
     String repaintRectsAsText(Document*, ExceptionCode&) const;
     String scrollingStateTreeAsText(Document*, ExceptionCode&) const;
-
     String mainThreadScrollingReasons(Document*, ExceptionCode&) const;
+    PassRefPtr<ClientRectList> nonFastScrollableRects(Document*, ExceptionCode&) const;
 
     void garbageCollectDocumentResources(Document*, ExceptionCode&) const;

trunk/Source/WebCore/testing/Internals.idl

@@ -175 +175 @@
     DOMString scrollingStateTreeAsText(in Document document) raises (DOMException);
     DOMString mainThreadScrollingReasons(in Document document) raises (DOMException);
+    ClientRectList nonFastScrollableRects(in Document document) raises (DOMException);
 
     DOMString repaintRectsAsText(in Document document) raises (DOMException);

trunk/Source/WebKit/win/WebKit.vcproj/WebKit.def.in

@@ -1567 +1567 @@
         ?pauseTransitionAtTime@AnimationController@WebCore@@QAE_NPAVRenderObject@2@ABVString@WTF@@N@Z
         ?addFromLiteralData@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PBDI@Z
+        ?nonFastScrollableRects@Page@WebCore@@QAE?AV?$PassRefPtr@VClientRectList@WebCore@@@WTF@@PBVFrame@2@@Z

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-07  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Add window.internals.nonFastScrollableRects for testing scrollable areas in fast/slow paths
+        https://bugs.webkit.org/show_bug.cgi?id=105546
+
+        Reviewed by James Robinson.
+
+        Export the new symbol.
+
+        * win/WebKit2.def.in:
+
 2013-01-07  Mike West  <mkwst@chromium.org>
 

trunk/Source/autotools/symbols.filter

@@ -31 +31 @@
 _ZN7WebCore4Page18setPageScaleFactorEfRKNS_8IntPointE;
 _ZN7WebCore4Page20setDeviceScaleFactorEf;
+_ZN7WebCore4Page22nonFastScrollableRectsEPKNS_5FrameE;
 _ZN7WebCore4Page24scrollingStateTreeAsTextEv;
 _ZN7WebCore4Page32mainThreadScrollingReasonsAsTextEv;