Title: [149469] trunk/Source/WebCore
- Revision
- 149469
- Author
- [email protected]
- Date
- 2013-05-01 17:40:22 -0700 (Wed, 01 May 2013)
Log Message
Null check plugInClient earlier in snapshotting path
https://bugs.webkit.org/show_bug.cgi?id=115498
Patch by Joseph Pecoraro <[email protected]> on 2013-05-01
Reviewed by Darin Adler.
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149468 => 149469)
--- trunk/Source/WebCore/ChangeLog 2013-05-02 00:39:14 UTC (rev 149468)
+++ trunk/Source/WebCore/ChangeLog 2013-05-02 00:40:22 UTC (rev 149469)
@@ -1,3 +1,13 @@
+2013-05-01 Joseph Pecoraro <[email protected]>
+
+ Null check plugInClient earlier in snapshotting path
+ https://bugs.webkit.org/show_bug.cgi?id=115498
+
+ Reviewed by Darin Adler.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn):
+
2013-05-01 Seokju Kwon <[email protected]>
Web Inspector: Fix check-inspector-strings script and fix localized strings
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (149468 => 149469)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-05-02 00:39:14 UTC (rev 149468)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-05-02 00:40:22 UTC (rev 149469)
@@ -645,7 +645,7 @@
return;
}
- if (document()->page()->settings()->autostartOriginPlugInSnapshottingEnabled() && document()->page()->plugInClient()->shouldAutoStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), url.host(), loadedMimeType())) {
+ if (document()->page()->settings()->autostartOriginPlugInSnapshottingEnabled() && document()->page()->plugInClient() && document()->page()->plugInClient()->shouldAutoStartFromOrigin(document()->page()->mainFrame()->document()->baseURL().host(), url.host(), loadedMimeType())) {
LOG(Plugins, "%p Plug-in from (%s, %s) is marked to auto-start, set to play", this, document()->page()->mainFrame()->document()->baseURL().host().utf8().data(), url.host().utf8().data());
m_snapshotDecision = NeverSnapshot;
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
