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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 30 matching lines...) Expand all
41 #include "public/platform/WebURLRequest.h" 41 #include "public/platform/WebURLRequest.h"
42 #include "public/platform/WebURLResponse.h" 42 #include "public/platform/WebURLResponse.h"
43 #include "public/web/WebFrameWidget.h" 43 #include "public/web/WebFrameWidget.h"
44 #include "public/web/WebRemoteFrame.h" 44 #include "public/web/WebRemoteFrame.h"
45 #include "public/web/WebSettings.h" 45 #include "public/web/WebSettings.h"
46 #include "public/web/WebTreeScopeType.h" 46 #include "public/web/WebTreeScopeType.h"
47 #include "public/web/WebViewClient.h" 47 #include "public/web/WebViewClient.h"
48 #include "web/WebLocalFrameImpl.h" 48 #include "web/WebLocalFrameImpl.h"
49 #include "web/WebRemoteFrameImpl.h" 49 #include "web/WebRemoteFrameImpl.h"
50 #include "wtf/Functional.h" 50 #include "wtf/Functional.h"
51 #include "wtf/PtrUtil.h"
52 #include "wtf/StdLibExtras.h" 51 #include "wtf/StdLibExtras.h"
53 #include "wtf/text/StringBuilder.h" 52 #include "wtf/text/StringBuilder.h"
54 53
55 namespace blink { 54 namespace blink {
56 namespace FrameTestHelpers { 55 namespace FrameTestHelpers {
57 56
58 namespace { 57 namespace {
59 58
60 // The frame test helpers coordinate frame loads in a carefully choreographed 59 // The frame test helpers coordinate frame loads in a carefully choreographed
61 // dance. Since the parser is threaded, simply spinning the run loop once is not 60 // dance. Since the parser is threaded, simply spinning the run loop once is not
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 299
301 void TestWebRemoteFrameClient::frameDetached(DetachType type) 300 void TestWebRemoteFrameClient::frameDetached(DetachType type)
302 { 301 {
303 if (type == DetachType::Remove && m_frame->parent()) 302 if (type == DetachType::Remove && m_frame->parent())
304 m_frame->parent()->removeChild(m_frame); 303 m_frame->parent()->removeChild(m_frame);
305 m_frame->close(); 304 m_frame->close();
306 } 305 }
307 306
308 void TestWebViewClient::initializeLayerTreeView() 307 void TestWebViewClient::initializeLayerTreeView()
309 { 308 {
310 m_layerTreeView = wrapUnique(new WebLayerTreeViewImplForTesting); 309 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting);
311 } 310 }
312 311
313 } // namespace FrameTestHelpers 312 } // namespace FrameTestHelpers
314 } // namespace blink 313 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/FrameTestHelpers.h ('k') | third_party/WebKit/Source/web/tests/KeyboardTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698