Changeset 168843 in webkit
- Timestamp:
- May 14, 2014 10:24:47 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 7 deleted
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r168842 r168843 1 2014-05-13 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Revert "Don't dispatch 'beforeload' event inside FrameView::layout()", 4 commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated 5 follow-up fixes: 6 7 "platform/mac/plugins/testplugin-onnew-onpaint.html failing after 8 r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4 9 "[Win] Unreviewed build fix after r168668.", commit 10 4fa470ad12c38ee7d4c114541b6dd321181a8bc9 11 12 The original merged patch appears to have caused a regression in 13 fast/dom/HTMLObjectElement/object-as-frame.html. 14 15 <https://bugs.webkit.org/show_bug.cgi?id=132886> 16 17 Reviewed by Alexey Proskuryakov. 18 19 * compositing/plugins/composited-plugin.html: 20 * compositing/plugins/no-backing-store.html: 21 * fast/dom/beforeload/flash-before-load.html: 22 * fast/events/beforeload-assertion-expected.txt: Removed. 23 * fast/events/beforeload-assertion.html: Removed. 24 * fast/events/beforeload-iframe-crash-expected.txt: Removed. 25 * fast/events/beforeload-iframe-crash.html: Removed. 26 * fast/events/beforeload-input-time-crash-expected.txt: Removed. 27 * fast/events/beforeload-input-time-crash.html: Removed. 28 * http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html: 29 * http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html: 30 * http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html: 31 * http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html: 32 * http/tests/security/contentSecurityPolicy/object-src-none-allowed.html: 33 * http/tests/security/contentSecurityPolicy/object-src-none-blocked.html: 34 * http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js: 35 (testImpl.iframe.onload): 36 (testImpl): 37 * http/tests/security/mixedContent/insecure-plugin-in-iframe.html: 38 * platform/mac/plugins/supports-carbon-event-model.html: 39 * platform/mac/plugins/testplugin-onnew-onpaint.html: 40 * plugins/get-user-agent-with-null-npp-from-npp-new.html: 41 * plugins/mouse-click-plugin-clears-selection.html: 42 * plugins/netscape-plugin-map-data-to-src.html: 43 * plugins/no-mime-with-valid-extension.html: 44 * plugins/plugin-initiate-popup-window.html: 45 * plugins/windowless_plugin_paint_test.html: 46 * resources/plugin.js: Removed. 47 1 48 2014-05-14 Kiran <kiran.guduru@samsung.com> 2 49 -
trunk/LayoutTests/compositing/plugins/composited-plugin.html
r168668 r168843 2 2 <html> 3 3 <body> 4 <script src="../../resources/plugin.js"></script>5 <script>runAfterPluginLoad(null, NotifyDone);</script>6 4 <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation"> 7 5 </body> -
trunk/LayoutTests/compositing/plugins/no-backing-store.html
r168668 r168843 7 7 } 8 8 </style> 9 <script src="../../resources/plugin.js"></script>10 9 <script type="text/javascript" charset="utf-8"> 11 if (window.testRunner) 10 if (window.testRunner) { 12 11 testRunner.dumpAsText(); 13 14 runAfterPluginLoad(doTest, DoNotNotifyDone);12 testRunner.waitUntilDone(); 13 } 15 14 16 15 function doTest() … … 24 23 }, 0) 25 24 } 25 window.addEventListener('load', doTest, false); 26 26 </script> 27 27 </head> -
trunk/LayoutTests/fast/dom/beforeload/flash-before-load.html
r168668 r168843 5 5 <body> 6 6 <div id="console"></div> 7 <script src="../../../resources/plugin.js"></script>8 7 <script> 9 if (window.testRunner) 10 testRunner.dumpAsText(); 11 12 runAfterPluginLoad(null, NotifyDone); 8 if (window.testRunner) 9 testRunner.dumpAsText(); 13 10 </script> 14 11 -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-data.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script>5 4 <script> 6 if (window.testRunner) { 7 testRunner.dumpAsText(); 8 testRunner.dumpChildFramesAsText(); 9 } 10 11 runAfterPluginLoad(null, NotifyDone); 5 if (window.testRunner) { 6 testRunner.dumpAsText(); 7 testRunner.dumpChildFramesAsText(); 8 } 12 9 </script> 13 10 <script src="/plugins/resources/mock-plugin-logger.js"></script> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-blocked.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script>5 4 <script> 6 if (window.testRunner) 7 testRunner.dumpAsText(); 8 9 runAfterPluginLoad(null, NotifyDone); 5 if (window.testRunner) 6 testRunner.dumpAsText(); 10 7 </script> 11 8 <meta http-equiv="X-WebKit-CSP" content="plugin-types text/plain"> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-allowed.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script>5 4 <script> 6 if (window.testRunner) 7 testRunner.dumpAsText(); 8 9 runAfterPluginLoad(null, NotifyDone); 5 if (window.testRunner) 6 testRunner.dumpAsText(); 10 7 </script> 11 8 <meta http-equiv="Content-Security-Policy" content="object-src 'self'"> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-no-url-blocked.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script>5 4 <script> 6 if (window.testRunner) 7 testRunner.dumpAsText(); 8 9 runAfterPluginLoad(null, NotifyDone); 5 if (window.testRunner) 6 testRunner.dumpAsText(); 10 7 </script> 11 8 <meta http-equiv="Content-Security-Policy" content="object-src 'none'"> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-allowed.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script> 4 <script> 5 if (window.testRunner) { 6 testRunner.dumpAsText(); 7 testRunner.dumpChildFramesAsText(); 8 } 9 </script> 5 10 </head> 6 11 <body> 7 12 <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-object-data.pl?plugin=data:application/x-webkit-test-netscape,logifloaded&log=PASS!&csp=img-src%20'none'"></iframe> 8 13 </body> 9 <script>10 if (window.testRunner) {11 testRunner.dumpAsText();12 testRunner.dumpChildFramesAsText();13 }14 15 runAfterPluginLoad(null, NotifyDone, document.getElementsByTagName("iframe")[0]);16 </script>17 14 </html> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-none-blocked.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="/js-test-resources/plugin.js"></script> 4 <script> 5 if (window.testRunner) { 6 testRunner.dumpAsText(); 7 testRunner.dumpChildFramesAsText(); 8 } 9 </script> 5 10 </head> 6 11 <body> 7 12 <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-object-data.pl?plugin=data:application/x-webkit-test-netscape,logifloaded&log=FAIL&csp=object-src%20'none'"></iframe> 8 13 </body> 9 <script>10 if (window.testRunner) {11 testRunner.dumpAsText();12 testRunner.dumpChildFramesAsText();13 }14 15 runAfterPluginLoad(null, NotifyDone, document.getElementsByTagName("iframe")[0]);16 </script>17 14 </html> -
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-plugin-test.js
r168668 r168843 39 39 iframe.src += "&type=application/x-webkit-test-netscape"; 40 40 41 iframe.onload = function() { 42 if (window.internals) 43 internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(iframe); 44 testImpl(experimental); 45 }; 41 iframe.onload = function() { testImpl(experimental); }; 46 42 document.body.appendChild(iframe); 47 43 } -
trunk/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
r168668 r168843 4 4 if (window.testRunner) 5 5 testRunner.dumpAsText(); 6 7 onload = function() {8 if (window.internals)9 internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(document.querySelector('iframe'));10 };11 6 </script> 12 7 <p>This test loads a secure iframe that loads an insecure plugin. We should -
trunk/LayoutTests/platform/mac/plugins/supports-carbon-event-model.html
r168668 r168843 1 <script src="../../../resources/plugin.js"></script>2 1 <script> 3 if (window.testRunner) 4 testRunner.dumpAsText(); 5 6 runAfterPluginLoad(null, NotifyDone); 2 if (window.testRunner) 3 testRunner.dumpAsText(); 7 4 </script> 8 5 -
trunk/LayoutTests/platform/mac/plugins/testplugin-onnew-onpaint.html
r168743 r168843 3 3 <html> 4 4 <head> 5 <script src="../../../resources/plugin.js"></script>6 5 <script type="text/javascript" charset="utf-8"> 7 6 if (window.testRunner) … … 27 26 } 28 27 } 29 30 runAfterPluginLoad(null, NotifyDone);31 28 </script> 32 29 </head> -
trunk/LayoutTests/plugins/get-user-agent-with-null-npp-from-npp-new.html
r168668 r168843 2 2 <html> 3 3 <head> 4 <script src="../resources/plugin.js"></script>5 4 <script> 6 5 if (window.testRunner) 7 6 testRunner.dumpAsText(); 8 runAfterPluginLoad(null, NotifyDone);9 7 </script> 10 8 </head> -
trunk/LayoutTests/plugins/mouse-click-plugin-clears-selection.html
r168668 r168843 1 1 <html> 2 2 <head> 3 <script src="../resources/plugin.js"></script>4 3 <script> 5 4 6 runAfterPluginLoad(function() {5 function runTest() { 7 6 inputElement = document.getElementById('frame'); 8 7 inputElement.focus(); … … 16 15 eventSender.mouseUp(); 17 16 } 18 } , NotifyDone);17 } 19 18 </script> 20 19 </head> 21 <body >20 <body onload="runTest();"> 22 21 <embed id="plg" type="application/x-webkit-test-netscape" width="100" height="100" windowedplugin="false"></embed><br> 23 22 <input id="frame" value="hello"/> -
trunk/LayoutTests/plugins/netscape-plugin-map-data-to-src.html
r168668 r168843 1 1 <html> 2 2 <head> 3 <script src="../resources/plugin.js"></script>4 3 <script> 5 4 if (window.testRunner) 6 5 testRunner.dumpAsText(); 7 runAfterPluginLoad(null, NotifyDone);8 6 </script> 9 7 <body style="margin:0px;overflow:hidden"> -
trunk/LayoutTests/plugins/no-mime-with-valid-extension.html
r168668 r168843 1 <script src="../resources/plugin.js"></script>2 1 <script> 3 if (window.testRunner) 2 if (window.testRunner) { 4 3 testRunner.dumpAsText(); 5 runAfterPluginLoad(null, NotifyDone); 4 testRunner.waitUntilDone(); 5 } 6 6 </script> 7 7 <p> … … 14 14 <!-- Embed tag with missing type="" parameter --> 15 15 <embed id="plugin" name="plugin" src="resources/test.testnetscape" logSrc="1"> 16 <script> 17 if (window.testRunner) 18 testRunner.notifyDone(); 19 </script> -
trunk/LayoutTests/plugins/plugin-initiate-popup-window.html
r168668 r168843 65 65 </script> 66 66 </head> 67 <body onload=" internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(); test();">67 <body onload="window.setTimeout(test, 0);"> 68 68 <embed type="application/x-webkit-test-netscape" width=100 height=40 evaluatescript="mouse::popup_by_mousedown()" windowedplugin="false"></embed><br> 69 69 <embed type="application/x-webkit-test-netscape" width=100 height=40 evaluatescript="key::popup_by_keydown()" windowedplugin="false"></embed><br> -
trunk/LayoutTests/plugins/windowless_plugin_paint_test.html
r168668 r168843 15 15 // Create the plugin in the middle of the page. 16 16 pluginDiv.innerHTML = "<embed id=\"testPlugin\" type=\"application/x-webkit-test-netscape\" width=\"200\" height=\"200\" onpaintevent=\"didPaint()\" windowedPlugin=\"false\"></embed>"; 17 if (window.internals)18 internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();19 17 testRunner.displayInvalidatedRegion(); 20 18 } -
trunk/Source/WebCore/ChangeLog
r168842 r168843 1 2014-05-13 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Revert "Don't dispatch 'beforeload' event inside FrameView::layout()", 4 commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated 5 follow-up fixes: 6 7 "platform/mac/plugins/testplugin-onnew-onpaint.html failing after 8 r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4 9 "[Win] Unreviewed build fix after r168668.", commit 10 4fa470ad12c38ee7d4c114541b6dd321181a8bc9 11 12 The original merged patch appears to have caused a regression in 13 fast/dom/HTMLObjectElement/object-as-frame.html. 14 15 <https://bugs.webkit.org/show_bug.cgi?id=132886> 16 17 Reviewed by Alexey Proskuryakov. 18 19 * WebCore.exp.in: 20 * dom/Document.cpp: 21 (WebCore::Document::updateLayoutIgnorePendingStylesheets): 22 * dom/Document.h: 23 * html/HTMLAppletElement.cpp: 24 (WebCore::HTMLAppletElement::renderWidgetForJSBindings): 25 * html/HTMLEmbedElement.cpp: 26 (WebCore::HTMLEmbedElement::renderWidgetForJSBindings): 27 * html/HTMLObjectElement.cpp: 28 (WebCore::HTMLObjectElement::renderWidgetForJSBindings): 29 * page/FrameView.cpp: 30 (WebCore::FrameView::FrameView): 31 (WebCore::FrameView::reset): 32 (WebCore::FrameView::flushAnyPendingPostLayoutTasks): 33 (WebCore::FrameView::performPostLayoutTasks): 34 (WebCore::FrameView::updateEmbeddedObjectsTimerFired): Deleted. 35 * page/FrameView.h: 36 * testing/Internals.cpp: 37 (WebCore::Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks): Deleted. 38 * testing/Internals.h: 39 * testing/Internals.idl: 40 1 41 2014-05-14 Kiran <kiran.guduru@samsung.com> 2 42 -
trunk/Source/WebCore/WebCore.exp.in
r168830 r168843 1257 1257 __ZN7WebCore8Document26pageSizeAndMarginsInPixelsEiRNS_7IntSizeERiS3_S3_S3_ 1258 1258 __ZN7WebCore8Document27removeMediaCanStartListenerEPNS_21MediaCanStartListenerE 1259 __ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsE NS0_18RunPostLayoutTasksE1259 __ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv 1260 1260 __ZN7WebCore8Document4headEv 1261 1261 __ZN7WebCore8Document8iconURLsEi … … 1775 1775 __ZNK7WebCore21BackForwardController18canGoBackOrForwardEi 1776 1776 __ZNK7WebCore21BackForwardController9backCountEv 1777 __ZNK7WebCore21HTMLFrameOwnerElement15contentDocumentEv1778 1777 __ZNK7WebCore21NetworkStorageSession13cookieStorageEv 1779 1778 __ZNK7WebCore21RenderLayerCompositor11scrollLayerEv -
trunk/Source/WebCore/dom/Document.cpp
r168761 r168843 1832 1832 // lets us get reasonable answers. The long term solution to this problem is 1833 1833 // to instead suspend JavaScript execution. 1834 void Document::updateLayoutIgnorePendingStylesheets( Document::RunPostLayoutTasks runPostLayoutTasks)1834 void Document::updateLayoutIgnorePendingStylesheets() 1835 1835 { 1836 1836 bool oldIgnore = m_ignorePendingStylesheets; 1837 1837 1838 1838 if (!haveStylesheetsLoaded()) { 1839 1839 m_ignorePendingStylesheets = true; … … 1856 1856 1857 1857 updateLayout(); 1858 1859 if (runPostLayoutTasks == RunPostLayoutTasksSynchronously && view())1860 view()->flushAnyPendingPostLayoutTasks();1861 1858 1862 1859 m_ignorePendingStylesheets = oldIgnore; -
trunk/Source/WebCore/dom/Document.h
r168761 r168843 588 588 bool updateStyleIfNeededForNode(const Node&); 589 589 void updateLayout(); 590 enum RunPostLayoutTasks { 591 RunPostLayoutTasksAsyhnchronously, 592 RunPostLayoutTasksSynchronously, 593 }; 594 void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasksAsyhnchronously); 590 void updateLayoutIgnorePendingStylesheets(); 595 591 PassRef<RenderStyle> styleForElementIgnoringPendingStylesheets(Element*); 596 592 -
trunk/Source/WebCore/html/HTMLAppletElement.cpp
r168668 r168843 89 89 return 0; 90 90 91 // Needs to load the plugin immediatedly because this function is called 92 // when JavaScript code accesses the plugin. 93 // FIXME: <rdar://16893708> Check if dispatching events here is safe. 94 document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously); 91 document().updateLayoutIgnorePendingStylesheets(); 95 92 return renderWidget(); 96 93 } -
trunk/Source/WebCore/html/HTMLEmbedElement.cpp
r168668 r168843 72 72 { 73 73 FrameView* view = document().view(); 74 if (!view || (!view->isInLayout() && !view->isPainting())) { 75 // Needs to load the plugin immediatedly because this function is called 76 // when JavaScript code accesses the plugin. 77 // FIXME: <rdar://16893708> Check if dispatching events here is safe. 78 document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously); 79 } 74 if (!view || (!view->isInLayout() && !view->isPainting())) 75 document().updateLayoutIgnorePendingStylesheets(); 80 76 return findWidgetRenderer(this); 81 77 } -
trunk/Source/WebCore/html/HTMLObjectElement.cpp
r168668 r168843 84 84 RenderWidget* HTMLObjectElement::renderWidgetForJSBindings() const 85 85 { 86 // Needs to load the plugin immediatedly because this function is called 87 // when JavaScript code accesses the plugin. 88 // FIXME: <rdar://16893708> Check if dispatching events here is safe. 89 document().updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously); 86 document().updateLayoutIgnorePendingStylesheets(); 90 87 return renderWidget(); // This will return 0 if the renderer is not a RenderWidget. 91 88 } -
trunk/Source/WebCore/page/FrameView.cpp
r168763 r168843 161 161 , m_inSynchronousPostLayout(false) 162 162 , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired) 163 , m_updateEmbeddedObjectsTimer(this, &FrameView::updateEmbeddedObjectsTimerFired)164 163 , m_isTransparent(false) 165 164 , m_baseBackgroundColor(Color::white) … … 252 251 m_nestedLayoutCount = 0; 253 252 m_postLayoutTasksTimer.stop(); 254 m_updateEmbeddedObjectsTimer.stop();255 253 m_firstLayout = true; 256 254 m_firstLayoutCallbackPending = false; … … 2745 2743 } 2746 2744 2747 void FrameView::updateEmbeddedObjectsTimerFired(Timer<FrameView>*)2748 {2749 RefPtr<FrameView> protect(this);2750 m_updateEmbeddedObjectsTimer.stop();2751 for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) {2752 if (updateEmbeddedObjects())2753 break;2754 }2755 }2756 2757 2745 void FrameView::flushAnyPendingPostLayoutTasks() 2758 2746 { 2759 if ( m_postLayoutTasksTimer.isActive())2760 performPostLayoutTasks();2761 if (m_updateEmbeddedObjectsTimer.isActive()) 2762 updateEmbeddedObjectsTimerFired(nullptr);2747 if (!m_postLayoutTasksTimer.isActive()) 2748 return; 2749 2750 performPostLayoutTasks(); 2763 2751 } 2764 2752 2765 2753 void FrameView::performPostLayoutTasks() 2766 2754 { 2767 // FIXME: We should not run any JavaScript code in this function.2768 2769 2755 m_postLayoutTasksTimer.stop(); 2770 2756 … … 2797 2783 Ref<FrameView> protect(*this); 2798 2784 2799 m_updateEmbeddedObjectsTimer.startOneShot(0); 2785 for (unsigned i = 0; i < maxUpdateEmbeddedObjectsIterations; i++) { 2786 if (updateEmbeddedObjects()) 2787 break; 2788 } 2800 2789 2801 2790 if (auto* page = frame().page()) { -
trunk/Source/WebCore/page/FrameView.h
r168668 r168843 592 592 void speculativeTilingEnableTimerFired(Timer<FrameView>&); 593 593 594 void updateEmbeddedObjectsTimerFired(Timer<FrameView>*);595 594 bool updateEmbeddedObjects(); 596 595 void updateEmbeddedObject(RenderEmbeddedObject&); … … 647 646 unsigned m_nestedLayoutCount; 648 647 Timer<FrameView> m_postLayoutTasksTimer; 649 Timer<FrameView> m_updateEmbeddedObjectsTimer;650 648 bool m_firstLayoutCallbackPending; 651 649 -
trunk/Source/WebCore/testing/Internals.cpp
r168668 r168843 51 51 #include "FrameLoader.h" 52 52 #include "FrameView.h" 53 #include "HTMLIFrameElement.h"54 53 #include "HTMLInputElement.h" 55 54 #include "HTMLNames.h" … … 1897 1896 } 1898 1897 1899 void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode& ec)1900 {1901 updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(nullptr, ec);1902 }1903 1904 void Internals::updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node* node, ExceptionCode& ec)1905 {1906 Document* document;1907 if (!node)1908 document = contextDocument();1909 else if (node->isDocumentNode())1910 document = toDocument(node);1911 else if (node->hasTagName(HTMLNames::iframeTag))1912 document = toHTMLIFrameElement(node)->contentDocument();1913 else {1914 ec = TypeError;1915 return;1916 }1917 1918 document->updateLayoutIgnorePendingStylesheets(Document::RunPostLayoutTasksSynchronously);1919 }1920 1921 1898 #if !PLATFORM(IOS) 1922 1899 static const char* cursorTypeToString(Cursor::Type cursorType) -
trunk/Source/WebCore/testing/Internals.h
r168668 r168843 271 271 void startTrackingRepaints(ExceptionCode&); 272 272 void stopTrackingRepaints(ExceptionCode&); 273 void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(ExceptionCode&);274 void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(Node*, ExceptionCode&);275 273 276 274 PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const; -
trunk/Source/WebCore/testing/Internals.idl
r168668 r168843 232 232 [RaisesException] void stopTrackingRepaints(); 233 233 234 // |node| should be Document, HTMLIFrameElement, or unspecified.235 // If |node| is an HTMLIFrameElement, it assumes node.contentDocument is236 // specified without security checks. Unspecified means this document.237 [RaisesException] void updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks(optional Node node);238 239 234 // Returns a string with information about the mouse cursor used at the specified client location. 240 235 [RaisesException] DOMString getCurrentCursorInfo(); -
trunk/Source/WebKit/ChangeLog
r168766 r168843 1 2014-05-13 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Revert "Don't dispatch 'beforeload' event inside FrameView::layout()", 4 commit 84fe8cf6fbe8b5de9a06300ca3ef6d0ffc96948c, and associated 5 follow-up fixes: 6 7 "platform/mac/plugins/testplugin-onnew-onpaint.html failing after 8 r168668", commit c17be3bf5127baf94310af4b4b9bf5a57d29aaf4 9 "[Win] Unreviewed build fix after r168668.", commit 10 4fa470ad12c38ee7d4c114541b6dd321181a8bc9 11 12 The original merged patch appears to have caused a regression in 13 fast/dom/HTMLObjectElement/object-as-frame.html. 14 15 <https://bugs.webkit.org/show_bug.cgi?id=132886> 16 17 Reviewed by Alexey Proskuryakov. 18 19 * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: 20 1 21 2014-05-13 Dean Jackson <dino@apple.com> 2 22 -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in
r168766 r168843 176 176 symbolWithPointer(?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z, ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AEAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z) 177 177 symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAAAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAAEAVVM@JSC@@XZ) 178 symbolWithPointer(?contentDocument@HTMLFrameOwnerElement@WebCore@@QBEPAVDocument@2@XZ, ?contentDocument@HTMLFrameOwnerElement@WebCore@@QEBAPEAVDocument@2@XZ)179 178 symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z) 180 179 #if USE(CF) … … 205 204 symbolWithPointer(?hitTest@RenderView@WebCore@@QAE_NABVHitTestRequest@2@AAVHitTestResult@2@@Z, ?hitTest@RenderView@WebCore@@QEAA_NAEBVHitTestRequest@2@AEAVHitTestResult@2@@Z) 206 205 ?inputTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B 207 symbolWithPointer(?iframeTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B,?iframeTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B)208 206 symbolWithPointer(?intersects@IntRect@WebCore@@QBE_NABV12@@Z, ?intersects@IntRect@WebCore@@QEBA_NAEBV12@@Z) 209 207 symbolWithPointer(?item@StaticNodeList@WebCore@@UBEPAVNode@2@I@Z, ?item@StaticNodeList@WebCore@@UEBAPEAVNode@2@I@Z) … … 326 324 symbolWithPointer(?isTreeScope@Node@WebCore@@QBE_NXZ, ?isTreeScope@Node@WebCore@@QEBA_NXZ) 327 325 symbolWithPointer(?updateEditorUINowIfScheduled@Editor@WebCore@@QAEXXZ, ?updateEditorUINowIfScheduled@Editor@WebCore@@QEAAXXZ) 328 symbolWithPointer(?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEX W4RunPostLayoutTasks@12@@Z, ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QEAAXW4RunPostLayoutTasks@12@@Z)326 symbolWithPointer(?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QAEXXZ, ?updateLayoutIgnorePendingStylesheets@Document@WebCore@@QEAAXXZ) 329 327 symbolWithPointer(?updateStyleIfNeeded@Document@WebCore@@QAEXXZ, ?updateStyleIfNeeded@Document@WebCore@@QEAAXXZ) 330 328 symbolWithPointer(?view@Document@WebCore@@QBEPAVFrameView@2@XZ, ?view@Document@WebCore@@QEBAPEAVFrameView@2@XZ)
Note: See TracChangeset
for help on using the changeset viewer.