| Index: content/browser/compositor/browser_compositor_view_mac.mm
|
| diff --git a/content/browser/compositor/browser_compositor_view_mac.mm b/content/browser/compositor/browser_compositor_view_mac.mm
|
| index c764165b76d8d3bb503a5cdf8ce820d41639b7c6..ea3665a1724f9531eaaa39ade8d3996189d43e0f 100644
|
| --- a/content/browser/compositor/browser_compositor_view_mac.mm
|
| +++ b/content/browser/compositor/browser_compositor_view_mac.mm
|
| @@ -80,11 +80,10 @@ void BrowserCompositorViewMac::GotAcceleratedFrame(
|
| gfx::Size pixel_size, float scale_factor) {
|
| BrowserCompositorViewMacInternal* internal_view =
|
| BrowserCompositorViewMacInternal::FromAcceleratedWidget(widget);
|
| - if (!internal_view)
|
| - return;
|
| - IOSurfaceID io_surface_id = IOSurfaceIDFromSurfaceHandle(surface_handle);
|
| - internal_view->GotAcceleratedIOSurfaceFrame(
|
| - io_surface_id, surface_id, latency_info, pixel_size, scale_factor);
|
| + if (internal_view) {
|
| + internal_view->GotAcceleratedFrame(
|
| + surface_handle, surface_id, latency_info, pixel_size, scale_factor);
|
| + }
|
| }
|
|
|
| // static
|
| @@ -93,9 +92,8 @@ void BrowserCompositorViewMac::GotSoftwareFrame(
|
| cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas) {
|
| BrowserCompositorViewMacInternal* internal_view =
|
| BrowserCompositorViewMacInternal::FromAcceleratedWidget(widget);
|
| - if (!internal_view)
|
| - return;
|
| - internal_view->GotSoftwareFrame(frame_data, scale_factor, canvas);
|
| + if (internal_view)
|
| + internal_view->GotSoftwareFrame(frame_data, scale_factor, canvas);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|