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

Unified Diff: ui/gl/async_pixel_transfer_delegate_stub.cc

Issue 12040049: gpu: Implement idle async pixel transfers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add DCHECKs to ensure idle async uploads are only used with GL_TEXTURE_2D target Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/async_pixel_transfer_delegate_stub.h ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/async_pixel_transfer_delegate_stub.cc
diff --git a/ui/gl/async_pixel_transfer_delegate_stub.cc b/ui/gl/async_pixel_transfer_delegate_stub.cc
index 2ec16bbcff4adaae952960a31151301053a852ed..e3835a2a378929fba4bc9bccdf47bf94f3fc1a15 100644
--- a/ui/gl/async_pixel_transfer_delegate_stub.cc
+++ b/ui/gl/async_pixel_transfer_delegate_stub.cc
@@ -18,7 +18,7 @@ void* GetAddress(SharedMemory* shared_memory,
uint32 shm_data_offset,
uint32 shm_data_size) {
// Memory bounds have already been validated, so there
- // is just DCHECKS here.
+ // are just DCHECKS here.
DCHECK(shared_memory);
DCHECK(shared_memory->memory());
DCHECK_LE(shm_data_offset + shm_data_size, shm_size);
@@ -28,13 +28,6 @@ void* GetAddress(SharedMemory* shared_memory,
namespace gfx {
-#if !defined(OS_ANDROID)
-scoped_ptr<AsyncPixelTransferDelegate>
- AsyncPixelTransferDelegate::Create(gfx::GLContext* context) {
- return AsyncPixelTransferDelegateStub::Create(context);
-}
-#endif
-
scoped_ptr<AsyncPixelTransferDelegate>
AsyncPixelTransferDelegateStub::Create(gfx::GLContext* context) {
return make_scoped_ptr(
@@ -63,8 +56,7 @@ AsyncPixelTransferState*
AsyncPixelTransferDelegateStub::CreateRawPixelTransferState(
GLuint texture_id,
const AsyncTexImage2DParams& define_params) {
- return static_cast<AsyncPixelTransferState*>(
- new AsyncTransferStateStub(texture_id));
+ return new AsyncTransferStateStub(texture_id);
}
bool AsyncPixelTransferDelegateStub::BindCompletedAsyncTransfers() {
@@ -141,5 +133,13 @@ base::TimeDelta AsyncPixelTransferDelegateStub::GetTotalTextureUploadTime() {
return total_texture_upload_time_;
}
+bool AsyncPixelTransferDelegateStub::ProcessMorePendingTransfers() {
+ return false;
+}
+
+bool AsyncPixelTransferDelegateStub::NeedsProcessMorePendingTransfers() {
+ return false;
+}
+
} // namespace gfx
« no previous file with comments | « ui/gl/async_pixel_transfer_delegate_stub.h ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698