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

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

Issue 447113004: Fix crash in GotAcceleratedIOSurfaceFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <IOSurface/IOSurfaceAPI.h> 9 #include <IOSurface/IOSurfaceAPI.h>
10 #include <list> 10 #include <list>
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 344
345 // SoftwareFrameManagerClient implementation: 345 // SoftwareFrameManagerClient implementation:
346 virtual void SoftwareFrameWasFreed( 346 virtual void SoftwareFrameWasFreed(
347 uint32 output_surface_id, unsigned frame_id) OVERRIDE; 347 uint32 output_surface_id, unsigned frame_id) OVERRIDE;
348 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE; 348 virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE;
349 349
350 virtual SkColorType PreferredReadbackFormat() OVERRIDE; 350 virtual SkColorType PreferredReadbackFormat() OVERRIDE;
351 351
352 // CompositingIOSurfaceLayerClient implementation. 352 // CompositingIOSurfaceLayerClient implementation.
353 virtual bool AcceleratedLayerShouldAckImmediately() const OVERRIDE; 353 virtual bool AcceleratedLayerShouldAckImmediately() const OVERRIDE;
354 virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE; 354 virtual void AcceleratedLayerDidDrawFrame() OVERRIDE;
355 virtual void AcceleratedLayerHitError() OVERRIDE;
355 356
356 // gfx::DisplayObserver implementation. 357 // gfx::DisplayObserver implementation.
357 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; 358 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
358 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; 359 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
359 virtual void OnDisplayMetricsChanged(const gfx::Display& display, 360 virtual void OnDisplayMetricsChanged(const gfx::Display& display,
360 uint32_t metrics) OVERRIDE; 361 uint32_t metrics) OVERRIDE;
361 362
362 // Forwards the mouse event to the renderer. 363 // Forwards the mouse event to the renderer.
363 void ForwardMouseEvent(const blink::WebMouseEvent& event); 364 void ForwardMouseEvent(const blink::WebMouseEvent& event);
364 365
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_; 634 scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
634 635
635 base::WeakPtrFactory<RenderWidgetHostViewMac> 636 base::WeakPtrFactory<RenderWidgetHostViewMac>
636 software_frame_weak_ptr_factory_; 637 software_frame_weak_ptr_factory_;
637 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 638 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
638 }; 639 };
639 640
640 } // namespace content 641 } // namespace content
641 642
642 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 643 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698