git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a798a0)
LayoutTests:
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 20:52:42 +0000 (20:52 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 20:52:42 +0000 (20:52 +0000)
        Reviewed by Mitz.

        <rdar://problem/5280532>
        REGRESSION: Can't access nested embed by document.name if object is not immediate parent

        * plugins/embed-inside-object-expected.txt: Added.
        * plugins/embed-inside-object.html: Added.

WebCore:

        Reviewed by Mitz.

        <rdar://problem/5280532>
        REGRESSION: Can't access nested embed by document.name if object is not immediate parent

        Traverse up the tree looking for an object element.

        * html/HTMLEmbedElement.cpp:
        (WebCore::HTMLEmbedElement::getInstance):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24068 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/plugins/embed-inside-object-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/plugins/embed-inside-object.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/html/HTMLEmbedElement.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b07587552e4f11d28f6fc47a2e573dd1d8933bb2..5f4d2594b5022c65a7c0501cc71bf1dfab989d84 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Mitz.
+
+        <rdar://problem/5280532>
+        REGRESSION: Can't access nested embed by document.name if object is not immediate parent
+        
+        * plugins/embed-inside-object-expected.txt: Added.
+        * plugins/embed-inside-object.html: Added.
+
 2007-07-06  Adam Roben  <aroben@apple.com>
 
         Add another Leopard failure
diff --git a/LayoutTests/plugins/embed-inside-object-expected.txt b/LayoutTests/plugins/embed-inside-object-expected.txt
new file mode 100644 (file)
index 0000000..93e31b3
--- /dev/null
+++ b/LayoutTests/plugins/embed-inside-object-expected.txt
@@ -0,0 +1,5 @@
+
+This tests that it's possible to control an embed that is nested inside an object with a span tag in between.
+plugin object is: [object HTMLEmbedElement]
+SUCCESS
+
diff --git a/LayoutTests/plugins/embed-inside-object.html b/LayoutTests/plugins/embed-inside-object.html
new file mode 100644 (file)
index 0000000..2d288fb
--- /dev/null
+++ b/LayoutTests/plugins/embed-inside-object.html
@@ -0,0 +1,37 @@
+<html>
+<script>
+    function debug(str) {
+        document.getElementById('console').innerHTML += str + "<br>";
+    }
+    
+    function pluginCallback() {
+        debug('SUCCESS');
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    }
+    
+    function runTest() {
+        if (window.layoutTestController) {
+            layoutTestController.dumpAsText();
+            layoutTestController.waitUntilDone();
+        }
+        
+        var plugin = document.plugin;
+    
+        debug('plugin object is: ' + plugin);
+        plugin.getURL('javascript:pluginCallback()', '_self')
+    }
+</script>
+<body onload="runTest()">
+<object name="plugin" type="application/x-webkit-test-netscape">
+    <span>
+        <embed name="plugin" type="application/x-webkit-test-netscape"></embed>
+    </span>
+</object>
+<div>
+    This tests that it's possible to control an embed that is nested inside an object with a span tag in between.
+</div>
+<div id="console">
+</div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef386199ef452dd0c986bee6b484b31523e2aa68..c96e49d3766cbc1724b11721f2a99d63d3652b65 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Mitz.
+
+        <rdar://problem/5280532> 
+        REGRESSION: Can't access nested embed by document.name if object is not immediate parent
+        
+        Traverse up the tree looking for an object element.
+        
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::getInstance):
+
 2007-07-06  George Staikos  <staikos@kde.org>
 
         Qt build fix: Don't clobber qmake variables that are already set.
diff --git a/WebCore/html/HTMLEmbedElement.cpp b/WebCore/html/HTMLEmbedElement.cpp
index 74c6a5f984a7d9404f9f33da975830304faae390..89b11cffd382a62ba3ca8dae8372fc8a4c054569 100644 (file)
--- a/WebCore/html/HTMLEmbedElement.cpp
+++ b/WebCore/html/HTMLEmbedElement.cpp
@@ -68,8 +68,15 @@ KJS::Bindings::Instance *HTMLEmbedElement::getInstance() const
     RenderObject *r = renderer();
     if (!r) {
         Node *p = parentNode();
-        if (p && p->hasTagName(objectTag))
-            r = p->renderer();
+        
+        while (p) {
+            if (p->hasTagName(objectTag)) {
+                r = p->renderer();
+                break;
+            }
+            
+            p = p->parentNode();
+        }
     }
 
     if (r && r->isWidget()) {
Mirror of the WebKit open source project from svn.webkit.org.