Diff
Modified: trunk/Source/WebKit2/ChangeLog (175774 => 175775)
--- trunk/Source/WebKit2/ChangeLog 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-08 10:50:04 UTC (rev 175775)
@@ -1,3 +1,16 @@
+2014-11-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Allow to create a view with a related page in WTR
+ https://bugs.webkit.org/show_bug.cgi?id=138501
+
+ Reviewed by Martin Robinson.
+
+ This is needed when running tests in multi web process mode.
+
+ * UIProcess/API/C/gtk/WKView.cpp:
+ (WKViewCreate):
+ * UIProcess/API/C/gtk/WKView.h:
+
2014-11-07 Conrad Shultz <[email protected]>
"Lookup" action menu should read "Look up"
Modified: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp (175774 => 175775)
--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp 2014-11-08 10:50:04 UTC (rev 175775)
@@ -35,9 +35,9 @@
using namespace WebKit;
using namespace WebCore;
-WKViewRef WKViewCreate(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+WKViewRef WKViewCreate(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKPageRef relatedPage)
{
- return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), nullptr, toImpl(pageGroupRef), nullptr, nullptr));
+ return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), nullptr, toImpl(pageGroupRef), nullptr, toImpl(relatedPage)));
}
WKPageRef WKViewGetPage(WKViewRef viewRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h (175774 => 175775)
--- trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h 2014-11-08 10:50:04 UTC (rev 175775)
@@ -34,7 +34,7 @@
extern "C" {
#endif
-WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup);
+WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef relatedPage);
WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view);
Modified: trunk/Tools/ChangeLog (175774 => 175775)
--- trunk/Tools/ChangeLog 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Tools/ChangeLog 2014-11-08 10:50:04 UTC (rev 175775)
@@ -1,5 +1,19 @@
2014-11-08 Carlos Garcia Campos <[email protected]>
+ [GTK] Allow to create a view with a related page in WTR
+ https://bugs.webkit.org/show_bug.cgi?id=138501
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
+ (TestWebKitAPI::PlatformWebView::PlatformWebView): Pass nullptr as
+ related page to WKViewCreate.
+ * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
+ (WTR::PlatformWebView::PlatformWebView): Pass the given related
+ page to WKViewCreate.
+
+2014-11-08 Carlos Garcia Campos <[email protected]>
+
WTR crashes after running a test when NetworkProcess enabled
https://bugs.webkit.org/show_bug.cgi?id=138500
Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (175774 => 175775)
--- trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-11-08 10:50:04 UTC (rev 175775)
@@ -35,7 +35,7 @@
PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
{
m_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- m_view = WKViewCreate(contextRef, pageGroupRef);
+ m_view = WKViewCreate(contextRef, pageGroupRef, nullptr);
gtk_container_add(GTK_CONTAINER(m_window), GTK_WIDGET(m_view));
gtk_widget_show(GTK_WIDGET(m_view));
gtk_widget_show(m_window);
Modified: trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp (175774 => 175775)
--- trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2014-11-08 10:47:08 UTC (rev 175774)
+++ trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp 2014-11-08 10:50:04 UTC (rev 175775)
@@ -34,8 +34,8 @@
namespace WTR {
-PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef /* relatedPage */, WKDictionaryRef options)
- : m_view(WKViewCreate(context, pageGroup))
+PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef relatedPage, WKDictionaryRef options)
+ : m_view(WKViewCreate(context, pageGroup, relatedPage))
, m_window(gtk_window_new(GTK_WINDOW_POPUP))
, m_windowIsKey(true)
, m_options(options)
