Changeset 64504 in webkit
- Timestamp:
- Aug 2, 2010 4:39:50 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r64503 r64504 1 2010-08-02 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Fix plug-in test failures and remove tests from the Skipped list 6 https://bugs.webkit.org/show_bug.cgi?id=43389 7 8 * platform/mac-wk2/Skipped: 9 Move plug-in tests that now fail due to lack of functionality out into appropriate sections. 10 1 11 2010-08-02 Jon Honeycutt <jhoneycutt@apple.com> 2 12 -
trunk/LayoutTests/platform/mac-wk2/Skipped
r64501 r64504 1063 1063 platform/mac/fast/overflow/overflow-scrollbar-hit-test.html 1064 1064 plugins/createScriptableObject-before-start.html 1065 plugins/destroy-during-npp-new.html 1066 plugins/resize-from-plugin.html 1065 1067 scrollbars/scrollbar-iframe-click-does-not-blur-content.html 1066 1068 scrollbars/scrollbar-middleclick-nopaste.html … … 1457 1459 http/tests/security/xssAuditor/script-tag.html 1458 1460 http/tests/security/xssAuditor/xss-protection-parsing-01.html 1461 plugins/js-from-destroy.html 1459 1462 1460 1463 # WebKit2 needs plugins support … … 1467 1470 http/tests/misc/acid2-pixel.html 1468 1471 http/tests/misc/acid2.html 1469 http/tests/plugins1470 1472 java 1471 platform/mac/plugins1472 plugins/attach-during-destroy.html1473 plugins/clicking-missing-plugin-fires-delegate.html1474 plugins/destroy-during-npp-new.html1475 plugins/destroy-reentry.html1476 plugins/destroy-stream-twice.html1477 plugins/embed-attributes-setting.html1478 plugins/embed-attributes-style.html1479 plugins/embed-inside-object.html1480 plugins/get-empty-url.html1481 plugins/get-file-url.html1482 plugins/get-url-that-the-resource-load-delegate-will-disallow.html1483 plugins/get-url-with-blank-target.html1484 plugins/get-url-with-iframe-target.html1485 plugins/geturl-replace-query.html1486 plugins/iframe-shims.html1487 plugins/inner-html-display-none.html1488 plugins/instance-available-before-stylesheets-loaded-object.html1489 plugins/instance-available-before-stylesheets-loaded.html1490 plugins/js-from-destroy.html1491 plugins/missing-plugin.html1492 plugins/netscape-plugin-map-data-to-src.html1493 plugins/netscape-plugin-setwindow-size-2.html1494 plugins/netscape-plugin-setwindow-size.html1495 plugins/plugin-remove-subframe.html1496 plugins/reentrant-update-widget-positions.html1497 plugins/reloadplugins-no-pages.html1498 plugins/resize-from-plugin.html1499 plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html1500 plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html1501 plugins/return-negative-one-from-write.html1502 plugins/update-widgets-crash.html1503 plugins/window-open.html1504 1473 1505 1474 # WebKit2 needs layoutTestController.overridePreference … … 2056 2025 # <https://bugs.webkit.org/show_bug.cgi?id=42541> 2057 2026 fast/loader/local-CSS-from-local.html 2058 fast/loader/local-JavaScript-from-local.html2059 2027 fast/loader/local-iFrame-source-from-local.html 2060 2028 fast/loader/local-image-from-local.html 2029 fast/loader/local-JavaScript-from-local.html 2030 http/tests/plugins/post-url-file.html 2061 2031 http/tests/security/frame-loading-via-document-write.html 2062 2032 http/tests/security/local-CSS-from-remote.html 2063 http/tests/security/local-JavaScript-from-remote.html2064 2033 http/tests/security/local-iFrame-from-remote.html 2065 2034 http/tests/security/local-image-from-remote.html 2035 http/tests/security/local-JavaScript-from-remote.html 2066 2036 http/tests/security/local-video-poster-from-remote.html 2067 2037 http/tests/security/local-video-source-from-remote.html … … 2228 2198 editing/selection/4975120.html 2229 2199 fast/events/show-modal-dialog-onblur-onfocus.html 2200 plugins/netscape-plugin-setwindow-size-2.html 2230 2201 2231 2202 # WebKitTestRunner needs layoutTestController.setEditingBehavior … … 2293 2264 # <https://bugs.webkit.org/show_bug.cgi?id=42778> 2294 2265 http/tests/cookies/third-party-cookie-relaxing.html 2266 http/tests/plugins/third-party-cookie-accept-policy.html 2295 2267 2296 2268 # WebKitTestRunner needs GCController … … 2362 2334 fast/events/onbeforeunload-focused-iframe.html 2363 2335 2336 # WebKitTestRunner needs layoutTestController.setPluginsEnabled 2337 platform/mac/plugins/disable-plugins.html 2338 2364 2339 # WebKitTestRunner needs layoutTestController.setHandlesAuthenticationChallenges 2365 2340 http/tests/loading/basic-auth-resend-wrong-credentials.html … … 2389 2364 fast/events/popup-blocked-from-fake-user-gesture.html 2390 2365 fast/events/popup-blocked-to-post-blank.html 2366 2367 # WebKitTestRunner needs layoutTestController.addDisallowedURL 2368 plugins/get-url-that-the-resource-load-delegate-will-disallow.html 2369 2370 # WebKitTestRunner gets confused by location.href redirects. 2371 plugins/attach-during-destroy.html 2372 plugins/destroy-reentry.html 2391 2373 2392 2374 # WebKit2 needs support for moving/resizing and querying the location/size the window … … 2456 2438 storage/domstorage/events/case-sensitive.html 2457 2439 storage/domstorage/events/documentURI.html 2440 2441 # WebKit2 doesn't have a missing plug-in delegate 2442 plugins/clicking-missing-plugin-fires-delegate.html 2443 2444 # These are plug-in tests that use Flash or QuickTime. We should convert these to use the test plug-in. 2445 plugins/embed-attributes-setting.html 2446 plugins/iframe-shims.html 2447 2448 # This test checks that NPN_GetURL with a blank target will return an error if the window isn't opened. This behavior doesn't 2449 # match Firefox or Chrome. We should either fix the test, or get rid of it. 2450 plugins/get-url-with-blank-target.html 2458 2451 2459 2452 # Unexplained failures that were formerly in the dumpChildFramesAsText list. … … 2623 2616 platform/mac/fast/objc/longlongTest.html 2624 2617 platform/mac/fast/objc/webScriptObject-hasWebScriptKey.html 2618 platform/mac/plugins/bindings-array-apply-crash.html 2625 2619 platform/mac/plugins/bindings-test-objc.html 2620 platform/mac/plugins/call-as-function-test.html 2621 platform/mac/plugins/root-object-premature-delete-crash.html 2622 platform/mac/plugins/undefined-property-crash.html 2623 platform/mac/plugins/webScriptObject-exception-deadlock.html 2626 2624 2627 2625 # WebKitTestRunner doesn't have objCPlugin 2628 2626 platform/mac/editing/pasteboard/5583362.html 2627 platform/mac/plugins/jsobjc-dom-wrappers.html 2628 platform/mac/plugins/jsobjc-simple.html 2629 platform/mac/plugins/throw-on-dealloc.html 2629 2630 2630 2631 # WebKitTestRunner doesn't have eventSender.enableDOMUIEventLogging -
trunk/WebCore/ChangeLog
r64492 r64504 1 2010-08-02 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Fix plug-in test failures and remove tests from the Skipped list 6 https://bugs.webkit.org/show_bug.cgi?id=43389 7 8 * WebCore.exp.in: 9 Export FrameLoader::cancelledError. 10 1 11 2010-08-02 Brady Eidson <beidson@apple.com> 2 12 -
trunk/WebCore/WebCore.exp.in
r64492 r64504 850 850 __ZNK7WebCore11CachedImage5imageEv 851 851 __ZNK7WebCore11FrameLoader10isCompleteEv 852 __ZNK7WebCore11FrameLoader14cancelledErrorERKNS_15ResourceRequestE 852 853 __ZNK7WebCore11FrameLoader14frameHasLoadedEv 853 854 __ZNK7WebCore11FrameLoader16outgoingReferrerEv -
trunk/WebKit2/ChangeLog
r64494 r64504 1 2010-08-02 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Sam Weinig. 4 5 Fix plug-in test failures and remove tests from the Skipped list 6 https://bugs.webkit.org/show_bug.cgi?id=43389 7 8 * WebProcess/Plugins/JSNPMethod.cpp: 9 JSNPMethod::s_info should specify InternalFunction::info as its parent. 10 11 * WebProcess/Plugins/Netscape/NetscapePlugin.cpp: 12 (WebKit::NetscapePlugin::cancelStreamLoad): 13 Special-case the manual stream and call PluginController::cancelManualStreamLoad. 14 15 * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp: 16 (WebKit::NetscapePluginStream::stop): 17 It's OK to call stop on a stream that hasn't been started. Remove assertion and return early. 18 19 * WebProcess/Plugins/PluginController.h: 20 Add cancelManualStreamLoad. 21 22 * WebProcess/Plugins/PluginView.cpp: 23 (WebKit::PluginView::cancelManualStreamLoad): 24 Tell the document loader to cancel the main resource load. 25 26 * WebProcess/WebPage/WebFrame.cpp: 27 (WebKit::WebFrame::innerText): 28 Check for a null document element. 29 1 30 2010-08-02 Anders Carlsson <andersca@apple.com> 2 31 -
trunk/WebKit2/WebProcess/Plugins/JSNPMethod.cpp
r64231 r64504 39 39 namespace WebKit { 40 40 41 const ClassInfo JSNPMethod::s_info = { "NPMethod", 0, 0, 0 };41 const ClassInfo JSNPMethod::s_info = { "NPMethod", &InternalFunction::info, 0, 0 }; 42 42 43 43 JSNPMethod::JSNPMethod(ExecState* exec, JSGlobalObject* globalObject, const Identifier& name, NPIdentifier npIdentifier) -
trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
r64494 r64504 175 175 void NetscapePlugin::cancelStreamLoad(NetscapePluginStream* pluginStream) 176 176 { 177 if (pluginStream == m_manualStream) { 178 m_pluginController->cancelManualStreamLoad(); 179 return; 180 } 181 177 182 // Ask the plug-in controller to cancel this stream load. 178 183 m_pluginController->cancelStreamLoad(pluginStream->streamID()); -
trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
r63756 r64504 276 276 void NetscapePluginStream::stop(NPReason reason) 277 277 { 278 ASSERT(m_isStarted); 278 // The stream was stopped before it got a chance to start. This can happen if a stream is cancelled by 279 // WebKit before it received a response. 280 if (!m_isStarted) 281 return; 279 282 280 283 if (reason == NPRES_DONE && m_deliveryData && !m_deliveryData->isEmpty()) { -
trunk/WebKit2/WebProcess/Plugins/PluginController.h
r64377 r64504 60 60 virtual void cancelStreamLoad(uint64_t streamID) = 0; 61 61 62 // Cancels the load of the manual stream. 63 virtual void cancelManualStreamLoad() = 0; 64 62 65 // Get the NPObject that corresponds to the window JavaScript object. Returns a retained object. 63 66 virtual NPObject* windowScriptNPObject() = 0; -
trunk/WebKit2/WebProcess/Plugins/PluginView.cpp
r64494 r64504 665 665 } 666 666 667 void PluginView::cancelManualStreamLoad() 668 { 669 if (!frame()) 670 return; 671 672 DocumentLoader* documentLoader = frame()->loader()->activeDocumentLoader(); 673 ASSERT(documentLoader); 674 675 if (documentLoader->isLoadingMainResource()) 676 documentLoader->cancelMainResourceLoad(frame()->loader()->cancelledError(m_parameters.url)); 677 } 678 667 679 NPObject* PluginView::windowScriptNPObject() 668 680 { -
trunk/WebKit2/WebProcess/Plugins/PluginView.h
r64494 r64504 109 109 const WebCore::HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups); 110 110 virtual void cancelStreamLoad(uint64_t streamID); 111 virtual void cancelManualStreamLoad(); 111 112 virtual NPObject* windowScriptNPObject(); 112 113 virtual NPObject* pluginElementNPObject(); -
trunk/WebKit2/WebProcess/WebPage/WebFrame.cpp
r64426 r64504 191 191 return String(); 192 192 193 if (!m_coreFrame->document()->documentElement()) 194 return String(); 195 193 196 return m_coreFrame->document()->documentElement()->innerText(); 194 197 }
Note: See TracChangeset
for help on using the changeset viewer.