Changeset 79040 in webkit

Timestamp:

Feb 18, 2011 3:27:55 PM (13 years ago)

Author:

Simon Fraser

Message:

2011-02-18 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein.

Plugin snapshot location is wrong for subframes
​https://bugs.webkit.org/show_bug.cgi?id=54776

Only change the CTM to the way that the plugin expects it
when painting the plugin, not when drawing the snapshot.
This fixes the snapshot location when painting flattened
frames.

• WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::paint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-18  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Plugin snapshot location is wrong for subframes
+        https://bugs.webkit.org/show_bug.cgi?id=54776
+        
+        Only change the CTM to the way that the plugin expects it
+        when painting the plugin, not when drawing the snapshot.
+        This fixes the snapshot location when painting flattened
+        frames.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::paint):
+
 2011-02-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -513 +513 @@
 
     IntRect dirtyRectInWindowCoordinates = parent()->contentsToWindow(dirtyRect);
-    
     IntRect paintRectInWindowCoordinates = intersection(dirtyRectInWindowCoordinates, clipRectInWindowCoordinates());
     if (paintRectInWindowCoordinates.isEmpty())
         return;
 
-    // context is in document coordinates. Translate it to window coordinates.
-    IntPoint documentOriginInWindowCoordinates = parent()->contentsToWindow(IntPoint());
-    context->save();
-    context->translate(-documentOriginInWindowCoordinates.x(), -documentOriginInWindowCoordinates.y());
-
     if (m_snapshot)
-        m_snapshot->paint(*context, paintRectInWindowCoordinates.location(), m_snapshot->bounds());
-    else
-        m_plugin->paint(context, paintRectInWindowCoordinates);
-
-    context->restore();
+        m_snapshot->paint(*context, frameRect().location(), m_snapshot->bounds());
+    else {
+        // The plugin is given a frame rect which is parent()->contentsToWindow(frameRect()),
+        // and un-translates by the its origin when painting. The current CTM reflects
+        // this widget's frame is its parent (the document), so we have to offset the CTM by
+        // the document's window coordinates.
+        IntPoint documentOriginInWindowCoordinates = parent()->contentsToWindow(IntPoint());
+        context->save();
+        context->translate(-documentOriginInWindowCoordinates.x(), -documentOriginInWindowCoordinates.y());
+        m_plugin->paint(context, dirtyRect);
+        context->restore();
+    }
 }