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

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

Issue 338993003: Cleanup various WebView/WebFrame APIs to properly handle remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove unneeded header. Created 6 years, 6 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 | Annotate | Revision Log
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 "public/web/WebRemoteFrame.h" 8 #include "public/web/WebRemoteFrame.h"
9 #include "web/RemoteFrameClient.h" 9 #include "web/RemoteFrameClient.h"
10 #include "wtf/HashMap.h" 10 #include "wtf/HashMap.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 virtual void setScrollOffset(const WebSize&) OVERRIDE; 43 virtual void setScrollOffset(const WebSize&) OVERRIDE;
44 virtual WebSize minimumScrollOffset() const OVERRIDE; 44 virtual WebSize minimumScrollOffset() const OVERRIDE;
45 virtual WebSize maximumScrollOffset() const OVERRIDE; 45 virtual WebSize maximumScrollOffset() const OVERRIDE;
46 virtual WebSize contentsSize() const OVERRIDE; 46 virtual WebSize contentsSize() const OVERRIDE;
47 virtual bool hasVisibleContent() const OVERRIDE; 47 virtual bool hasVisibleContent() const OVERRIDE;
48 virtual WebRect visibleContentRect() const OVERRIDE; 48 virtual WebRect visibleContentRect() const OVERRIDE;
49 virtual bool hasHorizontalScrollbar() const OVERRIDE; 49 virtual bool hasHorizontalScrollbar() const OVERRIDE;
50 virtual bool hasVerticalScrollbar() const OVERRIDE; 50 virtual bool hasVerticalScrollbar() const OVERRIDE;
51 virtual WebView* view() const OVERRIDE; 51 virtual WebView* view() const OVERRIDE;
52 virtual void removeChild(WebFrame*) OVERRIDE; 52 virtual void removeChild(WebFrame*) OVERRIDE;
53 virtual WebFrame* traversePrevious(bool wrap) const OVERRIDE;
54 virtual WebFrame* traverseNext(bool wrap) const OVERRIDE;
55 virtual WebFrame* findChildByName(const WebString&) const OVERRIDE;
56 virtual WebDocument document() const OVERRIDE; 53 virtual WebDocument document() const OVERRIDE;
57 virtual WebPerformance performance() const OVERRIDE; 54 virtual WebPerformance performance() const OVERRIDE;
58 virtual bool dispatchBeforeUnloadEvent() OVERRIDE; 55 virtual bool dispatchBeforeUnloadEvent() OVERRIDE;
59 virtual void dispatchUnloadEvent() OVERRIDE; 56 virtual void dispatchUnloadEvent() OVERRIDE;
60 virtual NPObject* windowObject() const OVERRIDE; 57 virtual NPObject* windowObject() const OVERRIDE;
61 virtual void bindToWindowObject(const WebString& name, NPObject*) OVERRIDE; 58 virtual void bindToWindowObject(const WebString& name, NPObject*) OVERRIDE;
62 virtual void bindToWindowObject(const WebString& name, NPObject*, void*) OVE RRIDE; 59 virtual void bindToWindowObject(const WebString& name, NPObject*, void*) OVE RRIDE;
63 virtual void executeScript(const WebScriptSource&) OVERRIDE; 60 virtual void executeScript(const WebScriptSource&) OVERRIDE;
64 virtual void executeScriptInIsolatedWorld( 61 virtual void executeScriptInIsolatedWorld(
65 int worldID, const WebScriptSource* sources, unsigned numSources, 62 int worldID, const WebScriptSource* sources, unsigned numSources,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 virtual WebString layerTreeAsText(bool showDebugInfo = false) const OVERRIDE ; 175 virtual WebString layerTreeAsText(bool showDebugInfo = false) const OVERRIDE ;
179 176
180 virtual WebLocalFrame* createLocalChild(const WebString& name, WebFrameClien t*) OVERRIDE; 177 virtual WebLocalFrame* createLocalChild(const WebString& name, WebFrameClien t*) OVERRIDE;
181 virtual WebRemoteFrame* createRemoteChild(const WebString& name, WebFrameCli ent*) OVERRIDE; 178 virtual WebRemoteFrame* createRemoteChild(const WebString& name, WebFrameCli ent*) OVERRIDE;
182 179
183 void initializeAsMainFrame(WebCore::Page*); 180 void initializeAsMainFrame(WebCore::Page*);
184 181
185 void setWebCoreFrame(PassRefPtr<WebCore::RemoteFrame>); 182 void setWebCoreFrame(PassRefPtr<WebCore::RemoteFrame>);
186 WebCore::RemoteFrame* frame() const { return m_frame.get(); } 183 WebCore::RemoteFrame* frame() const { return m_frame.get(); }
187 184
185 static WebRemoteFrameImpl* fromFrame(WebCore::RemoteFrame&);
186
188 private: 187 private:
189 RemoteFrameClient m_frameClient; 188 RemoteFrameClient m_frameClient;
190 RefPtr<WebCore::RemoteFrame> m_frame; 189 RefPtr<WebCore::RemoteFrame> m_frame;
191 190
192 HashMap<WebFrame*, OwnPtr<WebCore::FrameOwner> > m_ownersForChildren; 191 HashMap<WebFrame*, OwnPtr<WebCore::FrameOwner> > m_ownersForChildren;
193 }; 192 };
194 193
195 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame()); 194 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame());
196 195
197 } // namespace blink 196 } // namespace blink
198 197
199 #endif // WebRemoteFrameImpl_h 198 #endif // WebRemoteFrameImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698