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

Unified Diff: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Issue 2528813002: Fix Self-Referencing OOPIF Infinite Loop (Closed)
Patch Set: refactor allowedToLoadFrame conditional Created 3 years, 10 months 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/html/HTMLFrameElementBase.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
index ed05618b07ae7bac1f96455b39d745f2e253b58f..41a2aaa9f7a45d2594d77b50b94e509f347094b1 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp
@@ -465,11 +465,9 @@ LayoutEmbeddedItem HTMLPlugInElement::layoutEmbeddedItem() const {
// depending on <param> values.
bool HTMLPlugInElement::allowedToLoadFrameURL(const String& url) {
KURL completeURL = document().completeURL(url);
- if (contentFrame() && completeURL.protocolIsJavaScript() &&
- !document().getSecurityOrigin()->canAccess(
- contentFrame()->securityContext()->getSecurityOrigin()))
- return false;
- return document().frame()->isURLAllowed(completeURL);
+ return !(contentFrame() && completeURL.protocolIsJavaScript() &&
+ !document().getSecurityOrigin()->canAccess(
+ contentFrame()->securityContext()->getSecurityOrigin()));
}
// We don't use m_url, or m_serviceType as they may not be the final values
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698