Diff
Modified: trunk/Source/WebCore/ChangeLog (183404 => 183405)
--- 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)
@@ -1,3 +1,31 @@
+2015-04-27 Brady Eidson <[email protected]>
+
+ 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):
+
2015-04-27 Yoav Weiss <[email protected]>
Fix viewport units in Media Queries
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (183404 => 183405)
--- 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)
@@ -1300,7 +1300,7 @@
}
if (request.shouldCheckNewWindowPolicy()) {
- 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) {
+ 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) {
continueLoadAfterNewWindowPolicy(request, formState, frameName, action, shouldContinue, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress);
});
@@ -1573,7 +1573,7 @@
// If we're about to re-post, set up action so the application can warn the user.
if (request.httpMethod() == "POST")
- loader->setTriggeringAction(NavigationAction(request, NavigationTypeFormResubmitted));
+ loader->setTriggeringAction(NavigationAction(request, NavigationType::FormResubmitted));
loader->setOverrideEncoding(m_documentLoader->overrideEncoding());
@@ -3209,7 +3209,7 @@
action = "" loadType, false);
} else {
request.setCachePolicy(ReturnCacheDataElseLoad);
- action = "" NavigationTypeFormResubmitted);
+ action = "" NavigationType::FormResubmitted);
}
} else {
switch (loadType) {
Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (183404 => 183405)
--- 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)
@@ -62,14 +62,14 @@
Allow
};
- enum NavigationType {
- NavigationTypeLinkClicked,
- NavigationTypeFormSubmitted,
- NavigationTypeBackForward,
- NavigationTypeReload,
- NavigationTypeFormResubmitted,
- NavigationTypeOther
- };
+enum class NavigationType {
+ LinkClicked,
+ FormSubmitted,
+ BackForward,
+ Reload,
+ FormResubmitted,
+ Other
+};
enum ClearProvisionalItemPolicy {
ShouldClearProvisionalItem,
Modified: trunk/Source/WebCore/loader/NavigationAction.cpp (183404 => 183405)
--- 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)
@@ -38,25 +38,25 @@
static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSubmission, bool haveEvent)
{
if (isFormSubmission)
- return NavigationTypeFormSubmitted;
+ return NavigationType::FormSubmitted;
if (haveEvent)
- return NavigationTypeLinkClicked;
+ return NavigationType::LinkClicked;
if (frameLoadType == FrameLoadType::Reload || frameLoadType == FrameLoadType::ReloadFromOrigin)
- return NavigationTypeReload;
+ return NavigationType::Reload;
if (isBackForwardLoadType(frameLoadType))
- return NavigationTypeBackForward;
- return NavigationTypeOther;
+ return NavigationType::BackForward;
+ return NavigationType::Other;
}
NavigationAction::NavigationAction()
- : m_type(NavigationTypeOther)
+ : m_type(NavigationType::Other)
, m_processingUserGesture(ScriptController::processingUserGesture())
{
}
NavigationAction::NavigationAction(const ResourceRequest& resourceRequest)
: m_resourceRequest(resourceRequest)
- , m_type(NavigationTypeOther)
+ , m_type(NavigationType::Other)
, m_processingUserGesture(ScriptController::processingUserGesture())
{
}
Modified: trunk/Source/WebCore/loader/PolicyChecker.cpp (183404 => 183405)
--- 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)
@@ -65,7 +65,7 @@
{
NavigationAction action = ""
if (action.isEmpty()) {
- action = "" NavigationTypeOther);
+ action = "" NavigationType::Other);
loader->setTriggeringAction(action);
}
Modified: trunk/Source/WebCore/page/PerformanceNavigation.cpp (183404 => 183405)
--- 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)
@@ -55,9 +55,9 @@
WebCore::NavigationType navigationType = documentLoader->triggeringAction().type();
switch (navigationType) {
- case NavigationTypeReload:
+ case NavigationType::Reload:
return TYPE_RELOAD;
- case NavigationTypeBackForward:
+ case NavigationType::BackForward:
return TYPE_BACK_FORWARD;
default:
return TYPE_NAVIGATE;
Modified: trunk/Source/WebKit/mac/ChangeLog (183404 => 183405)
--- 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)
@@ -1,3 +1,13 @@
+2015-04-27 Brady Eidson <[email protected]>
+
+ 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):
+
2015-04-27 Brent Fulgham <[email protected]>
REGRESSION(r182879): Images and video can no longer be downloaded
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (183404 => 183405)
--- 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)
@@ -1566,7 +1566,7 @@
NSURL *originalURL = action.url();
NSMutableDictionary *result = [NSMutableDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
+ [NSNumber numberWithInt:static_cast<int>(action.type())], WebActionNavigationTypeKey,
[NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
originalURL, WebActionOriginalURLKey,
nil];
Modified: trunk/Source/WebKit2/ChangeLog (183404 => 183405)
--- 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)
@@ -1,3 +1,28 @@
+2015-04-27 Brady Eidson <[email protected]>
+
+ 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):
+
2015-04-27 Brent Fulgham <[email protected]>
REGRESSION(r182879): Images and video can no longer be downloaded
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (183404 => 183405)
--- 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)
@@ -752,22 +752,22 @@
WKFrameNavigationType wkType = kWKFrameNavigationTypeOther;
switch (type) {
- case WebCore::NavigationTypeLinkClicked:
+ case WebCore::NavigationType::LinkClicked:
wkType = kWKFrameNavigationTypeLinkClicked;
break;
- case WebCore::NavigationTypeFormSubmitted:
+ case WebCore::NavigationType::FormSubmitted:
wkType = kWKFrameNavigationTypeFormSubmitted;
break;
- case WebCore::NavigationTypeBackForward:
+ case WebCore::NavigationType::BackForward:
wkType = kWKFrameNavigationTypeBackForward;
break;
- case WebCore::NavigationTypeReload:
+ case WebCore::NavigationType::Reload:
wkType = kWKFrameNavigationTypeReload;
break;
- case WebCore::NavigationTypeFormResubmitted:
+ case WebCore::NavigationType::FormResubmitted:
wkType = kWKFrameNavigationTypeFormResubmitted;
break;
- case WebCore::NavigationTypeOther:
+ case WebCore::NavigationType::Other:
wkType = kWKFrameNavigationTypeOther;
break;
}
Modified: trunk/Source/WebKit2/Shared/NavigationActionData.cpp (183404 => 183405)
--- 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)
@@ -34,7 +34,7 @@
namespace WebKit {
NavigationActionData::NavigationActionData()
- : navigationType(NavigationTypeOther)
+ : navigationType(NavigationType::Other)
, modifiers()
, mouseButton(WebMouseEvent::NoButton)
, isProcessingUserGesture(false)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (183404 => 183405)
--- 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)
@@ -37,17 +37,17 @@
static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
{
switch (navigationType) {
- case WebCore::NavigationTypeLinkClicked:
+ case WebCore::NavigationType::LinkClicked:
return WKNavigationTypeLinkActivated;
- case WebCore::NavigationTypeFormSubmitted:
+ case WebCore::NavigationType::FormSubmitted:
return WKNavigationTypeFormSubmitted;
- case WebCore::NavigationTypeBackForward:
+ case WebCore::NavigationType::BackForward:
return WKNavigationTypeBackForward;
- case WebCore::NavigationTypeReload:
+ case WebCore::NavigationType::Reload:
return WKNavigationTypeReload;
- case WebCore::NavigationTypeFormResubmitted:
+ case WebCore::NavigationType::FormResubmitted:
return WKNavigationTypeFormResubmitted;
- case WebCore::NavigationTypeOther:
+ case WebCore::NavigationType::Other:
return WKNavigationTypeOther;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp (183404 => 183405)
--- 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)
@@ -56,17 +56,17 @@
WebKitNavigationType toWebKitNavigationType(WebCore::NavigationType type)
{
switch (type) {
- case WebCore::NavigationType::NavigationTypeLinkClicked:
+ case WebCore::NavigationType::LinkClicked:
return WEBKIT_NAVIGATION_TYPE_LINK_CLICKED;
- case WebCore::NavigationType::NavigationTypeFormSubmitted:
+ case WebCore::NavigationType::FormSubmitted:
return WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED;
- case WebCore::NavigationType::NavigationTypeBackForward:
+ case WebCore::NavigationType::BackForward:
return WEBKIT_NAVIGATION_TYPE_BACK_FORWARD;
- case WebCore::NavigationType::NavigationTypeReload:
+ case WebCore::NavigationType::Reload:
return WEBKIT_NAVIGATION_TYPE_RELOAD;
- case WebCore::NavigationType::NavigationTypeFormResubmitted:
+ case WebCore::NavigationType::FormResubmitted:
return WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED;
- case WebCore::NavigationType::NavigationTypeOther:
+ case WebCore::NavigationType::Other:
return WEBKIT_NAVIGATION_TYPE_OTHER;
default:
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (183404 => 183405)
--- 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)
@@ -764,7 +764,7 @@
RefPtr<WebFrame> originatingFrame;
switch (action->navigationType()) {
- case NavigationTypeLinkClicked:
+ case NavigationType::LinkClicked:
if (EventTarget* target = navigationAction.event()->target()) {
if (Node* node = target->toNode()) {
if (Frame* frame = node->document().frame())
@@ -772,14 +772,14 @@
}
}
break;
- case NavigationTypeFormSubmitted:
- case NavigationTypeFormResubmitted:
+ case NavigationType::FormSubmitted:
+ case NavigationType::FormResubmitted:
if (formState)
originatingFrame = WebFrame::fromCoreFrame(*formState->sourceDocument()->frame());
break;
- case NavigationTypeBackForward:
- case NavigationTypeReload:
- case NavigationTypeOther:
+ case NavigationType::BackForward:
+ case NavigationType::Reload:
+ case NavigationType::Other:
break;
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (183404 => 183405)
--- 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)
@@ -137,7 +137,7 @@
Frame& inspectedMainFrame = inspectedPage->mainFrame();
FrameLoadRequest request(inspectedMainFrame.document()->securityOrigin(), ResourceRequest(urlString), "_blank");
- Page* newPage = inspectedPage->chrome().createWindow(&inspectedMainFrame, request, WindowFeatures(), NavigationAction(request.resourceRequest(), NavigationTypeLinkClicked));
+ Page* newPage = inspectedPage->chrome().createWindow(&inspectedMainFrame, request, WindowFeatures(), NavigationAction(request.resourceRequest(), NavigationType::LinkClicked));
if (!newPage)
return;
