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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 319183003: Add missed NULL check in r274802 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@disable_partial_swap
Patch Set: Created 6 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #import <objc/runtime.h> 7 #import <objc/runtime.h>
8 #include <QuartzCore/QuartzCore.h> 8 #include <QuartzCore/QuartzCore.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 2317 matching lines...) Expand 10 before | Expand all | Expand 10 after
2328 // BrowserCompositorViewMacClient, public: 2328 // BrowserCompositorViewMacClient, public:
2329 2329
2330 void RenderWidgetHostViewMac::BrowserCompositorDidDrawFrame() { 2330 void RenderWidgetHostViewMac::BrowserCompositorDidDrawFrame() {
2331 PostReleaseBrowserCompositorLock(); 2331 PostReleaseBrowserCompositorLock();
2332 } 2332 }
2333 2333
2334 //////////////////////////////////////////////////////////////////////////////// 2334 ////////////////////////////////////////////////////////////////////////////////
2335 // CompositingIOSurfaceLayerClient, public: 2335 // CompositingIOSurfaceLayerClient, public:
2336 2336
2337 void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) { 2337 void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) {
2338 if (!render_widget_host_)
2339 return;
2340
2338 SendPendingLatencyInfoToHost(); 2341 SendPendingLatencyInfoToHost();
2339 SendPendingSwapAck(); 2342 SendPendingSwapAck();
2340 if (!succeeded) 2343 if (!succeeded)
2341 GotAcceleratedCompositingError(); 2344 GotAcceleratedCompositingError();
2342 } 2345 }
2343 2346
2344 } // namespace content 2347 } // namespace content
2345 2348
2346 // RenderWidgetHostViewCocoa --------------------------------------------------- 2349 // RenderWidgetHostViewCocoa ---------------------------------------------------
2347 2350
(...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after
4032 4035
4033 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding 4036 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
4034 // regions that are not draggable. (See ControlRegionView in 4037 // regions that are not draggable. (See ControlRegionView in
4035 // native_app_window_cocoa.mm). This requires the render host view to be 4038 // native_app_window_cocoa.mm). This requires the render host view to be
4036 // draggable by default. 4039 // draggable by default.
4037 - (BOOL)mouseDownCanMoveWindow { 4040 - (BOOL)mouseDownCanMoveWindow {
4038 return YES; 4041 return YES;
4039 } 4042 }
4040 4043
4041 @end 4044 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698