| 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 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 { | 767 { |
| 768 if (!frame() || !frame()->document()) | 768 if (!frame() || !frame()->document()) |
| 769 return WebDocument(); | 769 return WebDocument(); |
| 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 NPObject* WebFrameImpl::windowObject() const | 780 NPObject* WebFrameImpl::windowObject() const |
| 781 { | 781 { |
| 782 if (!frame()) | 782 if (!frame()) |
| 783 return 0; | 783 return 0; |
| 784 return frame()->script().windowScriptNPObject(); | 784 return frame()->script().windowScriptNPObject(); |
| 785 } | 785 } |
| 786 | 786 |
| 787 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object) | 787 void WebFrameImpl::bindToWindowObject(const WebString& name, NPObject* object) |
| (...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2485 | 2485 |
| 2486 // There is a possibility that the frame being detached was the only | 2486 // There is a possibility that the frame being detached was the only |
| 2487 // pending one. We need to make sure final replies can be sent. | 2487 // pending one. We need to make sure final replies can be sent. |
| 2488 flushCurrentScopingEffort(m_findRequestIdentifier); | 2488 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2489 | 2489 |
| 2490 cancelPendingScopingEffort(); | 2490 cancelPendingScopingEffort(); |
| 2491 } | 2491 } |
| 2492 } | 2492 } |
| 2493 | 2493 |
| 2494 } // namespace blink | 2494 } // namespace blink |
| OLD | NEW |