<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164438] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164438">164438</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-20 11:31:02 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformGTKcmake">trunk/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkGNUmakefileam">trunk/Source/WebKit/gtk/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebnavigationactioncpp">trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebsettingscpp">trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewprivateh">trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCredentialcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitErrorcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllerh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewGroupcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportAssertMatchingEnumscpp">trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/ChangeLog 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-20 Enrique Ocaña González <eocanha@igalia.com>
+
+ WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
+ https://bugs.webkit.org/show_bug.cgi?id=127800
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake: Removed AssertMatchingEnums.cpp
+
</ins><span class="cx"> 2014-02-18 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Changing selection shouldn't synchronously update editor UI components
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
</span><span class="cx">
</span><span class="cx"> gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
</span><del>- gtk/WebCoreSupport/AssertMatchingEnums.cpp
</del><span class="cx"> gtk/WebCoreSupport/ChromeClientGtk.cpp
</span><span class="cx"> gtk/WebCoreSupport/ContextMenuClientGtk.cpp
</span><span class="cx"> gtk/WebCoreSupport/DeviceMotionClientGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-20 Enrique Ocaña González <eocanha@igalia.com>
+
+ WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
+ https://bugs.webkit.org/show_bug.cgi?id=127800
+
+ Reviewed by Martin Robinson.
+
+ * 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
+
</ins><span class="cx"> 2014-02-17 Sergio Correia <sergio.correia@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Replace uses of PassOwnPtr/OwnPtr with std::unique_ptr in WebCore/inspector
</span></span></pre></div>
<a id="trunkSourceWebKitgtkGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/GNUmakefile.am 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -190,7 +190,6 @@
</span><span class="cx"> webkitgtk_sources += \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
</span><del>- Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
</del><span class="cx"> Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.cpp \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/BatteryClientGtk.h \
</span><span class="cx"> Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportAssertMatchingEnumscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -1,79 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-// Use this file to assert that various WebKit API enum values continue
-// matching WebCore defined enum values.
-
-#include "config.h"
-
-#include "DumpRenderTreeSupportGtk.h"
-#include "EditingBehaviorTypes.h"
-#include "ErrorsGtk.h"
-#include "FindOptions.h"
-#include "FrameLoaderTypes.h"
-#include "PasteboardHelper.h"
-#include "webkiterror.h"
-#include "webkitwebnavigationaction.h"
-#include "webkitwebsettings.h"
-#include "webkitwebview.h"
-#include <wtf/Assertions.h>
-
-#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
- COMPILE_ASSERT(int(webkit_name) == int(WebCore::webcore_name), mismatching_enums)
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_EDITING_BEHAVIOR_MAC, EditingMacBehavior);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_EDITING_BEHAVIOR_WINDOWS, EditingWindowsBehavior);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_EDITING_BEHAVIOR_UNIX, EditingUnixBehavior);
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED, NavigationTypeLinkClicked);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED, NavigationTypeFormSubmitted);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD, NavigationTypeBackForward);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_RELOAD, NavigationTypeReload);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED, NavigationTypeFormResubmitted);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_NAVIGATION_REASON_OTHER, NavigationTypeOther);
-
-COMPILE_ASSERT_MATCHING_ENUM(WebKit::WebFindOptionsAtWordStarts, AtWordStarts);
-COMPILE_ASSERT_MATCHING_ENUM(WebKit::WebFindOptionsTreatMedialCapitalAsWordStart, TreatMedialCapitalAsWordStart);
-COMPILE_ASSERT_MATCHING_ENUM(WebKit::WebFindOptionsBackwards, Backwards);
-COMPILE_ASSERT_MATCHING_ENUM(WebKit::WebFindOptionsWrapAround, WrapAround);
-COMPILE_ASSERT_MATCHING_ENUM(WebKit::WebFindOptionsStartInSelection, StartInSelection);
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_HTML, PasteboardHelper::TargetTypeMarkup);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_TEXT, PasteboardHelper::TargetTypeText);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE, PasteboardHelper::TargetTypeImage);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST, PasteboardHelper::TargetTypeURIList);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL, PasteboardHelper::TargetTypeNetscapeURL);
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FAILED, NetworkErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_TRANSPORT, NetworkErrorTransport);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, NetworkErrorUnknownProtocol);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_CANCELLED, NetworkErrorCancelled);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, NetworkErrorFileDoesNotExist);
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FAILED, PolicyErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, PolicyErrorCannotShowMimeType);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, PolicyErrorCannotShowURL);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, PolicyErrorFrameLoadInterruptedByPolicyChange);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, PolicyErrorCannotUseRestrictedPort);
-
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_FAILED, PluginErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, PluginErrorCannotFindPlugin);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, PluginErrorCannotLoadPlugin);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, PluginErrorJavaUnavailable);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, PluginErrorConnectionCancelled);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, PluginErrorWillHandleLoad);
</del></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -86,6 +86,16 @@
</span><span class="cx"> DumpRenderTreeSupportGtk::FrameLoadEventCallback DumpRenderTreeSupportGtk::s_frameLoadEventCallback = 0;
</span><span class="cx"> DumpRenderTreeSupportGtk::AuthenticationCallback DumpRenderTreeSupportGtk::s_authenticationCallback = 0;
</span><span class="cx">
</span><ins>+static inline WebCore::FindOptions toWebCoreFindOptions(WebKitFindOptions type)
+{
+ return static_cast<WebCore::FindOptions>((type & WebFindOptionsCaseInsensitive ? CaseInsensitive : 0)
+ | (type & WebFindOptionsAtWordStarts ? AtWordStarts : 0)
+ | (type & WebFindOptionsTreatMedialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0)
+ | (type & WebFindOptionsBackwards ? Backwards : 0)
+ | (type & WebFindOptionsWrapAround ? WrapAround : 0)
+ | (type & WebFindOptionsStartInSelection ? StartInSelection : 0));
+}
+
</ins><span class="cx"> DumpRenderTreeSupportGtk::DumpRenderTreeSupportGtk()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -475,7 +485,7 @@
</span><span class="cx">
</span><span class="cx"> bool DumpRenderTreeSupportGtk::findString(WebKitWebView* webView, const gchar* targetString, WebKitFindOptions findOptions)
</span><span class="cx"> {
</span><del>- return core(webView)->findString(String::fromUTF8(targetString), findOptions);
</del><ins>+ return core(webView)->findString(String::fromUTF8(targetString), toWebCoreFindOptions(findOptions));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DumpRenderTreeSupportGtk::setValueForUser(JSContextRef context, JSValueRef nodeObject, JSStringRef value)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -104,6 +104,47 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+inline int toWebKitNetworkError(int errorCode)
+{
+ switch (errorCode) {
+ case NetworkErrorFailed:
+ return WEBKIT_NETWORK_ERROR_FAILED;
+ case NetworkErrorTransport:
+ return WEBKIT_NETWORK_ERROR_TRANSPORT;
+ case NetworkErrorUnknownProtocol:
+ return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
+ case NetworkErrorCancelled:
+ return WEBKIT_NETWORK_ERROR_CANCELLED;
+ case NetworkErrorFileDoesNotExist:
+ return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
+ case PolicyErrorFailed:
+ return WEBKIT_POLICY_ERROR_FAILED;
+ case PolicyErrorCannotShowMimeType:
+ return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
+ case PolicyErrorCannotShowURL:
+ return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL;
+ case PolicyErrorFrameLoadInterruptedByPolicyChange:
+ return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
+ case PolicyErrorCannotUseRestrictedPort:
+ return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
+ case PluginErrorFailed:
+ return WEBKIT_PLUGIN_ERROR_FAILED;
+ case PluginErrorCannotFindPlugin:
+ return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
+ case PluginErrorCannotLoadPlugin:
+ return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
+ case PluginErrorJavaUnavailable:
+ return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
+ case PluginErrorConnectionCancelled:
+ return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
+ case PluginErrorWillHandleLoad:
+ return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_NETWORK_ERROR_FAILED;
+ }
+}
+
</ins><span class="cx"> FrameLoaderClient::FrameLoaderClient(WebKitWebFrame* frame)
</span><span class="cx"> : m_frame(frame)
</span><span class="cx"> , m_policyDecision(0)
</span><span class="lines">@@ -992,7 +1033,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(error.domain().utf8().data()),
</span><del>- error.errorCode(), error.localizedDescription().utf8().data()));
</del><ins>+ toWebKitNetworkError(error.errorCode()), error.localizedDescription().utf8().data()));
</ins><span class="cx">
</span><span class="cx"> g_signal_emit_by_name(webResource, "load-failed", webError.get());
</span><span class="cx"> g_signal_emit_by_name(m_frame, "resource-load-failed", webResource, webError.get());
</span><span class="lines">@@ -1020,9 +1061,10 @@
</span><span class="cx"> notifyStatus(m_frame, WEBKIT_LOAD_FAILED);
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><ins>+
</ins><span class="cx"> GUniquePtr<GError> webError(g_error_new_literal(
</span><span class="cx"> g_quark_from_string(error.domain().utf8().data()),
</span><del>- error.errorCode(),
</del><ins>+ toWebKitNetworkError(error.errorCode()),
</ins><span class="cx"> error.localizedDescription().utf8().data()));
</span><span class="cx"> gboolean isHandled = false;
</span><span class="cx"> g_signal_emit_by_name(webView, "load-error", m_frame, error.failingURL().utf8().data(), webError.get(), &isHandled);
</span><span class="lines">@@ -1094,7 +1136,7 @@
</span><span class="cx">
</span><span class="cx"> bool FrameLoaderClient::shouldFallBack(const ResourceError& error)
</span><span class="cx"> {
</span><del>- return !(error.isCancellation() || error.errorCode() == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE || error.errorCode() == WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD);
</del><ins>+ return !(error.isCancellation() || error.errorCode() == PolicyErrorFrameLoadInterruptedByPolicyChange || error.errorCode() == PluginErrorWillHandleLoad);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FrameLoaderClient::canCachePage() const
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebnavigationactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -364,12 +364,44 @@
</span><span class="cx">
</span><span class="cx"> WebKitWebNavigationReason kit(WebCore::NavigationType type)
</span><span class="cx"> {
</span><del>- return (WebKitWebNavigationReason)type;
</del><ins>+ switch(type) {
+ case WebCore::NavigationTypeLinkClicked:
+ return WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED;
+ case WebCore::NavigationTypeFormSubmitted:
+ return WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED;
+ case WebCore::NavigationTypeBackForward:
+ return WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD;
+ case WebCore::NavigationTypeReload:
+ return WEBKIT_WEB_NAVIGATION_REASON_RELOAD;
+ case WebCore::NavigationTypeFormResubmitted:
+ return WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED;
+ case WebCore::NavigationTypeOther:
+ return WEBKIT_WEB_NAVIGATION_REASON_OTHER;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCore::NavigationType core(WebKitWebNavigationReason type)
</span><span class="cx"> {
</span><del>- return static_cast<WebCore::NavigationType>(type);
</del><ins>+ switch(type) {
+ case WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED:
+ return WebCore::NavigationTypeLinkClicked;
+ case WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED:
+ return WebCore::NavigationTypeFormSubmitted;
+ case WEBKIT_WEB_NAVIGATION_REASON_BACK_FORWARD:
+ return WebCore::NavigationTypeBackForward;
+ case WEBKIT_WEB_NAVIGATION_REASON_RELOAD:
+ return WebCore::NavigationTypeReload;
+ case WEBKIT_WEB_NAVIGATION_REASON_FORM_RESUBMITTED:
+ return WebCore::NavigationTypeFormResubmitted;
+ case WEBKIT_WEB_NAVIGATION_REASON_OTHER:
+ return WebCore::NavigationTypeOther;
+ default:
+ ASSERT_NOT_REACHED();
+ return WebCore::NavigationTypeLinkClicked;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebsettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -1658,9 +1658,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
</del><ins>+inline WebCore::EditingBehaviorType core(WebKitEditingBehavior type)
</ins><span class="cx"> {
</span><del>- return static_cast<WebCore::EditingBehaviorType>(type);
</del><ins>+ switch (type) {
+ case WEBKIT_EDITING_BEHAVIOR_MAC:
+ return EditingMacBehavior;
+ case WEBKIT_EDITING_BEHAVIOR_WINDOWS:
+ return EditingWindowsBehavior;
+ case WEBKIT_EDITING_BEHAVIOR_UNIX:
+ return EditingUnixBehavior;
+ default:
+ ASSERT_NOT_REACHED();
+ return EditingMacBehavior;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><ins>+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span><span class="lines">@@ -282,6 +283,47 @@
</span><span class="cx"> static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWebWindowFeatures* webWindowFeatures);
</span><span class="cx"> static void webkitWebViewDirectionChanged(WebKitWebView*, GtkTextDirection previousDirection, gpointer);
</span><span class="cx">
</span><ins>+static inline WebKitWebViewTargetInfo toWebKitWebViewTargetInfo(PasteboardHelper::PasteboardTargetType flags)
+{
+ switch (flags) {
+ case PasteboardHelper::TargetTypeMarkup:
+ return WEBKIT_WEB_VIEW_TARGET_INFO_HTML;
+ break;
+ case PasteboardHelper::TargetTypeText:
+ return WEBKIT_WEB_VIEW_TARGET_INFO_TEXT;
+ break;
+ case PasteboardHelper::TargetTypeImage:
+ return WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE;
+ break;
+ case PasteboardHelper::TargetTypeURIList:
+ return WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST;
+ break;
+ case PasteboardHelper::TargetTypeNetscapeURL:
+ return WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_WEB_VIEW_TARGET_INFO_HTML;
+ }
+}
+
+static GtkTargetList* copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(GtkTargetList* coreGtkTargetList)
+{
+ g_return_val_if_fail(coreGtkTargetList, nullptr);
+
+ GtkTargetList* targetListWithWebKitEnumValues = nullptr;
+ int tableSize = 0;
+ GtkTargetEntry* table(gtk_target_table_new_from_list(coreGtkTargetList, &tableSize));
+
+ for (int i = 0; i < tableSize; i++)
+ table[i].flags = toWebKitWebViewTargetInfo(static_cast<PasteboardHelper::PasteboardTargetType>(table[i].flags));
+
+ targetListWithWebKitEnumValues = gtk_target_list_new(table, tableSize);
+ gtk_target_table_free(table, tableSize);
+
+ return targetListWithWebKitEnumValues;
+}
+
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pushIn, gpointer userData)
</span><span class="cx"> {
</span><span class="lines">@@ -1380,6 +1422,7 @@
</span><span class="cx"> priv->webWindowFeatures.clear();
</span><span class="cx"> priv->mainResource.clear();
</span><span class="cx"> priv->subResources.clear();
</span><ins>+ priv->targetList.clear();
</ins><span class="cx">
</span><span class="cx"> G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
</span><span class="cx">
</span><span class="lines">@@ -3873,10 +3916,12 @@
</span><span class="cx">
</span><span class="cx"> priv->subResources = adoptGRef(g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref));
</span><span class="cx">
</span><ins>+ priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
+
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> priv->dragAndDropHelper.setWidget(GTK_WIDGET(webView));
</span><span class="cx"> 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));
</span><del>- gtk_drag_dest_set_target_list(GTK_WIDGET(webView), PasteboardHelper::defaultPasteboardHelper()->targetList());
</del><ins>+ gtk_drag_dest_set_target_list(GTK_WIDGET(webView), priv->targetList.get());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> priv->selfScrolling = false;
</span><span class="lines">@@ -4691,7 +4736,8 @@
</span><span class="cx"> **/
</span><span class="cx"> GtkTargetList* webkit_web_view_get_copy_target_list(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- return PasteboardHelper::defaultPasteboardHelper()->targetList();
</del><ins>+ webView->priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
+ return webView->priv->targetList.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -4708,7 +4754,8 @@
</span><span class="cx"> **/
</span><span class="cx"> GtkTargetList* webkit_web_view_get_paste_target_list(WebKitWebView* webView)
</span><span class="cx"> {
</span><del>- return PasteboardHelper::defaultPasteboardHelper()->targetList();
</del><ins>+ webView->priv->targetList = adoptGRef(copyGtkTargetListConvertingWebCoreEnumValuesToWebKitEnumValues(PasteboardHelper::defaultPasteboardHelper()->targetList()));
+ return webView->priv->targetList.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewprivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> WebCore::GtkClickCounter clickCounter;
</span><span class="cx"> WebCore::GtkDragAndDropHelper dragAndDropHelper;
</span><span class="cx"> bool selfScrolling;
</span><ins>+ GRefPtr<GtkTargetList> targetList;
</ins><span class="cx">
</span><span class="cx"> OwnPtr<WebKit::AcceleratedCompositingContext> acceleratedCompositingContext;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2014-02-20 Enrique Ocaña González <eocanha@igalia.com>
+
+ WebKitGTK+ should stop using COMPILE_ASSERT_MATCHING_ENUM macros
+ https://bugs.webkit.org/show_bug.cgi?id=127800
+
+ Reviewed by Martin Robinson.
+
+ * 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):
+
</ins><span class="cx"> 2014-02-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Get rid of redundant Platform.h includes
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitAuthenticationRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationRequest.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -67,18 +67,35 @@
</span><span class="cx">
</span><span class="cx"> static guint signals[LAST_SIGNAL] = { 0, };
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_DEFAULT, ProtectionSpaceAuthenticationSchemeDefault);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTTP_BASIC, ProtectionSpaceAuthenticationSchemeHTTPBasic);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTTP_DIGEST, ProtectionSpaceAuthenticationSchemeHTTPDigest);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_HTML_FORM, ProtectionSpaceAuthenticationSchemeHTMLForm);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_NTLM, ProtectionSpaceAuthenticationSchemeNTLM);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_NEGOTIATE, ProtectionSpaceAuthenticationSchemeNegotiate);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_CLIENT_CERTIFICATE_REQUESTED, ProtectionSpaceAuthenticationSchemeClientCertificateRequested);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_SERVER_TRUST_EVALUATION_REQUESTED, ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN, ProtectionSpaceAuthenticationSchemeUnknown);
-
</del><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitAuthenticationRequest, webkit_authentication_request, G_TYPE_OBJECT)
</span><span class="cx">
</span><ins>+static inline WebKitAuthenticationScheme toWebKitAuthenticationScheme(WebCore::ProtectionSpaceAuthenticationScheme coreScheme)
+{
+ switch (coreScheme) {
+ case WebCore::ProtectionSpaceAuthenticationSchemeDefault:
+ return WEBKIT_AUTHENTICATION_SCHEME_DEFAULT;
+ case WebCore::ProtectionSpaceAuthenticationSchemeHTTPBasic:
+ return WEBKIT_AUTHENTICATION_SCHEME_HTTP_BASIC;
+ case WebCore::ProtectionSpaceAuthenticationSchemeHTTPDigest:
+ return WEBKIT_AUTHENTICATION_SCHEME_HTTP_DIGEST;
+ case WebCore::ProtectionSpaceAuthenticationSchemeHTMLForm:
+ return WEBKIT_AUTHENTICATION_SCHEME_HTML_FORM;
+ case WebCore::ProtectionSpaceAuthenticationSchemeNTLM:
+ return WEBKIT_AUTHENTICATION_SCHEME_NTLM;
+ case WebCore::ProtectionSpaceAuthenticationSchemeNegotiate:
+ return WEBKIT_AUTHENTICATION_SCHEME_NEGOTIATE;
+ case WebCore::ProtectionSpaceAuthenticationSchemeClientCertificateRequested:
+ return WEBKIT_AUTHENTICATION_SCHEME_CLIENT_CERTIFICATE_REQUESTED;
+ case WebCore::ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested:
+ return WEBKIT_AUTHENTICATION_SCHEME_SERVER_TRUST_EVALUATION_REQUESTED;
+ case WebCore::ProtectionSpaceAuthenticationSchemeUnknown:
+ return WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_AUTHENTICATION_SCHEME_DEFAULT;
+ }
+}
+
</ins><span class="cx"> static void webkitAuthenticationRequestDispose(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> WebKitAuthenticationRequest* request = WEBKIT_AUTHENTICATION_REQUEST(object);
</span><span class="lines">@@ -244,7 +261,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_AUTHENTICATION_REQUEST(request), WEBKIT_AUTHENTICATION_SCHEME_UNKNOWN);
</span><span class="cx">
</span><del>- return static_cast<WebKitAuthenticationScheme>(request->priv->authenticationChallenge->protectionSpace()->authenticationScheme());
</del><ins>+ return toWebKitAuthenticationScheme(request->priv->authenticationChallenge->protectionSpace()->authenticationScheme());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -68,13 +68,49 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitCookieManager, webkit_cookie_manager, G_TYPE_OBJECT)
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT, SoupCookiePersistentStorageText);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE, SoupCookiePersistentStorageSQLite);
</del><ins>+static inline SoupCookiePersistentStorageType toSoupCookiePersistentStorageType(WebKitCookiePersistentStorage kitStorage)
+{
+ switch (kitStorage) {
+ case WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT:
+ return SoupCookiePersistentStorageText;
+ case WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE:
+ return SoupCookiePersistentStorageSQLite;
+ default:
+ ASSERT_NOT_REACHED();
+ return SoupCookiePersistentStorageText;
+ }
+}
</ins><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS, HTTPCookieAcceptPolicyAlways);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_NEVER, HTTPCookieAcceptPolicyNever);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY, HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
</del><ins>+static inline WebKitCookieAcceptPolicy toWebKitCookieAcceptPolicy(HTTPCookieAcceptPolicy httpPolicy)
+{
+ switch (httpPolicy) {
+ case HTTPCookieAcceptPolicyAlways:
+ return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+ case HTTPCookieAcceptPolicyNever:
+ return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
+ case HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain:
+ return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+ }
+}
</ins><span class="cx">
</span><ins>+static inline HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WebKitCookieAcceptPolicy kitPolicy)
+{
+ switch (kitPolicy) {
+ case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
+ return HTTPCookieAcceptPolicyAlways;
+ case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
+ return HTTPCookieAcceptPolicyNever;
+ case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
+ return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
+ default:
+ ASSERT_NOT_REACHED();
+ return HTTPCookieAcceptPolicyAlways;
+ }
+}
+
</ins><span class="cx"> static void webkit_cookie_manager_class_init(WebKitCookieManagerClass* findClass)
</span><span class="cx"> {
</span><span class="cx"> GObjectClass* gObjectClass = G_OBJECT_CLASS(findClass);
</span><span class="lines">@@ -137,7 +173,7 @@
</span><span class="cx"> g_return_if_fail(filename);
</span><span class="cx">
</span><span class="cx"> manager->priv->webCookieManager->stopObservingCookieChanges();
</span><del>- manager->priv->webCookieManager->setCookiePersistentStorage(String::fromUTF8(filename), storage);
</del><ins>+ manager->priv->webCookieManager->setCookiePersistentStorage(String::fromUTF8(filename), toSoupCookiePersistentStorageType(storage));
</ins><span class="cx"> manager->priv->webCookieManager->startObservingCookieChanges();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,13 +188,13 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx">
</span><del>- manager->priv->webCookieManager->setHTTPCookieAcceptPolicy(policy);
</del><ins>+ manager->priv->webCookieManager->setHTTPCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitCookieManagerGetAcceptPolicyCallback(WKHTTPCookieAcceptPolicy policy, WKErrorRef, void* context)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GTask> task = adoptGRef(G_TASK(context));
</span><del>- g_task_return_int(task.get(), policy);
</del><ins>+ g_task_return_int(task.get(), toWebKitCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCredentialcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCredential.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -37,12 +37,38 @@
</span><span class="cx"> CString password;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_NONE, WebCore::CredentialPersistenceNone);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION, WebCore::CredentialPersistenceForSession);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT, WebCore::CredentialPersistencePermanent);
-
</del><span class="cx"> G_DEFINE_BOXED_TYPE(WebKitCredential, webkit_credential, webkit_credential_copy, webkit_credential_free)
</span><span class="cx">
</span><ins>+static inline WebKitCredentialPersistence toWebKitCredentialPersistence(WebCore::CredentialPersistence corePersistence)
+{
+ switch (corePersistence) {
+ case WebCore::CredentialPersistenceNone:
+ return WEBKIT_CREDENTIAL_PERSISTENCE_NONE;
+ case WebCore::CredentialPersistenceForSession:
+ return WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION;
+ case WebCore::CredentialPersistencePermanent:
+ return WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_CREDENTIAL_PERSISTENCE_NONE;
+ }
+}
+
+static inline WebCore::CredentialPersistence toWebCoreCredentialPersistence(WebKitCredentialPersistence kitPersistence)
+{
+ switch (kitPersistence) {
+ case WEBKIT_CREDENTIAL_PERSISTENCE_NONE:
+ return WebCore::CredentialPersistenceNone;
+ case WEBKIT_CREDENTIAL_PERSISTENCE_FOR_SESSION:
+ return WebCore::CredentialPersistenceForSession;
+ case WEBKIT_CREDENTIAL_PERSISTENCE_PERMANENT:
+ return WebCore::CredentialPersistencePermanent;
+ default:
+ ASSERT_NOT_REACHED();
+ return WebCore::CredentialPersistenceNone;
+ }
+}
+
</ins><span class="cx"> WebKitCredential* webkitCredentialCreate(const WebCore::Credential& coreCredential)
</span><span class="cx"> {
</span><span class="cx"> WebKitCredential* credential = g_slice_new(WebKitCredential);
</span><span class="lines">@@ -73,7 +99,7 @@
</span><span class="cx"> g_return_val_if_fail(username, 0);
</span><span class="cx"> g_return_val_if_fail(password, 0);
</span><span class="cx">
</span><del>- return webkitCredentialCreate(WebCore::Credential(String::fromUTF8(username), String::fromUTF8(password), static_cast<WebCore::CredentialPersistence>(persistence)));
</del><ins>+ return webkitCredentialCreate(WebCore::Credential(String::fromUTF8(username), String::fromUTF8(password), toWebCoreCredentialPersistence(persistence)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -178,5 +204,5 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(credential, WEBKIT_CREDENTIAL_PERSISTENCE_NONE);
</span><span class="cx">
</span><del>- return static_cast<WebKitCredentialPersistence>(credential->credential.persistence());
</del><ins>+ return toWebKitCredentialPersistence(credential->credential.persistence());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "WebKitDownloadPrivate.h"
</span><span class="cx"> #include "WebKitMarshal.h"
</span><ins>+#include "WebKitPrivate.h"
</ins><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="cx"> #include <WebCore/ErrorsGtk.h>
</span><span class="lines">@@ -340,7 +341,7 @@
</span><span class="cx"> void webkitDownloadFailed(WebKitDownload* download, const ResourceError& resourceError)
</span><span class="cx"> {
</span><span class="cx"> GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
</span><del>- resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</del><ins>+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> if (download->priv->timer)
</span><span class="cx"> g_timer_stop(download->priv->timer.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -40,53 +40,26 @@
</span><span class="cx"> return g_quark_from_static_string(WebCore::errorDomainNetwork);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FAILED, NetworkErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_TRANSPORT, NetworkErrorTransport);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, NetworkErrorUnknownProtocol);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_CANCELLED, NetworkErrorCancelled);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, NetworkErrorFileDoesNotExist);
-
</del><span class="cx"> GQuark webkit_policy_error_quark()
</span><span class="cx"> {
</span><span class="cx"> return g_quark_from_static_string(WebCore::errorDomainPolicy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FAILED, PolicyErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, PolicyErrorCannotShowMimeType);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI, PolicyErrorCannotShowURL);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, PolicyErrorFrameLoadInterruptedByPolicyChange);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, PolicyErrorCannotUseRestrictedPort);
-
</del><span class="cx"> GQuark webkit_plugin_error_quark()
</span><span class="cx"> {
</span><span class="cx"> return g_quark_from_static_string(WebCore::errorDomainPlugin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_FAILED, PluginErrorFailed);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, PluginErrorCannotFindPlugin);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, PluginErrorCannotLoadPlugin);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, PluginErrorJavaUnavailable);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, PluginErrorConnectionCancelled);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, PluginErrorWillHandleLoad);
-
</del><span class="cx"> GQuark webkit_download_error_quark()
</span><span class="cx"> {
</span><span class="cx"> return g_quark_from_static_string(WebCore::errorDomainDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_NETWORK, DownloadErrorNetwork);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER, DownloadErrorCancelledByUser);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_DOWNLOAD_ERROR_DESTINATION, DownloadErrorDestination);
-
</del><span class="cx"> GQuark webkit_print_error_quark()
</span><span class="cx"> {
</span><span class="cx"> return g_quark_from_static_string(WebCore::errorDomainPrint);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_GENERAL, PrintErrorGeneral);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND, PrintErrorPrinterNotFound);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE, PrintErrorInvalidPageRange);
-
</del><span class="cx"> GQuark webkit_javascript_error_quark()
</span><span class="cx"> {
</span><span class="cx"> return g_quark_from_static_string("WebKitJavascriptError");
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -82,12 +82,23 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitFindController, webkit_find_controller, G_TYPE_OBJECT)
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE, FindOptionsCaseInsensitive);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_AT_WORD_STARTS, FindOptionsAtWordStarts);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START, FindOptionsTreatMedialCapitalAsWordStart);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_BACKWARDS, FindOptionsBackwards);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_FIND_OPTIONS_WRAP_AROUND, FindOptionsWrapAround);
</del><ins>+static inline WebKit::FindOptions toWebKitFindOptions(WebKitFindOptions type)
+{
+ return static_cast<WebKit::FindOptions>((type & WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE ? FindOptionsCaseInsensitive : 0)
+ | (type & WEBKIT_FIND_OPTIONS_AT_WORD_STARTS ? FindOptionsAtWordStarts : 0)
+ | (type & WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START ? FindOptionsTreatMedialCapitalAsWordStart : 0)
+ | (type & WEBKIT_FIND_OPTIONS_BACKWARDS ? FindOptionsBackwards : 0)
+ | (type & WEBKIT_FIND_OPTIONS_WRAP_AROUND ? FindOptionsWrapAround : 0)
+ | (type & WEBKIT_FIND_OPTIONS_SHOW_OVERLAY ? FindOptionsShowOverlay : 0)
+ | (type & WEBKIT_FIND_OPTIONS_SHOW_FIND_INDICATOR ? FindOptionsShowFindIndicator : 0)
+ | (type & WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT ? FindOptionsShowHighlight : 0));
+}
</ins><span class="cx">
</span><ins>+static inline WebKit::FindOptions toWebKitFindOptions(uint32_t type)
+{
+ return toWebKitFindOptions(static_cast<WebKitFindOptions>(type));
+}
+
</ins><span class="cx"> static void didFindString(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> g_signal_emit(WEBKIT_FIND_CONTROLLER(clientInfo), signals[FOUND_TEXT], 0, matchCount);
</span><span class="lines">@@ -349,7 +360,7 @@
</span><span class="cx"> WebKitFindControllerPrivate* priv = findController->priv;
</span><span class="cx"> if (operation == CountOperation) {
</span><span class="cx"> getPage(findController)->countStringMatches(String::fromUTF8(priv->searchText.data()),
</span><del>- static_cast<WebKit::FindOptions>(priv->findOptions), priv->maxMatchCount);
</del><ins>+ toWebKitFindOptions(priv->findOptions), priv->maxMatchCount);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -362,9 +373,9 @@
</span><span class="cx"> // unconditionally show highlights. Both search_next() and
</span><span class="cx"> // search_prev() should not enable highlighting to avoid an
</span><span class="cx"> // extra unmarkAllTextMatches() + markAllTextMatches()
</span><del>- findOptions |= FindOptionsShowHighlight;
</del><ins>+ findOptions |= WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
</ins><span class="cx">
</span><del>- getPage(findController)->findString(String::fromUTF8(priv->searchText.data()), static_cast<WebKit::FindOptions>(findOptions),
</del><ins>+ getPage(findController)->findString(String::fromUTF8(priv->searchText.data()), toWebKitFindOptions(findOptions),
</ins><span class="cx"> priv->maxMatchCount);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -425,7 +436,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_FIND_CONTROLLER(findController));
</span><span class="cx">
</span><span class="cx"> findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_BACKWARDS;
</span><del>- findController->priv->findOptions &= ~FindOptionsShowHighlight;
</del><ins>+ findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
</ins><span class="cx"> webKitFindControllerPerform(findController, FindNextPrevOperation);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,7 +454,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_FIND_CONTROLLER(findController));
</span><span class="cx">
</span><span class="cx"> findController->priv->findOptions |= WEBKIT_FIND_OPTIONS_BACKWARDS;
</span><del>- findController->priv->findOptions &= ~FindOptionsShowHighlight;
</del><ins>+ findController->priv->findOptions &= ~WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT;
</ins><span class="cx"> webKitFindControllerPerform(findController, FindNextPrevOperation);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -63,6 +63,10 @@
</span><span class="cx"> WEBKIT_FIND_OPTIONS_TREAT_MEDIAL_CAPITAL_AS_WORD_START = 1 << 2,
</span><span class="cx"> WEBKIT_FIND_OPTIONS_BACKWARDS = 1 << 3,
</span><span class="cx"> WEBKIT_FIND_OPTIONS_WRAP_AROUND = 1 << 4,
</span><ins>+ /*< private >*/
+ WEBKIT_FIND_OPTIONS_SHOW_OVERLAY = 1 << 5,
+ WEBKIT_FIND_OPTIONS_SHOW_FIND_INDICATOR = 1 << 6,
+ WEBKIT_FIND_OPTIONS_SHOW_HIGHLIGHT = 1 << 7,
</ins><span class="cx"> } WebKitFindOptions;
</span><span class="cx">
</span><span class="cx"> struct _WebKitFindController {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "WebKitInjectedBundleClient.h"
</span><span class="cx">
</span><span class="cx"> #include "WebImage.h"
</span><ins>+#include "WebKitPrivate.h"
</ins><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="lines">@@ -87,7 +88,7 @@
</span><span class="cx"> API::Error* webError = static_cast<API::Error*>(message.get(String::fromUTF8("Error")));
</span><span class="cx"> const ResourceError& platformError = webError->platformError();
</span><span class="cx"> GUniquePtr<GError> resourceError(g_error_new_literal(g_quark_from_string(platformError.domain().utf8().data()),
</span><del>- platformError.errorCode(), platformError.localizedDescription().utf8().data()));
</del><ins>+ toWebKitError(platformError.errorCode()), platformError.localizedDescription().utf8().data()));
</ins><span class="cx">
</span><span class="cx"> webkitWebResourceFailed(resource.get(), resourceError.get());
</span><span class="cx"> webkitWebViewRemoveLoadingWebResource(webView, resourceIdentifier->value());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "WebKitLoaderClient.h"
</span><span class="cx">
</span><span class="cx"> #include "WebKitBackForwardListPrivate.h"
</span><ins>+#include "WebKitPrivate.h"
</ins><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="cx"> #include "WebKitWebViewPrivate.h"
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> const ResourceError& resourceError = toImpl(error)->platformError();
</span><span class="cx"> GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
</span><del>- resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</del><ins>+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> if (resourceError.tlsErrors()) {
</span><span class="cx"> webkitWebViewLoadFailedWithTLSErrors(WEBKIT_WEB_VIEW(clientInfo), resourceError.failingURL().utf8().data(), webError.get(),
</span><span class="cx"> static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate());
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> const ResourceError& resourceError = toImpl(error)->platformError();
</span><span class="cx"> GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
</span><del>- resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</del><ins>+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED,
</span><span class="cx"> resourceError.failingURL().utf8().data(), webError.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -243,13 +243,6 @@
</span><span class="cx"> return decision->priv->frameName.data();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_LINK_CLICKED, NavigationTypeLinkClicked);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED, NavigationTypeFormSubmitted);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_BACK_FORWARD, NavigationTypeBackForward);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_RELOAD, NavigationTypeReload);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED, NavigationTypeFormResubmitted);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_OTHER, NavigationTypeOther);
-
</del><span class="cx"> WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType navigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest* request, const char* frameName, WebFramePolicyListenerProxy* listener)
</span><span class="cx"> {
</span><span class="cx"> WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_NAVIGATION_POLICY_DECISION, NULL));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -29,10 +29,31 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><ins>+static inline WebKitNavigationType toWebKitNavigationType(WKFrameNavigationType type)
+{
+ switch (type) {
+ case kWKFrameNavigationTypeLinkClicked:
+ return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
+ case kWKFrameNavigationTypeFormSubmitted:
+ return WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED;
+ case kWKFrameNavigationTypeBackForward:
+ return WEBKIT_NAVIGATION_TYPE_BACK_FORWARD;
+ case kWKFrameNavigationTypeReload:
+ return WEBKIT_NAVIGATION_TYPE_RELOAD;
+ case kWKFrameNavigationTypeFormResubmitted:
+ return WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED;
+ case kWKFrameNavigationTypeOther:
+ return WEBKIT_NAVIGATION_TYPE_OTHER;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
+ }
+}
+
</ins><span class="cx"> static void decidePolicyForNavigationAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitNavigationPolicyDecision> decision =
</span><del>- adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType),
</del><ins>+ adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
</ins><span class="cx"> wkEventMouseButtonToWebKitMouseButton(mouseButton),
</span><span class="cx"> wkEventModifiersToGdkModifiers(modifiers),
</span><span class="cx"> toImpl(request),
</span><span class="lines">@@ -46,7 +67,7 @@
</span><span class="cx"> static void decidePolicyForNewWindowAction(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitNavigationPolicyDecision> decision =
</span><del>- adoptGRef(webkitNavigationPolicyDecisionCreate(static_cast<WebKitNavigationType>(navigationType),
</del><ins>+ adoptGRef(webkitNavigationPolicyDecisionCreate(toWebKitNavigationType(navigationType),
</ins><span class="cx"> wkEventMouseButtonToWebKitMouseButton(mouseButton),
</span><span class="cx"> wkEventModifiersToGdkModifiers(modifiers),
</span><span class="cx"> toImpl(request),
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> const WebCore::ResourceError& resourceError = wkPrintError ? wkPrintError->platformError() : WebCore::ResourceError();
</span><span class="cx"> if (!resourceError.isNull()) {
</span><span class="cx"> GUniquePtr<GError> printError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
</span><del>- resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</del><ins>+ toWebKitError(resourceError.errorCode()), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> g_signal_emit(printOperation, signals[FAILED], 0, printError.get());
</span><span class="cx"> }
</span><span class="cx"> g_signal_emit(printOperation, signals[FINISHED], 0, NULL);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx">
</span><ins>+#include "ErrorsGtk.h"
+#include "WebKitError.h"
</ins><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx">
</span><span class="cx"> unsigned wkEventModifiersToGdkModifiers(WKEventModifiers wkModifiers)
</span><span class="lines">@@ -51,3 +53,109 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+
+unsigned toWebKitError(unsigned webCoreError)
+{
+ switch (webCoreError) {
+ case WebCore::NetworkErrorFailed:
+ return WEBKIT_NETWORK_ERROR_FAILED;
+ case WebCore::NetworkErrorTransport:
+ return WEBKIT_NETWORK_ERROR_TRANSPORT;
+ case WebCore::NetworkErrorUnknownProtocol:
+ return WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL;
+ case WebCore::NetworkErrorCancelled:
+ return WEBKIT_NETWORK_ERROR_CANCELLED;
+ case WebCore::NetworkErrorFileDoesNotExist:
+ return WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST;
+ case WebCore::PolicyErrorFailed:
+ return WEBKIT_POLICY_ERROR_FAILED;
+ case WebCore::PolicyErrorCannotShowMimeType:
+ return WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE;
+ case WebCore::PolicyErrorCannotShowURL:
+ return WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI;
+ case WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange:
+ return WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE;
+ case WebCore::PolicyErrorCannotUseRestrictedPort:
+ return WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT;
+ case WebCore::PluginErrorFailed:
+ return WEBKIT_PLUGIN_ERROR_FAILED;
+ case WebCore::PluginErrorCannotFindPlugin:
+ return WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN;
+ case WebCore::PluginErrorCannotLoadPlugin:
+ return WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN;
+ case WebCore::PluginErrorJavaUnavailable:
+ return WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE;
+ case WebCore::PluginErrorConnectionCancelled:
+ return WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED;
+ case WebCore::PluginErrorWillHandleLoad:
+ return WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD;
+ case WebCore::DownloadErrorNetwork:
+ return WEBKIT_DOWNLOAD_ERROR_NETWORK;
+ case WebCore::DownloadErrorCancelledByUser:
+ return WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER;
+ case WebCore::DownloadErrorDestination:
+ return WEBKIT_DOWNLOAD_ERROR_DESTINATION;
+ case WebCore::PrintErrorGeneral:
+ return WEBKIT_PRINT_ERROR_GENERAL;
+ case WebCore::PrintErrorPrinterNotFound:
+ return WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND;
+ case WebCore::PrintErrorInvalidPageRange:
+ return WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_NETWORK_ERROR_FAILED;
+ }
+}
+
+unsigned toWebCoreError(unsigned webKitError)
+{
+ switch (webKitError) {
+ case WEBKIT_NETWORK_ERROR_FAILED:
+ return WebCore::NetworkErrorFailed;
+ case WEBKIT_NETWORK_ERROR_TRANSPORT:
+ return WebCore::NetworkErrorTransport;
+ case WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL:
+ return WebCore::NetworkErrorUnknownProtocol;
+ case WEBKIT_NETWORK_ERROR_CANCELLED:
+ return WebCore::NetworkErrorCancelled;
+ case WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST:
+ return WebCore::NetworkErrorFileDoesNotExist;
+ case WEBKIT_POLICY_ERROR_FAILED:
+ return WebCore::PolicyErrorFailed;
+ case WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE:
+ return WebCore::PolicyErrorCannotShowMimeType;
+ case WEBKIT_POLICY_ERROR_CANNOT_SHOW_URI:
+ return WebCore::PolicyErrorCannotShowURL;
+ case WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE:
+ return WebCore::PolicyErrorFrameLoadInterruptedByPolicyChange;
+ case WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT:
+ return WebCore::PolicyErrorCannotUseRestrictedPort;
+ case WEBKIT_PLUGIN_ERROR_FAILED:
+ return WebCore::PluginErrorFailed;
+ case WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN:
+ return WebCore::PluginErrorCannotFindPlugin;
+ case WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN:
+ return WebCore::PluginErrorCannotLoadPlugin;
+ case WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE:
+ return WebCore::PluginErrorJavaUnavailable;
+ case WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED:
+ return WebCore::PluginErrorConnectionCancelled;
+ case WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD:
+ return WebCore::PluginErrorWillHandleLoad;
+ case WEBKIT_DOWNLOAD_ERROR_NETWORK:
+ return WebCore::DownloadErrorNetwork;
+ case WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER:
+ return WebCore::DownloadErrorCancelledByUser;
+ case WEBKIT_DOWNLOAD_ERROR_DESTINATION:
+ return WebCore::DownloadErrorDestination;
+ case WEBKIT_PRINT_ERROR_GENERAL:
+ return WebCore::PrintErrorGeneral;
+ case WEBKIT_PRINT_ERROR_PRINTER_NOT_FOUND:
+ return WebCore::PrintErrorPrinterNotFound;
+ case WEBKIT_PRINT_ERROR_INVALID_PAGE_RANGE:
+ return WebCore::PrintErrorInvalidPageRange;
+ default:
+ ASSERT_NOT_REACHED();
+ return WebCore::NetworkErrorFailed;
+ }
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> #define WEBKIT_PARAM_WRITABLE (static_cast<GParamFlags>(G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))
</span><span class="cx"> #define WEBKIT_PARAM_READWRITE (static_cast<GParamFlags>(G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))
</span><span class="cx">
</span><del>-#define COMPILE_ASSERT_MATCHING_ENUM(webkitName, webcoreName) \
- COMPILE_ASSERT(int(webkitName) == int(webcoreName), mismatchingEnums)
-
</del><span class="cx"> #define WEBKIT_DEFINE_ASYNC_DATA_STRUCT(structName) \
</span><span class="cx"> static structName* create##structName() \
</span><span class="cx"> { \
</span><span class="lines">@@ -118,6 +115,8 @@
</span><span class="cx">
</span><span class="cx"> unsigned wkEventModifiersToGdkModifiers(WKEventModifiers);
</span><span class="cx"> unsigned wkEventMouseButtonToWebKitMouseButton(WKEventMouseButton);
</span><ins>+unsigned toWebKitError(unsigned webCoreError);
+unsigned toWebCoreError(unsigned webKitError);
</ins><span class="cx">
</span><span class="cx"> enum SnapshotRegion {
</span><span class="cx"> SnapshotRegionVisible,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "WebKitURISchemeRequest.h"
</span><span class="cx">
</span><span class="cx"> #include "APIData.h"
</span><ins>+#include "WebKitPrivate.h"
</ins><span class="cx"> #include "WebKitURISchemeRequestPrivate.h"
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="cx"> #include "WebKitWebView.h"
</span><span class="lines">@@ -230,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitURISchemeRequestPrivate* priv = request->priv;
</span><span class="cx">
</span><del>- WebCore::ResourceError resourceError(g_quark_to_string(error->domain), error->code, priv->uri.data(), String::fromUTF8(error->message));
</del><ins>+ WebCore::ResourceError resourceError(g_quark_to_string(error->domain), toWebCoreError(error->code), priv->uri.data(), String::fromUTF8(error->message));
</ins><span class="cx"> priv->webRequestManager->didFailWithError(priv->requestID, resourceError);
</span><span class="cx"> webkitWebContextDidFinishLoadingCustomProtocol(priv->webContext, priv->requestID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -165,6 +165,32 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT)
</span><span class="cx">
</span><ins>+static inline WebKit::ProcessModel toProcessModel(WebKitProcessModel webKitProcessModel)
+{
+ switch (webKitProcessModel) {
+ case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
+ return ProcessModelSharedSecondaryProcess;
+ case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
+ return ProcessModelMultipleSecondaryProcesses;
+ default:
+ ASSERT_NOT_REACHED();
+ return ProcessModelSharedSecondaryProcess;
+ }
+}
+
+static inline WebKitProcessModel toWebKitProcessModel(WebKit::ProcessModel processModel)
+{
+ switch (processModel) {
+ case ProcessModelSharedSecondaryProcess:
+ return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
+ case ProcessModelMultipleSecondaryProcesses:
+ return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
+ }
+}
+
</ins><span class="cx"> static void webkit_web_context_class_init(WebKitWebContextClass* webContextClass)
</span><span class="cx"> {
</span><span class="cx"> GObjectClass* gObjectClass = G_OBJECT_CLASS(webContextClass);
</span><span class="lines">@@ -917,19 +943,8 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
</span><span class="cx">
</span><del>- ProcessModel newProcessModel;
</del><ins>+ ProcessModel newProcessModel(toProcessModel(processModel));
</ins><span class="cx">
</span><del>- switch (processModel) {
- case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
- newProcessModel = ProcessModelSharedSecondaryProcess;
- break;
- case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
- newProcessModel = ProcessModelMultipleSecondaryProcesses;
- break;
- default:
- g_assert_not_reached();
- }
-
</del><span class="cx"> if (newProcessModel == context->priv->context->processModel())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -952,14 +967,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS);
</span><span class="cx">
</span><del>- switch (context->priv->context->processModel()) {
- case ProcessModelSharedSecondaryProcess:
- return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
- case ProcessModelMultipleSecondaryProcesses:
- return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
- default:
- g_assert_not_reached();
- }
</del><ins>+ return toWebKitProcessModel(context->priv->context->processModel());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitDownload* webkitWebContextGetOrCreateDownload(DownloadProxy* downloadProxy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -3106,9 +3106,6 @@
</span><span class="cx"> g_task_return_pointer(task.get(), 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_SNAPSHOT_REGION_VISIBLE, SnapshotRegionVisible);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_SNAPSHOT_REGION_FULL_DOCUMENT, SnapshotRegionFullDocument);
-
</del><span class="cx"> static inline unsigned webKitSnapshotOptionsToSnapshotOptions(WebKitSnapshotOptions options)
</span><span class="cx"> {
</span><span class="cx"> SnapshotOptions snapshotOptions = 0;
</span><span class="lines">@@ -3119,6 +3116,19 @@
</span><span class="cx"> return snapshotOptions;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline SnapshotRegion toSnapshotRegion(WebKitSnapshotRegion region)
+{
+ switch (region) {
+ case WEBKIT_SNAPSHOT_REGION_VISIBLE:
+ return SnapshotRegionVisible;
+ case WEBKIT_SNAPSHOT_REGION_FULL_DOCUMENT:
+ return SnapshotRegionFullDocument;
+ default:
+ ASSERT_NOT_REACHED();
+ return SnapshotRegionVisible;
+ }
+}
+
</ins><span class="cx"> static inline uint64_t generateSnapshotCallbackID()
</span><span class="cx"> {
</span><span class="cx"> static uint64_t uniqueCallbackID = 1;
</span><span class="lines">@@ -3148,7 +3158,7 @@
</span><span class="cx"> ImmutableDictionary::MapType message;
</span><span class="cx"> uint64_t callbackID = generateSnapshotCallbackID();
</span><span class="cx"> message.set(String::fromUTF8("SnapshotOptions"), API::UInt64::create(static_cast<uint64_t>(webKitSnapshotOptionsToSnapshotOptions(options))));
</span><del>- message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(region)));
</del><ins>+ message.set(String::fromUTF8("SnapshotRegion"), API::UInt64::create(static_cast<uint64_t>(toSnapshotRegion(region))));
</ins><span class="cx"> message.set(String::fromUTF8("CallbackID"), API::UInt64::create(callbackID));
</span><span class="cx">
</span><span class="cx"> webView->priv->snapshotResultsMap.set(callbackID, adoptGRef(g_task_new(webView, cancellable, callback, userData)));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp (164437 => 164438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2014-02-20 19:19:12 UTC (rev 164437)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp 2014-02-20 19:31:02 UTC (rev 164438)
</span><span class="lines">@@ -67,6 +67,19 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebViewGroup, webkit_web_view_group, G_TYPE_OBJECT)
</span><span class="cx">
</span><ins>+static inline WebCore::UserContentInjectedFrames toWebCoreUserContentInjectedFrames(WebKitInjectedContentFrames kitFrames)
+{
+ switch (kitFrames) {
+ case WEBKIT_INJECTED_CONTENT_FRAMES_ALL:
+ return WebCore::InjectInAllFrames;
+ case WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY:
+ return WebCore::InjectInTopFrameOnly;
+ default:
+ ASSERT_NOT_REACHED();
+ return WebCore::InjectInAllFrames;
+ }
+}
+
</ins><span class="cx"> static void webkitWebViewGroupSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewGroup* group = WEBKIT_WEB_VIEW_GROUP(object);
</span><span class="lines">@@ -224,9 +237,6 @@
</span><span class="cx"> g_object_notify(G_OBJECT(group), "settings");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_ALL, WebCore::InjectInAllFrames);
-COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY, WebCore::InjectInTopFrameOnly);
-
</del><span class="cx"> static PassRefPtr<API::Array> toAPIArray(const char* const* list)
</span><span class="cx"> {
</span><span class="cx"> if (!list)
</span><span class="lines">@@ -270,7 +280,7 @@
</span><span class="cx"> String::fromUTF8(baseURI),
</span><span class="cx"> webWhitelist.get(),
</span><span class="cx"> webBlacklist.get(),
</span><del>- static_cast<WebCore::UserContentInjectedFrames>(injectedFrames),
</del><ins>+ toWebCoreUserContentInjectedFrames(injectedFrames),
</ins><span class="cx"> WebCore::UserStyleUserLevel);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>