Changeset 148294 in webkit


Ignore:
Timestamp:
Apr 12, 2013 11:57:38 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Split GtkAuthenticationDialog in two widgets
https://bugs.webkit.org/show_bug.cgi?id=103644

Reviewed by Xan Lopez.

Source/WebCore:

The current GtkAuthenticationDialog implements both the common
logic and widgets to implement a real GtkDialog and a widget to be
embedded in any container. WebKit1 uses a GtkDialog while WebKit2
embeds the dialog in the WebView. This patch splits the code to
leave in Platform only the code that is actually common, leaving
the widget implementation to the WebKit layer, using a dialog in
WebKit1 and embedding auth widget in the WebView in WebKit2.

  • GNUmakefile.list.am: Add new files to compilation.
  • platform/gtk/GtkAuthenticationDialog.cpp: Removed.
  • platform/gtk/GtkAuthenticationDialog.h: Removed.
  • platform/gtk/WebKitAuthenticationWidget.cpp: Added.

(_WebKitAuthenticationWidgetPrivate):
(packTwoColumnLayoutInBox):
(createLabel):
(createEntry):
(webkitAuthenticationWidgetInitialize):
(webkitAuthenticationWidgetFinalize):
(webkit_authentication_widget_init):
(webkit_authentication_widget_class_init):
(webkitAuthenticationWidgetNew):
(webkitAuthenticationWidgetCreateCredential):
(webkitAuthenticationWidgetGetChallenge):

  • platform/gtk/WebKitAuthenticationWidget.h: Added.

(_WebKitAuthenticationWidget):
(_WebKitAuthenticationWidgetClass):

Source/WebKit/gtk:

  • GNUmakefile.am: Add new files to compilation.
  • WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
Use helper createAuthenticationDialog() to create and show the
auth dialog.

  • webkit/webkitauthenticationdialog.cpp: Added.

(authenticationDialogResponseCallback):
(createAuthenticationDialog):

  • webkit/webkitauthenticationdialog.h: Added.
  • webkit/webkitsoupauthdialog.cpp:

(sessionAuthenticate): Ditto.

Source/WebKit2:

  • GNUmakefile.list.am: Add new files to compilation.
  • UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.cpp: Removed.
  • UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.h: Removed.
  • UIProcess/API/gtk/WebKitAuthenticationDialog.cpp: Added.

(webkitAuthenticationDialogAuthenticate): Use the
AuthenticationChallengeProxy to authenticate and destroy the dialog.
(okButtonClicked): Call webkitAuthenticationDialogAuthenticate()
with the credential.
(cancelButtonClicked): Call
webkitAuthenticationDialogAuthenticate() with a NULL credential to
continue without credential.
(webkitAuthenticationDialogInitialize): Build the UI.
(webkitAuthenticationDialogDraw): Draw a background.
(webkitAuthenticationDialogMap): Grab default button.
(webkitAuthenticationDialogConstructed): Create a GtkStyleContext
with the GtkWindow path to draw the widget background like a real
dialog.
(webkit_authentication_dialog_class_init):
(webkitAuthenticationDialogNew): Create a new
WebKitAuthenticationDialog widget.

  • UIProcess/API/gtk/WebKitAuthenticationDialog.h: Added.
  • UIProcess/API/gtk/WebKitLoaderClient.cpp:
  • UIProcess/API/gtk/WebKitWebView.cpp:

(webkitWebViewHandleAuthenticationChallenge): Create a
WebKitAuthenticationDialog widget and pass add it to the
container.

  • UIProcess/API/gtk/WebKitWebViewBase.cpp:

(_WebKitWebViewBasePrivate): Updated to use the widget directly.
(webkitWebViewChildIsInternalWidget): Ditto.
(webkitWebViewBaseAddAuthenticationDialog): Ditto.
(webkitWebViewBaseCancelAuthenticationDialog): Ditto.
(webkitWebViewBaseContainerRemove): Ditto.
(webkitWebViewBaseContainerForall): Ditto.
(resizeWebKitWebViewBaseFromAllocation): Ditto.
(webkitWebViewBaseFocus): Ditto.
(webkitWebViewBaseDestroy): Destroy the auth widget is present.
(webkit_web_view_base_class_init): Add implementation for
GtkWidgetClass::destroy.

  • UIProcess/API/gtk/WebKitWebViewBasePrivate.h:

Tools:

  • gtk/generate-gtkdoc:

(get_webkit2_options): Do not generate api docs for
WebKitAuthenticationDialog which is private in WebKit2.
(get_webkit1_options): Do not generate api docs for
webkitauthenticationdialog which is private in WebKit1.

Location:
trunk
Files:
6 added
4 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r148291 r148294  
     12013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Split GtkAuthenticationDialog in two widgets
     4        https://bugs.webkit.org/show_bug.cgi?id=103644
     5
     6        Reviewed by Xan Lopez.
     7
     8        The current GtkAuthenticationDialog implements both the common
     9        logic and widgets to implement a real GtkDialog and a widget to be
     10        embedded in any container. WebKit1 uses a GtkDialog while WebKit2
     11        embeds the dialog in the WebView. This patch splits the code to
     12        leave in Platform only the code that is actually common, leaving
     13        the widget implementation to the WebKit layer, using a dialog in
     14        WebKit1 and embedding auth widget in the WebView in WebKit2.
     15
     16        * GNUmakefile.list.am: Add new files to compilation.
     17        * platform/gtk/GtkAuthenticationDialog.cpp: Removed.
     18        * platform/gtk/GtkAuthenticationDialog.h: Removed.
     19        * platform/gtk/WebKitAuthenticationWidget.cpp: Added.
     20        (_WebKitAuthenticationWidgetPrivate):
     21        (packTwoColumnLayoutInBox):
     22        (createLabel):
     23        (createEntry):
     24        (webkitAuthenticationWidgetInitialize):
     25        (webkitAuthenticationWidgetFinalize):
     26        (webkit_authentication_widget_init):
     27        (webkit_authentication_widget_class_init):
     28        (webkitAuthenticationWidgetNew):
     29        (webkitAuthenticationWidgetCreateCredential):
     30        (webkitAuthenticationWidgetGetChallenge):
     31        * platform/gtk/WebKitAuthenticationWidget.h: Added.
     32        (_WebKitAuthenticationWidget):
     33        (_WebKitAuthenticationWidgetClass):
     34
    1352013-04-11  Jer Noble  <jer.noble@apple.com>
    236
  • trunk/Source/WebCore/GNUmakefile.list.am

    r148265 r148294  
    62256225        Source/WebCore/platform/gtk/GRefPtrGtk.cpp \
    62266226        Source/WebCore/platform/gtk/GRefPtrGtk.h \
    6227         Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp \
    6228         Source/WebCore/platform/gtk/GtkAuthenticationDialog.h \
    62296227        Source/WebCore/platform/gtk/GtkClickCounter.cpp \
    62306228        Source/WebCore/platform/gtk/GtkClickCounter.h \
     
    62576255        Source/WebCore/platform/gtk/UserAgentGtk.cpp \
    62586256        Source/WebCore/platform/gtk/UserAgentGtk.h \
     6257        Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp \
     6258        Source/WebCore/platform/gtk/WebKitAuthenticationWidget.h \
    62596259        Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp \
    62606260        Source/WebCore/platform/graphics/gtk/ColorGtk.cpp \
  • trunk/Source/WebCore/platform/gtk/po/POTFILES.in

    r145936 r148294  
    11# List of source files which contain translatable strings.
    22ErrorsGtk.cpp
    3 GtkAuthenticationDialog.cpp
    43LocalizedStringsGtk.cpp
     4WebKitAuthenticationWidget.cpp
    55../graphics/gtk/FullscreenVideoControllerGtk.cpp
    66../../../WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
  • trunk/Source/WebKit/gtk/ChangeLog

    r148159 r148294  
     12013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Split GtkAuthenticationDialog in two widgets
     4        https://bugs.webkit.org/show_bug.cgi?id=103644
     5
     6        Reviewed by Xan Lopez.
     7
     8        * GNUmakefile.am: Add new files to compilation.
     9        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     10        (WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
     11        Use helper createAuthenticationDialog() to create and show the
     12        auth dialog.
     13        * webkit/webkitauthenticationdialog.cpp: Added.
     14        (authenticationDialogResponseCallback):
     15        (createAuthenticationDialog):
     16        * webkit/webkitauthenticationdialog.h: Added.
     17        * webkit/webkitsoupauthdialog.cpp:
     18        (sessionAuthenticate): Ditto.
     19
    1202013-04-10  Benjamin Poulain  <bpoulain@apple.com>
    221
  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r147137 r148294  
    231231        Source/WebKit/gtk/WebCoreSupport/WebViewInputMethodFilter.h \
    232232        Source/WebKit/gtk/webkit/webkitapplicationcache.cpp \
     233        Source/WebKit/gtk/webkit/webkitauthenticationdialog.cpp \
     234        Source/WebKit/gtk/webkit/webkitauthenticationdialog.h \
    233235        Source/WebKit/gtk/webkit/webkitdownload.cpp \
    234236        Source/WebKit/gtk/webkit/webkitdownloadprivate.h \
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r145914 r148294  
    4141#include "FrameTree.h"
    4242#include "FrameView.h"
    43 #include "GtkAuthenticationDialog.h"
    4443#include "GtkPluginWidget.h"
    4544#include "GtkUtilities.h"
     
    6665#include "ScriptController.h"
    6766#include "Settings.h"
     67#include "webkitauthenticationdialog.h"
    6868#include "webkiterror.h"
    6969#include "webkitfavicondatabase.h"
     
    206206
    207207    WebKitWebView* view = webkit_web_frame_get_web_view(m_frame);
    208     GtkAuthenticationDialog::CredentialStorageMode credentialStorageMode;
    209 
     208
     209    CredentialStorageMode credentialStorageMode;
    210210    if (core(view)->settings()->privateBrowsingEnabled())
    211         credentialStorageMode = GtkAuthenticationDialog::DisallowPersistentStorage;
     211        credentialStorageMode = DisallowPersistentStorage;
    212212    else
    213         credentialStorageMode = GtkAuthenticationDialog::AllowPersistentStorage;
     213        credentialStorageMode = AllowPersistentStorage;
    214214
    215215    GtkWidget* toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
    216     GtkWindow* toplevelWindow = widgetIsOnscreenToplevelWindow(toplevel) ? GTK_WINDOW(toplevel) : 0;
    217     GtkAuthenticationDialog* dialog = new GtkAuthenticationDialog(toplevelWindow, challenge, credentialStorageMode);
    218     dialog->show();
     216    GtkWidget* authDialog = createAuthenticationDialog(widgetIsOnscreenToplevelWindow(toplevel) ? GTK_WINDOW(toplevel) : 0, challenge, credentialStorageMode);
     217    gtk_widget_show(authDialog);
    219218}
    220219
  • trunk/Source/WebKit/gtk/webkit/webkitsoupauthdialog.cpp

    r145722 r148294  
    2222
    2323#include "AuthenticationClient.h"
    24 #include "GtkAuthenticationDialog.h"
    2524#include "ResourceHandle.h"
     25#include "webkitauthenticationdialog.h"
    2626#include "webkitmarshal.h"
     27#include <wtf/text/CString.h>
    2728
    2829using namespace WebCore;
     
    143144    client->derefWebKitSoupAuthDialogAuthenticationClient();
    144145
    145     GtkAuthenticationDialog* authDialog = new GtkAuthenticationDialog(toplevel, challenge, GtkAuthenticationDialog::DisallowPersistentStorage);
    146     authDialog->show();
     146    GtkWidget* authDialog = createAuthenticationDialog(toplevel, challenge, DisallowPersistentStorage);
     147    gtk_widget_show(authDialog);
    147148}
    148149
  • trunk/Source/WebKit2/ChangeLog

    r148286 r148294  
     12013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Split GtkAuthenticationDialog in two widgets
     4        https://bugs.webkit.org/show_bug.cgi?id=103644
     5
     6        Reviewed by Xan Lopez.
     7
     8        * GNUmakefile.list.am: Add new files to compilation.
     9        * UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.cpp: Removed.
     10        * UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.h: Removed.
     11        * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp: Added.
     12        (webkitAuthenticationDialogAuthenticate): Use the
     13        AuthenticationChallengeProxy to authenticate and destroy the dialog.
     14        (okButtonClicked): Call webkitAuthenticationDialogAuthenticate()
     15        with the credential.
     16        (cancelButtonClicked): Call
     17        webkitAuthenticationDialogAuthenticate() with a NULL credential to
     18        continue without credential.
     19        (webkitAuthenticationDialogInitialize): Build the UI.
     20        (webkitAuthenticationDialogDraw): Draw a background.
     21        (webkitAuthenticationDialogMap): Grab default button.
     22        (webkitAuthenticationDialogConstructed): Create a GtkStyleContext
     23        with the GtkWindow path to draw the widget background like a real
     24        dialog.
     25        (webkit_authentication_dialog_class_init):
     26        (webkitAuthenticationDialogNew): Create a new
     27        WebKitAuthenticationDialog widget.
     28        * UIProcess/API/gtk/WebKitAuthenticationDialog.h: Added.
     29        * UIProcess/API/gtk/WebKitLoaderClient.cpp:
     30        * UIProcess/API/gtk/WebKitWebView.cpp:
     31        (webkitWebViewHandleAuthenticationChallenge): Create a
     32        WebKitAuthenticationDialog widget and pass add it to the
     33        container.
     34        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
     35        (_WebKitWebViewBasePrivate): Updated to use the widget directly.
     36        (webkitWebViewChildIsInternalWidget): Ditto.
     37        (webkitWebViewBaseAddAuthenticationDialog): Ditto.
     38        (webkitWebViewBaseCancelAuthenticationDialog): Ditto.
     39        (webkitWebViewBaseContainerRemove): Ditto.
     40        (webkitWebViewBaseContainerForall): Ditto.
     41        (resizeWebKitWebViewBaseFromAllocation): Ditto.
     42        (webkitWebViewBaseFocus): Ditto.
     43        (webkitWebViewBaseDestroy): Destroy the auth widget is present.
     44        (webkit_web_view_base_class_init): Add implementation for
     45        GtkWidgetClass::destroy.
     46        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
     47
    1482013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
    249
  • trunk/Source/WebKit2/GNUmakefile.list.am

    r148176 r148294  
    648648        Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h \
    649649        Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp \
    650         Source/WebKit2/UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.cpp \
    651         Source/WebKit2/UIProcess/API/gtk/WebKit2GtkAuthenticationDialog.h \
     650        Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp \
     651        Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.h \
    652652        Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.h \
    653653        Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp \
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp

    r147725 r148294  
    2222#include "WebKitLoaderClient.h"
    2323
    24 #include "WebKit2GtkAuthenticationDialog.h"
    2524#include "WebKitBackForwardListPrivate.h"
    2625#include "WebKitURIResponsePrivate.h"
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r145202 r148294  
    2727#include "WebContextMenuItemData.h"
    2828#include "WebData.h"
     29#include "WebKitAuthenticationDialog.h"
    2930#include "WebKitBackForwardListPrivate.h"
    3031#include "WebKitContextMenuClient.h"
     
    16671668void webkitWebViewHandleAuthenticationChallenge(WebKitWebView* webView, AuthenticationChallengeProxy* authenticationChallenge)
    16681669{
    1669     WebKit2GtkAuthenticationDialog* dialog;
    1670     GtkAuthenticationDialog::CredentialStorageMode credentialStorageMode;
    1671 
     1670    CredentialStorageMode credentialStorageMode;
    16721671    if (webkit_settings_get_enable_private_browsing(webView->priv->settings.get()))
    1673         credentialStorageMode = GtkAuthenticationDialog::DisallowPersistentStorage;
     1672        credentialStorageMode = DisallowPersistentStorage;
    16741673    else
    1675         credentialStorageMode = GtkAuthenticationDialog::AllowPersistentStorage;
    1676 
    1677     dialog = new WebKit2GtkAuthenticationDialog(authenticationChallenge, credentialStorageMode);
    1678     webkitWebViewBaseAddAuthenticationDialog(WEBKIT_WEB_VIEW_BASE(webView), dialog);
    1679     dialog->show();
     1674        credentialStorageMode = AllowPersistentStorage;
     1675
     1676    webkitWebViewBaseAddAuthenticationDialog(WEBKIT_WEB_VIEW_BASE(webView), webkitAuthenticationDialogNew(authenticationChallenge, credentialStorageMode));
    16801677}
    16811678
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r147137 r148294  
    3737#include "WebFullScreenClientGtk.h"
    3838#include "WebInspectorProxy.h"
     39#include "WebKitAuthenticationDialog.h"
    3940#include "WebKitPrivate.h"
    4041#include "WebKitWebViewBaseAccessible.h"
     
    105106    GRefPtr<AtkObject> accessible;
    106107    bool needsResizeOnMap;
    107     WebKit2GtkAuthenticationDialog* authenticationDialog;
     108    GtkWidget* authenticationDialog;
    108109    GtkWidget* inspectorView;
    109110    unsigned inspectorViewHeight;
     
    273274{
    274275    WebKitWebViewBasePrivate* priv = webViewBase->priv;
    275     return widget == priv->inspectorView || (priv->authenticationDialog && priv->authenticationDialog->widget() == widget);
     276    return widget == priv->inspectorView || widget == priv->authenticationDialog;
    276277}
    277278
     
    292293}
    293294
    294 void webkitWebViewBaseAddAuthenticationDialog(WebKitWebViewBase* webViewBase, WebKit2GtkAuthenticationDialog* dialog)
    295 {
    296     webViewBase->priv->authenticationDialog = dialog;
    297     gtk_container_add(GTK_CONTAINER(webViewBase), dialog->widget());
    298     gtk_widget_queue_draw(GTK_WIDGET(webViewBase)); // We need to draw the shadow over the widget.
     295void webkitWebViewBaseAddAuthenticationDialog(WebKitWebViewBase* webViewBase, GtkWidget* dialog)
     296{
     297    WebKitWebViewBasePrivate* priv = webViewBase->priv;
     298    priv->authenticationDialog = dialog;
     299    gtk_container_add(GTK_CONTAINER(webViewBase), dialog);
     300    gtk_widget_show(dialog);
     301
     302    // We need to draw the shadow over the widget.
     303    gtk_widget_queue_draw(GTK_WIDGET(webViewBase));
    299304}
    300305
     
    303308    WebKitWebViewBasePrivate* priv = webViewBase->priv;
    304309    if (priv->authenticationDialog)
    305         priv->authenticationDialog->destroy();
     310        gtk_widget_destroy(priv->authenticationDialog);
    306311}
    307312
     
    324329        priv->inspectorView = 0;
    325330        priv->inspectorViewHeight = 0;
    326     } else if (priv->authenticationDialog && priv->authenticationDialog->widget() == widget) {
     331    } else if (priv->authenticationDialog == widget) {
    327332        priv->authenticationDialog = 0;
    328333    } else {
     
    348353
    349354    if (includeInternals && priv->authenticationDialog)
    350         (*callback)(priv->authenticationDialog->widget(), callbackData);
     355        (*callback)(priv->authenticationDialog, callbackData);
    351356}
    352357
     
    474479    if (priv->authenticationDialog) {
    475480        GtkRequisition naturalSize;
    476         gtk_widget_get_preferred_size(priv->authenticationDialog->widget(), 0, &naturalSize);
     481        gtk_widget_get_preferred_size(priv->authenticationDialog, 0, &naturalSize);
    477482
    478483        GtkAllocation childAllocation = {
     
    482487            naturalSize.height
    483488        };
    484         gtk_widget_size_allocate(priv->authenticationDialog->widget(), &childAllocation);
     489        gtk_widget_size_allocate(priv->authenticationDialog, &childAllocation);
    485490    }
    486491
     
    818823    if (priv->authenticationDialog) {
    819824        gboolean returnValue;
    820         g_signal_emit_by_name(priv->authenticationDialog->widget(), "focus", direction, &returnValue);
     825        g_signal_emit_by_name(priv->authenticationDialog, "focus", direction, &returnValue);
    821826        return returnValue;
    822827    }
    823828
    824829    return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->focus(widget, direction);
     830}
     831
     832static void webkitWebViewBaseDestroy(GtkWidget* widget)
     833{
     834    WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
     835    if (priv->authenticationDialog)
     836        gtk_widget_destroy(priv->authenticationDialog);
     837
     838    GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->destroy(widget);
    825839}
    826840
     
    851865    widgetClass->get_accessible = webkitWebViewBaseGetAccessible;
    852866    widgetClass->parent_set = webkitWebViewBaseParentSet;
     867    widgetClass->destroy = webkitWebViewBaseDestroy;
    853868
    854869    GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

    r138544 r148294  
    3030
    3131#include "WebContextMenuProxyGtk.h"
    32 #include "WebKit2GtkAuthenticationDialog.h"
    3332#include "WebKitPrivate.h"
    3433#include "WebKitWebViewBase.h"
     
    6867void webkitWebViewBaseHandleDownloadRequest(WebKitWebViewBase*, WebKit::DownloadProxy*);
    6968
    70 void webkitWebViewBaseAddAuthenticationDialog(WebKitWebViewBase*, WebKit::WebKit2GtkAuthenticationDialog*);
     69void webkitWebViewBaseAddAuthenticationDialog(WebKitWebViewBase*, GtkWidget* authDialog);
    7170void webkitWebViewBaseCancelAuthenticationDialog(WebKitWebViewBase*);
    7271void webkitWebViewBaseAddWebInspector(WebKitWebViewBase*, GtkWidget* inspector);
  • trunk/Tools/ChangeLog

    r148292 r148294  
     12013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Split GtkAuthenticationDialog in two widgets
     4        https://bugs.webkit.org/show_bug.cgi?id=103644
     5
     6        Reviewed by Xan Lopez.
     7
     8        * gtk/generate-gtkdoc:
     9        (get_webkit2_options): Do not generate api docs for
     10        WebKitAuthenticationDialog which is private in WebKit2.
     11        (get_webkit1_options): Do not generate api docs for
     12        webkitauthenticationdialog which is private in WebKit1.
     13
    1142013-04-12  Ryosuke Niwa  <rniwa@webkit.org>
    215
  • trunk/Tools/gtk/generate-gtkdoc

    r142394 r148294  
    101101                         glob.glob(injected_bundle_src_path('*Private.h')) + \
    102102                         glob.glob(src_path('*Client*')) + \
    103                          glob.glob(src_path('WebKit2GtkAuthenticationDialog.*')) + \
    104103                         glob.glob(src_path('WebKitGeolocationProvider.*')) + \
    105104                         glob.glob(src_path('WebKitTextChecker.*')) + \
     105                         glob.glob(src_path('WebKitAuthenticationDialog.*')) + \
    106106                         glob.glob(src_path('WebKitWebViewBaseAccessible.*')) + \
    107107                         glob.glob(src_path('WebViewBaseInputMethodFilter.*')) + \
     
    139139        'cross_reference_deps' : get_gtkdoc_module_paths(xref_deps),
    140140        'ignored_files': glob.glob(src_path('webkit', '*private.*')) + \
     141                         glob.glob(src_path('webkit', 'webkitauthenticationdialog.*')) + \
    141142                         glob.glob(src_path('webkit', 'webkitspellcheckerenchant.*'))
    142143    })
Note: See TracChangeset for help on using the changeset viewer.