Changeset 175775 in webkit


Ignore:
Timestamp:
Nov 8, 2014 2:50:04 AM (9 years ago)
Author:
Carlos Garcia Campos
Message:

[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.

Source/WebKit2:

This is needed when running tests in multi web process mode.

  • UIProcess/API/C/gtk/WKView.cpp:

(WKViewCreate):

  • UIProcess/API/C/gtk/WKView.h:

Tools:

  • 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.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r175770 r175775  
     12014-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Allow to create a view with a related page in WTR
     4        https://bugs.webkit.org/show_bug.cgi?id=138501
     5
     6        Reviewed by Martin Robinson.
     7
     8        This is needed when running tests in multi web process mode.
     9
     10        * UIProcess/API/C/gtk/WKView.cpp:
     11        (WKViewCreate):
     12        * UIProcess/API/C/gtk/WKView.h:
     13
    1142014-11-07  Conrad Shultz  <conrad_shultz@apple.com>
    215

  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp

    r171742 r175775  
    3636using namespace WebCore;
    3737
    38 WKViewRef WKViewCreate(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
     38WKViewRef WKViewCreate(WKContextRef contextRef, WKPageGroupRef pageGroupRef, WKPageRef relatedPage)
    3939{
    40     return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), nullptr, toImpl(pageGroupRef), nullptr, nullptr));
     40    return toAPI(webkitWebViewBaseCreate(toImpl(contextRef), nullptr, toImpl(pageGroupRef), nullptr, toImpl(relatedPage)));
    4141}
    4242

  • trunk/Source/WebKit2/UIProcess/API/C/gtk/WKView.h

    r168961 r175775  
    3535#endif
    3636
    37 WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup);
     37WK_EXPORT WKViewRef WKViewCreate(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef relatedPage);
    3838
    3939WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view);

  • trunk/Tools/ChangeLog

    r175774 r175775  
     12014-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Allow to create a view with a related page in WTR
     4        https://bugs.webkit.org/show_bug.cgi?id=138501
     5
     6        Reviewed by Martin Robinson.
     7
     8        * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
     9        (TestWebKitAPI::PlatformWebView::PlatformWebView): Pass nullptr as
     10        related page to WKViewCreate.
     11        * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
     12        (WTR::PlatformWebView::PlatformWebView): Pass the given related
     13        page to WKViewCreate.
     14
    1152014-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
    216

  • trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp

    r163797 r175775  
    3636{
    3737    m_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    38     m_view = WKViewCreate(contextRef, pageGroupRef);
     38    m_view = WKViewCreate(contextRef, pageGroupRef, nullptr);
    3939    gtk_container_add(GTK_CONTAINER(m_window), GTK_WIDGET(m_view));
    4040    gtk_widget_show(GTK_WIDGET(m_view));

  • trunk/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp

    r170078 r175775  
    3535namespace WTR {
    3636
    37 PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef /* relatedPage */, WKDictionaryRef options)
    38     : m_view(WKViewCreate(context, pageGroup))
     37PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKPageRef relatedPage, WKDictionaryRef options)
     38    : m_view(WKViewCreate(context, pageGroup, relatedPage))
    3939    , m_window(gtk_window_new(GTK_WINDOW_POPUP))
    4040    , m_windowIsKey(true)
Note: See TracChangeset for help on using the changeset viewer.