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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameTestHelpers.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) 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 24 matching lines...) Expand all
35 #include "platform/RuntimeEnabledFeatures.h" 35 #include "platform/RuntimeEnabledFeatures.h"
36 #include "platform/scroll/ScrollbarTheme.h" 36 #include "platform/scroll/ScrollbarTheme.h"
37 #include "public/platform/WebString.h" 37 #include "public/platform/WebString.h"
38 #include "public/platform/WebURLRequest.h" 38 #include "public/platform/WebURLRequest.h"
39 #include "public/web/WebFrameClient.h" 39 #include "public/web/WebFrameClient.h"
40 #include "public/web/WebFrameOwnerProperties.h" 40 #include "public/web/WebFrameOwnerProperties.h"
41 #include "public/web/WebHistoryItem.h" 41 #include "public/web/WebHistoryItem.h"
42 #include "public/web/WebRemoteFrameClient.h" 42 #include "public/web/WebRemoteFrameClient.h"
43 #include "public/web/WebViewClient.h" 43 #include "public/web/WebViewClient.h"
44 #include "web/WebViewImpl.h" 44 #include "web/WebViewImpl.h"
45 #include "wtf/PassOwnPtr.h"
46 #include <gmock/gmock.h> 45 #include <gmock/gmock.h>
47 #include <gtest/gtest.h> 46 #include <gtest/gtest.h>
47 #include <memory>
48 #include <string> 48 #include <string>
49 49
50 namespace blink { 50 namespace blink {
51 51
52 class WebFrame; 52 class WebFrame;
53 class WebFrameWidget; 53 class WebFrameWidget;
54 class WebLocalFrame; 54 class WebLocalFrame;
55 class WebRemoteFrame; 55 class WebRemoteFrame;
56 class WebRemoteFrameImpl; 56 class WebRemoteFrameImpl;
57 enum class WebCachePolicy; 57 enum class WebCachePolicy;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 void scheduleAnimation() override { m_animationScheduled = true; } 127 void scheduleAnimation() override { m_animationScheduled = true; }
128 bool animationScheduled() { return m_animationScheduled; } 128 bool animationScheduled() { return m_animationScheduled; }
129 void clearAnimationScheduled() { m_animationScheduled = false; } 129 void clearAnimationScheduled() { m_animationScheduled = false; }
130 130
131 // TODO(lfg): This is a temporary method to retrieve the WebWidgetClient, 131 // TODO(lfg): This is a temporary method to retrieve the WebWidgetClient,
132 // while we refactor WebView to not inherit from Webwidget. 132 // while we refactor WebView to not inherit from Webwidget.
133 // Returns the WebWidgetClient. 133 // Returns the WebWidgetClient.
134 WebWidgetClient* widgetClient() { return this; } 134 WebWidgetClient* widgetClient() { return this; }
135 135
136 private: 136 private:
137 OwnPtr<WebLayerTreeView> m_layerTreeView; 137 std::unique_ptr<WebLayerTreeView> m_layerTreeView;
138 bool m_animationScheduled; 138 bool m_animationScheduled;
139 }; 139 };
140 140
141 // Convenience class for handling the lifetime of a WebView and its associated m ainframe in tests. 141 // Convenience class for handling the lifetime of a WebView and its associated m ainframe in tests.
142 class WebViewHelper { 142 class WebViewHelper {
143 WTF_MAKE_NONCOPYABLE(WebViewHelper); 143 WTF_MAKE_NONCOPYABLE(WebViewHelper);
144 public: 144 public:
145 WebViewHelper(SettingOverrider* = 0); 145 WebViewHelper(SettingOverrider* = 0);
146 ~WebViewHelper(); 146 ~WebViewHelper();
147 147
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 WebDOMMessageEvent) override { } 206 WebDOMMessageEvent) override { }
207 207
208 private: 208 private:
209 Persistent<WebRemoteFrameImpl> const m_frame; 209 Persistent<WebRemoteFrameImpl> const m_frame;
210 }; 210 };
211 211
212 } // namespace FrameTestHelpers 212 } // namespace FrameTestHelpers
213 } // namespace blink 213 } // namespace blink
214 214
215 #endif // FrameTestHelpers_h 215 #endif // FrameTestHelpers_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp ('k') | third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698