Title: [102259] branches/safari-534.53-branch/Source/WebKit2
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102258 => 102259)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:32:55 UTC (rev 102258)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:34:09 UTC (rev 102259)
@@ -1,5 +1,18 @@
2011-12-07 Lucas Forschler <[email protected]>
+ Merge 98438
+
+ 2011-10-26 Ryosuke Niwa <[email protected]>
+
+ Another GTK build fix attempt after r98413 and r98416.
+
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::paint):
+ (WebKit::PluginProxy::geometryDidChange):
+ (WebKit::PluginProxy::update):
+
+2011-12-07 Lucas Forschler <[email protected]>
+
Merge 98437
2011-10-25 Ryosuke Niwa <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (102258 => 102259)
--- branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-12-07 19:32:55 UTC (rev 102258)
+++ branches/safari-534.53-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2011-12-07 19:34:09 UTC (rev 102259)
@@ -143,7 +143,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);
@@ -190,7 +194,11 @@
{
ASSERT(m_isStarted);
+#if PLATFORM(MAC)
float contentsScaleFactor = controller()->contentsScaleFactor();
+#else
+ float contentsScaleFactor = 0;
+#endif
if (m_frameRect.isEmpty() || !needsBackingStore()) {
ShareableBitmap::Handle pluginBackingStoreHandle;
@@ -541,7 +549,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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
