Title: [102257] branches/safari-534.53-branch/Source/WebKit2
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102256 => 102257)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:29:44 UTC (rev 102256)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:31:43 UTC (rev 102257)
@@ -1,5 +1,17 @@
2011-12-07 Lucas Forschler <[email protected]>
+ Merge 98435
+
+ 2011-10-25 Ryosuke Niwa <[email protected]>
+
+ GTK build fix attempt after r98413 and r98416.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::paint):
+ (WebKit::PluginControllerProxy::geometryDidChange):
+
+2011-12-07 Lucas Forschler <[email protected]>
+
Merge 98416
2011-10-25 Anders Carlsson <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102256 => 102257)
--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 19:29:44 UTC (rev 102256)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 19:31:43 UTC (rev 102257)
@@ -163,9 +163,11 @@
// Create a graphics context.
OwnPtr<GraphicsContext> graphicsContext = m_backingStore->createGraphicsContext();
+#if PLATFORM(MAC)
// FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
// which we currently don't have initiated in the plug-in process.
graphicsContext->scale(FloatSize(m_contentsScaleFactor, m_contentsScaleFactor));
+#endif
graphicsContext->translate(-m_frameRect.x(), -m_frameRect.y());
@@ -447,10 +449,14 @@
ASSERT(m_plugin);
+#if PLATFORM(MAC)
if (contentsScaleFactor != m_contentsScaleFactor) {
m_contentsScaleFactor = contentsScaleFactor;
m_plugin->contentsScaleFactorChanged(m_contentsScaleFactor);
}
+#else
+ UNUSED_PARAM(contentsScaleFactor)
+#endif
platformGeometryDidChange();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
