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

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

Issue 843683005: Fix a bit of C++11 in web/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 "core/frame/FrameOwner.h" 8 #include "core/frame/FrameOwner.h"
9 #include "platform/heap/Handle.h" 9 #include "platform/heap/Handle.h"
10 #include "public/web/WebRemoteFrame.h" 10 #include "public/web/WebRemoteFrame.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 int extensionGroup) override; 80 int extensionGroup) override;
81 virtual void setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOr igin&) override; 81 virtual void setIsolatedWorldSecurityOrigin(int worldID, const WebSecurityOr igin&) override;
82 virtual void setIsolatedWorldContentSecurityPolicy(int worldID, const WebStr ing&) override; 82 virtual void setIsolatedWorldContentSecurityPolicy(int worldID, const WebStr ing&) override;
83 virtual void addMessageToConsole(const WebConsoleMessage&) override; 83 virtual void addMessageToConsole(const WebConsoleMessage&) override;
84 virtual void collectGarbage() override; 84 virtual void collectGarbage() override;
85 virtual bool checkIfRunInsecureContent(const WebURL&) const override; 85 virtual bool checkIfRunInsecureContent(const WebURL&) const override;
86 virtual v8::Handle<v8::Value> executeScriptAndReturnValue( 86 virtual v8::Handle<v8::Value> executeScriptAndReturnValue(
87 const WebScriptSource&) override; 87 const WebScriptSource&) override;
88 virtual void executeScriptInIsolatedWorld( 88 virtual void executeScriptInIsolatedWorld(
89 int worldID, const WebScriptSource* sourcesIn, unsigned numSources, 89 int worldID, const WebScriptSource* sourcesIn, unsigned numSources,
90 int extensionGroup, WebVector<v8::Local<v8::Value> >* results) override; 90 int extensionGroup, WebVector<v8::Local<v8::Value>>* results) override;
91 virtual v8::Handle<v8::Value> callFunctionEvenIfScriptDisabled( 91 virtual v8::Handle<v8::Value> callFunctionEvenIfScriptDisabled(
92 v8::Handle<v8::Function>, 92 v8::Handle<v8::Function>,
93 v8::Handle<v8::Value>, 93 v8::Handle<v8::Value>,
94 int argc, 94 int argc,
95 v8::Handle<v8::Value> argv[]) override; 95 v8::Handle<v8::Value> argv[]) override;
96 virtual v8::Local<v8::Context> mainWorldScriptContext() const override; 96 virtual v8::Local<v8::Context> mainWorldScriptContext() const override;
97 virtual void reload(bool ignoreCache) override; 97 virtual void reload(bool ignoreCache) override;
98 virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCac he) override; 98 virtual void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCac he) override;
99 virtual void loadRequest(const WebURLRequest&) override; 99 virtual void loadRequest(const WebURLRequest&) override;
100 virtual void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebU RLRequest::CachePolicy) override; 100 virtual void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebU RLRequest::CachePolicy) override;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 #if ENABLE(OILPAN) 207 #if ENABLE(OILPAN)
208 void trace(Visitor*); 208 void trace(Visitor*);
209 #endif 209 #endif
210 210
211 private: 211 private:
212 RemoteFrameClientImpl m_frameClient; 212 RemoteFrameClientImpl m_frameClient;
213 RefPtrWillBeMember<RemoteFrame> m_frame; 213 RefPtrWillBeMember<RemoteFrame> m_frame;
214 WebRemoteFrameClient* m_client; 214 WebRemoteFrameClient* m_client;
215 215
216 WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> > m_ownersForChi ldren; 216 WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>> m_ownersForChil dren;
217 217
218 #if ENABLE(OILPAN) 218 #if ENABLE(OILPAN)
219 // Oilpan: to provide the guarantee of having the frame live until 219 // Oilpan: to provide the guarantee of having the frame live until
220 // close() is called, an instance keep a self-persistent. It is 220 // close() is called, an instance keep a self-persistent. It is
221 // cleared upon calling close(). This avoids having to assume that 221 // cleared upon calling close(). This avoids having to assume that
222 // an embedder's WebFrame references are all discovered via thread 222 // an embedder's WebFrame references are all discovered via thread
223 // state (stack, registers) should an Oilpan GC strike while we're 223 // state (stack, registers) should an Oilpan GC strike while we're
224 // in the process of detaching. 224 // in the process of detaching.
225 GC_PLUGIN_IGNORE("340522") 225 GC_PLUGIN_IGNORE("340522")
226 Persistent<WebRemoteFrameImpl> m_selfKeepAlive; 226 Persistent<WebRemoteFrameImpl> m_selfKeepAlive;
227 #endif 227 #endif
228 }; 228 };
229 229
230 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame()); 230 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame() , frame.isWebRemoteFrame());
231 231
232 } // namespace blink 232 } // namespace blink
233 233
234 #endif // WebRemoteFrameImpl_h 234 #endif // WebRemoteFrameImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698