Changeset 66095 in webkit

Timestamp:

Aug 26, 2010 4:56:40 AM (14 years ago)

Author:

Girish Ramakrishnan

Message:

[Qt] Set the clipRect correctly in windowed and windowless mode.
In Windowed mode, the values are in page coordinates. In Windowless
mode the values are in drawable coordinates. Setting these values is
purely academic since they are not used by Flash. However, there is a
possibility that plugins might infer a 'null' clipRect to mean 'invisible'.

​https://bugs.webkit.org/show_bug.cgi?id=44594

Reviewed by Simon Hausmann.

• plugins/qt/PluginViewQt.cpp:

(WebCore::PluginView::setNPWindowIfNeeded):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-26  Girish Ramakrishnan  <girish@forwardbias.in>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Set the clipRect correctly in windowed and windowless mode.
+        In Windowed mode, the values are in page coordinates. In Windowless
+        mode the values are in drawable coordinates. Setting these values is
+        purely academic since they are not used by Flash. However, there is a
+        possibility that plugins might infer a 'null' clipRect to mean 'invisible'.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44594
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::setNPWindowIfNeeded):
+
 2010-08-26  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -579 +579 @@
         m_npWindow.x = m_windowRect.x();
         m_npWindow.y = m_windowRect.y();
-
-        m_npWindow.clipRect.left = max(0, m_clipRect.x());
-        m_npWindow.clipRect.top = max(0, m_clipRect.y());
-        m_npWindow.clipRect.right = m_clipRect.x() + m_clipRect.width();
-        m_npWindow.clipRect.bottom = m_clipRect.y() + m_clipRect.height();
     } else {
         m_npWindow.x = 0;
         m_npWindow.y = 0;
-
+    }
+
+    // If the width or height are null, set the clipRect to null, indicating that
+    // the plugin is not visible/scrolled out.
+    if (!m_clipRect.width() || !m_clipRect.height()) {
         m_npWindow.clipRect.left = 0;
+        m_npWindow.clipRect.right = 0;
         m_npWindow.clipRect.top = 0;
-        m_npWindow.clipRect.right = 0;
         m_npWindow.clipRect.bottom = 0;
+    } else {
+        // Clipping rectangle of the plug-in; the origin is the top left corner of the drawable or window. 
+        m_npWindow.clipRect.left = m_npWindow.x + m_clipRect.x();
+        m_npWindow.clipRect.top = m_npWindow.y + m_clipRect.y();
+        m_npWindow.clipRect.right = m_npWindow.x + m_clipRect.x() + m_clipRect.width();
+        m_npWindow.clipRect.bottom = m_npWindow.y + m_clipRect.y() + m_clipRect.height();
     }