Title: [98435] trunk/Source/WebKit2
- Revision
- 98435
- Author
- [email protected]
- Date
- 2011-10-25 23:47:12 -0700 (Tue, 25 Oct 2011)
Log Message
GTK build fix attempt after r98413 and r98416.
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::paint):
(WebKit::PluginControllerProxy::geometryDidChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98434 => 98435)
--- trunk/Source/WebKit2/ChangeLog 2011-10-26 06:46:35 UTC (rev 98434)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-26 06:47:12 UTC (rev 98435)
@@ -1,3 +1,11 @@
+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-10-25 Mark Hahnenberg <[email protected]>
Remove deletePropertyVirtual
Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (98434 => 98435)
--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-10-26 06:46:35 UTC (rev 98434)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-10-26 06:47:12 UTC (rev 98435)
@@ -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());
@@ -434,10 +436,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
