Changeset 112142 in webkit

Timestamp:

Mar 26, 2012 12:43:16 PM (12 years ago)

Author:

jamesr@google.com

Message:

Scrollable plugins not registered properly in ScrollingCoordinator
​https://bugs.webkit.org/show_bug.cgi?id=82163

Reviewed by Anders Carlsson.

Source/WebCore:

Plugins may be scrollable, so we have to add them in the non-fast scrollable region. Tested manually.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::computeNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::nonFastScrollableRegion):
(WebCore):

• page/scrolling/ScrollingCoordinator.h:

(ScrollingCoordinator):

• plugins/PluginViewBase.h:

(WebCore::PluginViewBase::scrollable):
(PluginViewBase):

Source/WebKit/chromium:

• src/WebPluginContainerImpl.cpp:

(WebKit::WebPluginContainerImpl::scrollable):

• src/WebPluginContainerImpl.h:

(WebPluginContainerImpl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (2 diffs)
• WebCore/plugins/PluginViewBase.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  James Robinson  <jamesr@chromium.org>
+
+        Scrollable plugins not registered properly in ScrollingCoordinator
+        https://bugs.webkit.org/show_bug.cgi?id=82163
+
+        Reviewed by Anders Carlsson.
+
+        Plugins may be scrollable, so we have to add them in the non-fast scrollable region. Tested manually.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::computeNonFastScrollableRegion):
+        (WebCore::ScrollingCoordinator::nonFastScrollableRegion):
+        (WebCore):
+        * page/scrolling/ScrollingCoordinator.h:
+        (ScrollingCoordinator):
+        * plugins/PluginViewBase.h:
+        (WebCore::PluginViewBase::scrollable):
+        (PluginViewBase):
+
 2012-03-26  Joone Hur  <joone.hur@collabora.co.uk>
 

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

@@ -33 +33 @@
 #include "Page.h"
 #include "PlatformWheelEvent.h"
+#include "PluginViewBase.h"
 #include "Region.h"
 #include "RenderView.h"
@@ -112 +113 @@
         if ((*it)->isFrameView())
             childFrameViews.add(static_cast<FrameView*>(it->get()));
+        else if ((*it)->isPluginViewBase()) {
+            if (static_cast<PluginViewBase*>(it->get())->wantWheelEvents())
+                nonFastScrollableRegion.unite((*it)->frameRect());
+        }
     }
 

trunk/Source/WebCore/plugins/PluginViewBase.h

@@ -54 +54 @@
     virtual bool scroll(ScrollDirection, ScrollGranularity) { return false; }
 
+    virtual bool wantWheelEvents() { return false; }
+
     // A plug-in can ask WebKit to handle scrollbars for it.
     virtual Scrollbar* horizontalScrollbar() { return 0; }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-26  James Robinson  <jamesr@chromium.org>
+
+        Scrollable plugins not registered properly in ScrollingCoordinator
+        https://bugs.webkit.org/show_bug.cgi?id=82163
+
+        Reviewed by Anders Carlsson.
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::scrollable):
+        * src/WebPluginContainerImpl.h:
+        (WebPluginContainerImpl):
+
 2012-03-26  W. James MacLean  <wjmaclean@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -519 +519 @@
 #endif
 
+bool WebPluginContainerImpl::wantWheelEvents()
+{
+    return m_scrollbarGroup;
+}
 
 ScrollbarGroup* WebPluginContainerImpl::scrollbarGroup()

trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -74 +74 @@
     // PluginViewBase methods
     virtual bool getFormValue(String&);
+    virtual bool wantWheelEvents();
 
     // Widget methods