Diff
Modified: trunk/LayoutTests/ChangeLog (86705 => 86706)
--- trunk/LayoutTests/ChangeLog 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/LayoutTests/ChangeLog 2011-05-17 20:57:56 UTC (rev 86706)
@@ -1,3 +1,14 @@
+2011-05-16 Robert Hogan <[email protected]>
+
+ 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 <[email protected]>
Land linux 32 bit results.
Modified: trunk/LayoutTests/platform/qt/Skipped (86705 => 86706)
--- trunk/LayoutTests/platform/qt/Skipped 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-05-17 20:57:56 UTC (rev 86706)
@@ -366,6 +366,9 @@
# headless display (like the buildbot), so XKeysymToKeycode doesn't work.
plugins/keyboard-events.html
+#Times out
+plugins/windowless_plugin_paint_test.html
+
# =========================================================================== #
# Failing Sputnik tests #
# =========================================================================== #
@@ -603,10 +606,6 @@
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
editing/text-iterator/findString.html
Modified: trunk/LayoutTests/platform/qt-mac/Skipped (86705 => 86706)
--- trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-17 20:57:56 UTC (rev 86706)
@@ -2661,6 +2661,7 @@
plugins/npruntime/round-trip-npobject.html
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
scrollbars/custom-scrollbar-with-incomplete-style.html
Modified: trunk/Source/WebKit/qt/ChangeLog (86705 => 86706)
--- trunk/Source/WebKit/qt/ChangeLog 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-05-17 20:57:56 UTC (rev 86706)
@@ -1,3 +1,17 @@
+2011-05-16 Robert Hogan <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (86705 => 86706)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-05-17 20:57:56 UTC (rev 86706)
@@ -130,6 +130,13 @@
return platformPageClient()->windowRect();
}
+bool ChromeClientQt::allowsAcceleratedCompositing() const
+{
+ if (!platformPageClient())
+ return false;
+ return platformPageClient()->allowsAcceleratedCompositing();
+}
+
FloatRect ChromeClientQt::pageRect()
{
if (!m_webPage)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (86705 => 86706)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2011-05-17 20:57:56 UTC (rev 86706)
@@ -156,6 +156,7 @@
virtual void scheduleCompositingLayerSync();
virtual CompositingTriggerFlags allowedCompositingTriggers() const;
#endif
+ virtual bool allowsAcceleratedCompositing() const;
#if ENABLE(TILED_BACKING_STORE)
virtual IntRect visibleRectForTiledBackingStore() const;
Modified: trunk/Tools/ChangeLog (86705 => 86706)
--- trunk/Tools/ChangeLog 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Tools/ChangeLog 2011-05-17 20:57:56 UTC (rev 86706)
@@ -1,3 +1,23 @@
+2011-05-16 Robert Hogan <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Ojan Vafai.
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp (86705 => 86706)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp 2011-05-17 20:57:56 UTC (rev 86706)
@@ -652,6 +652,8 @@
case GraphicsExpose:
if (obj->eventLogging)
pluginLog(instance, "updateEvt");
+ if (obj->onPaintEvent)
+ executeScript(obj, obj->onPaintEvent);
break;
// NPAPI events
case FocusIn:
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (86705 => 86706)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-05-17 20:57:56 UTC (rev 86706)
@@ -224,6 +224,11 @@
emit showPage();
}
+void LayoutTestController::displayInvalidatedRegion()
+{
+ display();
+}
+
void LayoutTestController::clearBackForwardList()
{
m_drt->webPage()->history()->clear();
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (86705 => 86706)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-05-17 20:57:56 UTC (rev 86706)
@@ -133,6 +133,7 @@
bool checkDesktopNotificationPermission(const QString& origin);
void simulateDesktopNotificationClick(const QString& title);
void display();
+ void displayInvalidatedRegion();
void clearBackForwardList();
QString pathToLocalResource(const QString& url);
void dumpTitleChanges() { m_dumpTitleChanges = true; }
Modified: trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp (86705 => 86706)
--- trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp 2011-05-17 20:57:28 UTC (rev 86705)
+++ trunk/Tools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp 2011-05-17 20:57:56 UTC (rev 86706)
@@ -98,6 +98,17 @@
obj->testWindowOpen = TRUE;
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]);
}
browser->getvalue(instance, NPNVprivateModeBool, (void *)&obj->cachedPrivateBrowsingMode);
@@ -278,34 +289,44 @@
webkit_test_plugin_handle_event(NPP instance, void* event)
{
PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
- if (!obj->eventLogging)
- return 0;
XEvent* evt = static_cast<XEvent*>(event);
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:
case EnterNotify:
case LeaveNotify:
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:
pluginLog(instance, "event %d", evt->type);
}
