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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Removed added printf statements; LocalFrameId::is_valid() no longer checks if nonce is 0. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index b3f77735c48aef23bf470f9cf60473d7a813db97..e382ec0e971ee6fa788b2318f07837355406c4c4 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -374,7 +374,7 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
return GetDelegatedFrameHost()->LocalFrameIdForTesting();
}
- bool HasFrameData() const { return !GetLocalFrameId().is_null(); }
+ bool HasFrameData() const { return GetLocalFrameId().is_valid(); }
bool released_front_lock_active() const {
return GetDelegatedFrameHost()->ReleasedFrontLockActiveForTesting();
@@ -1911,7 +1911,7 @@ TEST_F(RenderWidgetHostViewAuraTest, RecreateLayers) {
wm::RecreateLayers(view_->GetNativeView(), nullptr));
cc::SurfaceId id = view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
- if (!id.is_null()) {
+ if (id.is_valid()) {
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
cc::SurfaceManager* manager = factory->GetSurfaceManager();
cc::Surface* surface = manager->GetSurfaceForId(id);
@@ -2036,7 +2036,7 @@ TEST_F(RenderWidgetHostViewAuraTest, Resize) {
view_->OnSwapCompositorFrame(
0, MakeDelegatedFrame(1.f, size2, gfx::Rect(size2)));
cc::SurfaceId surface_id = view_->surface_id();
- if (surface_id.is_null()) {
+ if (!surface_id.is_valid()) {
// No frame ack yet.
EXPECT_EQ(0u, sink_->message_count());
} else {
@@ -2630,7 +2630,7 @@ class RenderWidgetHostViewAuraCopyRequestTest
1, MakeDelegatedFrame(1.f, view_rect_.size(), view_rect_));
cc::SurfaceId surface_id =
view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
- if (!surface_id.is_null())
+ if (surface_id.is_valid())
view_->GetDelegatedFrameHost()->WillDrawSurface(
surface_id.local_frame_id(), view_rect_);
ASSERT_TRUE(view_->last_copy_request_);

Powered by Google App Engine
This is Rietveld 408576698