Changeset 190249 in webkit

Timestamp:

Sep 25, 2015 12:13:49 PM (9 years ago)

Author:

peavo@outlook.com

Message:

[WinCairo] Incorrect position for windowless plugins.
​https://bugs.webkit.org/show_bug.cgi?id=149524

Reviewed by Alex Christensen.

Source/WebCore:

Added method to get graphics context HDC.

• platform/graphics/GraphicsContext.h:
• platform/graphics/win/GraphicsContextWin.cpp:

(WebCore::GraphicsContext::getWindowsContext):
(WebCore::GraphicsContext::hdc):
(WebCore::GraphicsContextPlatformPrivate::save):

Source/WebKit/win:

Only perform the device context transformation if the plugin is painting
directly into the GraphicsContext HDC. The previous check was not correct
in all cases.

• Plugins/PluginViewWin.cpp:

(WebCore::PluginView::paint):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext.h (modified) (1 diff)
• WebCore/platform/graphics/win/GraphicsContextWin.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Plugins/PluginViewWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-25  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Incorrect position for windowless plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=149524
+
+        Reviewed by Alex Christensen.
+
+        Added method to get graphics context HDC.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/win/GraphicsContextWin.cpp:
+        (WebCore::GraphicsContext::getWindowsContext):
+        (WebCore::GraphicsContext::hdc):
+        (WebCore::GraphicsContextPlatformPrivate::save):
+
 2015-09-25  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -453 +453 @@
         HDC getWindowsContext(const IntRect&, bool supportAlphaBlend, bool mayCreateBitmap); // The passed in rect is used to create a bitmap for compositing inside transparency layers.
         void releaseWindowsContext(HDC, const IntRect&, bool supportAlphaBlend, bool mayCreateBitmap); // The passed in HDC should be the one handed back by getWindowsContext.
+        HDC hdc() const;
 #if PLATFORM(WIN)
 #if USE(WINGDI)

trunk/Source/WebCore/platform/graphics/win/GraphicsContextWin.cpp

@@ -137 +137 @@
 }
 
+HDC GraphicsContext::hdc() const
+{
+    if (!m_data)
+        return nullptr;
+
+    return m_data->m_hdc;
+}
+
 #if PLATFORM(WIN)
 void GraphicsContextPlatformPrivate::save()

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-09-25  Per Arne Vollan  <peavo@outlook.com>
+
+        [WinCairo] Incorrect position for windowless plugins.
+        https://bugs.webkit.org/show_bug.cgi?id=149524
+
+        Reviewed by Alex Christensen.
+
+        Only perform the device context transformation if the plugin is painting
+        directly into the GraphicsContext HDC. The previous check was not correct
+        in all cases.
+
+        * Plugins/PluginViewWin.cpp:
+        (WebCore::PluginView::paint):
+
 2015-09-24  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp

@@ -565 +565 @@
     // On Safari/Windows without transparency layers the GraphicsContext returns the HDC
     // of the window and the plugin expects that the passed in DC has window coordinates.
-    if (!context.isInTransparencyLayer()) {
+    if (context.hdc() == windowsContext.hdc()) {
         XFORM transform;
         GetWorldTransform(windowsContext.hdc(), &transform);