| OLD | NEW |
| 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 } | 284 } |
| 285 | 285 |
| 286 String CanvasRenderingContext2D::ColorSpaceAsString() const { | 286 String CanvasRenderingContext2D::ColorSpaceAsString() const { |
| 287 return CanvasRenderingContext::ColorSpaceAsString(); | 287 return CanvasRenderingContext::ColorSpaceAsString(); |
| 288 } | 288 } |
| 289 | 289 |
| 290 CanvasPixelFormat CanvasRenderingContext2D::PixelFormat() const { | 290 CanvasPixelFormat CanvasRenderingContext2D::PixelFormat() const { |
| 291 return color_params().pixel_format(); | 291 return color_params().pixel_format(); |
| 292 } | 292 } |
| 293 | 293 |
| 294 ColorBehavior CanvasRenderingContext2D::DrawImageColorBehavior() const { | |
| 295 return CanvasRenderingContext::ColorBehaviorForMediaDrawnToCanvas(); | |
| 296 } | |
| 297 | |
| 298 void CanvasRenderingContext2D::Reset() { | 294 void CanvasRenderingContext2D::Reset() { |
| 299 // This is a multiple inherritance bootstrap | 295 // This is a multiple inherritance bootstrap |
| 300 BaseRenderingContext2D::Reset(); | 296 BaseRenderingContext2D::Reset(); |
| 301 } | 297 } |
| 302 | 298 |
| 303 void CanvasRenderingContext2D::RestoreCanvasMatrixClipStack( | 299 void CanvasRenderingContext2D::RestoreCanvasMatrixClipStack( |
| 304 PaintCanvas* c) const { | 300 PaintCanvas* c) const { |
| 305 RestoreMatrixClipStack(c); | 301 RestoreMatrixClipStack(c); |
| 306 } | 302 } |
| 307 | 303 |
| (...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1154 } | 1150 } |
| 1155 | 1151 |
| 1156 unsigned CanvasRenderingContext2D::HitRegionsCount() const { | 1152 unsigned CanvasRenderingContext2D::HitRegionsCount() const { |
| 1157 if (hit_region_manager_) | 1153 if (hit_region_manager_) |
| 1158 return hit_region_manager_->GetHitRegionsCount(); | 1154 return hit_region_manager_->GetHitRegionsCount(); |
| 1159 | 1155 |
| 1160 return 0; | 1156 return 0; |
| 1161 } | 1157 } |
| 1162 | 1158 |
| 1163 } // namespace blink | 1159 } // namespace blink |
| OLD | NEW |