| OLD | NEW |
| 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 Intel Corporation. All rights reserved. | 8 * Copyright (C) 2012 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 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1544 void CanvasRenderingContext2D::drawImageFromRect(HTMLImageElement* image, | 1544 void CanvasRenderingContext2D::drawImageFromRect(HTMLImageElement* image, |
| 1545 float sx, float sy, float sw, float sh, | 1545 float sx, float sy, float sw, float sh, |
| 1546 float dx, float dy, float dw, float dh, | 1546 float dx, float dy, float dw, float dh, |
| 1547 const String& compositeOperation) | 1547 const String& compositeOperation) |
| 1548 { | 1548 { |
| 1549 CompositeOperator op; | 1549 CompositeOperator op; |
| 1550 BlendMode blendOp = BlendModeNormal; | 1550 BlendMode blendOp = BlendModeNormal; |
| 1551 if (!parseCompositeAndBlendOperator(compositeOperation, op, blendOp) || blen
dOp != BlendModeNormal) | 1551 if (!parseCompositeAndBlendOperator(compositeOperation, op, blendOp) || blen
dOp != BlendModeNormal) |
| 1552 op = CompositeSourceOver; | 1552 op = CompositeSourceOver; |
| 1553 | 1553 |
| 1554 drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), op, B
lendModeNormal, IGNORE_EXCEPTION_STATE); | 1554 drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), op, B
lendModeNormal, IGNORE_EXCEPTION); |
| 1555 } | 1555 } |
| 1556 | 1556 |
| 1557 void CanvasRenderingContext2D::setAlpha(float alpha) | 1557 void CanvasRenderingContext2D::setAlpha(float alpha) |
| 1558 { | 1558 { |
| 1559 setGlobalAlpha(alpha); | 1559 setGlobalAlpha(alpha); |
| 1560 } | 1560 } |
| 1561 | 1561 |
| 1562 void CanvasRenderingContext2D::setCompositeOperation(const String& operation) | 1562 void CanvasRenderingContext2D::setCompositeOperation(const String& operation) |
| 1563 { | 1563 { |
| 1564 setGlobalCompositeOperation(operation); | 1564 setGlobalCompositeOperation(operation); |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2403 Color focusRingColor = RenderTheme::focusRingColor(); | 2403 Color focusRingColor = RenderTheme::focusRingColor(); |
| 2404 const int focusRingWidth = 5; | 2404 const int focusRingWidth = 5; |
| 2405 const int focusRingOutline = 0; | 2405 const int focusRingOutline = 0; |
| 2406 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor); | 2406 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor); |
| 2407 didDraw(path.boundingRect()); | 2407 didDraw(path.boundingRect()); |
| 2408 | 2408 |
| 2409 c->restore(); | 2409 c->restore(); |
| 2410 } | 2410 } |
| 2411 | 2411 |
| 2412 } // namespace WebCore | 2412 } // namespace WebCore |
| OLD | NEW |