| 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 "content/browser/android/in_process/synchronous_compositor_output_surfa
ce.h" | 5 #include "content/browser/android/in_process/synchronous_compositor_output_surfa
ce.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 if (surface_->current_sw_canvas_) | 65 if (surface_->current_sw_canvas_) |
| 66 return surface_->current_sw_canvas_; | 66 return surface_->current_sw_canvas_; |
| 67 return &null_canvas_; | 67 return &null_canvas_; |
| 68 } | 68 } |
| 69 virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE { | 69 virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE { |
| 70 surface_->current_sw_canvas_ = NULL; | 70 surface_->current_sw_canvas_ = NULL; |
| 71 } | 71 } |
| 72 virtual void CopyToBitmap(gfx::Rect rect, SkBitmap* output) OVERRIDE { | 72 virtual void CopyToBitmap(gfx::Rect rect, SkBitmap* output) OVERRIDE { |
| 73 NOTIMPLEMENTED(); | 73 NOTIMPLEMENTED(); |
| 74 } | 74 } |
| 75 virtual void Scroll(gfx::Vector2d delta, | |
| 76 gfx::Rect clip_rect) OVERRIDE { | |
| 77 NOTIMPLEMENTED(); | |
| 78 } | |
| 79 virtual void ReclaimDIB(const TransportDIB::Id& id) OVERRIDE { | |
| 80 NOTIMPLEMENTED(); | |
| 81 } | |
| 82 | 75 |
| 83 private: | 76 private: |
| 84 SynchronousCompositorOutputSurface* surface_; | 77 SynchronousCompositorOutputSurface* surface_; |
| 85 SkDevice null_device_; | 78 SkDevice null_device_; |
| 86 SkCanvas null_canvas_; | 79 SkCanvas null_canvas_; |
| 87 | 80 |
| 88 DISALLOW_COPY_AND_ASSIGN(SoftwareDevice); | 81 DISALLOW_COPY_AND_ASSIGN(SoftwareDevice); |
| 89 }; | 82 }; |
| 90 | 83 |
| 91 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface( | 84 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface( |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const { | 210 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const { |
| 218 return BrowserThread::CurrentlyOn(BrowserThread::UI); | 211 return BrowserThread::CurrentlyOn(BrowserThread::UI); |
| 219 } | 212 } |
| 220 | 213 |
| 221 SynchronousCompositorOutputSurfaceDelegate* | 214 SynchronousCompositorOutputSurfaceDelegate* |
| 222 SynchronousCompositorOutputSurface::GetDelegate() { | 215 SynchronousCompositorOutputSurface::GetDelegate() { |
| 223 return SynchronousCompositorImpl::FromRoutingID(routing_id_); | 216 return SynchronousCompositorImpl::FromRoutingID(routing_id_); |
| 224 } | 217 } |
| 225 | 218 |
| 226 } // namespace content | 219 } // namespace content |
| OLD | NEW |