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

Side by Side Diff: Source/core/frame/RemoteFrame.h

Issue 842033003: Cleanup RemotePlatformLayer when disconnecting RemoteFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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/core/frame/Frame.cpp ('k') | Source/core/frame/RemoteFrame.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 // 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 #ifndef RemoteFrame_h 5 #ifndef RemoteFrame_h
6 #define RemoteFrame_h 6 #define RemoteFrame_h
7 7
8 #include "core/dom/RemoteSecurityContext.h" 8 #include "core/dom/RemoteSecurityContext.h"
9 #include "core/frame/Frame.h" 9 #include "core/frame/Frame.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 class Event; 13 class Event;
14 class RemoteDOMWindow; 14 class RemoteDOMWindow;
15 class RemoteFrameClient; 15 class RemoteFrameClient;
16 class RemoteFrameView; 16 class RemoteFrameView;
17 class WebLayer;
17 class WindowProxyManager; 18 class WindowProxyManager;
18 19
19 class RemoteFrame: public Frame { 20 class RemoteFrame: public Frame {
20 public: 21 public:
21 static PassRefPtrWillBeRawPtr<RemoteFrame> create(RemoteFrameClient*, FrameH ost*, FrameOwner*); 22 static PassRefPtrWillBeRawPtr<RemoteFrame> create(RemoteFrameClient*, FrameH ost*, FrameOwner*);
22 23
23 virtual ~RemoteFrame(); 24 virtual ~RemoteFrame();
24 25
25 // Frame overrides: 26 // Frame overrides:
26 void trace(Visitor*) override; 27 void trace(Visitor*) override;
27 virtual bool isRemoteFrame() const override { return true; } 28 bool isRemoteFrame() const override { return true; }
28 virtual DOMWindow* domWindow() const override; 29 DOMWindow* domWindow() const override;
29 WindowProxy* windowProxy(DOMWrapperWorld&) override; 30 WindowProxy* windowProxy(DOMWrapperWorld&) override;
30 virtual void navigate(Document& originDocument, const KURL&, bool lockBackFo rwardList) override; 31 void navigate(Document& originDocument, const KURL&, bool lockBackForwardLis t) override;
31 virtual void reload(ReloadPolicy, ClientRedirectPolicy) override; 32 void reload(ReloadPolicy, ClientRedirectPolicy) override;
32 virtual void detach() override; 33 void detach() override;
33 virtual RemoteSecurityContext* securityContext() const override; 34 RemoteSecurityContext* securityContext() const override;
34 void printNavigationErrorMessage(const Frame&, const char* reason) override { } 35 void printNavigationErrorMessage(const Frame&, const char* reason) override { }
36 void disconnectOwnerElement() override;
35 37
36 // FIXME: Remove this method once we have input routing in the browser 38 // FIXME: Remove this method once we have input routing in the browser
37 // process. See http://crbug.com/339659. 39 // process. See http://crbug.com/339659.
38 void forwardInputEvent(Event*); 40 void forwardInputEvent(Event*);
39 41
42 void setRemotePlatformLayer(WebLayer*);
43 WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
44
40 void setView(PassRefPtrWillBeRawPtr<RemoteFrameView>); 45 void setView(PassRefPtrWillBeRawPtr<RemoteFrameView>);
41 void createView(); 46 void createView();
42 47
43 RemoteFrameView* view() const; 48 RemoteFrameView* view() const;
44 49
45 private: 50 private:
46 RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*); 51 RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*);
47 52
48 RemoteFrameClient* remoteFrameClient() const; 53 RemoteFrameClient* remoteFrameClient() const;
49 54
50 RefPtrWillBeMember<RemoteFrameView> m_view; 55 RefPtrWillBeMember<RemoteFrameView> m_view;
51 RefPtr<RemoteSecurityContext> m_securityContext; 56 RefPtr<RemoteSecurityContext> m_securityContext;
52 RefPtrWillBeMember<RemoteDOMWindow> m_domWindow; 57 RefPtrWillBeMember<RemoteDOMWindow> m_domWindow;
53 OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager; 58 OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
59 WebLayer* m_remotePlatformLayer;
54 }; 60 };
55 61
56 inline RemoteFrameView* RemoteFrame::view() const 62 inline RemoteFrameView* RemoteFrame::view() const
57 { 63 {
58 return m_view.get(); 64 return m_view.get();
59 } 65 }
60 66
61 DEFINE_TYPE_CASTS(RemoteFrame, Frame, remoteFrame, remoteFrame->isRemoteFrame(), remoteFrame.isRemoteFrame()); 67 DEFINE_TYPE_CASTS(RemoteFrame, Frame, remoteFrame, remoteFrame->isRemoteFrame(), remoteFrame.isRemoteFrame());
62 68
63 } // namespace blink 69 } // namespace blink
64 70
65 #endif // RemoteFrame_h 71 #endif // RemoteFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/frame/RemoteFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698