Title: [188826] trunk
- Revision
- 188826
- Author
- [email protected]
- Date
- 2015-08-22 11:38:29 -0700 (Sat, 22 Aug 2015)
Log Message
Unreviewed, attempt to fix GTK build after r188718
Source/WebKit2:
* CMakeLists.txt: Build WKPageConfigurationRef.cpp
* PlatformEfl.cmake: Don't build WKPageConfigurationRef.cpp
Tools:
* WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
(WTR::PlatformWebView::PlatformWebView):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (188825 => 188826)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-08-22 18:35:47 UTC (rev 188825)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-08-22 18:38:29 UTC (rev 188826)
@@ -440,6 +440,7 @@
UIProcess/API/C/WKOpenPanelResultListener.cpp
UIProcess/API/C/WKOriginDataManager.cpp
UIProcess/API/C/WKPage.cpp
+ UIProcess/API/C/WKPageConfigurationRef.cpp
UIProcess/API/C/WKPageGroup.cpp
UIProcess/API/C/WKPluginSiteDataManager.cpp
UIProcess/API/C/WKPreferences.cpp
Modified: trunk/Source/WebKit2/ChangeLog (188825 => 188826)
--- trunk/Source/WebKit2/ChangeLog 2015-08-22 18:35:47 UTC (rev 188825)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-22 18:38:29 UTC (rev 188826)
@@ -1,3 +1,10 @@
+2015-08-22 Michael Catanzaro <[email protected]>
+
+ Unreviewed, attempt to fix GTK build after r188718
+
+ * CMakeLists.txt: Build WKPageConfigurationRef.cpp
+ * PlatformEfl.cmake: Don't build WKPageConfigurationRef.cpp
+
2015-08-22 Antti Koivisto <[email protected]>
Decode data URLs in web process
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (188825 => 188826)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-08-22 18:35:47 UTC (rev 188825)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-08-22 18:38:29 UTC (rev 188826)
@@ -65,8 +65,6 @@
UIProcess/BackingStore.cpp
UIProcess/DefaultUndoController.cpp
- UIProcess/API/C/WKPageConfigurationRef.cpp
-
UIProcess/API/C/CoordinatedGraphics/WKView.cpp
UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
Modified: trunk/Tools/ChangeLog (188825 => 188826)
--- trunk/Tools/ChangeLog 2015-08-22 18:35:47 UTC (rev 188825)
+++ trunk/Tools/ChangeLog 2015-08-22 18:38:29 UTC (rev 188826)
@@ -1,3 +1,10 @@
+2015-08-22 Michael Catanzaro <[email protected]>
+
+ Unreviewed, attempt to fix GTK build after r188718
+
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+ (WTR::PlatformWebView::PlatformWebView):
+
2015-08-21 Commit Queue <[email protected]>
Unreviewed, rolling out r188807, r188813, and r188815.
Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (188825 => 188826)
--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-08-22 18:35:47 UTC (rev 188825)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2015-08-22 18:38:29 UTC (rev 188826)
@@ -29,14 +29,15 @@
#include "PlatformWebView.h"
#include <WebKit/WKImageCairo.h>
+#include <WebKit/WKPageConfigurationRef.h>
#include <WebKit/WKViewPrivate.h>
#include <gtk/gtk.h>
#include <wtf/Assertions.h>
namespace WTR {
-PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef relatedPage, const ViewOptions& options)
- : m_view(WKViewCreate(context, pageGroup, relatedPage))
+PlatformWebView::PlatformWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
+ : m_view(WKViewCreate(WKPageConfigurationGetContext(configuration), WKPageConfigurationGetPageGroup(configuration), WKPageConfigurationGetRelatedPage(configuration)))
, m_window(gtk_window_new(GTK_WINDOW_POPUP))
, m_windowIsKey(true)
, m_options(options)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
