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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 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
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 25 matching lines...) Expand all
36 #include "platform/geometry/FloatRect.h" 36 #include "platform/geometry/FloatRect.h"
37 #include "platform/heap/SelfKeepAlive.h" 37 #include "platform/heap/SelfKeepAlive.h"
38 #include "public/platform/WebFileSystemType.h" 38 #include "public/platform/WebFileSystemType.h"
39 #include "public/web/WebFrameWidget.h" 39 #include "public/web/WebFrameWidget.h"
40 #include "public/web/WebLocalFrame.h" 40 #include "public/web/WebLocalFrame.h"
41 #include "web/FrameLoaderClientImpl.h" 41 #include "web/FrameLoaderClientImpl.h"
42 #include "web/UserMediaClientImpl.h" 42 #include "web/UserMediaClientImpl.h"
43 #include "web/WebExport.h" 43 #include "web/WebExport.h"
44 #include "web/WebFrameImplBase.h" 44 #include "web/WebFrameImplBase.h"
45 #include "wtf/Compiler.h" 45 #include "wtf/Compiler.h"
46 #include "wtf/OwnPtr.h"
47 #include "wtf/text/WTFString.h" 46 #include "wtf/text/WTFString.h"
47 #include <memory>
48 48
49 namespace blink { 49 namespace blink {
50 50
51 class ChromePrintContext; 51 class ChromePrintContext;
52 class IntSize; 52 class IntSize;
53 class KURL; 53 class KURL;
54 class Range; 54 class Range;
55 class ScrollableArea; 55 class ScrollableArea;
56 class SharedWorkerRepositoryClientImpl; 56 class SharedWorkerRepositoryClientImpl;
57 class TextFinder; 57 class TextFinder;
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 Member<LocalFrame> m_frame; 364 Member<LocalFrame> m_frame;
365 365
366 Member<WebDevToolsAgentImpl> m_devToolsAgent; 366 Member<WebDevToolsAgentImpl> m_devToolsAgent;
367 367
368 // This is set if the frame is the root of a local frame tree, and requires a widget for layout. 368 // This is set if the frame is the root of a local frame tree, and requires a widget for layout.
369 WebFrameWidget* m_frameWidget; 369 WebFrameWidget* m_frameWidget;
370 370
371 WebFrameClient* m_client; 371 WebFrameClient* m_client;
372 WebAutofillClient* m_autofillClient; 372 WebAutofillClient* m_autofillClient;
373 WebContentSettingsClient* m_contentSettingsClient; 373 WebContentSettingsClient* m_contentSettingsClient;
374 OwnPtr<SharedWorkerRepositoryClientImpl> m_sharedWorkerRepositoryClient; 374 std::unique_ptr<SharedWorkerRepositoryClientImpl> m_sharedWorkerRepositoryCl ient;
375 375
376 // Will be initialized after first call to find() or scopeStringMatches(). 376 // Will be initialized after first call to find() or scopeStringMatches().
377 Member<TextFinder> m_textFinder; 377 Member<TextFinder> m_textFinder;
378 378
379 // Valid between calls to BeginPrint() and EndPrint(). Containts the print 379 // Valid between calls to BeginPrint() and EndPrint(). Containts the print
380 // information. Is used by PrintPage(). 380 // information. Is used by PrintPage().
381 Member<ChromePrintContext> m_printContext; 381 Member<ChromePrintContext> m_printContext;
382 382
383 // Stores the additional input events offset and scale when device metrics e mulation is enabled. 383 // Stores the additional input events offset and scale when device metrics e mulation is enabled.
384 IntSize m_inputEventsOffsetForEmulation; 384 IntSize m_inputEventsOffsetForEmulation;
385 float m_inputEventsScaleFactorForEmulation; 385 float m_inputEventsScaleFactorForEmulation;
386 386
387 UserMediaClientImpl m_userMediaClientImpl; 387 UserMediaClientImpl m_userMediaClientImpl;
388 388
389 WebDevToolsFrontendImpl* m_webDevToolsFrontend; 389 WebDevToolsFrontendImpl* m_webDevToolsFrontend;
390 390
391 Member<Node> m_contextMenuNode; 391 Member<Node> m_contextMenuNode;
392 392
393 // Oilpan: WebLocalFrameImpl must remain alive until close() is called. 393 // Oilpan: WebLocalFrameImpl must remain alive until close() is called.
394 // Accomplish that by keeping a self-referential Persistent<>. It is 394 // Accomplish that by keeping a self-referential Persistent<>. It is
395 // cleared upon close(). 395 // cleared upon close().
396 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive; 396 SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
397 }; 397 };
398 398
399 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame()); 399 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
400 400
401 } // namespace blink 401 } // namespace blink
402 402
403 #endif 403 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebKit.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698