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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.h

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "wtf/RefCounted.h" 45 #include "wtf/RefCounted.h"
46 #include "wtf/text/WTFString.h" 46 #include "wtf/text/WTFString.h"
47 47
48 namespace blink { 48 namespace blink {
49 49
50 class ChromePrintContext; 50 class ChromePrintContext;
51 class GeolocationClientProxy; 51 class GeolocationClientProxy;
52 class IntSize; 52 class IntSize;
53 class KURL; 53 class KURL;
54 class Range; 54 class Range;
55 class ServiceRegistry;
55 class SharedWorkerRepositoryClientImpl; 56 class SharedWorkerRepositoryClientImpl;
56 class TextFinder; 57 class TextFinder;
57 class WebAutofillClient; 58 class WebAutofillClient;
58 class WebDataSourceImpl; 59 class WebDataSourceImpl;
59 class WebDevToolsAgentImpl; 60 class WebDevToolsAgentImpl;
60 class WebDevToolsFrontendImpl; 61 class WebDevToolsFrontendImpl;
61 class WebFrameClient; 62 class WebFrameClient;
62 class WebFrameWidget; 63 class WebFrameWidget;
63 class WebNode; 64 class WebNode;
64 class WebPerformance; 65 class WebPerformance;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect) ove rride; 255 int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect) ove rride;
255 void setTickmarks(const WebVector<WebRect>&) override; 256 void setTickmarks(const WebVector<WebRect>&) override;
256 257
257 // WebFrameImplBase methods: 258 // WebFrameImplBase methods:
258 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override; 259 void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name, const AtomicString& uniqueName) override;
259 LocalFrame* frame() const override { return m_frame.get(); } 260 LocalFrame* frame() const override { return m_frame.get(); }
260 261
261 void willBeDetached(); 262 void willBeDetached();
262 void willDetachParent(); 263 void willDetachParent();
263 264
264 static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame * opener); 265 static WebLocalFrameImpl* create(WebTreeScopeType, WebFrameClient*, WebFrame * opener, ServiceRegistry*);
265 static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame* , WebSandboxFlags, const WebFrameOwnerProperties&); 266 static WebLocalFrameImpl* createProvisional(WebFrameClient*, WebRemoteFrame* , WebSandboxFlags, const WebFrameOwnerProperties&, ServiceRegistry*);
266 ~WebLocalFrameImpl() override; 267 ~WebLocalFrameImpl() override;
267 268
268 PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*); 269 PassRefPtrWillBeRawPtr<LocalFrame> createChildFrame(const FrameLoadRequest&, const AtomicString& name, HTMLFrameOwnerElement*);
269 270
270 void didChangeContentsSize(const IntSize&); 271 void didChangeContentsSize(const IntSize&);
271 272
272 void createFrameView(); 273 void createFrameView();
273 274
274 static WebLocalFrameImpl* fromFrame(LocalFrame*); 275 static WebLocalFrameImpl* fromFrame(LocalFrame*);
275 static WebLocalFrameImpl* fromFrame(LocalFrame&); 276 static WebLocalFrameImpl* fromFrame(LocalFrame&);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 void setDevToolsFrontend(WebDevToolsFrontendImpl* frontend) { m_webDevToolsF rontend = frontend; } 345 void setDevToolsFrontend(WebDevToolsFrontendImpl* frontend) { m_webDevToolsF rontend = frontend; }
345 WebDevToolsFrontendImpl* devToolsFrontend() { return m_webDevToolsFrontend; } 346 WebDevToolsFrontendImpl* devToolsFrontend() { return m_webDevToolsFrontend; }
346 347
347 #if ENABLE(OILPAN) 348 #if ENABLE(OILPAN)
348 DECLARE_TRACE(); 349 DECLARE_TRACE();
349 #endif 350 #endif
350 351
351 private: 352 private:
352 friend class FrameLoaderClientImpl; 353 friend class FrameLoaderClientImpl;
353 354
354 WebLocalFrameImpl(WebTreeScopeType, WebFrameClient*); 355 WebLocalFrameImpl(WebTreeScopeType, WebFrameClient*, ServiceRegistry*);
355 WebLocalFrameImpl(WebRemoteFrame*, WebFrameClient*); 356 WebLocalFrameImpl(WebRemoteFrame*, WebFrameClient*, ServiceRegistry*);
356 357
357 // Inherited from WebFrame, but intentionally hidden: it never makes sense 358 // Inherited from WebFrame, but intentionally hidden: it never makes sense
358 // to call these on a WebLocalFrameImpl. 359 // to call these on a WebLocalFrameImpl.
359 bool isWebLocalFrame() const override; 360 bool isWebLocalFrame() const override;
360 WebLocalFrame* toWebLocalFrame() override; 361 WebLocalFrame* toWebLocalFrame() override;
361 bool isWebRemoteFrame() const override; 362 bool isWebRemoteFrame() const override;
362 WebRemoteFrame* toWebRemoteFrame() override; 363 WebRemoteFrame* toWebRemoteFrame() override;
363 364
364 // Sets the local core frame and registers destruction observers. 365 // Sets the local core frame and registers destruction observers.
365 void setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame>); 366 void setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame>);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 float m_inputEventsScaleFactorForEmulation; 399 float m_inputEventsScaleFactorForEmulation;
399 400
400 UserMediaClientImpl m_userMediaClientImpl; 401 UserMediaClientImpl m_userMediaClientImpl;
401 402
402 OwnPtrWillBeMember<GeolocationClientProxy> m_geolocationClientProxy; 403 OwnPtrWillBeMember<GeolocationClientProxy> m_geolocationClientProxy;
403 404
404 WebDevToolsFrontendImpl* m_webDevToolsFrontend; 405 WebDevToolsFrontendImpl* m_webDevToolsFrontend;
405 406
406 HashMap<AtomicString, OwnPtr<WebTestInterfaceFactory>> m_testInterfaces; 407 HashMap<AtomicString, OwnPtr<WebTestInterfaceFactory>> m_testInterfaces;
407 408
409 ServiceRegistry* const m_serviceRegistry;
410
408 #if ENABLE(OILPAN) 411 #if ENABLE(OILPAN)
409 // Oilpan: WebLocalFrameImpl must remain alive until close() is called. 412 // Oilpan: WebLocalFrameImpl must remain alive until close() is called.
410 // Accomplish that by keeping a self-referential Persistent<>. It is 413 // Accomplish that by keeping a self-referential Persistent<>. It is
411 // cleared upon close(). 414 // cleared upon close().
412 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive; 415 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
413 #endif 416 #endif
414 }; 417 };
415 418
416 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 419 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
417 420
418 } // namespace blink 421 } // namespace blink
419 422
420 #endif 423 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698