Title: [135797] trunk/Source/WebKit2
- Revision
- 135797
- Author
- timothy_hor...@apple.com
- Date
- 2012-11-26 18:01:49 -0800 (Mon, 26 Nov 2012)
Log Message
Ensure that plugins are initialized before using handleEditingCommand/isEditingCommandEnabled/shouldAllowScripting
https://bugs.webkit.org/show_bug.cgi?id=103288
Reviewed by Dan Bernstein.
Other PluginView methods that use m_plugin null-check m_plugin and check
that the plugin has finished initializing before using it. These three
should do the same thing.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::handleEditingCommand):
(WebKit::PluginView::isEditingCommandEnabled):
(WebKit::PluginView::shouldAllowScripting):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (135796 => 135797)
--- trunk/Source/WebKit2/ChangeLog 2012-11-27 02:01:06 UTC (rev 135796)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-27 02:01:49 UTC (rev 135797)
@@ -1,5 +1,21 @@
2012-11-26 Tim Horton <timothy_hor...@apple.com>
+ Ensure that plugins are initialized before using handleEditingCommand/isEditingCommandEnabled/shouldAllowScripting
+ https://bugs.webkit.org/show_bug.cgi?id=103288
+
+ Reviewed by Dan Bernstein.
+
+ Other PluginView methods that use m_plugin null-check m_plugin and check
+ that the plugin has finished initializing before using it. These three
+ should do the same thing.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::handleEditingCommand):
+ (WebKit::PluginView::isEditingCommandEnabled):
+ (WebKit::PluginView::shouldAllowScripting):
+
+2012-11-26 Tim Horton <timothy_hor...@apple.com>
+
PDFPlugin: Subframe PDF context menus are in the wrong place
https://bugs.webkit.org/show_bug.cgi?id=103284
<rdar://problem/12727972>
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (135796 => 135797)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-11-27 02:01:06 UTC (rev 135796)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2012-11-27 02:01:49 UTC (rev 135797)
@@ -831,16 +831,25 @@
bool PluginView::handleEditingCommand(const String& commandName, const String& argument)
{
+ if (!m_isInitialized || !m_plugin)
+ return false;
+
return m_plugin->handleEditingCommand(commandName, argument);
}
bool PluginView::isEditingCommandEnabled(const String& commandName)
{
+ if (!m_isInitialized || !m_plugin)
+ return false;
+
return m_plugin->isEditingCommandEnabled(commandName);
}
bool PluginView::shouldAllowScripting()
{
+ if (!m_isInitialized || !m_plugin)
+ return false;
+
return m_plugin->shouldAllowScripting();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
