| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "web/WebRemoteFrameImpl.h" | 6 #include "web/WebRemoteFrameImpl.h" |
| 7 | 7 |
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" |
| 9 #include "core/frame/RemoteFrame.h" | 9 #include "core/frame/RemoteFrame.h" |
| 10 #include "core/frame/Settings.h" | 10 #include "core/frame/Settings.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 SandboxFlags PlaceholderFrameOwner::sandboxFlags() const | 85 SandboxFlags PlaceholderFrameOwner::sandboxFlags() const |
| 86 { | 86 { |
| 87 return 0; | 87 return 0; |
| 88 } | 88 } |
| 89 | 89 |
| 90 void PlaceholderFrameOwner::dispatchLoad() | 90 void PlaceholderFrameOwner::dispatchLoad() |
| 91 { | 91 { |
| 92 } | 92 } |
| 93 | 93 |
| 94 void PlaceholderFrameOwner::trace(Visitor* visitor) |
| 95 { |
| 96 FrameOwner::trace(visitor); |
| 97 } |
| 98 |
| 94 WebRemoteFrame* WebRemoteFrame::create(WebRemoteFrameClient* client) | 99 WebRemoteFrame* WebRemoteFrame::create(WebRemoteFrameClient* client) |
| 95 { | 100 { |
| 96 WebRemoteFrameImpl* frame = new WebRemoteFrameImpl(client); | 101 WebRemoteFrameImpl* frame = new WebRemoteFrameImpl(client); |
| 97 #if ENABLE(OILPAN) | 102 #if ENABLE(OILPAN) |
| 98 return frame; | 103 return frame; |
| 99 #else | 104 #else |
| 100 return adoptRef(frame).leakRef(); | 105 return adoptRef(frame).leakRef(); |
| 101 #endif | 106 #endif |
| 102 } | 107 } |
| 103 | 108 |
| (...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 858 { | 863 { |
| 859 frame()->setIsLoading(false); | 864 frame()->setIsLoading(false); |
| 860 if (parent() && parent()->isWebLocalFrame()) { | 865 if (parent() && parent()->isWebLocalFrame()) { |
| 861 WebLocalFrameImpl* parentFrame = | 866 WebLocalFrameImpl* parentFrame = |
| 862 toWebLocalFrameImpl(parent()->toWebLocalFrame()); | 867 toWebLocalFrameImpl(parent()->toWebLocalFrame()); |
| 863 parentFrame->frame()->loader().checkCompleted(); | 868 parentFrame->frame()->loader().checkCompleted(); |
| 864 } | 869 } |
| 865 } | 870 } |
| 866 | 871 |
| 867 } // namespace blink | 872 } // namespace blink |
| OLD | NEW |