[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0c9d94b40747c2cc0a483ffef33a21bdd44a5237
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 08:42:47 2010 +0000

    2010-10-05  Sanjeev Radhakrishnan  <sanjeevr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Fixed implementation of pluginWidgetFromDocument to search for the "embed" element rather than just use the first child.
            https://bugs.webkit.org/show_bug.cgi?id=47129
    
            * html/PluginDocument.cpp:
            (WebCore::PluginDocumentParser::pluginWidgetFromDocument):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d70b1a..80532dd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-05  Sanjeev Radhakrishnan  <sanjeevr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Fixed implementation of pluginWidgetFromDocument to search for the "embed" element rather than just use the first child.
+        https://bugs.webkit.org/show_bug.cgi?id=47129
+
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocumentParser::pluginWidgetFromDocument):
+
 2010-10-05  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/PluginDocument.cpp b/WebCore/html/PluginDocument.cpp
index a7537fb..715d3b6 100644
--- a/WebCore/html/PluginDocument.cpp
+++ b/WebCore/html/PluginDocument.cpp
@@ -32,6 +32,7 @@
 #include "HTMLHtmlElement.h"
 #include "HTMLNames.h"
 #include "MainResourceLoader.h"
+#include "NodeList.h"
 #include "Page.h"
 #include "RawDataDocumentParser.h"
 #include "RenderEmbeddedObject.h"
@@ -70,7 +71,9 @@ Widget* PluginDocumentParser::pluginWidgetFromDocument(Document* doc)
     ASSERT(doc);
     RefPtr<Element> body = doc->body();
     if (body) {
-        RefPtr<Node> node = body->firstChild();
+        RefPtr<NodeList> embedNodes = body->getElementsByTagName("embed");
+        ASSERT(embedNodes && embedNodes->length());
+        Node* node = embedNodes->item(0);
         if (node && node->renderer()) {
             ASSERT(node->renderer()->isEmbeddedObject());
             return toRenderEmbeddedObject(node->renderer())->widget();

-- 
WebKit Debian packaging