Changeset 63409 in webkit
- Timestamp:
- Jul 14, 2010 11:49:28 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r63408 r63409 1 2010-07-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r63352. 4 http://trac.webkit.org/changeset/63352 5 https://bugs.webkit.org/show_bug.cgi?id=42341 6 7 Broke plugin-initiate-popup-window.html and plugin-javascript- 8 access.html on snow leopard (Requested by abarth on #webkit). 9 10 * platform/chromium/test_expectations.txt: 11 * platform/gtk/Skipped: 12 * platform/qt/Skipped: 13 * platform/win/Skipped: 14 * plugins/plugin-initiate-popup-window-expected.txt: Removed. 15 * plugins/plugin-initiate-popup-window.html: Removed. 16 1 17 2010-07-14 Martin Robinson <mrobinson@igalia.com> 2 18 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r63352 r63409 3003 3003 BUG48737 WIN LINUX MAC SKIP : ietestcenter/Javascript/15.4.4.15-3-8.html = TIMEOUT 3004 3004 3005 // Implement new test logic in Chromium's TestNetscape Plugin to pass the plugins/plugin-initiate-popup-window.html3006 BUG48033 SKIP : plugins/plugin-initiate-popup-window.html = TIMEOUT3007 3008 3005 // Broken prior to r62921. 3009 3006 BUG48696 WIN LINUX : fast/forms/focus2.html = CRASH -
trunk/LayoutTests/platform/gtk/Skipped
r63352 r63409 3342 3342 # These test require Qt Widgets 3343 3343 plugins/qt-qwidget-plugin.html 3344 # Tests failing , need to implement NPP_HandleEvent() in TestNetscapePlugin3344 # Tests failing 3345 3345 plugins/embed-attributes-setting.html 3346 3346 plugins/get-url-with-blank-target.html … … 3349 3349 plugins/keyboard-events.html 3350 3350 plugins/geturlnotify-during-document-teardown.html 3351 plugins/plugin-initiate-popup-window.html3352 3351 3353 3352 # This test is for clients that choose to make the missing plugin indicator a button -
trunk/LayoutTests/platform/qt/Skipped
r63352 r63409 458 458 plugins/keyboard-events.html 459 459 plugins/mouse-events-fixedpos.html 460 plugins/plugin-initiate-popup-window.html461 460 # ---- to be reviewed 462 461 http/tests/plugins/plugin-document-has-focus.html -
trunk/LayoutTests/platform/win/Skipped
r63352 r63409 805 805 plugins/keyboard-events.html 806 806 http/tests/plugins/plugin-document-has-focus.html 807 plugins/plugin-initiate-popup-window.html808 807 809 808 # DumpRenderTree code to enable Java is currently a no-op. Windows doesn't come with Java by default. -
trunk/WebCore/ChangeLog
r63403 r63409 1 2010-07-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r63352. 4 http://trac.webkit.org/changeset/63352 5 https://bugs.webkit.org/show_bug.cgi?id=42341 6 7 Broke plugin-initiate-popup-window.html and plugin-javascript- 8 access.html on snow leopard (Requested by abarth on #webkit). 9 10 * bindings/v8/NPV8Object.cpp: 11 (_NPN_EvaluateHelper): 12 1 13 2010-07-14 Eric Seidel <eric@webkit.org> 2 14 -
trunk/WebCore/bindings/v8/NPV8Object.cpp
r63352 r63409 35 35 #include "PlatformString.h" 36 36 #include "ScriptController.h" 37 #include "UserGestureIndicator.h"38 37 #include "V8GCController.h" 39 38 #include "V8Helpers.h" … … 279 278 if (!popupsAllowed) 280 279 filename = "npscript"; 281 282 UserGestureIndicator gestureIndicator(popupsAllowed ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);283 280 284 281 String script = String::fromUTF8(npScript->UTF8Characters, npScript->UTF8Length); -
trunk/WebKitTools/ChangeLog
r63399 r63409 1 2010-07-14 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r63352. 4 http://trac.webkit.org/changeset/63352 5 https://bugs.webkit.org/show_bug.cgi?id=42341 6 7 Broke plugin-initiate-popup-window.html and plugin-javascript- 8 access.html on snow leopard (Requested by abarth on #webkit). 9 10 * DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp: 11 (pluginAllocate): 12 * DumpRenderTree/TestNetscapePlugIn/PluginObject.h: 13 * DumpRenderTree/TestNetscapePlugIn/main.cpp: 14 (NPP_New): 15 (handleEventCarbon): 16 (handleEventCocoa): 17 1 18 2010-07-14 Maciej Stachowiak <mjs@apple.com> 2 19 -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp
r63352 r63409 979 979 newInstance->stream = 0; 980 980 981 newInstance->firstUrl = 0;982 newInstance->firstHeaders = 0;983 newInstance->lastUrl = 0;984 newInstance->lastHeaders = 0;981 newInstance->firstUrl = NULL; 982 newInstance->firstHeaders = NULL; 983 newInstance->lastUrl = NULL; 984 newInstance->lastHeaders = NULL; 985 985 986 986 newInstance->testGetURLOnDestroy = FALSE; … … 988 988 newInstance->testWindowOpen = FALSE; 989 989 newInstance->testKeyboardFocusForPlugins = FALSE; 990 991 newInstance->mouseDownForEvaluateScript = FALSE;992 newInstance->evaluateScriptOnMouseDownOrKeyDown = 0;993 990 994 991 return (NPObject*)newInstance; -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h
r63352 r63409 55 55 NPBool testWindowOpen; 56 56 NPBool testKeyboardFocusForPlugins; 57 NPBool mouseDownForEvaluateScript;58 57 char* onStreamLoad; 59 58 char* onStreamDestroy; … … 65 64 char* lastUrl; 66 65 char* lastHeaders; 67 char* evaluateScriptOnMouseDownOrKeyDown;68 66 #ifdef XP_MACOSX 69 67 NPEventModel eventModel; -
trunk/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp
r63352 r63409 184 184 obj->testGetURLOnDestroy = TRUE; 185 185 #endif 186 } else if ( !strcasecmp(argn[i], "src")&& strstr(argv[i], "plugin-document-has-focus.pl"))186 } else if (strcasecmp(argn[i], "src") == 0 && strstr(argv[i], "plugin-document-has-focus.pl")) 187 187 obj->testKeyboardFocusForPlugins = TRUE; 188 else if (!strcasecmp(argn[i], "evaluatescript")) {189 char* script = argv[i];190 if (script == strstr(script, "mouse::")) {191 obj->mouseDownForEvaluateScript = true;192 obj->evaluateScriptOnMouseDownOrKeyDown = strdup(script + sizeof("mouse::") - 1);193 } else if (script == strstr(script, "key::")) {194 obj->evaluateScriptOnMouseDownOrKeyDown = strdup(script + sizeof("key::") - 1);195 }196 // When testing evaluate script on mouse-down or key-down, allow event logging to handle events.197 if (obj->evaluateScriptOnMouseDownOrKeyDown)198 obj->eventLogging = true;199 }200 188 } 201 189 … … 382 370 GlobalToLocal(&pt); 383 371 pluginLog(instance, "mouseDown at (%d, %d)", pt.h, pt.v); 384 if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)385 executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);386 372 break; 387 373 case mouseUp: … … 391 377 case keyDown: 392 378 pluginLog(instance, "keyDown '%c'", (char)(event->message & 0xFF)); 393 if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)394 executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);395 379 break; 396 380 case keyUp: … … 466 450 if (event->data.key.characters) 467 451 pluginLog(instance, "keyDown '%c'", CFStringGetCharacterAtIndex(reinterpret_cast<CFStringRef>(event->data.key.characters), 0)); 468 if (obj->evaluateScriptOnMouseDownOrKeyDown && !obj->mouseDownForEvaluateScript)469 executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);470 452 return 1; 471 453 … … 488 470 (int)event->data.mouse.pluginX, 489 471 (int)event->data.mouse.pluginY); 490 if (obj->evaluateScriptOnMouseDownOrKeyDown && obj->mouseDownForEvaluateScript)491 executeScript(obj, obj->evaluateScriptOnMouseDownOrKeyDown);492 472 return 1; 493 473 case NPCocoaEventMouseUp:
Note: See TracChangeset
for help on using the changeset viewer.