OLD | NEW |
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 Loading... |
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" |
51 #include "wtf/StdLibExtras.h" | 52 #include "wtf/StdLibExtras.h" |
52 #include "wtf/text/StringBuilder.h" | 53 #include "wtf/text/StringBuilder.h" |
53 | 54 |
54 namespace blink { | 55 namespace blink { |
55 namespace FrameTestHelpers { | 56 namespace FrameTestHelpers { |
56 | 57 |
57 namespace { | 58 namespace { |
58 | 59 |
59 // The frame test helpers coordinate frame loads in a carefully choreographed | 60 // The frame test helpers coordinate frame loads in a carefully choreographed |
60 // dance. Since the parser is threaded, simply spinning the run loop once is not | 61 // 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 Loading... |
299 | 300 |
300 void TestWebRemoteFrameClient::frameDetached(DetachType type) | 301 void TestWebRemoteFrameClient::frameDetached(DetachType type) |
301 { | 302 { |
302 if (type == DetachType::Remove && m_frame->parent()) | 303 if (type == DetachType::Remove && m_frame->parent()) |
303 m_frame->parent()->removeChild(m_frame); | 304 m_frame->parent()->removeChild(m_frame); |
304 m_frame->close(); | 305 m_frame->close(); |
305 } | 306 } |
306 | 307 |
307 void TestWebViewClient::initializeLayerTreeView() | 308 void TestWebViewClient::initializeLayerTreeView() |
308 { | 309 { |
309 m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting); | 310 m_layerTreeView = wrapUnique(new WebLayerTreeViewImplForTesting); |
310 } | 311 } |
311 | 312 |
312 } // namespace FrameTestHelpers | 313 } // namespace FrameTestHelpers |
313 } // namespace blink | 314 } // namespace blink |
OLD | NEW |