Title: [103469] branches/safari-534.54-branch/Source/WebKit2
- Revision
- 103469
- Author
- lforsch...@apple.com
- Date
- 2011-12-21 16:00:05 -0800 (Wed, 21 Dec 2011)
Log Message
Merged r99097.
Modified Paths
Diff
Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (103468 => 103469)
--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2011-12-21 23:58:04 UTC (rev 103468)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog 2011-12-22 00:00:05 UTC (rev 103469)
@@ -1,3 +1,13 @@
+2011-12-21 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 99097
+
+ 2011-11-02 Anders Carlsson <ander...@apple.com>
+
+ Fix build.
+
+ * WebProcess/Plugins/PluginView.h:
+
2011-12-20 Lucas Forschler <lforsch...@apple.com>
Merge 99093
Modified: branches/safari-534.54-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h (103468 => 103469)
--- branches/safari-534.54-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2011-12-21 23:58:04 UTC (rev 103468)
+++ branches/safari-534.54-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2011-12-22 00:00:05 UTC (rev 103469)
@@ -150,8 +150,8 @@
#if PLATFORM(MAC)
virtual void setComplexTextInputEnabled(bool);
virtual mach_port_t compositingRenderServerPort();
+#endif
virtual float contentsScaleFactor();
-#endif
virtual String proxiesForURL(const String&);
virtual String cookiesForURL(const String&);
virtual void setCookiesForURL(const String& urlString, const String& cookieString);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
