Title: [102258] branches/safari-534.53-branch/Source/WebKit2
Diff
Modified: branches/safari-534.53-branch/Source/WebKit2/ChangeLog (102257 => 102258)
--- branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:31:43 UTC (rev 102257)
+++ branches/safari-534.53-branch/Source/WebKit2/ChangeLog 2011-12-07 19:32:55 UTC (rev 102258)
@@ -1,5 +1,16 @@
2011-12-07 Lucas Forschler <[email protected]>
+ Merge 98437
+
+ 2011-10-25 Ryosuke Niwa <[email protected]>
+
+ C/C++ needs ; after each statement.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::geometryDidChange):
+
+2011-12-07 Lucas Forschler <[email protected]>
+
Merge 98435
2011-10-25 Ryosuke Niwa <[email protected]>
Modified: branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (102257 => 102258)
--- branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 19:31:43 UTC (rev 102257)
+++ branches/safari-534.53-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2011-12-07 19:32:55 UTC (rev 102258)
@@ -455,7 +455,7 @@
m_plugin->contentsScaleFactorChanged(m_contentsScaleFactor);
}
#else
- UNUSED_PARAM(contentsScaleFactor)
+ UNUSED_PARAM(contentsScaleFactor);
#endif
platformGeometryDidChange();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
