<!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>[183405] 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/183405">183405</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 11:46:15 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make 'enum NavigationType' be an enum class
https://bugs.webkit.org/show_bug.cgi?id=144270
Reviewed by Alex Christensen.
Source/WebCore:
No new tests (No change in behavior).
I’ll be adding a new NavigationType for bug 144269 so it makes sense to make this
an enum class first.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::load):
(WebCore::FrameLoader::reload):
(WebCore::FrameLoader::loadDifferentDocumentItem):
* loader/FrameLoaderTypes.h:
* loader/NavigationAction.cpp:
(WebCore::navigationType):
(WebCore::NavigationAction::NavigationAction):
* loader/PolicyChecker.cpp:
(WebCore::PolicyChecker::checkNavigationPolicy):
* page/PerformanceNavigation.cpp:
(WebCore::PerformanceNavigation::type):
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::actionDictionary):
Source/WebKit2:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
* Shared/NavigationActionData.cpp:
(WebKit::NavigationActionData::NavigationActionData):
* UIProcess/API/Cocoa/WKNavigationAction.mm:
(toWKNavigationType):
* UIProcess/API/gtk/WebKitPrivate.cpp:
(toWebKitNavigationType):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::openInNewTab):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderTypesh">trunk/Source/WebCore/loader/FrameLoaderTypes.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationActioncpp">trunk/Source/WebCore/loader/NavigationAction.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPolicyCheckercpp">trunk/Source/WebCore/loader/PolicyChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceNavigationcpp">trunk/Source/WebCore/page/PerformanceNavigation.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNavigationActionDatacpp">trunk/Source/WebKit2/Shared/NavigationActionData.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/ChangeLog        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-04-27 Brady Eidson <beidson@apple.com>
+
+ Make 'enum NavigationType' be an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=144270
+
+ Reviewed by Alex Christensen.
+
+ No new tests (No change in behavior).
+
+ I’ll be adding a new NavigationType for bug 144269 so it makes sense to make this
+ an enum class first.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::load):
+ (WebCore::FrameLoader::reload):
+ (WebCore::FrameLoader::loadDifferentDocumentItem):
+ * loader/FrameLoaderTypes.h:
+
+ * loader/NavigationAction.cpp:
+ (WebCore::navigationType):
+ (WebCore::NavigationAction::NavigationAction):
+
+ * loader/PolicyChecker.cpp:
+ (WebCore::PolicyChecker::checkNavigationPolicy):
+
+ * page/PerformanceNavigation.cpp:
+ (WebCore::PerformanceNavigation::type):
+
</ins><span class="cx"> 2015-04-27 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Fix viewport units in Media Queries
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -1300,7 +1300,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (request.shouldCheckNewWindowPolicy()) {
</span><del>- policyChecker().checkNewWindowPolicy(NavigationAction(request.resourceRequest(), NavigationTypeOther), request.resourceRequest(), nullptr, request.frameName(), [this](const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
</del><ins>+ policyChecker().checkNewWindowPolicy(NavigationAction(request.resourceRequest(), NavigationType::Other), request.resourceRequest(), nullptr, request.frameName(), [this](const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& action, bool shouldContinue) {
</ins><span class="cx"> continueLoadAfterNewWindowPolicy(request, formState, frameName, action, shouldContinue, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -1573,7 +1573,7 @@
</span><span class="cx">
</span><span class="cx"> // If we're about to re-post, set up action so the application can warn the user.
</span><span class="cx"> if (request.httpMethod() == "POST")
</span><del>- loader->setTriggeringAction(NavigationAction(request, NavigationTypeFormResubmitted));
</del><ins>+ loader->setTriggeringAction(NavigationAction(request, NavigationType::FormResubmitted));
</ins><span class="cx">
</span><span class="cx"> loader->setOverrideEncoding(m_documentLoader->overrideEncoding());
</span><span class="cx">
</span><span class="lines">@@ -3209,7 +3209,7 @@
</span><span class="cx"> action = NavigationAction(request, loadType, false);
</span><span class="cx"> } else {
</span><span class="cx"> request.setCachePolicy(ReturnCacheDataElseLoad);
</span><del>- action = NavigationAction(request, NavigationTypeFormResubmitted);
</del><ins>+ action = NavigationAction(request, NavigationType::FormResubmitted);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> switch (loadType) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderTypes.h        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -62,14 +62,14 @@
</span><span class="cx"> Allow
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum NavigationType {
- NavigationTypeLinkClicked,
- NavigationTypeFormSubmitted,
- NavigationTypeBackForward,
- NavigationTypeReload,
- NavigationTypeFormResubmitted,
- NavigationTypeOther
- };
</del><ins>+enum class NavigationType {
+ LinkClicked,
+ FormSubmitted,
+ BackForward,
+ Reload,
+ FormResubmitted,
+ Other
+};
</ins><span class="cx">
</span><span class="cx"> enum ClearProvisionalItemPolicy {
</span><span class="cx"> ShouldClearProvisionalItem,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationAction.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationAction.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/loader/NavigationAction.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -38,25 +38,25 @@
</span><span class="cx"> static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSubmission, bool haveEvent)
</span><span class="cx"> {
</span><span class="cx"> if (isFormSubmission)
</span><del>- return NavigationTypeFormSubmitted;
</del><ins>+ return NavigationType::FormSubmitted;
</ins><span class="cx"> if (haveEvent)
</span><del>- return NavigationTypeLinkClicked;
</del><ins>+ return NavigationType::LinkClicked;
</ins><span class="cx"> if (frameLoadType == FrameLoadType::Reload || frameLoadType == FrameLoadType::ReloadFromOrigin)
</span><del>- return NavigationTypeReload;
</del><ins>+ return NavigationType::Reload;
</ins><span class="cx"> if (isBackForwardLoadType(frameLoadType))
</span><del>- return NavigationTypeBackForward;
- return NavigationTypeOther;
</del><ins>+ return NavigationType::BackForward;
+ return NavigationType::Other;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NavigationAction::NavigationAction()
</span><del>- : m_type(NavigationTypeOther)
</del><ins>+ : m_type(NavigationType::Other)
</ins><span class="cx"> , m_processingUserGesture(ScriptController::processingUserGesture())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NavigationAction::NavigationAction(const ResourceRequest& resourceRequest)
</span><span class="cx"> : m_resourceRequest(resourceRequest)
</span><del>- , m_type(NavigationTypeOther)
</del><ins>+ , m_type(NavigationType::Other)
</ins><span class="cx"> , m_processingUserGesture(ScriptController::processingUserGesture())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPolicyCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PolicyChecker.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/loader/PolicyChecker.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> {
</span><span class="cx"> NavigationAction action = loader->triggeringAction();
</span><span class="cx"> if (action.isEmpty()) {
</span><del>- action = NavigationAction(request, NavigationTypeOther);
</del><ins>+ action = NavigationAction(request, NavigationType::Other);
</ins><span class="cx"> loader->setTriggeringAction(action);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceNavigationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceNavigation.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceNavigation.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebCore/page/PerformanceNavigation.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> WebCore::NavigationType navigationType = documentLoader->triggeringAction().type();
</span><span class="cx"> switch (navigationType) {
</span><del>- case NavigationTypeReload:
</del><ins>+ case NavigationType::Reload:
</ins><span class="cx"> return TYPE_RELOAD;
</span><del>- case NavigationTypeBackForward:
</del><ins>+ case NavigationType::BackForward:
</ins><span class="cx"> return TYPE_BACK_FORWARD;
</span><span class="cx"> default:
</span><span class="cx"> return TYPE_NAVIGATE;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-27 Brady Eidson <beidson@apple.com>
+
+ Make 'enum NavigationType' be an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=144270
+
+ Reviewed by Alex Christensen.
+
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::actionDictionary):
+
</ins><span class="cx"> 2015-04-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r182879): Images and video can no longer be downloaded
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -1566,7 +1566,7 @@
</span><span class="cx"> NSURL *originalURL = action.url();
</span><span class="cx">
</span><span class="cx"> NSMutableDictionary *result = [NSMutableDictionary dictionaryWithObjectsAndKeys:
</span><del>- [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
</del><ins>+ [NSNumber numberWithInt:static_cast<int>(action.type())], WebActionNavigationTypeKey,
</ins><span class="cx"> [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
</span><span class="cx"> originalURL, WebActionOriginalURLKey,
</span><span class="cx"> nil];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/ChangeLog        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-27 Brady Eidson <beidson@apple.com>
+
+ Make 'enum NavigationType' be an enum class
+ https://bugs.webkit.org/show_bug.cgi?id=144270
+
+ Reviewed by Alex Christensen.
+
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI):
+
+ * Shared/NavigationActionData.cpp:
+ (WebKit::NavigationActionData::NavigationActionData):
+
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ (toWKNavigationType):
+
+ * UIProcess/API/gtk/WebKitPrivate.cpp:
+ (toWebKitNavigationType):
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::openInNewTab):
+
</ins><span class="cx"> 2015-04-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r182879): Images and video can no longer be downloaded
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -752,22 +752,22 @@
</span><span class="cx"> WKFrameNavigationType wkType = kWKFrameNavigationTypeOther;
</span><span class="cx">
</span><span class="cx"> switch (type) {
</span><del>- case WebCore::NavigationTypeLinkClicked:
</del><ins>+ case WebCore::NavigationType::LinkClicked:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeLinkClicked;
</span><span class="cx"> break;
</span><del>- case WebCore::NavigationTypeFormSubmitted:
</del><ins>+ case WebCore::NavigationType::FormSubmitted:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeFormSubmitted;
</span><span class="cx"> break;
</span><del>- case WebCore::NavigationTypeBackForward:
</del><ins>+ case WebCore::NavigationType::BackForward:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeBackForward;
</span><span class="cx"> break;
</span><del>- case WebCore::NavigationTypeReload:
</del><ins>+ case WebCore::NavigationType::Reload:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeReload;
</span><span class="cx"> break;
</span><del>- case WebCore::NavigationTypeFormResubmitted:
</del><ins>+ case WebCore::NavigationType::FormResubmitted:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeFormResubmitted;
</span><span class="cx"> break;
</span><del>- case WebCore::NavigationTypeOther:
</del><ins>+ case WebCore::NavigationType::Other:
</ins><span class="cx"> wkType = kWKFrameNavigationTypeOther;
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNavigationActionDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NavigationActionData.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NavigationActionData.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/Shared/NavigationActionData.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> NavigationActionData::NavigationActionData()
</span><del>- : navigationType(NavigationTypeOther)
</del><ins>+ : navigationType(NavigationType::Other)
</ins><span class="cx"> , modifiers()
</span><span class="cx"> , mouseButton(WebMouseEvent::NoButton)
</span><span class="cx"> , isProcessingUserGesture(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -37,17 +37,17 @@
</span><span class="cx"> static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
</span><span class="cx"> {
</span><span class="cx"> switch (navigationType) {
</span><del>- case WebCore::NavigationTypeLinkClicked:
</del><ins>+ case WebCore::NavigationType::LinkClicked:
</ins><span class="cx"> return WKNavigationTypeLinkActivated;
</span><del>- case WebCore::NavigationTypeFormSubmitted:
</del><ins>+ case WebCore::NavigationType::FormSubmitted:
</ins><span class="cx"> return WKNavigationTypeFormSubmitted;
</span><del>- case WebCore::NavigationTypeBackForward:
</del><ins>+ case WebCore::NavigationType::BackForward:
</ins><span class="cx"> return WKNavigationTypeBackForward;
</span><del>- case WebCore::NavigationTypeReload:
</del><ins>+ case WebCore::NavigationType::Reload:
</ins><span class="cx"> return WKNavigationTypeReload;
</span><del>- case WebCore::NavigationTypeFormResubmitted:
</del><ins>+ case WebCore::NavigationType::FormResubmitted:
</ins><span class="cx"> return WKNavigationTypeFormResubmitted;
</span><del>- case WebCore::NavigationTypeOther:
</del><ins>+ case WebCore::NavigationType::Other:
</ins><span class="cx"> return WKNavigationTypeOther;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -56,17 +56,17 @@
</span><span class="cx"> WebKitNavigationType toWebKitNavigationType(WebCore::NavigationType type)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><del>- case WebCore::NavigationType::NavigationTypeLinkClicked:
</del><ins>+ case WebCore::NavigationType::LinkClicked:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
</span><del>- case WebCore::NavigationType::NavigationTypeFormSubmitted:
</del><ins>+ case WebCore::NavigationType::FormSubmitted:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED;
</span><del>- case WebCore::NavigationType::NavigationTypeBackForward:
</del><ins>+ case WebCore::NavigationType::BackForward:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_BACK_FORWARD;
</span><del>- case WebCore::NavigationType::NavigationTypeReload:
</del><ins>+ case WebCore::NavigationType::Reload:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_RELOAD;
</span><del>- case WebCore::NavigationType::NavigationTypeFormResubmitted:
</del><ins>+ case WebCore::NavigationType::FormResubmitted:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED;
</span><del>- case WebCore::NavigationType::NavigationTypeOther:
</del><ins>+ case WebCore::NavigationType::Other:
</ins><span class="cx"> return WEBKIT_NAVIGATION_TYPE_OTHER;
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -764,7 +764,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebFrame> originatingFrame;
</span><span class="cx"> switch (action->navigationType()) {
</span><del>- case NavigationTypeLinkClicked:
</del><ins>+ case NavigationType::LinkClicked:
</ins><span class="cx"> if (EventTarget* target = navigationAction.event()->target()) {
</span><span class="cx"> if (Node* node = target->toNode()) {
</span><span class="cx"> if (Frame* frame = node->document().frame())
</span><span class="lines">@@ -772,14 +772,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>- case NavigationTypeFormSubmitted:
- case NavigationTypeFormResubmitted:
</del><ins>+ case NavigationType::FormSubmitted:
+ case NavigationType::FormResubmitted:
</ins><span class="cx"> if (formState)
</span><span class="cx"> originatingFrame = WebFrame::fromCoreFrame(*formState->sourceDocument()->frame());
</span><span class="cx"> break;
</span><del>- case NavigationTypeBackForward:
- case NavigationTypeReload:
- case NavigationTypeOther:
</del><ins>+ case NavigationType::BackForward:
+ case NavigationType::Reload:
+ case NavigationType::Other:
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (183404 => 183405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp        2015-04-27 18:42:29 UTC (rev 183404)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp        2015-04-27 18:46:15 UTC (rev 183405)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> Frame& inspectedMainFrame = inspectedPage->mainFrame();
</span><span class="cx"> FrameLoadRequest request(inspectedMainFrame.document()->securityOrigin(), ResourceRequest(urlString), "_blank");
</span><span class="cx">
</span><del>- Page* newPage = inspectedPage->chrome().createWindow(&inspectedMainFrame, request, WindowFeatures(), NavigationAction(request.resourceRequest(), NavigationTypeLinkClicked));
</del><ins>+ Page* newPage = inspectedPage->chrome().createWindow(&inspectedMainFrame, request, WindowFeatures(), NavigationAction(request.resourceRequest(), NavigationType::LinkClicked));
</ins><span class="cx"> if (!newPage)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>