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

Side by Side Diff: Source/modules/canvas2d/CanvasRenderingContext2D.cpp

Issue 1310573007: Speculative fix for recording texture-backed SkImages into SkPictures. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
10 * 10 *
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 1352
1353 c->restoreToCount(initialSaveCount); 1353 c->restoreToCount(initialSaveCount);
1354 } 1354 }
1355 1355
1356 bool shouldDisableDeferral(CanvasImageSource* imageSource) 1356 bool shouldDisableDeferral(CanvasImageSource* imageSource)
1357 { 1357 {
1358 if (imageSource->isVideoElement()) 1358 if (imageSource->isVideoElement())
1359 return true; 1359 return true;
1360 if (imageSource->isCanvasElement()) { 1360 if (imageSource->isCanvasElement()) {
1361 HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(imageSource) ; 1361 HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(imageSource) ;
1362 if (canvas->is3D()) 1362 if (canvas->renderingContext() && canvas->renderingContext()->isAccelera ted())
1363 return true; 1363 return true;
1364 if (canvas->isAnimated2D()) 1364 if (canvas->isAnimated2D())
1365 return true; 1365 return true;
1366 } 1366 }
1367 return false; 1367 return false;
1368 } 1368 }
1369 1369
1370 void CanvasRenderingContext2D::drawImage(CanvasImageSource* imageSource, 1370 void CanvasRenderingContext2D::drawImage(CanvasImageSource* imageSource,
1371 float sx, float sy, float sw, float sh, 1371 float sx, float sy, float sw, float sh,
1372 float dx, float dy, float dw, float dh, ExceptionState& exceptionState) 1372 float dx, float dy, float dw, float dh, ExceptionState& exceptionState)
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
2320 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage) 2320 if (imageType == CanvasRenderingContext2DState::NonOpaqueImage)
2321 return; 2321 return;
2322 if (alpha < 0xFF) 2322 if (alpha < 0xFF)
2323 return; 2323 return;
2324 } 2324 }
2325 2325
2326 canvas()->buffer()->willOverwriteCanvas(); 2326 canvas()->buffer()->willOverwriteCanvas();
2327 } 2327 }
2328 2328
2329 } // namespace blink 2329 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698