Changeset 121441 in webkit

Timestamp:

Jun 28, 2012 11:00:42 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][Win]: Fix plugin drawing to an offscreen buffer
​https://bugs.webkit.org/show_bug.cgi?id=89499

Patch by Kalev Lember <​kalevlember@gmail.com> on 2012-06-28
Reviewed by Brent Fulgham.

Take into account that the GTK+ port draws to a backing store and adjust
the target rectangle calculation accordingly.

• plugins/win/PluginViewWin.cpp:

(WebCore::PluginView::paint):
(WebCore::PluginView::setNPWindowRect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/win/PluginViewWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-28  Kalev Lember  <kalevlember@gmail.com>
+
+        [GTK][Win]: Fix plugin drawing to an offscreen buffer
+        https://bugs.webkit.org/show_bug.cgi?id=89499
+
+        Reviewed by Brent Fulgham.
+
+        Take into account that the GTK+ port draws to a backing store and adjust
+        the target rectangle calculation accordingly.
+
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginView::paint):
+        (WebCore::PluginView::setNPWindowRect):
+
 2012-06-28  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/plugins/win/PluginViewWin.cpp

@@ -649 +649 @@
 
     ASSERT(parent()->isFrameView());
+
+    // In the GTK port we draw in an offscreen buffer and don't want to use the window
+    // coordinates.
+#if PLATFORM(GTK)
+    IntRect rectInWindow(rect);
+    rectInWindow.intersect(frameRect());
+#else
     IntRect rectInWindow = static_cast<FrameView*>(parent())->contentsToWindow(frameRect());
+#endif
     LocalWindowsContext windowsContext(context, rectInWindow, m_isTransparent);
 
@@ -833 +841 @@
     m_npWindow.clipRect.bottom = r.height();
 #else
+    // In the GTK port we draw in an offscreen buffer and don't want to use the window
+    // coordinates.
+# if PLATFORM(GTK)
+    IntPoint p = rect.location();
+# else
     IntPoint p = static_cast<FrameView*>(parent())->contentsToWindow(rect.location());
+# endif
     m_npWindow.x = p.x();
     m_npWindow.y = p.y();