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

Side by Side Diff: content/browser/compositor/io_surface_layer_mac.mm

Issue 587193005: mac: Fix build with 10.9 SDK (from Xcode 6). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 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 "content/browser/compositor/io_surface_layer_mac.h" 5 #include "content/browser/compositor/io_surface_layer_mac.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include <CoreFoundation/CoreFoundation.h> 9 #include <CoreFoundation/CoreFoundation.h>
10 #include <OpenGL/CGLIOSurface.h> 10 #include <OpenGL/CGLIOSurface.h>
11 #include <OpenGL/CGLRenderers.h> 11 #include <OpenGL/CGLRenderers.h>
12 #include <OpenGL/gl.h>
12 #include <OpenGL/OpenGL.h> 13 #include <OpenGL/OpenGL.h>
13 14
14 #include "base/mac/mac_util.h" 15 #include "base/mac/mac_util.h"
15 #include "base/mac/sdk_forward_declarations.h" 16 #include "base/mac/sdk_forward_declarations.h"
16 #include "content/browser/gpu/gpu_data_manager_impl.h" 17 #include "content/browser/gpu/gpu_data_manager_impl.h"
17 #include "content/browser/renderer_host/render_widget_host_impl.h" 18 #include "content/browser/renderer_host/render_widget_host_impl.h"
18 #include "content/browser/renderer_host/render_widget_host_view_mac.h" 19 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
19 #include "ui/base/cocoa/animation_utils.h" 20 #include "ui/base/cocoa/animation_utils.h"
20 #include "ui/gfx/size_conversions.h" 21 #include "ui/gfx/size_conversions.h"
21 #include "ui/gl/scoped_cgl.h" 22 #include "ui/gl/scoped_cgl.h"
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 io_surface_texture_)); 491 io_surface_texture_));
491 492
492 // Reset the texture state. 493 // Reset the texture state.
493 io_surface_texture_ = 0; 494 io_surface_texture_ = 0;
494 io_surface_texture_context_.reset(); 495 io_surface_texture_context_.reset();
495 io_surface_texture_io_surface_.reset(); 496 io_surface_texture_io_surface_.reset();
496 cgl_renderer_id_ = 0; 497 cgl_renderer_id_ = 0;
497 } 498 }
498 499
499 @end 500 @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