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

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

Issue 1659013003: Don't reset LoadEventProgress if frame unload has already started. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more disabler Created 4 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 { 768 {
769 if (!frame()) 769 if (!frame())
770 return true; 770 return true;
771 return frame()->loader().shouldClose(); 771 return frame()->loader().shouldClose();
772 } 772 }
773 773
774 void WebLocalFrameImpl::dispatchUnloadEvent() 774 void WebLocalFrameImpl::dispatchUnloadEvent()
775 { 775 {
776 if (!frame()) 776 if (!frame())
777 return; 777 return;
778 SubframeLoadingDisabler disabler(frame()->document());
778 frame()->loader().dispatchUnloadEvent(); 779 frame()->loader().dispatchUnloadEvent();
779 } 780 }
780 781
781 NPObject* WebLocalFrameImpl::windowObject() const 782 NPObject* WebLocalFrameImpl::windowObject() const
782 { 783 {
783 if (!frame() || ScriptForbiddenScope::isScriptForbidden()) 784 if (!frame() || ScriptForbiddenScope::isScriptForbidden())
784 return 0; 785 return 0;
785 return frame()->script().windowScriptNPObject(); 786 return frame()->script().windowScriptNPObject();
786 } 787 }
787 788
(...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 return WebSandboxFlags::None; 2253 return WebSandboxFlags::None;
2253 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2254 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2254 } 2255 }
2255 2256
2256 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2257 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2257 { 2258 {
2258 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2259 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2259 } 2260 }
2260 2261
2261 } // namespace blink 2262 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698