Title: [140060] trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
- Revision
- 140060
- Author
- timo...@apple.com
- Date
- 2013-01-17 15:25:59 -0800 (Thu, 17 Jan 2013)
Log Message
Build fix. Bad merge.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (140059 => 140060)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-01-17 23:23:09 UTC (rev 140059)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2013-01-17 23:25:59 UTC (rev 140060)
@@ -1004,7 +1004,6 @@
return toImpl(preferencesRef)->aggressiveTileRetentionEnabled();
}
-<<<<<<< HEAD
void WKPreferencesSetQTKitEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setQTKitEnabled(enabled);
@@ -1013,7 +1012,8 @@
bool WKPreferencesGetQTKitEnabled(WKPreferencesRef preferencesRef)
{
return toImpl(preferencesRef)->isQTKitEnabled();
-=======
+}
+
void WKPreferencesSetLogsPageMessagesToSystemConsoleEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
toImpl(preferencesRef)->setLogsPageMessagesToSystemConsoleEnabled(enabled);
@@ -1022,5 +1022,4 @@
bool WKPreferencesGetLogsPageMessagesToSystemConsoleEnabled(WKPreferencesRef preferencesRef)
{
return toImpl(preferencesRef)->logsPageMessagesToSystemConsoleEnabled();
->>>>>>> Make logging console messages to STDOUT work in WebKit2 via a new setting.
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
