Changeset 29974 in webkit

Timestamp:

Feb 4, 2008 1:32:12 PM (16 years ago)

Author:

jhoneycutt@apple.com

Message:

2008-02-04 Jon Honeycutt <​jhoneycutt@apple.com>

Reviewed by Steve, Anders.

<rdar://problem/5211187> QuickTime and Flash plug-ins draw outside of
content area when inside an iframe or div with overflow when playing a
movie and scrolling the iframe/div area

Clip the update region to the zero rect when scrolling. Don't do this
for Java, because it results in repaint problems.

• plugins/PluginQuirkSet.h: Added the DontClipToZeroRectWhenScrolling quirk (WebCore::):
• plugins/win/PluginViewWin.cpp: (WebCore::PluginViewWin::updateWindow): Readded the old behavior of clipping to the zero rect when updating the window during a scroll. Added plug-in quirk to ignore this behavior for Java. Swapped order of the SetWindowRgn() and MoveWindow() calls to prevent Java from painting outside of its container during a scroll. (WebCore::PluginViewWin::determineQuirks): If this is Java, add the DontClipToZeroRectWhenScrolling quirk.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-04  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Reviewed by Steve, Anders.
+
+        <rdar://problem/5211187> QuickTime and Flash plug-ins draw outside of
+        content area when inside an iframe or div with overflow when playing a
+        movie and scrolling the iframe/div area
+
+        Clip the update region to the zero rect when scrolling. Don't do this
+        for Java, because it results in repaint problems. 
+
+        * plugins/PluginQuirkSet.h: Added the DontClipToZeroRectWhenScrolling
+        quirk
+        (WebCore::):
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginViewWin::updateWindow): Readded the old behavior of
+        clipping to the zero rect when updating the window during a scroll.
+        Added plug-in quirk to ignore this behavior for Java. Swapped order of
+        the SetWindowRgn() and MoveWindow() calls to prevent Java from painting
+        outside of its container during a scroll.
+        (WebCore::PluginViewWin::determineQuirks): If this is Java, add the
+        DontClipToZeroRectWhenScrolling quirk.
+
 2008-02-04  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/plugins/PluginQuirkSet.h

@@ -43 +43 @@
         PluginQuirkHasModalMessageLoop = 1 << 7,
         PluginQuirkFlashURLNotifyBug = 1 << 8,
+        PluginQuirkDontClipToZeroRectWhenScrolling = 1 << 9,
     };
 

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -354 +354 @@
         HRGN rgn;
 
+        setCallingPlugin(true);
+
         // To prevent flashes while scrolling, we disable drawing during the window
         // update process by clipping the window to the zero rect.
 
-        // FIXME: Setting the window region to an empty region causes bad scrolling 
-        // repaint problems with at least the WMP and Java plugins.
-        // <rdar://problem/5211187> Come up with a better way of handling plug-in scrolling
-        // is the bug that tracks the work of fixing this.
-        //rgn = ::CreateRectRgn(0, 0, 0, 0);
-        //::SetWindowRgn(m_window, rgn, false);
-
-        setCallingPlugin(true);
+        bool clipToZeroRect = !m_quirks.contains(PluginQuirkDontClipToZeroRectWhenScrolling);
+
+        if (clipToZeroRect) {
+            rgn = ::CreateRectRgn(0, 0, 0, 0);
+            ::SetWindowRgn(m_window, rgn, FALSE);
+        } else {
+            rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom());
+            ::SetWindowRgn(m_window, rgn, TRUE);
+        }
+
         if (m_windowRect != oldWindowRect)
-            ::MoveWindow(m_window, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), true);
-
-        // Re-enable drawing. (This serves the double purpose of updating the clip rect if it has changed.)
-        rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom());
-        ::SetWindowRgn(m_window, rgn, true);
-        ::UpdateWindow(m_window);
+            ::MoveWindow(m_window, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), TRUE);
+
+        if (clipToZeroRect) {
+            rgn = ::CreateRectRgn(m_clipRect.x(), m_clipRect.y(), m_clipRect.right(), m_clipRect.bottom());
+            ::SetWindowRgn(m_window, rgn, TRUE);
+        }
+
         setCallingPlugin(false);
     }
@@ -1505 +1510 @@
         m_quirks.add(PluginQuirkDontUnloadPlugin);
 
-    // Because a single process cannot create multiple VMs, and we cannot reliably unload a
-    // Java VM, we cannot unload the Java plugin, or we'll lose reference to our only VM
-    if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType))
+    if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
+        // Because a single process cannot create multiple VMs, and we cannot reliably unload a
+        // Java VM, we cannot unload the Java plugin, or we'll lose reference to our only VM
         m_quirks.add(PluginQuirkDontUnloadPlugin);
+
+        // Setting the window region to an empty region causes bad scrolling repaint problems
+        // with the Java plug-in.
+        m_quirks.add(PluginQuirkDontClipToZeroRectWhenScrolling);
+    }
 
     if (mimeType == "audio/x-pn-realaudio-plugin") {