Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
index 566a9cb9b6a65e356cd67d5d46c9ce83ed18c4d5..2e3534b3059a5c1ef8a0e9dec3e630f2c3b1859a 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
@@ -47,7 +47,6 @@ |
, m_scrollingMode(ScrollbarAuto) |
, m_marginWidth(-1) |
, m_marginHeight(-1) |
- , m_javaScriptURLFailedAccessCheck(false) |
{ |
} |
@@ -59,11 +58,8 @@ |
const KURL& completeURL = document().completeURL(m_URL); |
if (protocolIsJavaScript(completeURL)) { |
- if (contentFrame() && !ScriptController::canAccessFromCurrentOrigin(toIsolate(&document()), contentFrame())) { |
- m_javaScriptURLFailedAccessCheck = true; |
+ if (contentFrame() && !ScriptController::canAccessFromCurrentOrigin(toIsolate(&document()), contentFrame())) |
return false; |
- } |
- SECURITY_CHECK(!m_javaScriptURLFailedAccessCheck); |
} |
LocalFrame* parentFrame = document().frame(); |
@@ -170,10 +166,6 @@ |
if (!SubframeLoadingDisabler::canLoadFrame(*this)) |
return; |
- // We should never have a content frame at the point where we got inserted |
- // into a tree. |
- SECURITY_CHECK(!contentFrame()); |
- |
setNameAndOpenURL(); |
} |
@@ -194,7 +186,6 @@ |
void HTMLFrameElementBase::setLocation(const String& str) |
{ |
m_URL = AtomicString(str); |
- m_javaScriptURLFailedAccessCheck = false; |
if (isConnected()) |
openURL(false); |