OLD | NEW |
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 extern "C" { | 5 extern "C" { |
6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
7 } | 7 } |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
189 | 189 |
190 bool GLImageGLX::CopyTexSubImage(unsigned target, | 190 bool GLImageGLX::CopyTexSubImage(unsigned target, |
191 const gfx::Point& offset, | 191 const gfx::Point& offset, |
192 const gfx::Rect& rect) { | 192 const gfx::Rect& rect) { |
193 return false; | 193 return false; |
194 } | 194 } |
195 | 195 |
196 bool GLImageGLX::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, | 196 bool GLImageGLX::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, |
197 int z_order, | 197 int z_order, |
198 gfx::OverlayTransform transform, | 198 gfx::OverlayTransform transform, |
| 199 gfx::BufferFormat storage_format, |
199 const gfx::Rect& bounds_rect, | 200 const gfx::Rect& bounds_rect, |
200 const gfx::RectF& crop_rect) { | 201 const gfx::RectF& crop_rect, |
| 202 bool handle_scaling) { |
201 return false; | 203 return false; |
202 } | 204 } |
203 | 205 |
204 void GLImageGLX::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, | 206 void GLImageGLX::OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, |
205 uint64_t process_tracing_id, | 207 uint64_t process_tracing_id, |
206 const std::string& dump_name) { | 208 const std::string& dump_name) { |
207 // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914 | 209 // TODO(ericrk): Implement GLImage OnMemoryDump. crbug.com/514914 |
208 } | 210 } |
209 | 211 |
210 } // namespace gl | 212 } // namespace gl |
OLD | NEW |