Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(802)

Unified Diff: third_party/WebKit/Source/core/frame/History.cpp

Issue 2553383002: Mechanical style fixes: History.cpp and Location.cpp (Closed)
Patch Set: . Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/frame/History.h ('k') | third_party/WebKit/Source/core/frame/Location.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « third_party/WebKit/Source/core/frame/History.h ('k') | third_party/WebKit/Source/core/frame/Location.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698