Changeset 59904 in webkit

Timestamp:

May 20, 2010 8:20:27 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

REGRESSION(r53637): DivX plug-in fails to start until window is resized
​https://bugs.webkit.org/show_bug.cgi?id=39457
<rdar://problem/8006102>

Before r53637, we called Widget::move() (which caused us to call
NPP_SetWindow) before painting a plug-in. r53637 removed the call to
Widget::move(), and we end up never calling NPP_SetWindow for plug-ins
with the "DeferFirstSetWindowCall" quirk, including the DivX plug-in.

Reviewed by Simon Fraser.

• manual-tests/divx-plugin-fails-to-draw.html: Added.

• plugins/PluginView.cpp:

(WebCore::PluginView::PluginView):
Initialize new member to false.

• plugins/PluginView.h:

Added new member.

• plugins/win/PluginViewWin.cpp:

(WebCore::PluginView::paint):
Call setNPWindowRect() before painting to ensure that NPP_SetWindow gets
called.
(WebCore::PluginView::setNPWindowRect):
Set m_haveCalledSetWindow.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/divx-plugin-fails-to-draw.html (added)
• plugins/PluginView.cpp (modified) (1 diff)
• plugins/PluginView.h (modified) (1 diff)
• plugins/win/PluginViewWin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-20  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        REGRESSION(r53637): DivX plug-in fails to start until window is resized
+        https://bugs.webkit.org/show_bug.cgi?id=39457
+        <rdar://problem/8006102>
+
+        Before r53637, we called Widget::move() (which caused us to call
+        NPP_SetWindow) before painting a plug-in. r53637 removed the call to
+        Widget::move(), and we end up never calling NPP_SetWindow for plug-ins
+        with the "DeferFirstSetWindowCall" quirk, including the DivX plug-in.
+
+        Reviewed by Simon Fraser.
+
+        * manual-tests/divx-plugin-fails-to-draw.html: Added.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::PluginView):
+        Initialize new member to false.
+
+        * plugins/PluginView.h:
+        Added new member.
+
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginView::paint):
+        Call setNPWindowRect() before painting to ensure that NPP_SetWindow gets
+        called.
+        (WebCore::PluginView::setNPWindowRect):
+        Set m_haveCalledSetWindow.
+
 2010-05-20  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/plugins/PluginView.cpp

@@ -851 +851 @@
     , m_isHalted(false)
     , m_hasBeenHalted(false)
+    , m_haveCalledSetWindow(false)
 {
     if (!m_plugin) {

trunk/WebCore/plugins/PluginView.h

@@ -386 +386 @@
         bool m_hasBeenHalted;
 
+        bool m_haveCalledSetWindow;
+
         static PluginView* s_currentPluginView;
     };

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -602 +602 @@
         return;
 
+    // Ensure that we have called SetWindow before we try to paint.
+    if (!m_haveCalledSetWindow)
+        setNPWindowRect(frameRect());
+
     if (m_isWindowed) {
 #if !OS(WINCE)
@@ -807 +811 @@
         setCallingPlugin(false);
 
+        m_haveCalledSetWindow = true;
+
         if (!m_isWindowed)
             return;