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 #include "ui/compositor/compositor.h" | 5 #include "ui/compositor/compositor.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <deque> | 8 #include <deque> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 } | 77 } |
78 | 78 |
79 virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE { | 79 virtual WebKit::WebGraphicsContext3D* Context3D() const OVERRIDE { |
80 return context3D_.get(); | 80 return context3D_.get(); |
81 } | 81 } |
82 | 82 |
83 virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE { | 83 virtual cc::SoftwareOutputDevice* SoftwareDevice() const OVERRIDE { |
84 return NULL; | 84 return NULL; |
85 } | 85 } |
86 | 86 |
87 virtual void SendFrameToParentCompositor( | 87 virtual void SendFrameToParentCompositor(cc::CompositorFrame*) OVERRIDE { |
88 const cc::CompositorFrame&) OVERRIDE { | |
89 } | 88 } |
90 | 89 |
91 private: | 90 private: |
92 scoped_ptr<WebKit::WebGraphicsContext3D> context3D_; | 91 scoped_ptr<WebKit::WebGraphicsContext3D> context3D_; |
93 struct Capabilities capabilities_; | 92 struct Capabilities capabilities_; |
94 cc::OutputSurfaceClient* client_; | 93 cc::OutputSurfaceClient* client_; |
95 }; | 94 }; |
96 | 95 |
97 class PendingSwap { | 96 class PendingSwap { |
98 public: | 97 public: |
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
605 | 604 |
606 COMPOSITOR_EXPORT void DisableTestCompositor() { | 605 COMPOSITOR_EXPORT void DisableTestCompositor() { |
607 test_compositor_enabled = false; | 606 test_compositor_enabled = false; |
608 } | 607 } |
609 | 608 |
610 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { | 609 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() { |
611 return test_compositor_enabled; | 610 return test_compositor_enabled; |
612 } | 611 } |
613 | 612 |
614 } // namespace ui | 613 } // namespace ui |
OLD | NEW |