Changeset 218097 in webkit


Ignore:
Timestamp:
Jun 12, 2017 5:54:52 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] getPage() in WebKitWebView should return a reference instead of a pointer
​https://bugs.webkit.org/show_bug.cgi?id=173251

Reviewed by Žan Doberšek.

The WebPageProxy is created on WebKitWebView construction, so getPage() can only return nullptr if it's called
during construction. And that can only happen when construct properties are set. It's better to check that the
view has been constructed only in these particular cases and make getPage() return a reference.

  • UIProcess/API/gtk/WebKitWebView.cpp:

(webkitWebViewCreateJavaScriptDialog):
(allowModalDialogsChanged): Settings signals are only connected after the page has been created, so we don't
need to check page is available here.
(zoomTextOnlyChanged):
(userAgentChanged):
(webkitWebViewIsConstructed): Helper method to check if the view has been constructed.
(webkitWebViewUpdateSettings): Return early if view hasn't been constructed.
(webkitWebViewDisconnectSettingsSignalHandlers): Ditto.
(webkitWebViewConstructed):
(webkitWebViewDispose):
(webkitWebViewCreateNewPage):
(webkitWebViewSelectionDidChange):
(webkit_web_view_try_close):
(webkit_web_view_load_uri):
(webkit_web_view_load_html):
(webkit_web_view_load_alternate_html):
(webkit_web_view_load_plain_text):
(webkit_web_view_load_bytes):
(webkit_web_view_load_request):
(webkit_web_view_get_page_id):
(webkit_web_view_reload):
(webkit_web_view_reload_bypass_cache):
(webkit_web_view_stop_loading):
(webkit_web_view_is_playing_audio):
(webkit_web_view_go_back):
(webkit_web_view_can_go_back):
(webkit_web_view_go_forward):
(webkit_web_view_can_go_forward):
(webkit_web_view_get_custom_charset):
(webkit_web_view_set_custom_charset):
(webkit_web_view_get_estimated_load_progress):
(webkit_web_view_go_to_back_forward_list_item):
(webkit_web_view_set_zoom_level):
(webkit_web_view_get_zoom_level):
(webkit_web_view_can_execute_editing_command):
(webkit_web_view_execute_editing_command):
(webkit_web_view_execute_editing_command_with_argument):
(webkit_web_view_run_javascript):
(resourcesStreamReadCallback):
(webkit_web_view_get_inspector):
(webkit_web_view_can_show_mime_type):
(webkit_web_view_save):
(webkit_web_view_save_to_file):
(webkit_web_view_download_uri):
(webkit_web_view_get_tls_info):
(webkit_web_view_get_snapshot):
(webkit_web_view_set_background_color):
(webkit_web_view_get_background_color):
(webkit_web_view_is_editable):
(webkit_web_view_set_editable):
(webkit_web_view_get_editor_state):
(webkit_web_view_get_session_state):
(webkit_web_view_restore_session_state):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r218096 r218097  
     12017-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] getPage() in WebKitWebView should return a reference instead of a pointer
     4        https://bugs.webkit.org/show_bug.cgi?id=173251
     5
     6        Reviewed by Žan Doberšek.
     7
     8        The WebPageProxy is created on WebKitWebView construction, so getPage() can only return nullptr if it's called
     9        during construction. And that can only happen when construct properties are set. It's better to check that the
     10        view has been constructed only in these particular cases and make getPage() return a reference.
     11
     12        * UIProcess/API/gtk/WebKitWebView.cpp:
     13        (webkitWebViewCreateJavaScriptDialog):
     14        (allowModalDialogsChanged): Settings signals are only connected after the page has been created, so we don't
     15        need to check page is available here.
     16        (zoomTextOnlyChanged):
     17        (userAgentChanged):
     18        (webkitWebViewIsConstructed): Helper method to check if the view has been constructed.
     19        (webkitWebViewUpdateSettings): Return early if view hasn't been constructed.
     20        (webkitWebViewDisconnectSettingsSignalHandlers): Ditto.
     21        (webkitWebViewConstructed):
     22        (webkitWebViewDispose):
     23        (webkitWebViewCreateNewPage):
     24        (webkitWebViewSelectionDidChange):
     25        (webkit_web_view_try_close):
     26        (webkit_web_view_load_uri):
     27        (webkit_web_view_load_html):
     28        (webkit_web_view_load_alternate_html):
     29        (webkit_web_view_load_plain_text):
     30        (webkit_web_view_load_bytes):
     31        (webkit_web_view_load_request):
     32        (webkit_web_view_get_page_id):
     33        (webkit_web_view_reload):
     34        (webkit_web_view_reload_bypass_cache):
     35        (webkit_web_view_stop_loading):
     36        (webkit_web_view_is_playing_audio):
     37        (webkit_web_view_go_back):
     38        (webkit_web_view_can_go_back):
     39        (webkit_web_view_go_forward):
     40        (webkit_web_view_can_go_forward):
     41        (webkit_web_view_get_custom_charset):
     42        (webkit_web_view_set_custom_charset):
     43        (webkit_web_view_get_estimated_load_progress):
     44        (webkit_web_view_go_to_back_forward_list_item):
     45        (webkit_web_view_set_zoom_level):
     46        (webkit_web_view_get_zoom_level):
     47        (webkit_web_view_can_execute_editing_command):
     48        (webkit_web_view_execute_editing_command):
     49        (webkit_web_view_execute_editing_command_with_argument):
     50        (webkit_web_view_run_javascript):
     51        (resourcesStreamReadCallback):
     52        (webkit_web_view_get_inspector):
     53        (webkit_web_view_can_show_mime_type):
     54        (webkit_web_view_save):
     55        (webkit_web_view_save_to_file):
     56        (webkit_web_view_download_uri):
     57        (webkit_web_view_get_tls_info):
     58        (webkit_web_view_get_snapshot):
     59        (webkit_web_view_set_background_color):
     60        (webkit_web_view_get_background_color):
     61        (webkit_web_view_is_editable):
     62        (webkit_web_view_set_editable):
     63        (webkit_web_view_get_editor_state):
     64        (webkit_web_view_get_session_state):
     65        (webkit_web_view_restore_session_state):
     66
    1672017-06-12  Carlos Garcia Campos  <cgarcia@igalia.com>
    268

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r218064 r218097  
    221221WEBKIT_DEFINE_TYPE(WebKitWebView, webkit_web_view, WEBKIT_TYPE_WEB_VIEW_BASE)
    222222
    223 static inline WebPageProxy* getPage(WebKitWebView* webView)
    224 {
    225     return webkitWebViewBaseGetPage(reinterpret_cast<WebKitWebViewBase*>(webView));
     223static inline WebPageProxy& getPage(WebKitWebView* webView)
     224{
     225    auto* page = webkitWebViewBaseGetPage(reinterpret_cast<WebKitWebViewBase*>(webView));
     226    ASSERT(page);
     227    return *page;
    226228}
    227229
    … …  
    254256    void didChangeIsLoading() override
    255257    {
    256         webkitWebViewSetIsLoading(m_webView, getPage(m_webView)->pageLoadState().isLoading());
     258        webkitWebViewSetIsLoading(m_webView, getPage(m_webView).pageLoadState().isLoading());
    257259        g_object_thaw_notify(G_OBJECT(m_webView));
    258260    }
    … …  
    264266    void didChangeTitle() override
    265267    {
    266         m_webView->priv->title = getPage(m_webView)->pageLoadState().title().utf8();
     268        m_webView->priv->title = getPage(m_webView).pageLoadState().title().utf8();
    267269        g_object_notify(G_OBJECT(m_webView), "title");
    268270        g_object_thaw_notify(G_OBJECT(m_webView));
    … …  
    275277    void didChangeActiveURL() override
    276278    {
    277         m_webView->priv->activeURI = getPage(m_webView)->pageLoadState().activeURL().utf8();
     279        m_webView->priv->activeURI = getPage(m_webView).pageLoadState().activeURL().utf8();
    278280        g_object_notify(G_OBJECT(m_webView), "uri");
    279281        g_object_thaw_notify(G_OBJECT(m_webView));
    … …  
    332334    if (secondaryText)
    333335        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", secondaryText);
    334     GUniquePtr<char> title(g_strdup_printf("JavaScript - %s", getPage(webView)->pageLoadState().url().utf8().data()));
     336    GUniquePtr<char> title(g_strdup_printf("JavaScript - %s", getPage(webView).pageLoadState().url().utf8().data()));
    335337    gtk_window_set_title(GTK_WINDOW(dialog), title.get());
    336338    if (buttons != GTK_BUTTONS_NONE)
    … …  
    408410static void allowModalDialogsChanged(WebKitSettings* settings, GParamSpec*, WebKitWebView* webView)
    409411{
    410     WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
    411     if (!page)
    412         return;
    413     getPage(webView)->setCanRunModal(webkit_settings_get_allow_modal_dialogs(settings));
     412    getPage(webView).setCanRunModal(webkit_settings_get_allow_modal_dialogs(settings));
    414413}
    415414
    416415static void zoomTextOnlyChanged(WebKitSettings* settings, GParamSpec*, WebKitWebView* webView)
    417416{
    418     WebPageProxy* page = getPage(webView);
     417    auto& page = getPage(webView);
    419418    gboolean zoomTextOnly = webkit_settings_get_zoom_text_only(settings);
    420     gdouble pageZoomLevel = zoomTextOnly ? 1 : page->textZoomFactor();
    421     gdouble textZoomLevel = zoomTextOnly ? page->pageZoomFactor() : 1;
    422     page->setPageAndTextZoomFactors(pageZoomLevel, textZoomLevel);
     419    gdouble pageZoomLevel = zoomTextOnly ? 1 : page.textZoomFactor();
     420    gdouble textZoomLevel = zoomTextOnly ? page.pageZoomFactor() : 1;
     421    page.setPageAndTextZoomFactors(pageZoomLevel, textZoomLevel);
    423422}
    424423
    425424static void userAgentChanged(WebKitSettings* settings, GParamSpec*, WebKitWebView* webView)
    426425{
    427     getPage(webView)->setCustomUserAgent(String::fromUTF8(webkit_settings_get_user_agent(settings)));
     426    getPage(webView).setCustomUserAgent(String::fromUTF8(webkit_settings_get_user_agent(settings)));
    428427}
    429428
    … …  
    486485}
    487486
     487static bool webkitWebViewIsConstructed(WebKitWebView* webView)
     488{
     489    // The loadObserver is set in webkitWebViewConstructed, right after the
     490    // WebPageProxy is created, so we use it to check if the view has been
     491    // constructed instead of adding a boolean member only for that.
     492    return !!webView->priv->loadObserver;
     493}
     494
    488495static void webkitWebViewUpdateSettings(WebKitWebView* webView)
    489496{
    … …  
    491498    // case webkit_web_view_set_settings() will be called *before* the
    492499    // WebPageProxy has been created so we should do an early return.
    493     WebPageProxy* page = getPage(webView);
    494     if (!page)
     500    if (!webkitWebViewIsConstructed(webView))
    495501        return;
    496502
     503    auto& page = getPage(webView);
    497504    WebKitSettings* settings = webView->priv->settings.get();
    498     page->setPreferences(*webkitSettingsGetPreferences(settings));
    499     page->setCanRunModal(webkit_settings_get_allow_modal_dialogs(settings));
    500     page->setCustomUserAgent(String::fromUTF8(webkit_settings_get_user_agent(settings)));
     505    page.setPreferences(*webkitSettingsGetPreferences(settings));
     506    page.setCanRunModal(webkit_settings_get_allow_modal_dialogs(settings));
     507    page.setCustomUserAgent(String::fromUTF8(webkit_settings_get_user_agent(settings)));
    501508
    502509    g_signal_connect(settings, "notify::allow-modal-dialogs", G_CALLBACK(allowModalDialogsChanged), webView);
    … …  
    507514static void webkitWebViewDisconnectSettingsSignalHandlers(WebKitWebView* webView)
    508515{
     516    if (!webkitWebViewIsConstructed(webView))
     517        return;
     518
    509519    WebKitSettings* settings = webView->priv->settings.get();
    510520    g_signal_handlers_disconnect_by_func(settings, reinterpret_cast<gpointer>(allowModalDialogsChanged), webView);
    … …  
    684694
    685695    priv->loadObserver = std::make_unique<PageLoadStateObserver>(webView);
    686     getPage(webView)->pageLoadState().addObserver(*priv->loadObserver);
     696    getPage(webView).pageLoadState().addObserver(*priv->loadObserver);
    687697
    688698    // The related view is only valid during the construction.
    … …  
    699709    webkitWebViewUpdateSettings(webView);
    700710
    701     priv->backForwardList = adoptGRef(webkitBackForwardListCreate(&getPage(webView)->backForwardList()));
     711    priv->backForwardList = adoptGRef(webkitBackForwardListCreate(&getPage(webView).backForwardList()));
    702712    priv->windowProperties = adoptGRef(webkitWindowPropertiesCreate());
    703713}
    … …  
    802812
    803813    if (webView->priv->loadObserver) {
    804         getPage(webView)->pageLoadState().removeObserver(*webView->priv->loadObserver);
     814        getPage(webView).pageLoadState().removeObserver(*webView->priv->loadObserver);
    805815        webView->priv->loadObserver.reset();
    806816
    … …  
    19451955    webkitWindowPropertiesUpdateFromWebWindowFeatures(newWebView->priv->windowProperties.get(), windowFeatures);
    19461956
    1947     RefPtr<WebPageProxy> newPage = getPage(newWebView);
     1957    RefPtr<WebPageProxy> newPage = &getPage(newWebView);
    19481958    return newPage.leakRef();
    19491959}
    … …  
    21752185        return;
    21762186
    2177     webkitEditorStateChanged(webView->priv->editorState.get(), getPage(webView)->editorState());
     2187    webkitEditorStateChanged(webView->priv->editorState.get(), getPage(webView).editorState());
    21782188}
    21792189
    … …  
    24052415{
    24062416    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    2407     if (getPage(webView)->tryClose())
     2417    if (getPage(webView).tryClose())
    24082418        webkitWebViewClosePage(webView);
    24092419}
    … …  
    24242434
    24252435    GUniquePtr<SoupURI> soupURI(soup_uri_new(uri));
    2426     getPage(webView)->loadRequest(URL(soupURI.get()));
     2436    getPage(webView).loadRequest(URL(soupURI.get()));
    24272437}
    24282438
    … …  
    24482458    g_return_if_fail(content);
    24492459
    2450     getPage(webView)->loadHTMLString(String::fromUTF8(content), String::fromUTF8(baseURI));
     2460    getPage(webView).loadHTMLString(String::fromUTF8(content), String::fromUTF8(baseURI));
    24512461}
    24522462
    … …  
    24702480    g_return_if_fail(contentURI);
    24712481
    2472     getPage(webView)->loadAlternateHTMLString(String::fromUTF8(content), String::fromUTF8(baseURI), String::fromUTF8(contentURI));
     2482    getPage(webView).loadAlternateHTMLString(String::fromUTF8(content), String::fromUTF8(baseURI), String::fromUTF8(contentURI));
    24732483}
    24742484
    … …  
    24872497    g_return_if_fail(plainText);
    24882498
    2489     getPage(webView)->loadPlainTextString(String::fromUTF8(plainText));
     2499    getPage(webView).loadPlainTextString(String::fromUTF8(plainText));
    24902500}
    24912501
    … …  
    25252535
    25262536    Ref<API::Data> data = API::Data::createWithoutCopying(static_cast<const unsigned char*>(bytesData), bytesDataSize, releaseGBytes, bytes);
    2527     getPage(webView)->loadData(data.ptr(), mimeType ? String::fromUTF8(mimeType) : String::fromUTF8("text/html"),
     2537    getPage(webView).loadData(data.ptr(), mimeType ? String::fromUTF8(mimeType) : String::fromUTF8("text/html"),
    25282538        encoding ? String::fromUTF8(encoding) : String::fromUTF8("UTF-8"), String::fromUTF8(baseURI));
    25292539}
    … …  
    25452555    ResourceRequest resourceRequest;
    25462556    webkitURIRequestGetResourceRequest(request, resourceRequest);
    2547     getPage(webView)->loadRequest(resourceRequest);
     2557    getPage(webView).loadRequest(resourceRequest);
    25482558}
    25492559
    … …  
    25612571    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
    25622572
    2563     return getPage(webView)->pageID();
     2573    return getPage(webView).pageID();
    25642574}
    25652575
    … …  
    25922602    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    25932603
    2594     getPage(webView)->reload({ });
     2604    getPage(webView).reload({ });
    25952605}
    25962606
    … …  
    26062616    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    26072617
    2608     getPage(webView)->reload(WebCore::ReloadOption::FromOrigin);
     2618    getPage(webView).reload(WebCore::ReloadOption::FromOrigin);
    26092619}
    26102620
    … …  
    26232633    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    26242634
    2625     getPage(webView)->stopLoading();
     2635    getPage(webView).stopLoading();
    26262636}
    26272637
    … …  
    26642674    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    26652675
    2666     return getPage(webView)->isPlayingAudio();
     2676    return getPage(webView).isPlayingAudio();
    26672677}
    26682678
    … …  
    26792689    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    26802690
    2681     getPage(webView)->goBack();
     2691    getPage(webView).goBack();
    26822692}
    26832693
    … …  
    26942704    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    26952705
    2696     return !!getPage(webView)->backForwardList().backItem();
     2706    return !!getPage(webView).backForwardList().backItem();
    26972707}
    26982708
    … …  
    27092719    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    27102720
    2711     getPage(webView)->goForward();
     2721    getPage(webView).goForward();
    27122722}
    27132723
    … …  
    27242734    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    27252735
    2726     return !!getPage(webView)->backForwardList().forwardItem();
     2736    return !!getPage(webView).backForwardList().forwardItem();
    27272737}
    27282738
    … …  
    28252835    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
    28262836
    2827     String customTextEncoding = getPage(webView)->customTextEncodingName();
     2837    String customTextEncoding = getPage(webView).customTextEncodingName();
    28282838    if (customTextEncoding.isEmpty())
    28292839        return 0;
    … …  
    28482858    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    28492859
    2850     getPage(webView)->setCustomTextEncodingName(String::fromUTF8(charset));
     2860    getPage(webView).setCustomTextEncodingName(String::fromUTF8(charset));
    28512861}
    28522862
    … …  
    28652875{
    28662876    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
    2867     return getPage(webView)->pageLoadState().estimatedProgress();
     2877    return getPage(webView).pageLoadState().estimatedProgress();
    28682878}
    28692879
    … …  
    28982908    g_return_if_fail(WEBKIT_IS_BACK_FORWARD_LIST_ITEM(listItem));
    28992909
    2900     getPage(webView)->goToBackForwardItem(webkitBackForwardListItemGetItem(listItem));
     2910    getPage(webView).goToBackForwardItem(webkitBackForwardListItemGetItem(listItem));
    29012911}
    29022912
    … …  
    29892999        return;
    29903000
    2991     WebPageProxy* page = getPage(webView);
     3001    auto& page = getPage(webView);
    29923002    if (webkit_settings_get_zoom_text_only(webView->priv->settings.get()))
    2993         page->setTextZoomFactor(zoomLevel);
     3003        page.setTextZoomFactor(zoomLevel);
    29943004    else
    2995         page->setPageZoomFactor(zoomLevel);
     3005        page.setPageZoomFactor(zoomLevel);
    29963006    g_object_notify(G_OBJECT(webView), "zoom-level");
    29973007}
    … …  
    30103020    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 1);
    30113021
    3012     WebPageProxy* page = getPage(webView);
     3022    auto& page = getPage(webView);
    30133023    gboolean zoomTextOnly = webkit_settings_get_zoom_text_only(webView->priv->settings.get());
    3014     return zoomTextOnly ? page->textZoomFactor() : page->pageZoomFactor();
     3024    return zoomTextOnly ? page.textZoomFactor() : page.pageZoomFactor();
    30153025}
    30163026
    … …  
    30343044
    30353045    GTask* task = g_task_new(webView, cancellable, callback, userData);
    3036     getPage(webView)->validateCommand(String::fromUTF8(command), [task](const String&, bool isEnabled, int32_t, WebKit::CallbackBase::Error) {
     3046    getPage(webView).validateCommand(String::fromUTF8(command), [task](const String&, bool isEnabled, int32_t, WebKit::CallbackBase::Error) {
    30373047        g_task_return_boolean(adoptGRef(task).get(), isEnabled);       
    30383048    });
    … …  
    30713081    g_return_if_fail(command);
    30723082
    3073     getPage(webView)->executeEditCommand(String::fromUTF8(command));
     3083    getPage(webView).executeEditCommand(String::fromUTF8(command));
    30743084}
    30753085
    … …  
    30923102    g_return_if_fail(argument);
    30933103
    3094     getPage(webView)->executeEditCommand(String::fromUTF8(command), String::fromUTF8(argument));
     3104    getPage(webView).executeEditCommand(String::fromUTF8(command), String::fromUTF8(argument));
    30953105}
    30963106
    … …  
    31853195
    31863196    GTask* task = g_task_new(webView, cancellable, callback, userData);
    3187     getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, bool, const WebCore::ExceptionDetails& exceptionDetails, WebKit::CallbackBase::Error) {
     3197    getPage(webView).runJavaScriptInMainFrame(String::fromUTF8(script), [task](API::SerializedScriptValue* serializedScriptValue, bool, const WebCore::ExceptionDetails& exceptionDetails, WebKit::CallbackBase::Error) {
    31883198        webkitWebViewRunJavaScriptCallback(serializedScriptValue, exceptionDetails, adoptGRef(task).get());
    31893199    });
    … …  
    32753285    WebKitWebView* webView = WEBKIT_WEB_VIEW(g_task_get_source_object(task.get()));
    32763286    gpointer outputStreamData = g_memory_output_stream_get_data(G_MEMORY_OUTPUT_STREAM(object));
    3277     getPage(webView)->runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
     3287    getPage(webView).runJavaScriptInMainFrame(String::fromUTF8(reinterpret_cast<const gchar*>(outputStreamData)),
    32783288        [task](API::SerializedScriptValue* serializedScriptValue, bool, const WebCore::ExceptionDetails& exceptionDetails, WebKit::CallbackBase::Error) {
    32793289            webkitWebViewRunJavaScriptCallback(serializedScriptValue, exceptionDetails, task.get());
    … …  
    33653375
    33663376    if (!webView->priv->inspector)
    3367         webView->priv->inspector = adoptGRef(webkitWebInspectorCreate(getPage(webView)->inspector()));
     3377        webView->priv->inspector = adoptGRef(webkitWebInspectorCreate(getPage(webView).inspector()));
    33683378
    33693379    return webView->priv->inspector.get();
    … …  
    33843394    g_return_val_if_fail(mimeType, FALSE);
    33853395
    3386     return getPage(webView)->canShowMIMEType(String::fromUTF8(mimeType));
     3396    return getPage(webView).canShowMIMEType(String::fromUTF8(mimeType));
    33873397}
    33883398
    … …  
    34543464    g_task_set_source_tag(task, reinterpret_cast<gpointer>(webkit_web_view_save));
    34553465    g_task_set_task_data(task, createViewSaveAsyncData(), reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
    3456     getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
     3466    getPage(webView).getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
    34573467        getContentsAsMHTMLDataCallback(data, task);
    34583468    });
    … …  
    35193529    g_task_set_task_data(task, data, reinterpret_cast<GDestroyNotify>(destroyViewSaveAsyncData));
    35203530
    3521     getPage(webView)->getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
     3531    getPage(webView).getContentsAsMHTMLData([task](API::Data* data, WebKit::CallbackBase::Error) {
    35223532        getContentsAsMHTMLDataCallback(data, task);
    35233533    });
    … …  
    35573567    g_return_val_if_fail(uri, nullptr);
    35583568
    3559     GRefPtr<WebKitDownload> download = webkitWebContextStartDownload(webView->priv->context.get(), uri, getPage(webView));
     3569    GRefPtr<WebKitDownload> download = webkitWebContextStartDownload(webView->priv->context.get(), uri, &getPage(webView));
    35603570    return download.leakRef();
    35613571}
    … …  
    35893599    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    35903600
    3591     WebFrameProxy* mainFrame = getPage(webView)->mainFrame();
     3601    WebFrameProxy* mainFrame = getPage(webView).mainFrame();
    35923602    if (!mainFrame)
    35933603        return FALSE;
    … …  
    36773687
    36783688    webView->priv->snapshotResultsMap.set(callbackID, adoptGRef(g_task_new(webView, cancellable, callback, userData)));
    3679     getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), API::Dictionary::create(WTFMove(message)).ptr());
     3689    getPage(webView).postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), API::Dictionary::create(WTFMove(message)).ptr());
    36803690}
    36813691
    … …  
    37433753
    37443754    Color color(*rgba);
    3745     WebPageProxy* page = getPage(webView);
    3746     if (page->backgroundColor() == color)
     3755    auto& page = getPage(webView);
     3756    if (page.backgroundColor() == color)
    37473757        return;
    37483758
    3749     page->setBackgroundColor(color);
    3750     page->setDrawsBackground(color == Color::white);
     3759    page.setBackgroundColor(color);
     3760    page.setDrawsBackground(color == Color::white);
    37513761}
    37523762
    … …  
    37673777    g_return_if_fail(rgba);
    37683778
    3769     *rgba = getPage(webView)->backgroundColor();
     3779    *rgba = getPage(webView).backgroundColor();
    37703780}
    37713781
    … …  
    37873797    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), FALSE);
    37883798
    3789     return getPage(webView)->isEditable();
     3799    return getPage(webView).isEditable();
    37903800}
    37913801
    … …  
    38123822    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    38133823
    3814     if (editable == getPage(webView)->isEditable())
     3824    if (editable == getPage(webView).isEditable())
    38153825        return;
    38163826
    3817     getPage(webView)->setEditable(editable);
     3827    getPage(webView).setEditable(editable);
    38183828
    38193829    g_object_notify(G_OBJECT(webView), "editable");
    … …  
    38353845
    38363846    if (!webView->priv->editorState)
    3837         webView->priv->editorState = adoptGRef(webkitEditorStateCreate(getPage(webView)->editorState()));
     3847        webView->priv->editorState = adoptGRef(webkitEditorStateCreate(getPage(webView).editorState()));
    38383848
    38393849    return webView->priv->editorState.get();
    … …  
    38543864    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), nullptr);
    38553865
    3856     SessionState sessionState = getPage(webView)->sessionState(nullptr);
     3866    SessionState sessionState = getPage(webView).sessionState(nullptr);
    38573867    return webkitWebViewSessionStateCreate(WTFMove(sessionState));
    38583868}
    … …  
    38723882    g_return_if_fail(state);
    38733883
    3874     getPage(webView)->restoreFromSessionState(webkitWebViewSessionStateGetSessionState(state), false);
    3875 }
     3884    getPage(webView).restoreFromSessionState(webkitWebViewSessionStateGetSessionState(state), false);
     3885}
Note: See TracChangeset for help on using the changeset viewer.