[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
bweinstein at apple.com
bweinstein at apple.com
Wed Dec 22 12:39:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cf1bb85cdce3864e36bde4c1349b594b6307e426
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 26 20:20:16 2010 +0000
User scripts injected at start are not run for plugin and media documents
<https://bugs.webkit.org/show_bug.cgi?id=44711>
<rdar://problem/8359288>
Reviewed by Adam Roben.
http://trac.webkit.org/changeset/61271 made scripts injected at start run on ImageDocuments,
but didn't implement this behavior for MediaDocuments and PluginDocuments.
* loader/MediaDocument.cpp:
(WebCore::MediaDocumentParser::createDocumentStructure): Make sure we fire dispatchDocumentElementAvailable.
* loader/PluginDocument.cpp:
(WebCore::PluginDocumentParser::createDocumentStructure): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8453751..755ae2d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-26 Brian Weinstein <bweinstein at apple.com>
+
+ Reviewed by Adam Roben.
+
+ User scripts injected at start are not run for plugin and media documents
+ <https://bugs.webkit.org/show_bug.cgi?id=44711>
+ <rdar://problem/8359288>
+
+ http://trac.webkit.org/changeset/61271 made scripts injected at start run on ImageDocuments,
+ but didn't implement this behavior for MediaDocuments and PluginDocuments.
+
+ * loader/MediaDocument.cpp:
+ (WebCore::MediaDocumentParser::createDocumentStructure): Make sure we fire dispatchDocumentElementAvailable.
+ * loader/PluginDocument.cpp:
+ (WebCore::PluginDocumentParser::createDocumentStructure): Ditto.
+
2010-08-26 Peter Kasting <pkasting at google.com>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/loader/MediaDocument.cpp b/WebCore/loader/MediaDocument.cpp
index 7e28d02..dd58581 100644
--- a/WebCore/loader/MediaDocument.cpp
+++ b/WebCore/loader/MediaDocument.cpp
@@ -71,6 +71,9 @@ void MediaDocumentParser::createDocumentStructure()
ExceptionCode ec;
RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
document()->appendChild(rootElement, ec);
+
+ if (document()->frame() && document()->frame()->loader())
+ document()->frame()->loader()->dispatchDocumentElementAvailable();
RefPtr<Element> body = document()->createElement(bodyTag, false);
body->setAttribute(styleAttr, "background-color: rgb(38,38,38);");
diff --git a/WebCore/loader/PluginDocument.cpp b/WebCore/loader/PluginDocument.cpp
index 54e686c..ae036d3 100644
--- a/WebCore/loader/PluginDocument.cpp
+++ b/WebCore/loader/PluginDocument.cpp
@@ -84,6 +84,9 @@ void PluginDocumentParser::createDocumentStructure()
RefPtr<Element> rootElement = document()->createElement(htmlTag, false);
document()->appendChild(rootElement, ec);
+ if (document()->frame() && document()->frame()->loader())
+ document()->frame()->loader()->dispatchDocumentElementAvailable();
+
RefPtr<Element> body = document()->createElement(bodyTag, false);
body->setAttribute(marginwidthAttr, "0");
body->setAttribute(marginheightAttr, "0");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list