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

Side by Side Diff: Source/web/WebFrameImpl.cpp

Issue 217543005: Move dispatchBeforeUnloadEvent to WebFrame, part 1/3. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/web/WebFrameImpl.h ('k') | Source/web/WebViewImpl.cpp » ('j') | 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 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 return WebDocument(frame()->document()); 770 return WebDocument(frame()->document());
771 } 771 }
772 772
773 WebPerformance WebFrameImpl::performance() const 773 WebPerformance WebFrameImpl::performance() const
774 { 774 {
775 if (!frame()) 775 if (!frame())
776 return WebPerformance(); 776 return WebPerformance();
777 return WebPerformance(&frame()->domWindow()->performance()); 777 return WebPerformance(&frame()->domWindow()->performance());
778 } 778 }
779 779
780 bool WebFrameImpl::dispatchBeforeUnloadEvent()
781 {
782 if (!frame())
783 return true;
784 return frame()->loader().shouldClose();
785 }
786
787
abarth-chromium 2014/03/28 22:42:51 You've got an extra blank line here.
Avi (use Gerrit) 2014/03/29 01:30:24 Oops. Fixed.
780 NPObject* WebFrameImpl::windowObject() const 788 NPObject* WebFrameImpl::windowObject() const
781 { 789 {
782 if (!frame()) 790 if (!frame())
783 return 0; 791 return 0;
784 return frame()->script().windowScriptNPObject(); 792 return frame()->script().windowScriptNPObject();
785 } 793 }
786 794
787 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object) 795 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object)
788 { 796 {
789 bindToWindowObject(name, object, 0); 797 bindToWindowObject(name, object, 0);
(...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after
2535 2543
2536 // There is a possibility that the frame being detached was the only 2544 // There is a possibility that the frame being detached was the only
2537 // pending one. We need to make sure final replies can be sent. 2545 // pending one. We need to make sure final replies can be sent.
2538 flushCurrentScopingEffort(m_findRequestIdentifier); 2546 flushCurrentScopingEffort(m_findRequestIdentifier);
2539 2547
2540 cancelPendingScopingEffort(); 2548 cancelPendingScopingEffort();
2541 } 2549 }
2542 } 2550 }
2543 2551
2544 } // namespace blink 2552 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebFrameImpl.h ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698