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

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

Issue 2702153003: [content] Fix background color update handling in RWHVAura. (Closed)
Patch Set: Remove GetBackgroundOpaque and base impls of accessors. Created 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TEST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 gfx::NativeViewAccessible GetNativeViewAccessible() override; 71 gfx::NativeViewAccessible GetNativeViewAccessible() override;
72 ui::TextInputClient* GetTextInputClient() override; 72 ui::TextInputClient* GetTextInputClient() override;
73 bool HasFocus() const override; 73 bool HasFocus() const override;
74 bool IsSurfaceAvailableForCopy() const override; 74 bool IsSurfaceAvailableForCopy() const override;
75 void Show() override; 75 void Show() override;
76 void Hide() override; 76 void Hide() override;
77 bool IsShowing() override; 77 bool IsShowing() override;
78 void WasUnOccluded() override; 78 void WasUnOccluded() override;
79 void WasOccluded() override; 79 void WasOccluded() override;
80 gfx::Rect GetViewBounds() const override; 80 gfx::Rect GetViewBounds() const override;
81 void SetBackgroundColor(SkColor color) override;
82 SkColor background_color() const override;
81 #if defined(OS_MACOSX) 83 #if defined(OS_MACOSX)
82 ui::AcceleratedWidgetMac* GetAcceleratedWidgetMac() const override; 84 ui::AcceleratedWidgetMac* GetAcceleratedWidgetMac() const override;
83 void SetActive(bool active) override; 85 void SetActive(bool active) override;
84 void ShowDefinitionForSelection() override {} 86 void ShowDefinitionForSelection() override {}
85 bool SupportsSpeech() const override; 87 bool SupportsSpeech() const override;
86 void SpeakSelection() override; 88 void SpeakSelection() override;
87 bool IsSpeaking() const override; 89 bool IsSpeaking() const override;
88 void StopSpeaking() override; 90 void StopSpeaking() override;
89 #endif // defined(OS_MACOSX) 91 #endif // defined(OS_MACOSX)
90 void OnSwapCompositorFrame(uint32_t compositor_frame_sink_id, 92 void OnSwapCompositorFrame(uint32_t compositor_frame_sink_id,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; } 126 bool did_swap_compositor_frame() const { return did_swap_compositor_frame_; }
125 127
126 protected: 128 protected:
127 RenderWidgetHostImpl* rwh_; 129 RenderWidgetHostImpl* rwh_;
128 cc::FrameSinkId frame_sink_id_; 130 cc::FrameSinkId frame_sink_id_;
129 131
130 private: 132 private:
131 bool is_showing_; 133 bool is_showing_;
132 bool is_occluded_; 134 bool is_occluded_;
133 bool did_swap_compositor_frame_; 135 bool did_swap_compositor_frame_;
136 SkColor background_color_;
134 ui::DummyTextInputClient text_input_client_; 137 ui::DummyTextInputClient text_input_client_;
135 }; 138 };
136 139
137 #if defined(COMPILER_MSVC) 140 #if defined(COMPILER_MSVC)
138 // See comment for same warning on RenderViewHostImpl. 141 // See comment for same warning on RenderViewHostImpl.
139 #pragma warning(push) 142 #pragma warning(push)
140 #pragma warning(disable: 4250) 143 #pragma warning(disable: 4250)
141 #endif 144 #endif
142 145
143 // TestRenderViewHost ---------------------------------------------------------- 146 // TestRenderViewHost ----------------------------------------------------------
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 private: 305 private:
303 typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors> 306 typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
304 ScopedSetSupportedScaleFactors; 307 ScopedSetSupportedScaleFactors;
305 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 308 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
306 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 309 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
307 }; 310 };
308 311
309 } // namespace content 312 } // namespace content
310 313
311 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 314 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698