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

Side by Side Diff: content/test/content_browser_test_utils_internal.h

Issue 1743303002: Make browser hit testing return correct SurfaceId with nested Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Attempt to fix broken unit test Created 4 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_ 5 #ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
6 #define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_ 6 #define CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
7 7
8 // A collection of functions designed for use with content_shell based browser 8 // A collection of functions designed for use with content_shell based browser
9 // tests internal to the content/ module. 9 // tests internal to the content/ module.
10 // Note: If a function here also works with browser_tests, it should be in 10 // Note: If a function here also works with browser_tests, it should be in
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // has been composited in the top-level frame's Surface. At that point, 108 // has been composited in the top-level frame's Surface. At that point,
109 // browser process hit testing to target_view's Surface can succeed. 109 // browser process hit testing to target_view's Surface can succeed.
110 class SurfaceHitTestReadyNotifier { 110 class SurfaceHitTestReadyNotifier {
111 public: 111 public:
112 SurfaceHitTestReadyNotifier(RenderWidgetHostViewChildFrame* target_view); 112 SurfaceHitTestReadyNotifier(RenderWidgetHostViewChildFrame* target_view);
113 ~SurfaceHitTestReadyNotifier() {} 113 ~SurfaceHitTestReadyNotifier() {}
114 114
115 void WaitForSurfaceReady(); 115 void WaitForSurfaceReady();
116 116
117 private: 117 private:
118 bool ContainsSurfaceId(); 118 bool ContainsSurfaceId(cc::SurfaceId container_surface_id);
119 119
120 cc::SurfaceManager* surface_manager_; 120 cc::SurfaceManager* surface_manager_;
121 cc::SurfaceId root_surface_id_; 121 cc::SurfaceId root_surface_id_;
122 RenderWidgetHostViewChildFrame* target_view_; 122 RenderWidgetHostViewChildFrame* target_view_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(SurfaceHitTestReadyNotifier); 124 DISALLOW_COPY_AND_ASSIGN(SurfaceHitTestReadyNotifier);
125 }; 125 };
126 126
127 } // namespace content 127 } // namespace content
128 128
129 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_ 129 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_UTILS_INTERNAL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698