Title: [153449] trunk/Source/WebKit2
Revision
153449
Author
[email protected]
Date
2013-07-29 17:20:03 -0700 (Mon, 29 Jul 2013)

Log Message

Null deref under PluginView::handlesPageScaleFactor()
https://bugs.webkit.org/show_bug.cgi?id=119231
<rdar://problem/14440207>

Reviewed by Simon Fraser.

* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::handlesPageScaleFactor):
* WebProcess/Plugins/PluginView.h:
Null-check m_plugin and check m_isInitialized.
Make pageScaleFactor() and handlesPageScaleFactor const.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (153448 => 153449)


--- trunk/Source/WebKit2/ChangeLog	2013-07-30 00:15:43 UTC (rev 153448)
+++ trunk/Source/WebKit2/ChangeLog	2013-07-30 00:20:03 UTC (rev 153449)
@@ -1,3 +1,17 @@
+2013-07-29  Tim Horton  <[email protected]>
+
+        Null deref under PluginView::handlesPageScaleFactor()
+        https://bugs.webkit.org/show_bug.cgi?id=119231
+        <rdar://problem/14440207>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::handlesPageScaleFactor):
+        * WebProcess/Plugins/PluginView.h:
+        Null-check m_plugin and check m_isInitialized.
+        Make pageScaleFactor() and handlesPageScaleFactor const.
+
 2013-07-29  Anders Carlsson  <[email protected]>
 
         Remove setUnderlayPage() and associated code

Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (153448 => 153449)


--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2013-07-30 00:15:43 UTC (rev 153448)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2013-07-30 00:20:03 UTC (rev 153449)
@@ -463,11 +463,19 @@
     pageScaleFactorDidChange();
 }
 
-double PluginView::pageScaleFactor()
+double PluginView::pageScaleFactor() const
 {
     return m_pageScaleFactor;
 }
 
+bool PluginView::handlesPageScaleFactor() const
+{
+    if (!m_plugin || !m_isInitialized)
+        return false;
+
+    return m_plugin->handlesPageScaleFactor();
+}
+
 void PluginView::webPageDestroyed()
 {
     m_webPage = 0;

Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (153448 => 153449)


--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h	2013-07-30 00:15:43 UTC (rev 153448)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h	2013-07-30 00:20:03 UTC (rev 153449)
@@ -86,8 +86,8 @@
     WebCore::RenderBoxModelObject* renderer() const;
     
     void setPageScaleFactor(double scaleFactor, WebCore::IntPoint origin);
-    double pageScaleFactor();
-    bool handlesPageScaleFactor() { return m_plugin->handlesPageScaleFactor(); }
+    double pageScaleFactor() const;
+    bool handlesPageScaleFactor() const;
 
     void pageScaleFactorDidChange();
     void webPageDestroyed();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to