Changeset 71186 in webkit

Timestamp:

Nov 2, 2010 4:36:20 PM (14 years ago)

Author:

jam@chromium.org

Message:

2010-10-29 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Darin Fisher.

[chromium]: Allow plugins to use optimized scrolling
​https://bugs.webkit.org/show_bug.cgi?id=48660

• public/WebPluginContainer.h:
• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::scrollRect):
• src/WebPluginContainerImpl.h:

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebPluginContainer.h (modified) (1 diff)
• src/WebPluginContainerImpl.cpp (modified) (1 diff)
• src/WebPluginContainerImpl.h (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-29  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium]: Allow plugins to use optimized scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=48660
+
+        * public/WebPluginContainer.h:
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::scrollRect):
+        * src/WebPluginContainerImpl.h:
+
 2010-11-02  Marc-Antoine Ruel  <maruel@chromium.org>
 

trunk/WebKit/chromium/public/WebPluginContainer.h

@@ -50 +50 @@
     virtual void invalidate() = 0;
     virtual void invalidateRect(const WebRect&) = 0;
+    virtual void scrollRect(int dx, int dy, const WebRect&) = 0;
 
     // Causes the container to report its current geometry via

trunk/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -276 +276 @@
 }
 
+void WebPluginContainerImpl::scrollRect(int dx, int dy, const WebRect& rect)
+{
+    Widget* parentWidget = parent();
+    if (parentWidget->isFrameView()) {
+        FrameView* parentFrameView = static_cast<FrameView*>(parentWidget);
+        if (!parentFrameView->isOverlapped()) {
+            IntRect damageRect = convertToContainingWindow(static_cast<IntRect>(rect));
+            IntSize scrollDelta(dx, dy);
+            // scroll() only uses the second rectangle, clipRect, and ignores the first
+            // rectangle.
+            parent()->hostWindow()->scroll(scrollDelta, damageRect, damageRect);
+            return;
+        }
+    }
+
+    // Use slow scrolling instead.
+    invalidateRect(rect);
+}
+
 void WebPluginContainerImpl::reportGeometry()
 {

trunk/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -80 +80 @@
     virtual void invalidate();
     virtual void invalidateRect(const WebRect&);
+    virtual void scrollRect(int dx, int dy, const WebRect&);
     virtual void reportGeometry();
     virtual void clearScriptObjects();