Title: [153453] branches/safari-537-branch/Source/WebKit2
- Revision
- 153453
- Author
- [email protected]
- Date
- 2013-07-29 18:10:16 -0700 (Mon, 29 Jul 2013)
Log Message
Merged r153449. <rdar://problem/14440207>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153452 => 153453)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-30 01:07:53 UTC (rev 153452)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-30 01:10:16 UTC (rev 153453)
@@ -1,3 +1,21 @@
+2013-07-29 Lucas Forschler <[email protected]>
+
+ Merge r153449
+
+ 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-28 Lucas Forschler <[email protected]>
Merge r153404
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (153452 => 153453)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2013-07-30 01:07:53 UTC (rev 153452)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2013-07-30 01:10:16 UTC (rev 153453)
@@ -454,11 +454,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: branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h (153452 => 153453)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2013-07-30 01:07:53 UTC (rev 153452)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2013-07-30 01:10:16 UTC (rev 153453)
@@ -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