| OLD | NEW |
| 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 Loading... |
| 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 |
| 780 NPObject* WebFrameImpl::windowObject() const | 787 NPObject* WebFrameImpl::windowObject() const |
| 781 { | 788 { |
| 782 if (!frame()) | 789 if (!frame()) |
| 783 return 0; | 790 return 0; |
| 784 return frame()->script().windowScriptNPObject(); | 791 return frame()->script().windowScriptNPObject(); |
| 785 } | 792 } |
| 786 | 793 |
| 787 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object) | 794 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object) |
| 788 { | 795 { |
| 789 bindToWindowObject(name, object, 0); | 796 bindToWindowObject(name, object, 0); |
| (...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2535 | 2542 |
| 2536 // There is a possibility that the frame being detached was the only | 2543 // 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. | 2544 // pending one. We need to make sure final replies can be sent. |
| 2538 flushCurrentScopingEffort(m_findRequestIdentifier); | 2545 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2539 | 2546 |
| 2540 cancelPendingScopingEffort(); | 2547 cancelPendingScopingEffort(); |
| 2541 } | 2548 } |
| 2542 } | 2549 } |
| 2543 | 2550 |
| 2544 } // namespace blink | 2551 } // namespace blink |
| OLD | NEW |