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

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

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/WebRemoteFrameImpl.h ('k') | Source/web/WebSettingsImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/FrameOwner.h" 8 #include "core/frame/FrameOwner.h"
9 #include "core/frame/FrameView.h" 9 #include "core/frame/FrameView.h"
10 #include "core/frame/RemoteFrame.h" 10 #include "core/frame/RemoteFrame.h"
(...skipping 19 matching lines...) Expand all
30 // its owner element in another process. 30 // its owner element in another process.
31 // 2. Trigger a load event on its owner element once it finishes a load. 31 // 2. Trigger a load event on its owner element once it finishes a load.
32 class RemoteBridgeFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<Remo teBridgeFrameOwner>, public FrameOwner { 32 class RemoteBridgeFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<Remo teBridgeFrameOwner>, public FrameOwner {
33 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RemoteBridgeFrameOwner); 33 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RemoteBridgeFrameOwner);
34 public: 34 public:
35 static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillB eRawPtr<WebLocalFrameImpl> frame) 35 static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillB eRawPtr<WebLocalFrameImpl> frame)
36 { 36 {
37 return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame)); 37 return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame));
38 } 38 }
39 39
40 virtual bool isLocal() const OVERRIDE; 40 virtual bool isLocal() const override;
41 virtual SandboxFlags sandboxFlags() const OVERRIDE; 41 virtual SandboxFlags sandboxFlags() const override;
42 virtual void dispatchLoad() OVERRIDE; 42 virtual void dispatchLoad() override;
43 43
44 virtual void trace(Visitor*); 44 virtual void trace(Visitor*);
45 45
46 private: 46 private:
47 explicit RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl>); 47 explicit RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl>);
48 48
49 RefPtrWillBeMember<WebLocalFrameImpl> m_frame; 49 RefPtrWillBeMember<WebLocalFrameImpl> m_frame;
50 }; 50 };
51 51
52 RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFr ameImpl> frame) 52 RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFr ameImpl> frame)
(...skipping 26 matching lines...) Expand all
79 // FIXME: This is just a placeholder frame owner to supply to RemoteFrame when 79 // FIXME: This is just a placeholder frame owner to supply to RemoteFrame when
80 // the parent is also a remote frame. Strictly speaking, this shouldn't be 80 // the parent is also a remote frame. Strictly speaking, this shouldn't be
81 // necessary, since a remote frame shouldn't ever need to communicate with a 81 // necessary, since a remote frame shouldn't ever need to communicate with a
82 // remote parent (there are no sandbox flags to retrieve in this case, nor can 82 // remote parent (there are no sandbox flags to retrieve in this case, nor can
83 // the RemoteFrame itself load a document). In most circumstances, the check for 83 // the RemoteFrame itself load a document). In most circumstances, the check for
84 // frame->owner() can be replaced with a check for frame->tree().parent(). Once 84 // frame->owner() can be replaced with a check for frame->tree().parent(). Once
85 // that's done, this class can be removed. 85 // that's done, this class can be removed.
86 class PlaceholderFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<Place holderFrameOwner>, public FrameOwner { 86 class PlaceholderFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<Place holderFrameOwner>, public FrameOwner {
87 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PlaceholderFrameOwner); 87 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PlaceholderFrameOwner);
88 public: 88 public:
89 virtual bool isLocal() const OVERRIDE; 89 virtual bool isLocal() const override;
90 virtual SandboxFlags sandboxFlags() const OVERRIDE; 90 virtual SandboxFlags sandboxFlags() const override;
91 virtual void dispatchLoad() OVERRIDE; 91 virtual void dispatchLoad() override;
92 }; 92 };
93 93
94 bool PlaceholderFrameOwner::isLocal() const 94 bool PlaceholderFrameOwner::isLocal() const
95 { 95 {
96 return false; 96 return false;
97 } 97 }
98 98
99 SandboxFlags PlaceholderFrameOwner::sandboxFlags() const 99 SandboxFlags PlaceholderFrameOwner::sandboxFlags() const
100 { 100 {
101 ASSERT_NOT_REACHED(); 101 ASSERT_NOT_REACHED();
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const 861 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const
862 { 862 {
863 ASSERT(source); 863 ASSERT(source);
864 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); 864 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source);
865 client()->initializeChildFrame( 865 client()->initializeChildFrame(
866 localFrameImpl->frame()->view()->frameRect(), 866 localFrameImpl->frame()->view()->frameRect(),
867 localFrameImpl->frame()->view()->visibleContentScaleFactor()); 867 localFrameImpl->frame()->view()->visibleContentScaleFactor());
868 } 868 }
869 869
870 } // namespace blink 870 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebRemoteFrameImpl.h ('k') | Source/web/WebSettingsImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698