| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #ifndef CC_TREES_PROXY_H_ | 5 #ifndef CC_TREES_PROXY_H_ |
| 6 #define CC_TREES_PROXY_H_ | 6 #define CC_TREES_PROXY_H_ |
| 7 | 7 |
| 8 #include <string> |
| 9 |
| 8 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 9 #include "base/logging.h" | 11 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/time.h" | 13 #include "base/time.h" |
| 12 #include "base/values.h" | 14 #include "base/values.h" |
| 13 #include "cc/base/cc_export.h" | 15 #include "cc/base/cc_export.h" |
| 14 #include "skia/ext/refptr.h" | 16 #include "skia/ext/refptr.h" |
| 15 #include "third_party/skia/include/core/SkPicture.h" | 17 #include "third_party/skia/include/core/SkPicture.h" |
| 16 | 18 |
| 17 namespace gfx { | 19 namespace gfx { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 // Maximum number of sub-region texture updates supported for each commit. | 93 // Maximum number of sub-region texture updates supported for each commit. |
| 92 virtual size_t MaxPartialTextureUpdates() const = 0; | 94 virtual size_t MaxPartialTextureUpdates() const = 0; |
| 93 | 95 |
| 94 virtual void AcquireLayerTextures() = 0; | 96 virtual void AcquireLayerTextures() = 0; |
| 95 | 97 |
| 96 virtual skia::RefPtr<SkPicture> CapturePicture() = 0; | 98 virtual skia::RefPtr<SkPicture> CapturePicture() = 0; |
| 97 virtual scoped_ptr<base::Value> AsValue() const = 0; | 99 virtual scoped_ptr<base::Value> AsValue() const = 0; |
| 98 | 100 |
| 99 // Testing hooks | 101 // Testing hooks |
| 100 virtual bool CommitPendingForTesting() = 0; | 102 virtual bool CommitPendingForTesting() = 0; |
| 103 virtual std::string SchedulerStateAsStringForTesting(); |
| 101 | 104 |
| 102 protected: | 105 protected: |
| 103 explicit Proxy(scoped_ptr<Thread> impl_thread); | 106 explicit Proxy(scoped_ptr<Thread> impl_thread); |
| 104 friend class DebugScopedSetImplThread; | 107 friend class DebugScopedSetImplThread; |
| 105 friend class DebugScopedSetMainThread; | 108 friend class DebugScopedSetMainThread; |
| 106 friend class DebugScopedSetMainThreadBlocked; | 109 friend class DebugScopedSetMainThreadBlocked; |
| 107 | 110 |
| 108 private: | 111 private: |
| 109 scoped_ptr<Thread> main_thread_; | 112 scoped_ptr<Thread> main_thread_; |
| 110 scoped_ptr<Thread> impl_thread_; | 113 scoped_ptr<Thread> impl_thread_; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 137 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} | 140 explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} |
| 138 ~DebugScopedSetMainThreadBlocked() {} | 141 ~DebugScopedSetMainThreadBlocked() {} |
| 139 private: | 142 private: |
| 140 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); | 143 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); |
| 141 }; | 144 }; |
| 142 #endif | 145 #endif |
| 143 | 146 |
| 144 } // namespace cc | 147 } // namespace cc |
| 145 | 148 |
| 146 #endif // CC_TREES_PROXY_H_ | 149 #endif // CC_TREES_PROXY_H_ |
| OLD | NEW |