content/browser/frame_host/render_widget_host_view_guest_unittest.cc - Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/render_widget_host_view_guest_unittest.cc

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)

Patch Set: Rebase Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/frame_host/render_widget_host_view_guest.cc ('k') | content/browser/renderer_host/delegated_frame_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_widget_host_view_guest_unittest.cc

diff --git a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc

index 25cbd33a5cf46cf49304cf7ec0722beb4994d981..737f652f551186c291f3c1f4f131b30f8304cd1b 100644

--- a/content/browser/frame_host/render_widget_host_view_guest_unittest.cc

+++ b/content/browser/frame_host/render_widget_host_view_guest_unittest.cc

@@ -216,7 +216,7 @@ class RenderWidgetHostViewGuestSurfaceTest

DCHECK(view_);

RenderWidgetHostViewChildFrame* rwhvcf =

static_cast<RenderWidgetHostViewChildFrame*>(view_);

- if (rwhvcf->local_frame_id_.is_null())

+ if (!rwhvcf->local_frame_id_.is_valid())

return cc::SurfaceId();

return cc::SurfaceId(rwhvcf->frame_sink_id_, rwhvcf->local_frame_id_);

}

@@ -272,7 +272,7 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {

0, CreateDelegatedFrame(scale_factor, view_size, view_rect));

cc::SurfaceId id = GetSurfaceId();

- if (!id.is_null()) {

+ if (id.is_valid()) {

#if !defined(OS_ANDROID)

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

cc::SurfaceManager* manager = factory->GetSurfaceManager();

@@ -295,7 +295,7 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {

0, CreateDelegatedFrame(scale_factor, view_size, view_rect));

id = GetSurfaceId();

- if (!id.is_null()) {

+ if (id.is_valid()) {

#if !defined(OS_ANDROID)

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

cc::SurfaceManager* manager = factory->GetSurfaceManager();

@@ -317,7 +317,7 @@ TEST_F(RenderWidgetHostViewGuestSurfaceTest, TestGuestSurface) {

view_->OnSwapCompositorFrame(

0, CreateDelegatedFrame(scale_factor, view_size, view_rect));

- EXPECT_TRUE(GetSurfaceId().is_null());

+ EXPECT_FALSE(GetSurfaceId().is_valid());

}

} // namespace content