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

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

Issue 591413004: Send initializeChildFrame from RenderFrameProxy instead of WebLocalFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Undo changes to TestWebFrameClient 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 | « no previous file | Source/web/WebRemoteFrameImpl.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 WebRemoteFrameImpl_h 5 #ifndef WebRemoteFrameImpl_h
6 #define WebRemoteFrameImpl_h 6 #define WebRemoteFrameImpl_h
7 7
8 #include "platform/heap/Handle.h" 8 #include "platform/heap/Handle.h"
9 #include "public/web/WebRemoteFrame.h" 9 #include "public/web/WebRemoteFrame.h"
10 #include "public/web/WebRemoteFrameClient.h" 10 #include "public/web/WebRemoteFrameClient.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name); 181 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name);
182 182
183 void setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame>); 183 void setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame>);
184 RemoteFrame* frame() const { return m_frame.get(); } 184 RemoteFrame* frame() const { return m_frame.get(); }
185 185
186 WebRemoteFrameClient* client() const { return m_client; } 186 WebRemoteFrameClient* client() const { return m_client; }
187 187
188 static WebRemoteFrameImpl* fromFrame(RemoteFrame&); 188 static WebRemoteFrameImpl* fromFrame(RemoteFrame&);
189 189
190 virtual void initializeFromFrame(WebLocalFrame*) const OVERRIDE;
191
190 virtual void trace(Visitor*); 192 virtual void trace(Visitor*);
191 193
192 private: 194 private:
193 RemoteFrameClient m_frameClient; 195 RemoteFrameClient m_frameClient;
194 RefPtrWillBeMember<RemoteFrame> m_frame; 196 RefPtrWillBeMember<RemoteFrame> m_frame;
195 WebRemoteFrameClient* m_client; 197 WebRemoteFrameClient* m_client;
196 198
197 WebViewImpl* viewImpl() const; 199 WebViewImpl* viewImpl() const;
198 200
199 WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> > m_ownersForChi ldren; 201 WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> > m_ownersForChi ldren;
200 202
201 #if ENABLE(OILPAN) 203 #if ENABLE(OILPAN)
202 // Oilpan: to provide the guarantee of having the frame live until 204 // Oilpan: to provide the guarantee of having the frame live until
203 // close() is called, an instance keep a self-persistent. It is 205 // close() is called, an instance keep a self-persistent. It is
204 // cleared upon calling close(). This avoids having to assume that 206 // cleared upon calling close(). This avoids having to assume that
205 // an embedder's WebFrame references are all discovered via thread 207 // an embedder's WebFrame references are all discovered via thread
206 // state (stack, registers) should an Oilpan GC strike while we're 208 // state (stack, registers) should an Oilpan GC strike while we're
207 // in the process of detaching. 209 // in the process of detaching.
208 GC_PLUGIN_IGNORE("340522") 210 GC_PLUGIN_IGNORE("340522")
209 Persistent<WebRemoteFrameImpl> m_selfKeepAlive; 211 Persistent<WebRemoteFrameImpl> m_selfKeepAlive;
210 #endif 212 #endif
211 }; 213 };
212 214
213 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame()); 215 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame());
214 216
215 } // namespace blink 217 } // namespace blink
216 218
217 #endif // WebRemoteFrameImpl_h 219 #endif // WebRemoteFrameImpl_h
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebRemoteFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698