Title: [100698] trunk
Revision
100698
Author
pkast...@chromium.org
Date
2011-11-17 16:27:03 -0800 (Thu, 17 Nov 2011)

Log Message

Source/WebCore: Remove cargo-cult copy/pasting of ScriptExecutionContext namespace
https://bugs.webkit.org/show_bug.cgi?id=72676

Patch by Adam Barth <aba...@webkit.org> on 2011-11-17
Reviewed by Eric Seidel.

It looks like this cargo-cult started with initDNSPrefetch being hacked
into setSecurityOrigin.  I've removed this hack along with the
copy/paste code.

* dom/DOMImplementation.cpp:
* dom/Document.cpp:
(WebCore::Document::setIsViewSource):
(WebCore::Document::open):
(WebCore::Document::initSecurityContext):
(WebCore::Document::setSecurityOrigin):
* dom/Document.h:
* xml/XSLTProcessor.cpp:

LayoutTests: Unreviewed, rolling out r100584.
http://trac.webkit.org/changeset/100584
https://bugs.webkit.org/show_bug.cgi?id=72239

See if this change caused Linux dbg crashes.

* accessibility/loading-iframe-sends-notification.html: Removed.
* platform/chromium/accessibility/loading-iframe-sends-notification-expected.txt: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (100697 => 100698)


--- trunk/LayoutTests/ChangeLog	2011-11-18 00:23:28 UTC (rev 100697)
+++ trunk/LayoutTests/ChangeLog	2011-11-18 00:27:03 UTC (rev 100698)
@@ -1,3 +1,14 @@
+2011-11-17  Peter Kasting  <pkast...@google.com>
+
+        Unreviewed, rolling out r100584.
+        http://trac.webkit.org/changeset/100584
+        https://bugs.webkit.org/show_bug.cgi?id=72239
+
+        See if this change caused Linux dbg crashes.
+
+        * accessibility/loading-iframe-sends-notification.html: Removed.
+        * platform/chromium/accessibility/loading-iframe-sends-notification-expected.txt: Removed.
+
 2011-11-17  Konstantin Scheglov  <scheg...@google.com>
 
         Absolute child is not repainted when parent opacity changes

Deleted: trunk/LayoutTests/accessibility/loading-iframe-sends-notification.html (100697 => 100698)


--- trunk/LayoutTests/accessibility/loading-iframe-sends-notification.html	2011-11-18 00:23:28 UTC (rev 100697)
+++ trunk/LayoutTests/accessibility/loading-iframe-sends-notification.html	2011-11-18 00:27:03 UTC (rev 100698)
@@ -1,69 +0,0 @@
-<html>
-<head>
-<script src=""
-
-  <script>
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
-
-    function runTest()
-    {
-        description("This tests that when an iframe finishes loading, it sends a layout complete notification.");
-
-        if (window.accessibilityController) {
-            // Initially, the iframe's webarea is empty.
-            window.root = accessibilityController.rootElement;
-            window.body = root.childAtIndex(0);
-            window.iframe = body.childAtIndex(1).childAtIndex(0);
-            window.scrollarea = iframe.childAtIndex(0);
-            window.subwebarea = scrollarea.childAtIndex(0);
-            shouldBeFalse("subwebarea.childrenCount > 0");
-
-            iframe.addNotificationListener(function (notification) {
-                // Make sure that we get a LayoutComplete notification and that
-                // immediately after the notification is received, the iframe's
-                // webarea has content.
-                debug('Got notification on iframe: ' + notification);
-                window.newScrollarea = iframe.childAtIndex(0);
-                window.newSubwebarea = newScrollarea.childAtIndex(0);
-                shouldBeTrue("newSubwebarea.childrenCount > 0");
-            });
-        }
-
-        window.iframeElement = document.getElementById("iframe");
-        iframeElement.addEventListener("load", function() {
-            window.setTimeout(function() {
-                debug('<br /><span class="pass">TEST COMPLETE</span>');
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
-            }, 10);
-        }, false);
-
-        // Load content into the iframe. This will trigger the event
-        // handler above, which will check that the accessibility tree
-        // was updated with new content.
-        window.iframeElement.src = "" me</button></body>";
-
-    }
-
-    window.addEventListener('load', function() {
-        setTimeout(runTest, 10);
-    }, false);
-
-  </script>
-</head>
-<body>
-
-<p>Before</p>
-
-<iframe id="iframe"></iframe>
-
-<p>After</p>
-
-<p>End of test</p>
-
-<p id="description"></p>
-<div id="console"></div>
-
-</body>
-</html>

Deleted: trunk/LayoutTests/platform/chromium/accessibility/loading-iframe-sends-notification-expected.txt (100697 => 100698)


--- trunk/LayoutTests/platform/chromium/accessibility/loading-iframe-sends-notification-expected.txt	2011-11-18 00:23:28 UTC (rev 100697)
+++ trunk/LayoutTests/platform/chromium/accessibility/loading-iframe-sends-notification-expected.txt	2011-11-18 00:27:03 UTC (rev 100698)
@@ -1,18 +0,0 @@
-Before
-
-
-After
-
-End of test
-
-This tests that when an iframe finishes loading, it sends a layout complete notification.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS subwebarea.childrenCount > 0 is false
-Got notification on iframe: LayoutComplete
-PASS newSubwebarea.childrenCount > 0 is true
-
-TEST COMPLETE
-

Modified: trunk/Source/WebCore/ChangeLog (100697 => 100698)


--- trunk/Source/WebCore/ChangeLog	2011-11-18 00:23:28 UTC (rev 100697)
+++ trunk/Source/WebCore/ChangeLog	2011-11-18 00:27:03 UTC (rev 100698)
@@ -20,6 +20,17 @@
 
 2011-11-17  Peter Kasting  <pkast...@google.com>
 
+        Unreviewed, rolling out r100584.
+        http://trac.webkit.org/changeset/100584
+        https://bugs.webkit.org/show_bug.cgi?id=72239
+
+        See if this change caused Linux dbg crashes.
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitClose):
+
+2011-11-17  Peter Kasting  <pkast...@google.com>
+
         Unreviewed, rolling out r100676.
         http://trac.webkit.org/changeset/100676
         https://bugs.webkit.org/show_bug.cgi?id=72393

Modified: trunk/Source/WebCore/dom/Document.cpp (100697 => 100698)


--- trunk/Source/WebCore/dom/Document.cpp	2011-11-18 00:23:28 UTC (rev 100697)
+++ trunk/Source/WebCore/dom/Document.cpp	2011-11-18 00:27:03 UTC (rev 100698)
@@ -2252,27 +2252,13 @@
     }
 
 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
-    if (f && renderObject && AXObjectCache::accessibilityEnabled()) {
+    if (f && renderObject && this == topDocument() && AXObjectCache::accessibilityEnabled()) {
         // The AX cache may have been cleared at this point, but we need to make sure it contains an
         // AX object to send the notification to. getOrCreate will make sure that an valid AX object
         // exists in the cache (we ignore the return value because we don't need it here). This is 
         // only safe to call when a layout is not in progress, so it can not be used in postNotification.    
         axObjectCache()->getOrCreate(renderObject);
-        if (this == topDocument())
-            axObjectCache()->postNotification(renderObject, AXObjectCache::AXLoadComplete, true);
-        else {
-            // AXLoadComplete can only be posted on the top document, so if it's a document
-            // in an iframe that just finished loading, post a notification on the iframe
-            // element instead.
-            ScrollView* scrollView = frame()->view();
-            if (scrollView && scrollView->isFrameView()) {
-                HTMLFrameOwnerElement* owner = static_cast<FrameView*>(scrollView)->frame()->ownerElement();
-                if (owner && owner->renderer()) {
-                    AccessibilityObject* axIFrame = axObjectCache()->getOrCreate(owner->renderer());
-                    axObjectCache()->postNotification(axIFrame, axIFrame->document(), AXObjectCache::AXLayoutComplete, true);
-                }
-            }
-        }
+        axObjectCache()->postNotification(renderObject, AXObjectCache::AXLoadComplete, true);
     }
 #endif
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to