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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1710283003: OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Split off the relaxed DCHECK in OnCrossSiteResponse into separate CL Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1982 frameRequest.setReplacesCurrentItem(replace); 1982 frameRequest.setReplacesCurrentItem(replace);
1983 if (isClientRedirect) 1983 if (isClientRedirect)
1984 frameRequest.setClientRedirect(ClientRedirect); 1984 frameRequest.setClientRedirect(ClientRedirect);
1985 1985
1986 RefPtrWillBeRawPtr<HistoryItem> historyItem = PassRefPtrWillBeRawPtr<History Item>(item); 1986 RefPtrWillBeRawPtr<HistoryItem> historyItem = PassRefPtrWillBeRawPtr<History Item>(item);
1987 frame()->loader().load( 1987 frame()->loader().load(
1988 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem. get(), 1988 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem. get(),
1989 static_cast<HistoryLoadType>(webHistoryLoadType)); 1989 static_cast<HistoryLoadType>(webHistoryLoadType));
1990 } 1990 }
1991 1991
1992 void WebLocalFrameImpl::updateForBlockedLoad()
1993 {
1994 ASSERT(frame());
1995 frame()->updateForBlockedLoad();
1996 }
1997
1992 bool WebLocalFrameImpl::isLoading() const 1998 bool WebLocalFrameImpl::isLoading() const
1993 { 1999 {
1994 if (!frame() || !frame()->document()) 2000 if (!frame() || !frame()->document())
1995 return false; 2001 return false;
1996 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || frame()->loader().provisionalDocumentLoader() || !frame()->document()->loadEv entFinished(); 2002 return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() || frame()->loader().provisionalDocumentLoader() || !frame()->document()->loadEv entFinished();
1997 } 2003 }
1998 2004
1999 bool WebLocalFrameImpl::isResourceLoadInProgress() const 2005 bool WebLocalFrameImpl::isResourceLoadInProgress() const
2000 { 2006 {
2001 if (!frame() || !frame()->document()) 2007 if (!frame() || !frame()->document())
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 return WebSandboxFlags::None; 2202 return WebSandboxFlags::None;
2197 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2203 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2198 } 2204 }
2199 2205
2200 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2206 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2201 { 2207 {
2202 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2208 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2203 } 2209 }
2204 2210
2205 } // namespace blink 2211 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698