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

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

Issue 2797213002: Fix BaseRenderingContext2D create/put/get-ImageData() for color managed canvas (Closed)
Patch Set: Rebaseline Created 3 years, 7 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 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 8 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 10 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 if (ContextLostRestoredEventsEnabled()) { 272 if (ContextLostRestoredEventsEnabled()) {
273 Event* event(Event::Create(EventTypeNames::contextrestored)); 273 Event* event(Event::Create(EventTypeNames::contextrestored));
274 canvas()->DispatchEvent(event); 274 canvas()->DispatchEvent(event);
275 } 275 }
276 } 276 }
277 277
278 void CanvasRenderingContext2D::WillDrawImage(CanvasImageSource* source) const { 278 void CanvasRenderingContext2D::WillDrawImage(CanvasImageSource* source) const {
279 canvas()->WillDrawImageTo2DContext(source); 279 canvas()->WillDrawImageTo2DContext(source);
280 } 280 }
281 281
282 CanvasColorSpace CanvasRenderingContext2D::ColorSpace() const {
283 return color_params().color_space();
284 }
285
286 String CanvasRenderingContext2D::ColorSpaceAsString() const {
287 return CanvasRenderingContext::ColorSpaceAsString();
288 }
289
290 CanvasPixelFormat CanvasRenderingContext2D::PixelFormat() const {
291 return color_params().pixel_format();
292 }
293
282 ColorBehavior CanvasRenderingContext2D::DrawImageColorBehavior() const { 294 ColorBehavior CanvasRenderingContext2D::DrawImageColorBehavior() const {
283 return CanvasRenderingContext::ColorBehaviorForMediaDrawnToCanvas(); 295 return CanvasRenderingContext::ColorBehaviorForMediaDrawnToCanvas();
284 } 296 }
285 297
286 void CanvasRenderingContext2D::Reset() { 298 void CanvasRenderingContext2D::Reset() {
287 // This is a multiple inherritance bootstrap 299 // This is a multiple inherritance bootstrap
288 BaseRenderingContext2D::Reset(); 300 BaseRenderingContext2D::Reset();
289 } 301 }
290 302
291 void CanvasRenderingContext2D::RestoreCanvasMatrixClipStack( 303 void CanvasRenderingContext2D::RestoreCanvasMatrixClipStack(
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 } 1189 }
1178 return true; 1190 return true;
1179 } 1191 }
1180 1192
1181 void CanvasRenderingContext2D::ResetUsageTracking() { 1193 void CanvasRenderingContext2D::ResetUsageTracking() {
1182 UsageCounters new_counters; 1194 UsageCounters new_counters;
1183 usage_counters_ = new_counters; 1195 usage_counters_ = new_counters;
1184 } 1196 }
1185 1197
1186 } // namespace blink 1198 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698