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

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

Issue 1413373007: CC AnimationHost: Fix LinkHighlights detach scope. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 WebRemoteFrame* targetFrame, 131 WebRemoteFrame* targetFrame,
132 WebSecurityOrigin targetOrigin, 132 WebSecurityOrigin targetOrigin,
133 WebDOMMessageEvent) override { } 133 WebDOMMessageEvent) override { }
134 134
135 private: 135 private:
136 WebRemoteFrame* const m_frame; 136 WebRemoteFrame* const m_frame;
137 }; 137 };
138 138
139 class TestWebViewClient : public WebViewClient { 139 class TestWebViewClient : public WebViewClient {
140 public: 140 public:
141 TestWebViewClient();
141 virtual ~TestWebViewClient() { } 142 virtual ~TestWebViewClient() { }
142 void initializeLayerTreeView() override; 143 void initializeLayerTreeView() override;
143 WebLayerTreeView* layerTreeView() override { return m_layerTreeView.get(); } 144 WebLayerTreeView* layerTreeView() override { return m_layerTreeView.get(); }
144 145
146 void setUseCompositorAnimationTimelines(bool useCompositorAnimationTimelines ) { m_useCompositorAnimationTimelines = useCompositorAnimationTimelines; }
147
145 private: 148 private:
146 OwnPtr<WebLayerTreeView> m_layerTreeView; 149 OwnPtr<WebLayerTreeView> m_layerTreeView;
150 bool m_useCompositorAnimationTimelines;
147 }; 151 };
148 152
149 class UseMockScrollbarSettings { 153 class UseMockScrollbarSettings {
150 public: 154 public:
151 UseMockScrollbarSettings() 155 UseMockScrollbarSettings()
152 { 156 {
153 Settings::setMockScrollbarsEnabled(true); 157 Settings::setMockScrollbarsEnabled(true);
154 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); 158 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
155 EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars()); 159 EXPECT_TRUE(ScrollbarTheme::theme()->usesOverlayScrollbars());
156 } 160 }
157 161
158 ~UseMockScrollbarSettings() 162 ~UseMockScrollbarSettings()
159 { 163 {
160 Settings::setMockScrollbarsEnabled(false); 164 Settings::setMockScrollbarsEnabled(false);
161 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); 165 RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
162 } 166 }
163 }; 167 };
164 168
165 } // namespace FrameTestHelpers 169 } // namespace FrameTestHelpers
166 } // namespace blink 170 } // namespace blink
167 171
168 #endif // FrameTestHelpers_h 172 #endif // FrameTestHelpers_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698