| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/accelerated_widget_mac/io_surface_layer.h" | 5 #include "ui/accelerated_widget_mac/io_surface_layer.h" |
| 6 | 6 |
| 7 #include <CoreFoundation/CoreFoundation.h> | 7 #include <CoreFoundation/CoreFoundation.h> |
| 8 #include <OpenGL/CGLIOSurface.h> | 8 #include <OpenGL/CGLIOSurface.h> |
| 9 #include <OpenGL/CGLRenderers.h> | 9 #include <OpenGL/CGLRenderers.h> |
| 10 #include <OpenGL/gl.h> | 10 #include <OpenGL/gl.h> |
| 11 #include <OpenGL/OpenGL.h> | 11 #include <OpenGL/OpenGL.h> |
| 12 | 12 |
| 13 #include "base/debug/trace_event.h" | |
| 14 #include "base/mac/sdk_forward_declarations.h" | 13 #include "base/mac/sdk_forward_declarations.h" |
| 14 #include "base/trace_event/trace_event.h" |
| 15 #include "ui/accelerated_widget_mac/io_surface_context.h" | 15 #include "ui/accelerated_widget_mac/io_surface_context.h" |
| 16 #include "ui/accelerated_widget_mac/io_surface_texture.h" | 16 #include "ui/accelerated_widget_mac/io_surface_texture.h" |
| 17 #include "ui/base/cocoa/animation_utils.h" | 17 #include "ui/base/cocoa/animation_utils.h" |
| 18 #include "ui/gfx/geometry/size_conversions.h" | 18 #include "ui/gfx/geometry/size_conversions.h" |
| 19 #include "ui/gl/gpu_switching_manager.h" | 19 #include "ui/gl/gpu_switching_manager.h" |
| 20 | 20 |
| 21 //////////////////////////////////////////////////////////////////////////////// | 21 //////////////////////////////////////////////////////////////////////////////// |
| 22 // IOSurfaceLayerHelper | 22 // IOSurfaceLayerHelper |
| 23 | 23 |
| 24 namespace ui { | 24 namespace ui { |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 if (helper_) | 292 if (helper_) |
| 293 helper_->DidDraw(draw_succeeded); | 293 helper_->DidDraw(draw_succeeded); |
| 294 | 294 |
| 295 [super drawInCGLContext:glContext | 295 [super drawInCGLContext:glContext |
| 296 pixelFormat:pixelFormat | 296 pixelFormat:pixelFormat |
| 297 forLayerTime:timeInterval | 297 forLayerTime:timeInterval |
| 298 displayTime:timeStamp]; | 298 displayTime:timeStamp]; |
| 299 } | 299 } |
| 300 | 300 |
| 301 @end | 301 @end |
| OLD | NEW |