Title: [98438] trunk/Source/WebKit2
- Revision
- 98438
- Author
- rn...@webkit.org
- Date
- 2011-10-26 00:07:56 -0700 (Wed, 26 Oct 2011)
Log Message
Another GTK build fix attempt after r98413 and r98416.
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::paint):
(WebKit::PluginProxy::geometryDidChange):
(WebKit::PluginProxy::update):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98437 => 98438)
--- trunk/Source/WebKit2/ChangeLog 2011-10-26 06:57:58 UTC (rev 98437)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-26 07:07:56 UTC (rev 98438)
@@ -1,3 +1,12 @@
+2011-10-26 Ryosuke Niwa <rn...@webkit.org>
+
+ Another GTK build fix attempt after r98413 and r98416.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::paint):
+ (WebKit::PluginProxy::geometryDidChange):
+ (WebKit::PluginProxy::update):
+
2011-10-25 Ryosuke Niwa <rn...@webkit.org>
C/C++ needs ; after each statement.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (98437 => 98438)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-26 06:57:58 UTC (rev 98437)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-10-26 07:07:56 UTC (rev 98438)
@@ -135,7 +135,11 @@
if (!needsBackingStore() || !m_backingStore)
return;
+#if PLATFORM(MAC)
float contentsScaleFactor = controller()->contentsScaleFactor();
+#else
+ float contentsScaleFactor = 0;
+#endif
if (!m_pluginBackingStoreContainsValidData) {
m_connection->connection()->sendSync(Messages::PluginControllerProxy::PaintEntirePlugin(), Messages::PluginControllerProxy::PaintEntirePlugin::Reply(), m_pluginInstanceID);
@@ -182,7 +186,11 @@
{
ASSERT(m_isStarted);
+#if PLATFORM(MAC)
float contentsScaleFactor = controller()->contentsScaleFactor();
+#else
+ float contentsScaleFactor = 0;
+#endif
if (m_frameRect.isEmpty() || !needsBackingStore()) {
ShareableBitmap::Handle pluginBackingStoreHandle;
@@ -530,7 +538,11 @@
paintedRectPluginCoordinates.move(-m_frameRect.x(), -m_frameRect.y());
if (m_backingStore) {
+#if PLATFORM(MAC)
float contentsScaleFactor = controller()->contentsScaleFactor();
+#else
+ float contentsScaleFactor = 0;
+#endif
// Blit the plug-in backing store into our own backing store.
OwnPtr<GraphicsContext> graphicsContext = m_backingStore->createGraphicsContext();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
