Changeset 86706 in webkit

Timestamp:

May 17, 2011 1:57:56 PM (13 years ago)

Author:

robert@webkit.org

Message:

2011-05-16 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

plugins/invalidate_rect.html fails on linux ports

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

• platform/qt/Skipped: Unskip plugins/invalidate_rect.html
• platform/qt-mac/Skipped: Skip plugins/invalidate_rect.html

2011-05-16 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

plugins/invalidate_rect.html fails on linux ports

Add ChromeClientQt::allowsAcceleratedCompositing().

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

• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
• WebCoreSupport/ChromeClientQt.h:

2011-05-16 Robert Hogan <​robert@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

plugins/invalidate_rect.html fails on linux ports

• Make the unix test netscape plugin recognize the onPaintEvent and windowedPlugin parameters.

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

• DumpRenderTree/TestNetscapePlugIn/main.cpp: (handleEventX11):
• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::displayInvalidatedRegion):
• DumpRenderTree/qt/LayoutTestControllerQt.h:
• DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp: (webkit_test_plugin_new_instance): (webkit_test_plugin_handle_event):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-mac/Skipped (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (2 diffs)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (modified) (1 diff)
• Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)
• Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (1 diff)
• Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        plugins/invalidate_rect.html fails on linux ports
+
+        https://bugs.webkit.org/show_bug.cgi?id=54051
+
+       * platform/qt/Skipped: Unskip plugins/invalidate_rect.html
+       * platform/qt-mac/Skipped: Skip plugins/invalidate_rect.html
+
 2011-05-17  Tony Chang  <tony@chromium.org>
 

trunk/LayoutTests/platform/qt-mac/Skipped

@@ -2662 +2662 @@
 plugins/npruntime/throw-exception.html
 plugins/object-embed-plugin-scripting.html
+plugins/invalidate_rect.html
 printing/page-rule-in-media-query.html
 scrollbars/basic-scrollbar.html

trunk/LayoutTests/platform/qt/Skipped

@@ -366 +366 @@
 # headless display (like the buildbot), so XKeysymToKeycode doesn't work.
 plugins/keyboard-events.html
+
+#Times out
+plugins/windowless_plugin_paint_test.html
 
 # =========================================================================== #
@@ -603 +606 @@
 fast/dom/Window/timer-resume-on-navigation-back.html
 loader/go-back-to-different-window-size.html
-
-# Missing layoutTestController.displayInvalidatedRegion()
-plugins/invalidate_rect.html
-plugins/windowless_plugin_paint_test.html
 
 # Missing layoutTestController.findString() http://webkit.org/b/50236

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-05-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        plugins/invalidate_rect.html fails on linux ports
+
+        Add ChromeClientQt::allowsAcceleratedCompositing().
+
+        https://bugs.webkit.org/show_bug.cgi?id=54051
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.h:
+
 2011-05-17  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -131 +131 @@
 }
 
+bool ChromeClientQt::allowsAcceleratedCompositing() const
+{
+    if (!platformPageClient())
+        return false;
+    return platformPageClient()->allowsAcceleratedCompositing();
+}
+
 FloatRect ChromeClientQt::pageRect()
 {

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h

@@ -157 +157 @@
     virtual CompositingTriggerFlags allowedCompositingTriggers() const;
 #endif
+    virtual bool allowsAcceleratedCompositing() const;
 
 #if ENABLE(TILED_BACKING_STORE)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        plugins/invalidate_rect.html fails on linux ports
+
+        - Make the unix test netscape plugin recognize the onPaintEvent
+          and windowedPlugin parameters.
+
+        https://bugs.webkit.org/show_bug.cgi?id=54051
+
+        * DumpRenderTree/TestNetscapePlugIn/main.cpp:
+        (handleEventX11):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::displayInvalidatedRegion):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_handle_event):
+
 2011-05-17  Tony Chang  <tony@chromium.org>
 

trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp

@@ -653 +653 @@
         if (obj->eventLogging)
             pluginLog(instance, "updateEvt");
+        if (obj->onPaintEvent)
+            executeScript(obj, obj->onPaintEvent);
         break;
     // NPAPI events

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -225 +225 @@
 }
 
+void LayoutTestController::displayInvalidatedRegion()
+{
+    display();
+}
+
 void LayoutTestController::clearBackForwardList()
 {

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -134 +134 @@
     void simulateDesktopNotificationClick(const QString& title);
     void display();
+    void displayInvalidatedRegion();
     void clearBackForwardList();
     QString pathToLocalResource(const QString& url);

trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp

@@ -99 +99 @@
             else if (strcasecmp(argn[i], "onSetWindow") == 0 && !obj->onSetWindow)
                 obj->onSetWindow = strdup(argv[i]);
+            else if (!strcasecmp(argn[i], "windowedPlugin")) {
+                void* windowed = 0;
+                if (!strcasecmp(argv[i], "false") || !strcasecmp(argv[i], "0"))
+                    windowed = 0;
+                else if (!strcasecmp(argv[i], "true") || !strcasecmp(argv[i], "1"))
+                    windowed = reinterpret_cast<void*>(1);
+                else
+                    assert(false);
+                browser->setvalue(instance, NPPVpluginWindowBool, windowed);
+            } else if (!strcasecmp(argn[i], "onPaintEvent") && !obj->onPaintEvent)
+                obj->onPaintEvent = strdup(argv[i]);
         }
 
@@ -279 +290 @@
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
-    if (!obj->eventLogging)
-        return 0;
 
     XEvent* evt = static_cast<XEvent*>(event);
@@ -286 +295 @@
     switch (evt->type) {
         case ButtonRelease:
-            pluginLog(instance, "mouseUp at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
+            if (obj->eventLogging)
+                pluginLog(instance, "mouseUp at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
             break;
         case ButtonPress:
-            pluginLog(instance, "mouseDown at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
+            if (obj->eventLogging)
+                pluginLog(instance, "mouseDown at (%d, %d)", evt->xbutton.x, evt->xbutton.y);
             break;
         case KeyRelease:
-            pluginLog(instance, "keyUp '%c'", keyEventToChar(&evt->xkey));
+            if (obj->eventLogging)
+                pluginLog(instance, "keyUp '%c'", keyEventToChar(&evt->xkey));
             break;
         case KeyPress:
-            pluginLog(instance, "keyDown '%c'", keyEventToChar(&evt->xkey));
+            if (obj->eventLogging)
+                pluginLog(instance, "keyDown '%c'", keyEventToChar(&evt->xkey));
             break;
         case MotionNotify:
@@ -302 +315 @@
             break;
         case FocusIn:
-            pluginLog(instance, "getFocusEvent");
+            if (obj->eventLogging)
+                pluginLog(instance, "getFocusEvent");
             break;
         case FocusOut:
-            pluginLog(instance, "loseFocusEvent");
+            if (obj->eventLogging)
+                pluginLog(instance, "loseFocusEvent");
+            break;
+        case GraphicsExpose:
+            if (obj->eventLogging)
+                pluginLog(instance, "updateEvt");
+            if (obj->onPaintEvent)
+                executeScript(obj, obj->onPaintEvent);
             break;
         default: