Changeset 164438 in webkit


Ignore:
Timestamp:
Feb 20, 2014 11:31:02 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
​https://bugs.webkit.org/show_bug.cgi?id=127800

Patch by Enrique Ocaña González <​eocanha@igalia.com> on 2014-02-20
Reviewed by Martin Robinson.

Source/WebKit:

  • PlatformGTK.cmake: Removed AssertMatchingEnums.cpp

Source/WebKit/gtk:

  • GNUmakefile.am: Removed AssertMatchingEnums.cpp
  • WebCoreSupport/AssertMatchingEnums.cpp: Removed.
  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Defined and applied type conversions.

(toWebCoreFindOptions):
(DumpRenderTreeSupportGtk::findString):

  • WebCoreSupport/FrameLoaderClientGtk.cpp: Defined and applied type conversions.

(WebKit::toWebKitNetworkError):
(WebKit::FrameLoaderClient::dispatchDidFailLoading):
(WebKit::FrameLoaderClient::dispatchDidFailLoad):
(WebKit::FrameLoaderClient::shouldFallBack):

  • webkit/webkitwebnavigationaction.cpp: Defined and applied type conversions.

(WebKit::kit):
(WebKit::core):

  • webkit/webkitwebsettings.cpp: Defined and applied type conversions.

(WebKit::core):

  • webkit/webkitwebview.cpp: Defined and applied type conversions.

(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues):
(webkit_web_view_dispose):
(webkit_web_view_init):
(webkit_web_view_get_copy_target_list):
(webkit_web_view_get_paste_target_list):

  • webkit/webkitwebviewprivate.h: Added targetList private field, which mirrors PasteboardHelper::defaultPasteboardHelper()->targetList() but with the flags converted to WebKitWebViewTargetInfo

Source/WebKit2:

  • UIProcess/API/gtk/WebKitAuthenticationRequest.cpp: Defined and applied type conversions.

(webkit_authentication_request_get_scheme):

  • UIProcess/API/gtk/WebKitCookieManager.cpp: Defined and applied type conversions.

(toWebKitCookieAcceptPolicy):
(toHTTPCookieAcceptPolicy):
(webkit_cookie_manager_set_persistent_storage):
(webkit_cookie_manager_set_accept_policy):
(webkitCookieManagerGetAcceptPolicyCallback):

  • UIProcess/API/gtk/WebKitCredential.cpp: Defined and applied type conversions.

(toWebKitCredentialPersistence):
(toWebCoreCredentialPersistence):
(webkit_credential_new):
(webkit_credential_get_persistence):

  • UIProcess/API/gtk/WebKitDownload.cpp: Defined and applied type conversions.

(webkitDownloadFailed):

  • UIProcess/API/gtk/WebKitError.cpp: Defined and applied type conversions.
  • UIProcess/API/gtk/WebKitFindController.cpp: Defined and applied type conversions.

(toWebKitFindOptions):
(webKitFindControllerPerform):
(webkit_find_controller_search_next):
(webkit_find_controller_search_previous):

  • UIProcess/API/gtk/WebKitFindController.h: Added new private fields to the enum, needed to match conversions.
  • UIProcess/API/gtk/WebKitInjectedBundleClient.cpp: Defined and applied type conversions.

(didReceiveWebViewMessageFromInjectedBundle):

  • UIProcess/API/gtk/WebKitLoaderClient.cpp: Defined and applied type conversions.

(didFailProvisionalLoadWithErrorForFrame):
(didFailLoadWithErrorForFrame):

  • UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp: Defined and applied type conversions.
  • UIProcess/API/gtk/WebKitPolicyClient.cpp: Defined and applied type conversions.

(toWebKitNavigationType):
(decidePolicyForNavigationAction):
(decidePolicyForNewWindowAction):

  • UIProcess/API/gtk/WebKitPrintOperation.cpp: Defined and applied type conversions.

(drawPagesForPrintingCompleted):

  • UIProcess/API/gtk/WebKitPrivate.cpp: Defined and applied type conversions.

(toWebKitError):
(toWebCoreError):

  • UIProcess/API/gtk/WebKitPrivate.h: Defined and applied type conversions.
  • UIProcess/API/gtk/WebKitURISchemeRequest.cpp: Defined and applied type conversions.

(webkit_uri_scheme_request_finish_error):

  • UIProcess/API/gtk/WebKitWebContext.cpp: Defined and applied type conversions.

(toWebKitProcessModel):
(webkit_web_context_set_process_model):
(webkit_web_context_get_process_model):

  • UIProcess/API/gtk/WebKitWebView.cpp: Defined and applied type conversions.

(toSnapshotRegion):
(webkit_web_view_get_snapshot):

  • UIProcess/API/gtk/WebKitWebViewGroup.cpp: Defined and applied type conversions.

(toWebCoreUserContentInjectedFrames):
(webkit_web_view_group_add_user_style_sheet):

Location:
trunk/Source
Files:
1 deleted
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r164401 r164438  
     12014-02-20  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
     4        https://bugs.webkit.org/show_bug.cgi?id=127800
     5
     6        Reviewed by Martin Robinson.
     7
     8        * PlatformGTK.cmake: Removed AssertMatchingEnums.cpp
     9
    1102014-02-18  Ryosuke Niwa  <rniwa@webkit.org>
    211

  • trunk/Source/WebKit/PlatformGTK.cmake

    r163155 r164438  
    4141
    4242    gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
    43     gtk/WebCoreSupport/AssertMatchingEnums.cpp
    4443    gtk/WebCoreSupport/ChromeClientGtk.cpp
    4544    gtk/WebCoreSupport/ContextMenuClientGtk.cpp

  • trunk/Source/WebKit/gtk/ChangeLog

    r164245 r164438  
     12014-02-20  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
     4        https://bugs.webkit.org/show_bug.cgi?id=127800
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Removed AssertMatchingEnums.cpp
     9        * WebCoreSupport/AssertMatchingEnums.cpp: Removed.
     10        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Defined and applied type conversions.
     11        (toWebCoreFindOptions):
     12        (DumpRenderTreeSupportGtk::findString):
     13        * WebCoreSupport/FrameLoaderClientGtk.cpp: Defined and applied type conversions.
     14        (WebKit::toWebKitNetworkError):
     15        (WebKit::FrameLoaderClient::dispatchDidFailLoading):
     16        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
     17        (WebKit::FrameLoaderClient::shouldFallBack):
     18        * webkit/webkitwebnavigationaction.cpp: Defined and applied type conversions.
     19        (WebKit::kit):
     20        (WebKit::core):
     21        * webkit/webkitwebsettings.cpp: Defined and applied type conversions.
     22        (WebKit::core):
     23        * webkit/webkitwebview.cpp: Defined and applied type conversions.
     24        (copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues):
     25        (webkit_web_view_dispose):
     26        (webkit_web_view_init):
     27        (webkit_web_view_get_copy_target_list):
     28        (webkit_web_view_get_paste_target_list):
     29        * webkit/webkitwebviewprivate.h: Added targetList private field, which mirrors PasteboardHelper::defaultPasteboardHelper()->targetList() but with the flags converted to WebKitWebViewTargetInfo
     30
    1312014-02-17  Sergio Correia  <sergio.correia@openbossa.org>
    232

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r163440 r164438  
    191191        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
    192192        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
    193         Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
    194193        Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp \
    195194        Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h \

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r164131 r164438  
    8787DumpRenderTreeSupportGtk::AuthenticationCallback DumpRenderTreeSupportGtk::s_authenticationCallback = 0;
    8888
     89static inline WebCore::FindOptions toWebCoreFindOptions(WebKitFindOptions type)
     90{
     91    return static_cast<WebCore::FindOptions>((type & WebFindOptionsCaseInsensitive ? CaseInsensitive : 0)
     92        | (type & WebFindOptionsAtWordStarts ? AtWordStarts : 0)
     93        | (type & WebFindOptionsTreatMedialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0)
     94        | (type & WebFindOptionsBackwards ? Backwards : 0)
     95        | (type & WebFindOptionsWrapAround ? WrapAround : 0)
     96        | (type & WebFindOptionsStartInSelection ? StartInSelection : 0));
     97}
     98
    8999DumpRenderTreeSupportGtk::DumpRenderTreeSupportGtk()
    90100{
    … …  
    476486bool DumpRenderTreeSupportGtk::findString(WebKitWebView* webView, const gchar* targetString, WebKitFindOptions findOptions)
    477487{
    478     return core(webView)->findString(String::fromUTF8(targetString), findOptions);
     488    return core(webView)->findString(String::fromUTF8(targetString), toWebCoreFindOptions(findOptions));
    479489}
    480490

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r163797 r164438  
    105105namespace WebKit {
    106106
     107inline int toWebKitNetworkError(int errorCode)
     108{
     109    switch (errorCode) {
     110    case NetworkErrorFailed:
     111        return WEBKIT_NETWORK_ERROR_FAILED;
     112    case NetworkErrorTransport:
     113        return WEBKIT_NETWORK_ERROR_TRANSPORT;
     114    case NetworkErrorUnknownProtocol:
     115        return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
     116    case NetworkErrorCancelled:
     117        return WEBKIT_NETWORK_ERROR_CANCELLED;
     118    case NetworkErrorFileDoesNotExist:
     119        return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
     120    case PolicyErrorFailed:
     121        return WEBKIT_POLICY_ERROR_FAILED;
     122    case PolicyErrorCannotShowMimeType:
     123        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
     124    case PolicyErrorCannotShowURL:
     125        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL;
     126    case PolicyErrorFrameLoadInterruptedByPolicyChange:
     127        return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
     128    case PolicyErrorCannotUseRestrictedPort:
     129        return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
     130    case PluginErrorFailed:
     131        return WEBKIT_PLUGIN_ERROR_FAILED;
     132    case PluginErrorCannotFindPlugin:
     133        return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
     134    case PluginErrorCannotLoadPlugin:
     135        return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
     136    case PluginErrorJavaUnavailable:
     137        return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
     138    case PluginErrorConnectionCancelled:
     139        return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
     140    case PluginErrorWillHandleLoad:
     141        return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
     142    default:
     143        ASSERT_NOT_REACHED();
     144        return WEBKIT_NETWORK_ERROR_FAILED;
     145    }
     146}
     147
    107148FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
    108149    : m_frame(frame)
    … …  
    9931034
    9941035    GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(error.domain().utf8().data()),
    995         error.errorCode(), error.localizedDescription().utf8().data()));
     1036        toWebKitNetworkError(error.errorCode()), error.localizedDescription().utf8().data()));
    9961037
    9971038    g_signal_emit_by_name(webResource, "load-failed", webError.get());
    … …  
    10211062
    10221063    WebKitWebView* webView = getViewFromFrame(m_frame);
     1064
    10231065    GUniquePtr<GError> webError(g_error_new_literal(
    10241066        g_quark_from_string(error.domain().utf8().data()),
    1025         error.errorCode(),
     1067        toWebKitNetworkError(error.errorCode()),
    10261068        error.localizedDescription().utf8().data()));
    10271069    gboolean isHandled = false;
    … …  
    10951137bool FrameLoaderClient::shouldFallBack(const ResourceError& error)
    10961138{
    1097     return !(error.isCancellation() || error.errorCode() == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE || error.errorCode() == WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD);
     1139    return !(error.isCancellation() || error.errorCode() == PolicyErrorFrameLoadInterruptedByPolicyChange || error.errorCode() == PluginErrorWillHandleLoad);
    10981140}
    10991141

  • trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp

    r147557 r164438  
    365365WebKitWebNavigationReason kit(WebCore::NavigationType type)
    366366{
    367     return (WebKitWebNavigationReason)type;
     367    switch(type) {
     368    case WebCore::NavigationTypeLinkClicked:
     369        return WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED;
     370    case WebCore::NavigationTypeFormSubmitted:
     371        return WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED;
     372    case WebCore::NavigationTypeBackForward:
     373        return WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD;
     374    case WebCore::NavigationTypeReload:
     375        return WEBKIT_WEB_NAVIGATION_REASON_RELOAD;
     376    case WebCore::NavigationTypeFormResubmitted:
     377        return WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED;
     378    case WebCore::NavigationTypeOther:
     379        return WEBKIT_WEB_NAVIGATION_REASON_OTHER;
     380    default:
     381        ASSERT_NOT_REACHED();
     382        return WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED;
     383    }
    368384}
    369385
    370386WebCore::NavigationType core(WebKitWebNavigationReason type)
    371387{
    372     return static_cast<WebCore::NavigationType>(type);
    373 }
    374 
    375 }
     388    switch(type) {
     389    case WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED:
     390        return WebCore::NavigationTypeLinkClicked;
     391    case WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED:
     392        return WebCore::NavigationTypeFormSubmitted;
     393    case WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD:
     394        return WebCore::NavigationTypeBackForward;
     395    case WEBKIT_WEB_NAVIGATION_REASON_RELOAD:
     396        return WebCore::NavigationTypeReload;
     397    case WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED:
     398        return WebCore::NavigationTypeFormResubmitted;
     399    case WEBKIT_WEB_NAVIGATION_REASON_OTHER:
     400        return WebCore::NavigationTypeOther;
     401    default:
     402        ASSERT_NOT_REACHED();
     403        return WebCore::NavigationTypeLinkClicked;
     404    }
     405}
     406
     407}

  • trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp

    r163433 r164438  
    16591659namespace WebKit {
    16601660
    1661 WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
     1661inline WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
    16621662{
    1663     return static_cast<WebCore::EditingBehaviorType>(type);
     1663    switch (type) {
     1664    case WEBKIT_EDITING_BEHAVIOR_MAC:
     1665        return EditingMacBehavior;
     1666    case WEBKIT_EDITING_BEHAVIOR_WINDOWS:
     1667        return EditingWindowsBehavior;
     1668    case WEBKIT_EDITING_BEHAVIOR_UNIX:
     1669        return EditingUnixBehavior;
     1670    default:
     1671        ASSERT_NOT_REACHED();
     1672        return EditingMacBehavior;
     1673    }
    16641674}
    16651675

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r164235 r164438  
    120120#include <gdk/gdkkeysyms.h>
    121121#include <glib/gi18n-lib.h>
     122#include <gtk/gtk.h>
    122123#include <wtf/text/CString.h>
    123124
    … …  
    283284static void webkitWebViewDirectionChanged(WebKitWebView*, GtkTextDirection previousDirection, gpointer);
    284285
     286static inline WebKitWebViewTargetInfo toWebKitWebViewTargetInfo(PasteboardHelper::PasteboardTargetType flags)
     287{
     288    switch (flags) {
     289    case PasteboardHelper::TargetTypeMarkup:
     290        return WEBKIT_WEB_VIEW_TARGET_INFO_HTML;
     291        break;
     292    case PasteboardHelper::TargetTypeText:
     293        return WEBKIT_WEB_VIEW_TARGET_INFO_TEXT;
     294        break;
     295    case PasteboardHelper::TargetTypeImage:
     296        return WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE;
     297        break;
     298    case PasteboardHelper::TargetTypeURIList:
     299        return WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST;
     300        break;
     301    case PasteboardHelper::TargetTypeNetscapeURL:
     302        return WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL;
     303        break;
     304    default:
     305        ASSERT_NOT_REACHED();
     306        return WEBKIT_WEB_VIEW_TARGET_INFO_HTML;
     307    }
     308}
     309
     310static GtkTargetList* copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(GtkTargetList* coreGtkTargetList)
     311{
     312    g_return_val_if_fail(coreGtkTargetList, nullptr);
     313
     314    GtkTargetList* targetListWithWebKitEnumValues = nullptr;
     315    int tableSize = 0;
     316    GtkTargetEntry* table(gtk_target_table_new_from_list(coreGtkTargetList, &tableSize));
     317
     318    for (int i = 0; i < tableSize; i++)
     319        table[i].flags = toWebKitWebViewTargetInfo(static_cast<PasteboardHelper::PasteboardTargetType>(table[i].flags));
     320
     321    targetListWithWebKitEnumValues = gtk_target_list_new(table, tableSize);
     322    gtk_target_table_free(table, tableSize);
     323
     324    return targetListWithWebKitEnumValues;
     325}
     326
    285327#if ENABLE(CONTEXT_MENUS)
    286328static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pushIn, gpointer userData)
    … …  
    13811423    priv->mainResource.clear();
    13821424    priv->subResources.clear();
     1425    priv->targetList.clear();
    13831426
    13841427    G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
    … …  
    38743917    priv->subResources = adoptGRef(g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref));
    38753918
     3919    priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
     3920
    38763921#if ENABLE(DRAG_SUPPORT)
    38773922    priv->dragAndDropHelper.setWidget(GTK_WIDGET(webView));
    38783923    gtk_drag_dest_set(GTK_WIDGET(webView), static_cast<GtkDestDefaults>(0), 0, 0, static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE));
    3879     gtk_drag_dest_set_target_list(GTK_WIDGET(webView), PasteboardHelper::defaultPasteboardHelper()->targetList());
     3924    gtk_drag_dest_set_target_list(GTK_WIDGET(webView), priv->targetList.get());
    38803925#endif
    38813926
    … …  
    46924737GtkTargetList* webkit_web_view_get_copy_target_list(WebKitWebView* webView)
    46934738{
    4694     return PasteboardHelper::defaultPasteboardHelper()->targetList();
     4739    webView->priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
     4740    return webView->priv->targetList.get();
    46954741}
    46964742
    … …  
    47094755GtkTargetList* webkit_web_view_get_paste_target_list(WebKitWebView* webView)
    47104756{
    4711     return PasteboardHelper::defaultPasteboardHelper()->targetList();
     4757    webView->priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
     4758    return webView->priv->targetList.get();
    47124759}
    47134760

  • trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h

    r163079 r164438  
    101101    WebCore::GtkDragAndDropHelper dragAndDropHelper;
    102102    bool selfScrolling;
     103    GRefPtr<GtkTargetList> targetList;
    103104
    104105    OwnPtr<WebKit::AcceleratedCompositingContext> acceleratedCompositingContext;

  • trunk/Source/WebKit2/ChangeLog

    r164424 r164438  
     12014-02-20  Enrique Ocaña González  <eocanha@igalia.com>
     2
     3        WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
     4        https://bugs.webkit.org/show_bug.cgi?id=127800
     5
     6        Reviewed by Martin Robinson.
     7
     8        * UIProcess/API/gtk/WebKitAuthenticationRequest.cpp: Defined and applied type conversions.
     9        (webkit_authentication_request_get_scheme):
     10        * UIProcess/API/gtk/WebKitCookieManager.cpp: Defined and applied type conversions.
     11        (toWebKitCookieAcceptPolicy):
     12        (toHTTPCookieAcceptPolicy):
     13        (webkit_cookie_manager_set_persistent_storage):
     14        (webkit_cookie_manager_set_accept_policy):
     15        (webkitCookieManagerGetAcceptPolicyCallback):
     16        * UIProcess/API/gtk/WebKitCredential.cpp: Defined and applied type conversions.
     17        (toWebKitCredentialPersistence):
     18        (toWebCoreCredentialPersistence):
     19        (webkit_credential_new):
     20        (webkit_credential_get_persistence):
     21        * UIProcess/API/gtk/WebKitDownload.cpp: Defined and applied type conversions.
     22        (webkitDownloadFailed):
     23        * UIProcess/API/gtk/WebKitError.cpp: Defined and applied type conversions.
     24        * UIProcess/API/gtk/WebKitFindController.cpp: Defined and applied type conversions.
     25        (toWebKitFindOptions):
     26        (webKitFindControllerPerform):
     27        (webkit_find_controller_search_next):
     28        (webkit_find_controller_search_previous):
     29        * UIProcess/API/gtk/WebKitFindController.h: Added new private fields to the enum, needed to match conversions.
     30        * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp: Defined and applied type conversions.
     31        (didReceiveWebViewMessageFromInjectedBundle):
     32        * UIProcess/API/gtk/WebKitLoaderClient.cpp: Defined and applied type conversions.
     33        (didFailProvisionalLoadWithErrorForFrame):
     34        (didFailLoadWithErrorForFrame):
     35        * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp: Defined and applied type conversions.
     36        * UIProcess/API/gtk/WebKitPolicyClient.cpp: Defined and applied type conversions.
     37        (toWebKitNavigationType):
     38        (decidePolicyForNavigationAction):
     39        (decidePolicyForNewWindowAction):
     40        * UIProcess/API/gtk/WebKitPrintOperation.cpp: Defined and applied type conversions.
     41        (drawPagesForPrintingCompleted):
     42        * UIProcess/API/gtk/WebKitPrivate.cpp: Defined and applied type conversions.
     43        (toWebKitError):
     44        (toWebCoreError):
     45        * UIProcess/API/gtk/WebKitPrivate.h: Defined and applied type conversions.
     46        * UIProcess/API/gtk/WebKitURISchemeRequest.cpp: Defined and applied type conversions.
     47        (webkit_uri_scheme_request_finish_error):
     48        * UIProcess/API/gtk/WebKitWebContext.cpp: Defined and applied type conversions.
     49        (toWebKitProcessModel):
     50        (webkit_web_context_set_process_model):
     51        (webkit_web_context_get_process_model):
     52        * UIProcess/API/gtk/WebKitWebView.cpp: Defined and applied type conversions.
     53        (toSnapshotRegion):
     54        (webkit_web_view_get_snapshot):
     55        * UIProcess/API/gtk/WebKitWebViewGroup.cpp: Defined and applied type conversions.
     56        (toWebCoreUserContentInjectedFrames):
     57        (webkit_web_view_group_add_user_style_sheet):
     58
    1592014-02-20  Csaba Osztrogonác  <ossy@webkit.org>
    260

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

    r155347 r164438  
    6868static guint signals[LAST_SIGNAL] = { 0, };
    6969
    70 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_DEFAULT, ProtectionSpaceAuthenticationSchemeDefault);
    71 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTTP_BASIC, ProtectionSpaceAuthenticationSchemeHTTPBasic);
    72 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTTP_DIGEST, ProtectionSpaceAuthenticationSchemeHTTPDigest);
    73 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTML_FORM, ProtectionSpaceAuthenticationSchemeHTMLForm);
    74 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_NTLM, ProtectionSpaceAuthenticationSchemeNTLM);
    75 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_NEGOTIATE, ProtectionSpaceAuthenticationSchemeNegotiate);
    76 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_CLIENT_CERTIFICATE_REQUESTED, ProtectionSpaceAuthenticationSchemeClientCertificateRequested);
    77 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_SERVER_TRUST_EVALUATION_REQUESTED, ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested);
    78 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN, ProtectionSpaceAuthenticationSchemeUnknown);
    79 
    8070WEBKIT_DEFINE_TYPE(WebKitAuthenticationRequest, webkit_authentication_request, G_TYPE_OBJECT)
     71
     72static inline WebKitAuthenticationScheme toWebKitAuthenticationScheme(WebCore::ProtectionSpaceAuthenticationScheme coreScheme)
     73{
     74    switch (coreScheme) {
     75    case WebCore::ProtectionSpaceAuthenticationSchemeDefault:
     76        return WEBKIT_AUTHENTICATION_SCHEME_DEFAULT;
     77    case WebCore::ProtectionSpaceAuthenticationSchemeHTTPBasic:
     78        return WEBKIT_AUTHENTICATION_SCHEME_HTTP_BASIC;
     79    case WebCore::ProtectionSpaceAuthenticationSchemeHTTPDigest:
     80        return WEBKIT_AUTHENTICATION_SCHEME_HTTP_DIGEST;
     81    case WebCore::ProtectionSpaceAuthenticationSchemeHTMLForm:
     82        return WEBKIT_AUTHENTICATION_SCHEME_HTML_FORM;
     83    case WebCore::ProtectionSpaceAuthenticationSchemeNTLM:
     84        return WEBKIT_AUTHENTICATION_SCHEME_NTLM;
     85    case WebCore::ProtectionSpaceAuthenticationSchemeNegotiate:
     86        return WEBKIT_AUTHENTICATION_SCHEME_NEGOTIATE;
     87    case WebCore::ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
     88        return WEBKIT_AUTHENTICATION_SCHEME_CLIENT_CERTIFICATE_REQUESTED;
     89    case WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
     90        return WEBKIT_AUTHENTICATION_SCHEME_SERVER_TRUST_EVALUATION_REQUESTED;
     91    case WebCore::ProtectionSpaceAuthenticationSchemeUnknown:
     92        return WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN;
     93    default:
     94        ASSERT_NOT_REACHED();
     95        return WEBKIT_AUTHENTICATION_SCHEME_DEFAULT;
     96    }
     97}
    8198
    8299static void webkitAuthenticationRequestDispose(GObject* object)
    … …  
    245262    g_return_val_if_fail(WEBKIT_IS_AUTHENTICATION_REQUEST(request), WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN);
    246263
    247     return static_cast<WebKitAuthenticationScheme>(request->priv->authenticationChallenge->protectionSpace()->authenticationScheme());
     264    return toWebKitAuthenticationScheme(request->priv->authenticationChallenge->protectionSpace()->authenticationScheme());
    248265}
    249266

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

    r164409 r164438  
    6969WEBKIT_DEFINE_TYPE(WebKitCookieManager, webkit_cookie_manager, G_TYPE_OBJECT)
    7070
    71 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT, SoupCookiePersistentStorageText);
    72 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE, SoupCookiePersistentStorageSQLite);
    73 
    74 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS, HTTPCookieAcceptPolicyAlways);
    75 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_NEVER, HTTPCookieAcceptPolicyNever);
    76 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY, HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
     71static inline SoupCookiePersistentStorageType toSoupCookiePersistentStorageType(WebKitCookiePersistentStorage kitStorage)
     72{
     73    switch (kitStorage) {
     74    case WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT:
     75        return SoupCookiePersistentStorageText;
     76    case WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE:
     77        return SoupCookiePersistentStorageSQLite;
     78    default:
     79        ASSERT_NOT_REACHED();
     80        return SoupCookiePersistentStorageText;
     81    }
     82}
     83
     84static inline WebKitCookieAcceptPolicy toWebKitCookieAcceptPolicy(HTTPCookieAcceptPolicy httpPolicy)
     85{
     86    switch (httpPolicy) {
     87    case HTTPCookieAcceptPolicyAlways:
     88        return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
     89    case HTTPCookieAcceptPolicyNever:
     90        return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
     91    case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
     92        return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
     93    default:
     94        ASSERT_NOT_REACHED();
     95        return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
     96    }
     97}
     98
     99static inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WebKitCookieAcceptPolicy kitPolicy)
     100{
     101    switch (kitPolicy) {
     102    case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
     103        return HTTPCookieAcceptPolicyAlways;
     104    case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
     105        return HTTPCookieAcceptPolicyNever;
     106    case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
     107        return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
     108    default:
     109        ASSERT_NOT_REACHED();
     110        return HTTPCookieAcceptPolicyAlways;
     111    }
     112}
    77113
    78114static void webkit_cookie_manager_class_init(WebKitCookieManagerClass* findClass)
    … …  
    138174
    139175    manager->priv->webCookieManager->stopObservingCookieChanges();
    140     manager->priv->webCookieManager->setCookiePersistentStorage(String::fromUTF8(filename), storage);
     176    manager->priv->webCookieManager->setCookiePersistentStorage(String::fromUTF8(filename), toSoupCookiePersistentStorageType(storage));
    141177    manager->priv->webCookieManager->startObservingCookieChanges();
    142178}
    … …  
    153189    g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
    154190
    155     manager->priv->webCookieManager->setHTTPCookieAcceptPolicy(policy);
     191    manager->priv->webCookieManager->setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
    156192}
    157193
    … …  
    159195{
    160196    GRefPtr<GTask> task = adoptGRef(G_TASK(context));
    161     g_task_return_int(task.get(), policy);
     197    g_task_return_int(task.get(), toWebKitCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy)));
    162198}
    163199

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

    r154589 r164438  
    3838};
    3939
    40 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_NONE, WebCore::CredentialPersistenceNone);
    41 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION, WebCore::CredentialPersistenceForSession);
    42 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT, WebCore::CredentialPersistencePermanent);
    43 
    4440G_DEFINE_BOXED_TYPE(WebKitCredential, webkit_credential, webkit_credential_copy, webkit_credential_free)
     41
     42static inline WebKitCredentialPersistence toWebKitCredentialPersistence(WebCore::CredentialPersistence corePersistence)
     43{
     44    switch (corePersistence) {
     45    case WebCore::CredentialPersistenceNone:
     46        return WEBKIT_CREDENTIAL_PERSISTENCE_NONE;
     47    case WebCore::CredentialPersistenceForSession:
     48        return WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION;
     49    case WebCore::CredentialPersistencePermanent:
     50        return WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT;
     51    default:
     52        ASSERT_NOT_REACHED();
     53        return WEBKIT_CREDENTIAL_PERSISTENCE_NONE;
     54    }
     55}
     56
     57static inline WebCore::CredentialPersistence toWebCoreCredentialPersistence(WebKitCredentialPersistence kitPersistence)
     58{
     59    switch (kitPersistence) {
     60    case WEBKIT_CREDENTIAL_PERSISTENCE_NONE:
     61        return WebCore::CredentialPersistenceNone;
     62    case WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION:
     63        return WebCore::CredentialPersistenceForSession;
     64    case WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT:
     65        return WebCore::CredentialPersistencePermanent;
     66    default:
     67        ASSERT_NOT_REACHED();
     68        return WebCore::CredentialPersistenceNone;
     69    }
     70}
    4571
    4672WebKitCredential* webkitCredentialCreate(const WebCore::Credential& coreCredential)
    … …  
    74100    g_return_val_if_fail(password, 0);
    75101
    76     return webkitCredentialCreate(WebCore::Credential(String::fromUTF8(username), String::fromUTF8(password), static_cast<WebCore::CredentialPersistence>(persistence)));
     102    return webkitCredentialCreate(WebCore::Credential(String::fromUTF8(username), String::fromUTF8(password), toWebCoreCredentialPersistence(persistence)));
    77103}
    78104
    … …  
    179205    g_return_val_if_fail(credential, WEBKIT_CREDENTIAL_PERSISTENCE_NONE);
    180206
    181     return static_cast<WebKitCredentialPersistence>(credential->credential.persistence());
    182 }
     207    return toWebKitCredentialPersistence(credential->credential.persistence());
     208}

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

    r162599 r164438  
    2424#include "WebKitDownloadPrivate.h"
    2525#include "WebKitMarshal.h"
     26#include "WebKitPrivate.h"
    2627#include "WebKitURIRequestPrivate.h"
    2728#include "WebKitURIResponsePrivate.h"
    … …  
    341342{
    342343    GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
    343         resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
     344        toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    344345    if (download->priv->timer)
    345346        g_timer_stop(download->priv->timer.get());

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

    r148526 r164438  
    4141}
    4242
    43 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FAILED, NetworkErrorFailed);
    44 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_TRANSPORT, NetworkErrorTransport);
    45 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, NetworkErrorUnknownProtocol);
    46 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_CANCELLED, NetworkErrorCancelled);
    47 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, NetworkErrorFileDoesNotExist);
    48 
    4943GQuark webkit_policy_error_quark()
    5044{
    5145    return g_quark_from_static_string(WebCore::errorDomainPolicy);
    5246}
    53 
    54 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FAILED, PolicyErrorFailed);
    55 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, PolicyErrorCannotShowMimeType);
    56 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI, PolicyErrorCannotShowURL);
    57 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, PolicyErrorFrameLoadInterruptedByPolicyChange);
    58 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, PolicyErrorCannotUseRestrictedPort);
    5947
    6048GQuark webkit_plugin_error_quark()
    … …  
    6351}
    6452
    65 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_FAILED, PluginErrorFailed);
    66 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, PluginErrorCannotFindPlugin);
    67 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, PluginErrorCannotLoadPlugin);
    68 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, PluginErrorJavaUnavailable);
    69 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, PluginErrorConnectionCancelled);
    70 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, PluginErrorWillHandleLoad);
    71 
    7253GQuark webkit_download_error_quark()
    7354{
    … …  
    7556}
    7657
    77 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_NETWORK, DownloadErrorNetwork);
    78 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER, DownloadErrorCancelledByUser);
    79 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_DESTINATION, DownloadErrorDestination);
    80 
    8158GQuark webkit_print_error_quark()
    8259{
    8360    return g_quark_from_static_string(WebCore::errorDomainPrint);
    8461}
    85 
    86 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_GENERAL, PrintErrorGeneral);
    87 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND, PrintErrorPrinterNotFound);
    88 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE, PrintErrorInvalidPageRange);
    8962
    9063GQuark webkit_javascript_error_quark()

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

    r160125 r164438  
    8383WEBKIT_DEFINE_TYPE(WebKitFindController, webkit_find_controller, G_TYPE_OBJECT)
    8484
    85 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE, FindOptionsCaseInsensitive);
    86 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_AT_WORD_STARTS, FindOptionsAtWordStarts);
    87 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START, FindOptionsTreatMedialCapitalAsWordStart);
    88 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_BACKWARDS, FindOptionsBackwards);
    89 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_WRAP_AROUND, FindOptionsWrapAround);
     85static inline WebKit::FindOptions toWebKitFindOptions(WebKitFindOptions type)
     86{
     87    return static_cast<WebKit::FindOptions>((type & WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE ? FindOptionsCaseInsensitive : 0)
     88        | (type & WEBKIT_FIND_OPTIONS_AT_WORD_STARTS ? FindOptionsAtWordStarts : 0)
     89        | (type & WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START ? FindOptionsTreatMedialCapitalAsWordStart : 0)
     90        | (type & WEBKIT_FIND_OPTIONS_BACKWARDS ? FindOptionsBackwards : 0)
     91        | (type & WEBKIT_FIND_OPTIONS_WRAP_AROUND ? FindOptionsWrapAround : 0)
     92        | (type & WEBKIT_FIND_OPTIONS_SHOW_OVERLAY ? FindOptionsShowOverlay : 0)
     93        | (type & WEBKIT_FIND_OPTIONS_SHOW_FIND_INDICATOR ? FindOptionsShowFindIndicator : 0)
     94        | (type & WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT ? FindOptionsShowHighlight : 0));
     95}
     96
     97static inline WebKit::FindOptions toWebKitFindOptions(uint32_t type)
     98{
     99    return toWebKitFindOptions(static_cast<WebKitFindOptions>(type));
     100}
    90101
    91102static void didFindString(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo)
    … …  
    350361    if (operation == CountOperation) {
    351362        getPage(findController)->countStringMatches(String::fromUTF8(priv->searchText.data()),
    352                                                     static_cast<WebKit::FindOptions>(priv->findOptions), priv->maxMatchCount);
     363            toWebKitFindOptions(priv->findOptions), priv->maxMatchCount);
    353364        return;
    354365    }
    … …  
    363374        // search_prev() should not enable highlighting to avoid an
    364375        // extra unmarkAllTextMatches() + markAllTextMatches()
    365         findOptions |= FindOptionsShowHighlight;
    366 
    367     getPage(findController)->findString(String::fromUTF8(priv->searchText.data()), static_cast<WebKit::FindOptions>(findOptions),
     376        findOptions |= WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
     377
     378    getPage(findController)->findString(String::fromUTF8(priv->searchText.data()), toWebKitFindOptions(findOptions),
    368379                                        priv->maxMatchCount);
    369380}
    … …  
    426437
    427438    findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_BACKWARDS;
    428     findController->priv->findOptions &= ~FindOptionsShowHighlight;
     439    findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
    429440    webKitFindControllerPerform(findController, FindNextPrevOperation);
    430441}
    … …  
    444455
    445456    findController->priv->findOptions |= WEBKIT_FIND_OPTIONS_BACKWARDS;
    446     findController->priv->findOptions &= ~FindOptionsShowHighlight;
     457    findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
    447458    webKitFindControllerPerform(findController, FindNextPrevOperation);
    448459}

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h

    r150130 r164438  
    6464  WEBKIT_FIND_OPTIONS_BACKWARDS =                          1 << 3,
    6565  WEBKIT_FIND_OPTIONS_WRAP_AROUND =                        1 << 4,
     66  /*< private >*/
     67  WEBKIT_FIND_OPTIONS_SHOW_OVERLAY =                       1 << 5,
     68  WEBKIT_FIND_OPTIONS_SHOW_FIND_INDICATOR =                1 << 6,
     69  WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT =                     1 << 7,
    6670} WebKitFindOptions;
    6771

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

    r162599 r164438  
    2222
    2323#include "WebImage.h"
     24#include "WebKitPrivate.h"
    2425#include "WebKitURIRequestPrivate.h"
    2526#include "WebKitURIResponsePrivate.h"
    … …  
    8889        const ResourceError& platformError = webError->platformError();
    8990        GUniquePtr<GError> resourceError(g_error_new_literal(g_quark_from_string(platformError.domain().utf8().data()),
    90             platformError.errorCode(), platformError.localizedDescription().utf8().data()));
     91            toWebKitError(platformError.errorCode()), platformError.localizedDescription().utf8().data()));
    9192
    9293        webkitWebResourceFailed(resource.get(), resourceError.get());

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

    r162599 r164438  
    2323
    2424#include "WebKitBackForwardListPrivate.h"
     25#include "WebKitPrivate.h"
    2526#include "WebKitURIResponsePrivate.h"
    2627#include "WebKitWebViewBasePrivate.h"
    … …  
    5556    const ResourceError& resourceError = toImpl(error)->platformError();
    5657    GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
    57         resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
     58        toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    5859    if (resourceError.tlsErrors()) {
    5960        webkitWebViewLoadFailedWithTLSErrors(WEBKIT_WEB_VIEW(clientInfo), resourceError.failingURL().utf8().data(), webError.get(),
    … …  
    8687    const ResourceError& resourceError = toImpl(error)->platformError();
    8788    GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
    88         resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
     89        toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    8990    webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED,
    9091                            resourceError.failingURL().utf8().data(), webError.get());

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

    r160750 r164438  
    244244}
    245245
    246 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_LINK_CLICKED, NavigationTypeLinkClicked);
    247 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED, NavigationTypeFormSubmitted);
    248 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_BACK_FORWARD, NavigationTypeBackForward);
    249 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_RELOAD, NavigationTypeReload);
    250 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED, NavigationTypeFormResubmitted);
    251 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_OTHER, NavigationTypeOther);
    252 
    253246WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType navigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest* request, const char* frameName, WebFramePolicyListenerProxy* listener)
    254247{

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

    r161256 r164438  
    3030using namespace WebKit;
    3131
     32static inline WebKitNavigationType toWebKitNavigationType(WKFrameNavigationType type)
     33{
     34    switch (type) {
     35    case kWKFrameNavigationTypeLinkClicked:
     36        return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
     37    case kWKFrameNavigationTypeFormSubmitted:
     38        return WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED;
     39    case kWKFrameNavigationTypeBackForward:
     40        return WEBKIT_NAVIGATION_TYPE_BACK_FORWARD;
     41    case kWKFrameNavigationTypeReload:
     42        return WEBKIT_NAVIGATION_TYPE_RELOAD;
     43    case kWKFrameNavigationTypeFormResubmitted:
     44        return WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED;
     45    case kWKFrameNavigationTypeOther:
     46        return WEBKIT_NAVIGATION_TYPE_OTHER;
     47    default:
     48        ASSERT_NOT_REACHED();
     49        return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
     50    }
     51}
     52
    3253static void decidePolicyForNavigationAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
    3354{
    3455    GRefPtr<WebKitNavigationPolicyDecision> decision =
    35         adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType),
     56        adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
    3657                                                       wkEventMouseButtonToWebKitMouseButton(mouseButton),
    3758                                                       wkEventModifiersToGdkModifiers(modifiers),
    … …  
    4768{
    4869    GRefPtr<WebKitNavigationPolicyDecision> decision =
    49         adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType),
     70        adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
    5071                                                       wkEventMouseButtonToWebKitMouseButton(mouseButton),
    5172                                                       wkEventModifiersToGdkModifiers(modifiers),

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

    r164409 r164438  
    264264    if (!resourceError.isNull()) {
    265265        GUniquePtr<GError> printError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
    266             resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
     266            toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
    267267        g_signal_emit(printOperation, signals[FAILED], 0, printError.get());
    268268    }

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

    r131731 r164438  
    2121#include "WebKitPrivate.h"
    2222
     23#include "ErrorsGtk.h"
     24#include "WebKitError.h"
    2325#include <gdk/gdk.h>
    2426
    … …  
    5254    return 0;
    5355}
     56
     57unsigned toWebKitError(unsigned webCoreError)
     58{
     59    switch (webCoreError) {
     60    case WebCore::NetworkErrorFailed:
     61        return WEBKIT_NETWORK_ERROR_FAILED;
     62    case WebCore::NetworkErrorTransport:
     63        return WEBKIT_NETWORK_ERROR_TRANSPORT;
     64    case WebCore::NetworkErrorUnknownProtocol:
     65        return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
     66    case WebCore::NetworkErrorCancelled:
     67        return WEBKIT_NETWORK_ERROR_CANCELLED;
     68    case WebCore::NetworkErrorFileDoesNotExist:
     69        return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
     70    case WebCore::PolicyErrorFailed:
     71        return WEBKIT_POLICY_ERROR_FAILED;
     72    case WebCore::PolicyErrorCannotShowMimeType:
     73        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
     74    case WebCore::PolicyErrorCannotShowURL:
     75        return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
     76    case WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange:
     77        return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
     78    case WebCore::PolicyErrorCannotUseRestrictedPort:
     79        return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
     80    case WebCore::PluginErrorFailed:
     81        return WEBKIT_PLUGIN_ERROR_FAILED;
     82    case WebCore::PluginErrorCannotFindPlugin:
     83        return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
     84    case WebCore::PluginErrorCannotLoadPlugin:
     85        return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
     86    case WebCore::PluginErrorJavaUnavailable:
     87        return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
     88    case WebCore::PluginErrorConnectionCancelled:
     89        return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
     90    case WebCore::PluginErrorWillHandleLoad:
     91        return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
     92    case WebCore::DownloadErrorNetwork:
     93        return WEBKIT_DOWNLOAD_ERROR_NETWORK;
     94    case WebCore::DownloadErrorCancelledByUser:
     95        return WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER;
     96    case WebCore::DownloadErrorDestination:
     97        return WEBKIT_DOWNLOAD_ERROR_DESTINATION;
     98    case WebCore::PrintErrorGeneral:
     99        return WEBKIT_PRINT_ERROR_GENERAL;
     100    case WebCore::PrintErrorPrinterNotFound:
     101        return WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND;
     102    case WebCore::PrintErrorInvalidPageRange:
     103        return WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE;
     104    default:
     105        ASSERT_NOT_REACHED();
     106        return WEBKIT_NETWORK_ERROR_FAILED;
     107    }
     108}
     109
     110unsigned toWebCoreError(unsigned webKitError)
     111{
     112    switch (webKitError) {
     113    case WEBKIT_NETWORK_ERROR_FAILED:
     114        return WebCore::NetworkErrorFailed;
     115    case WEBKIT_NETWORK_ERROR_TRANSPORT:
     116        return WebCore::NetworkErrorTransport;
     117    case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
     118        return WebCore::NetworkErrorUnknownProtocol;
     119    case WEBKIT_NETWORK_ERROR_CANCELLED:
     120        return WebCore::NetworkErrorCancelled;
     121    case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
     122        return WebCore::NetworkErrorFileDoesNotExist;
     123    case WEBKIT_POLICY_ERROR_FAILED:
     124        return WebCore::PolicyErrorFailed;
     125    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
     126        return WebCore::PolicyErrorCannotShowMimeType;
     127    case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
     128        return WebCore::PolicyErrorCannotShowURL;
     129    case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
     130        return WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange;
     131    case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
     132        return WebCore::PolicyErrorCannotUseRestrictedPort;
     133    case WEBKIT_PLUGIN_ERROR_FAILED:
     134        return WebCore::PluginErrorFailed;
     135    case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
     136        return WebCore::PluginErrorCannotFindPlugin;
     137    case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
     138        return WebCore::PluginErrorCannotLoadPlugin;
     139    case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
     140        return WebCore::PluginErrorJavaUnavailable;
     141    case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
     142        return WebCore::PluginErrorConnectionCancelled;
     143    case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
     144        return WebCore::PluginErrorWillHandleLoad;
     145    case WEBKIT_DOWNLOAD_ERROR_NETWORK:
     146        return WebCore::DownloadErrorNetwork;
     147    case WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER:
     148        return WebCore::DownloadErrorCancelledByUser;
     149    case WEBKIT_DOWNLOAD_ERROR_DESTINATION:
     150        return WebCore::DownloadErrorDestination;
     151    case WEBKIT_PRINT_ERROR_GENERAL:
     152        return WebCore::PrintErrorGeneral;
     153    case WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND:
     154        return WebCore::PrintErrorPrinterNotFound;
     155    case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:
     156        return WebCore::PrintErrorInvalidPageRange;
     157    default:
     158        ASSERT_NOT_REACHED();
     159        return WebCore::NetworkErrorFailed;
     160    }
     161}

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h

    r162835 r164438  
    4949#define WEBKIT_PARAM_WRITABLE (static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))
    5050#define WEBKIT_PARAM_READWRITE (static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))
    51 
    52 #define COMPILE_ASSERT_MATCHING_ENUM(webkitName, webcoreName) \
    53         COMPILE_ASSERT(int(webkitName) == int(webcoreName), mismatchingEnums)
    5451
    5552#define WEBKIT_DEFINE_ASYNC_DATA_STRUCT(structName) \
    … …  
    119116unsigned wkEventModifiersToGdkModifiers(WKEventModifiers);
    120117unsigned wkEventMouseButtonToWebKitMouseButton(WKEventMouseButton);
     118unsigned toWebKitError(unsigned webCoreError);
     119unsigned toWebCoreError(unsigned webKitError);
    121120
    122121enum SnapshotRegion {

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

    r163797 r164438  
    2222
    2323#include "APIData.h"
     24#include "WebKitPrivate.h"
    2425#include "WebKitURISchemeRequestPrivate.h"
    2526#include "WebKitWebContextPrivate.h"
    … …  
    231232    WebKitURISchemeRequestPrivate* priv = request->priv;
    232233
    233     WebCore::ResourceError resourceError(g_quark_to_string(error->domain), error->code, priv->uri.data(), String::fromUTF8(error->message));
     234    WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), priv->uri.data(), String::fromUTF8(error->message));
    234235    priv->webRequestManager->didFailWithError(priv->requestID, resourceError);
    235236    webkitWebContextDidFinishLoadingCustomProtocol(priv->webContext, priv->requestID);

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

    r163781 r164438  
    166166WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT)
    167167
     168static inline WebKit::ProcessModel toProcessModel(WebKitProcessModel webKitProcessModel)
     169{
     170    switch (webKitProcessModel) {
     171    case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
     172        return ProcessModelSharedSecondaryProcess;
     173    case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
     174        return ProcessModelMultipleSecondaryProcesses;
     175    default:
     176        ASSERT_NOT_REACHED();
     177        return ProcessModelSharedSecondaryProcess;
     178    }
     179}
     180
     181static inline WebKitProcessModel toWebKitProcessModel(WebKit::ProcessModel processModel)
     182{
     183    switch (processModel) {
     184    case ProcessModelSharedSecondaryProcess:
     185        return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
     186    case ProcessModelMultipleSecondaryProcesses:
     187        return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
     188    default:
     189        ASSERT_NOT_REACHED();
     190        return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
     191    }
     192}
     193
    168194static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass)
    169195{
    … …  
    918944    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
    919945
    920     ProcessModel newProcessModel;
    921 
    922     switch (processModel) {
    923     case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
    924         newProcessModel = ProcessModelSharedSecondaryProcess;
    925         break;
    926     case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
    927         newProcessModel = ProcessModelMultipleSecondaryProcesses;
    928         break;
    929     default:
    930         g_assert_not_reached();
    931     }
     946    ProcessModel newProcessModel(toProcessModel(processModel));
    932947
    933948    if (newProcessModel == context->priv->context->processModel())
    … …  
    953968    g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS);
    954969
    955     switch (context->priv->context->processModel()) {
    956     case ProcessModelSharedSecondaryProcess:
    957         return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
    958     case ProcessModelMultipleSecondaryProcesses:
    959         return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
    960     default:
    961         g_assert_not_reached();
    962     }
     970    return toWebKitProcessModel(context->priv->context->processModel());
    963971}
    964972

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

    r164409 r164438  
    31073107}
    31083108
    3109 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_SNAPSHOT_REGION_VISIBLE, SnapshotRegionVisible);
    3110 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_SNAPSHOT_REGION_FULL_DOCUMENT, SnapshotRegionFullDocument);
    3111 
    31123109static inline unsigned webKitSnapshotOptionsToSnapshotOptions(WebKitSnapshotOptions options)
    31133110{
    … …  
    31183115
    31193116    return snapshotOptions;
     3117}
     3118
     3119static inline SnapshotRegion toSnapshotRegion(WebKitSnapshotRegion region)
     3120{
     3121    switch (region) {
     3122    case WEBKIT_SNAPSHOT_REGION_VISIBLE:
     3123        return SnapshotRegionVisible;
     3124    case WEBKIT_SNAPSHOT_REGION_FULL_DOCUMENT:
     3125        return SnapshotRegionFullDocument;
     3126    default:
     3127        ASSERT_NOT_REACHED();
     3128        return SnapshotRegionVisible;
     3129    }
    31203130}
    31213131
    … …  
    31493159    uint64_t callbackID = generateSnapshotCallbackID();
    31503160    message.set(String::fromUTF8("SnapshotOptions"), API::UInt64::create(static_cast<uint64_t>(webKitSnapshotOptionsToSnapshotOptions(options))));
    3151     message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(region)));
     3161    message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(toSnapshotRegion(region))));
    31523162    message.set(String::fromUTF8("CallbackID"), API::UInt64::create(callbackID));
    31533163

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

    r160632 r164438  
    6767
    6868WEBKIT_DEFINE_TYPE(WebKitWebViewGroup, webkit_web_view_group, G_TYPE_OBJECT)
     69
     70static inline WebCore::UserContentInjectedFrames toWebCoreUserContentInjectedFrames(WebKitInjectedContentFrames kitFrames)
     71{
     72    switch (kitFrames) {
     73    case WEBKIT_INJECTED_CONTENT_FRAMES_ALL:
     74        return WebCore::InjectInAllFrames;
     75    case WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY:
     76        return WebCore::InjectInTopFrameOnly;
     77    default:
     78        ASSERT_NOT_REACHED();
     79        return WebCore::InjectInAllFrames;
     80    }
     81}
    6982
    7083static void webkitWebViewGroupSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
    … …  
    225238}
    226239
    227 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_ALL, WebCore::InjectInAllFrames);
    228 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY, WebCore::InjectInTopFrameOnly);
    229 
    230240static PassRefPtr<API::Array> toAPIArray(const char* const* list)
    231241{
    … …  
    271281        webWhitelist.get(),
    272282        webBlacklist.get(),
    273         static_cast<WebCore::UserContentInjectedFrames>(injectedFrames),
     283        toWebCoreUserContentInjectedFrames(injectedFrames),
    274284        WebCore::UserStyleUserLevel);
    275285}
Note: See TracChangeset for help on using the changeset viewer.