Index: third_party/WebKit/Source/core/frame/History.cpp |
diff --git a/third_party/WebKit/Source/core/frame/History.cpp b/third_party/WebKit/Source/core/frame/History.cpp |
index ff278e4d8c74cc3ff2685cc5e9a663d3f5dd44c4..470ca16087c63cbb837afa5ff975fed1a70900a9 100644 |
--- a/third_party/WebKit/Source/core/frame/History.cpp |
+++ b/third_party/WebKit/Source/core/frame/History.cpp |
@@ -84,7 +84,7 @@ SerializedScriptValue* History::stateInternal() const { |
} |
void History::setScrollRestoration(const String& value) { |
- ASSERT(value == "manual" || value == "auto"); |
+ DCHECK(value == "manual" || value == "auto"); |
if (!frame() || !frame()->loader().client()) |
return; |
@@ -133,14 +133,15 @@ void History::go(ExecutionContext* context, int delta) { |
if (!frame() || !frame()->loader().client()) |
return; |
- ASSERT(isMainThread()); |
+ DCHECK(isMainThread()); |
Document* activeDocument = toDocument(context); |
if (!activeDocument) |
return; |
if (!activeDocument->frame() || |
- !activeDocument->frame()->canNavigate(*frame())) |
+ !activeDocument->frame()->canNavigate(*frame())) { |
return; |
+ } |
if (!NavigationDisablerForUnload::isNavigationAllowed()) |
return; |
@@ -185,8 +186,9 @@ bool History::canChangeToUrl(const KURL& url, |
RefPtr<SecurityOrigin> requestedOrigin = SecurityOrigin::create(url); |
if (requestedOrigin->isUnique() || |
- !requestedOrigin->isSameSchemeHostPort(documentOrigin)) |
+ !requestedOrigin->isSameSchemeHostPort(documentOrigin)) { |
return false; |
+ } |
return true; |
} |