Changeset 39238 in webkit

Timestamp:

Dec 12, 2008, 5:18:30 AM (16 years ago)

Author:

vestbo@webkit.org

Message:

2008-12-12 Tor Arne Vestbø <​tavestbo@trolltech.com>

Rubber-stamped by Oliver Hunt.

Share PluginView::paintMissingPluginIcon() between ports

Also, enable this feature for Qt/X11, Qt/Mac and GTK

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginView.cpp (modified) (1 diff)
• plugins/gtk/PluginViewGtk.cpp (modified) (1 diff)
• plugins/mac/PluginViewMac.cpp (modified) (1 diff)
• plugins/qt/PluginViewQt.cpp (modified) (1 diff)
• plugins/win/PluginViewWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-12  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Rubber-stamped by Oliver Hunt.
+
+        Share PluginView::paintMissingPluginIcon() between ports
+
+        Also, enable this feature for Qt/X11, Qt/Mac and GTK
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::paintMissingPluginIcon):
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::paint):
+        * plugins/mac/PluginViewMac.cpp:
+        (WebCore::PluginView::paint):
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::PluginView::paint):
+        * plugins/win/PluginViewWin.cpp:
+
 2008-12-12  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebCore/plugins/PluginView.cpp

@@ -903 +903 @@
 }
 
+void PluginView::paintMissingPluginIcon(GraphicsContext* context, const IntRect& rect)
+{
+    static RefPtr<Image> nullPluginImage;
+    if (!nullPluginImage)
+        nullPluginImage = Image::loadPlatformResource("nullPlugin");
+
+    IntRect imageRect(frameRect().x(), frameRect().y(), nullPluginImage->width(), nullPluginImage->height());
+
+    int xOffset = (frameRect().width() - imageRect.width()) / 2;
+    int yOffset = (frameRect().height() - imageRect.height()) / 2;
+
+    imageRect.move(xOffset, yOffset);
+
+    if (!rect.intersects(imageRect))
+        return;
+
+    context->save();
+    context->clip(windowClipRect());
+    context->drawImage(nullPluginImage.get(), imageRect.location());
+    context->restore();
+}
+
 } // namespace WebCore

trunk/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -141 +141 @@
 {
     if (!m_isStarted) {
-        // Draw the "missing plugin" image
-        //paintMissingPluginIcon(context, rect);
+        paintMissingPluginIcon(context, rect);
         return;
     }

trunk/WebCore/plugins/mac/PluginViewMac.cpp

@@ -415 +415 @@
 void PluginView::paint(GraphicsContext* context, const IntRect& rect)
 {
-    if (!m_isStarted)
-        return; // TODO: Draw the "missing plugin" image
+    if (!m_isStarted) {
+        paintMissingPluginIcon(context, rect);
+        return;
+    }
 
     if (context->paintingDisabled())

trunk/WebCore/plugins/qt/PluginViewQt.cpp

@@ -129 +129 @@
 {
     if (!m_isStarted) {
-        // Draw the "missing plugin" image
-        //paintMissingPluginIcon(context, rect);
+        paintMissingPluginIcon(context, rect);
         return;
     }

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -283 +283 @@
 }
 
-void PluginView::paintMissingPluginIcon(GraphicsContext* context, const IntRect& rect)
-{
-    static RefPtr<Image> nullPluginImage;
-    if (!nullPluginImage)
-        nullPluginImage = Image::loadPlatformResource("nullPlugin");
-
-    IntRect imageRect(frameRect().x(), frameRect().y(), nullPluginImage->width(), nullPluginImage->height());
-
-    int xOffset = (frameRect().width() - imageRect.width()) / 2;
-    int yOffset = (frameRect().height() - imageRect.height()) / 2;
-
-    imageRect.move(xOffset, yOffset);
-
-    if (!rect.intersects(imageRect))
-        return;
-
-    context->save();
-    context->clip(windowClipRect());
-    context->drawImage(nullPluginImage.get(), imageRect.location());
-    context->restore();
-}
-
 bool PluginView::dispatchNPEvent(NPEvent& npEvent)
 {