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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/AcceleratedStaticBitmapImage.cpp

Issue 2727133002: Remove ColorBehavior argument to Image::imageForCurrentFrame (Closed)
Patch Set: Rebase Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "platform/graphics/AcceleratedStaticBitmapImage.h" 5 #include "platform/graphics/AcceleratedStaticBitmapImage.h"
6 6
7 #include "gpu/command_buffer/client/gles2_interface.h" 7 #include "gpu/command_buffer/client/gles2_interface.h"
8 #include "gpu/command_buffer/common/sync_token.h" 8 #include "gpu/command_buffer/common/sync_token.h"
9 #include "platform/graphics/MailboxTextureHolder.h" 9 #include "platform/graphics/MailboxTextureHolder.h"
10 #include "platform/graphics/SkiaTextureHolder.h" 10 #include "platform/graphics/SkiaTextureHolder.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 destGL->WaitSyncTokenCHROMIUM(m_textureHolder->syncToken().GetData()); 82 destGL->WaitSyncTokenCHROMIUM(m_textureHolder->syncToken().GetData());
83 GLuint sourceTextureId = destGL->CreateAndConsumeTextureCHROMIUM( 83 GLuint sourceTextureId = destGL->CreateAndConsumeTextureCHROMIUM(
84 GL_TEXTURE_2D, m_textureHolder->mailbox().name); 84 GL_TEXTURE_2D, m_textureHolder->mailbox().name);
85 destGL->CopyTextureCHROMIUM(sourceTextureId, 0, GL_TEXTURE_2D, destTextureId, 85 destGL->CopyTextureCHROMIUM(sourceTextureId, 0, GL_TEXTURE_2D, destTextureId,
86 0, internalFormat, destType, flipY, false, false); 86 0, internalFormat, destType, flipY, false, false);
87 // This drops the |destGL| context's reference on our |m_mailbox|, but it's 87 // This drops the |destGL| context's reference on our |m_mailbox|, but it's
88 // still held alive by our SkImage. 88 // still held alive by our SkImage.
89 destGL->DeleteTextures(1, &sourceTextureId); 89 destGL->DeleteTextures(1, &sourceTextureId);
90 } 90 }
91 91
92 sk_sp<SkImage> AcceleratedStaticBitmapImage::imageForCurrentFrame( 92 sk_sp<SkImage> AcceleratedStaticBitmapImage::imageForCurrentFrame() {
93 const ColorBehavior& colorBehavior) {
94 // TODO(xlai): Refactor so that sync tokens are only used when 93 // TODO(xlai): Refactor so that sync tokens are only used when
95 // |m_textureHolder| is MailboxTextureHolder. 94 // |m_textureHolder| is MailboxTextureHolder.
96 // https://crbug.com/693229 95 // https://crbug.com/693229
97 // TODO(ccameron): This function should not ignore |colorBehavior|.
98 // https://crbug.com/672306
99 checkThread(); 96 checkThread();
100 if (!isValid()) 97 if (!isValid())
101 return nullptr; 98 return nullptr;
102 createImageFromMailboxIfNeeded(); 99 createImageFromMailboxIfNeeded();
103 return m_textureHolder->skImage(); 100 return m_textureHolder->skImage();
104 } 101 }
105 102
106 void AcceleratedStaticBitmapImage::draw(PaintCanvas* canvas, 103 void AcceleratedStaticBitmapImage::draw(PaintCanvas* canvas,
107 const PaintFlags& flags, 104 const PaintFlags& flags,
108 const FloatRect& dstRect, 105 const FloatRect& dstRect,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 172
176 void AcceleratedStaticBitmapImage::checkThread() { 173 void AcceleratedStaticBitmapImage::checkThread() {
177 if (m_detachThreadAtNextCheck) { 174 if (m_detachThreadAtNextCheck) {
178 m_threadChecker.DetachFromThread(); 175 m_threadChecker.DetachFromThread();
179 m_detachThreadAtNextCheck = false; 176 m_detachThreadAtNextCheck = false;
180 } 177 }
181 CHECK(m_threadChecker.CalledOnValidThread()); 178 CHECK(m_threadChecker.CalledOnValidThread());
182 } 179 }
183 180
184 } // namespace blink 181 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698