| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
| 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. |
| 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 if (SkColorGetA(flags.getColor()) < 255) | 356 if (SkColorGetA(flags.getColor()) < 255) |
| 357 return true; | 357 return true; |
| 358 return !flags.isSrcOver(); | 358 return !flags.isSrcOver(); |
| 359 } | 359 } |
| 360 | 360 |
| 361 void SVGImage::draw(PaintCanvas* canvas, | 361 void SVGImage::draw(PaintCanvas* canvas, |
| 362 const PaintFlags& flags, | 362 const PaintFlags& flags, |
| 363 const FloatRect& dstRect, | 363 const FloatRect& dstRect, |
| 364 const FloatRect& srcRect, | 364 const FloatRect& srcRect, |
| 365 RespectImageOrientationEnum shouldRespectImageOrientation, | 365 RespectImageOrientationEnum shouldRespectImageOrientation, |
| 366 ImageClampingMode clampMode, | 366 ImageClampingMode clampMode) { |
| 367 const ColorBehavior& colorBehavior) { | |
| 368 // TODO(ccameron): This function should not ignore |colorBehavior|. | |
| 369 // https://crbug.com/667431 | |
| 370 if (!m_page) | 367 if (!m_page) |
| 371 return; | 368 return; |
| 372 | 369 |
| 373 drawInternal(canvas, flags, dstRect, srcRect, shouldRespectImageOrientation, | 370 drawInternal(canvas, flags, dstRect, srcRect, shouldRespectImageOrientation, |
| 374 clampMode, KURL()); | 371 clampMode, KURL()); |
| 375 } | 372 } |
| 376 | 373 |
| 377 void SVGImage::drawInternal(PaintCanvas* canvas, | 374 void SVGImage::drawInternal(PaintCanvas* canvas, |
| 378 const PaintFlags& flags, | 375 const PaintFlags& flags, |
| 379 const FloatRect& dstRect, | 376 const FloatRect& dstRect, |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 } | 661 } |
| 665 | 662 |
| 666 return m_page ? SizeAvailable : SizeUnavailable; | 663 return m_page ? SizeAvailable : SizeUnavailable; |
| 667 } | 664 } |
| 668 | 665 |
| 669 String SVGImage::filenameExtension() const { | 666 String SVGImage::filenameExtension() const { |
| 670 return "svg"; | 667 return "svg"; |
| 671 } | 668 } |
| 672 | 669 |
| 673 } // namespace blink | 670 } // namespace blink |
| OLD | NEW |