Title: [136422] trunk/Source/WebKit2
- Revision
- 136422
- Author
- timothy_hor...@apple.com
- Date
- 2012-12-03 11:17:32 -0800 (Mon, 03 Dec 2012)
Log Message
PDFPlugin: <embed> and <object> PDFs affect their parent frame's page scale
https://bugs.webkit.org/show_bug.cgi?id=103286
<rdar://problem/12752315>
Reviewed by Dan Bernstein.
Style fixes after http://trac.webkit.org/changeset/136316.
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::isFullFramePlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136421 => 136422)
--- trunk/Source/WebKit2/ChangeLog 2012-12-03 19:15:36 UTC (rev 136421)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-03 19:17:32 UTC (rev 136422)
@@ -1,3 +1,16 @@
+2012-12-03 Tim Horton <timothy_hor...@apple.com>
+
+ PDFPlugin: <embed> and <object> PDFs affect their parent frame's page scale
+ https://bugs.webkit.org/show_bug.cgi?id=103286
+ <rdar://problem/12752315>
+
+ Reviewed by Dan Bernstein.
+
+ Style fixes after http://trac.webkit.org/changeset/136316.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::isFullFramePlugin):
+
2012-12-03 Alexis Menard <ale...@webkit.org>
[Mac] Enable CSS3 background-position offset by default.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (136421 => 136422)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2012-12-03 19:15:36 UTC (rev 136421)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2012-12-03 19:17:32 UTC (rev 136422)
@@ -707,10 +707,7 @@
// <object> or <embed> plugins will appear to be in their parent frame, so we have to
// check whether our frame's widget is exactly our PluginView.
Document* document = webFrame()->coreFrame()->document();
- if (document->isPluginDocument())
- return (static_cast<PluginDocument*>(document)->pluginWidget() == pluginView());
-
- return false;
+ return document->isPluginDocument() && static_cast<PluginDocument*>(document)->pluginWidget() == pluginView();
}
bool PDFPlugin::handlesPageScaleFactor()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
