| 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 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 896 if (useMaxWidth) { | 896 if (useMaxWidth) { |
| 897 drawingCanvas()->save(); | 897 drawingCanvas()->save(); |
| 898 drawingCanvas()->translate(location.x(), location.y()); | 898 drawingCanvas()->translate(location.x(), location.y()); |
| 899 // We draw when fontWidth is 0 so compositing operations (eg, a "copy" op) | 899 // We draw when fontWidth is 0 so compositing operations (eg, a "copy" op) |
| 900 // still work. | 900 // still work. |
| 901 drawingCanvas()->scale((fontWidth > 0 ? (width / fontWidth) : 0), 1); | 901 drawingCanvas()->scale((fontWidth > 0 ? (width / fontWidth) : 0), 1); |
| 902 location = FloatPoint(); | 902 location = FloatPoint(); |
| 903 } | 903 } |
| 904 | 904 |
| 905 draw( | 905 draw( |
| 906 [&font, this, &textRunPaintInfo, &location]( | 906 [&font, &textRunPaintInfo, &location]( |
| 907 SkCanvas* c, const SkPaint* paint) // draw lambda | 907 SkCanvas* c, const SkPaint* paint) // draw lambda |
| 908 { | 908 { |
| 909 font.drawBidiText(c, textRunPaintInfo, location, | 909 font.drawBidiText(c, textRunPaintInfo, location, |
| 910 Font::UseFallbackIfFontNotReady, cDeviceScaleFactor, | 910 Font::UseFallbackIfFontNotReady, cDeviceScaleFactor, |
| 911 *paint); | 911 *paint); |
| 912 }, | 912 }, |
| 913 [](const SkIRect& rect) // overdraw test lambda | 913 [](const SkIRect& rect) // overdraw test lambda |
| 914 { return false; }, | 914 { return false; }, |
| 915 textRunPaintInfo.bounds, paintType); | 915 textRunPaintInfo.bounds, paintType); |
| 916 } | 916 } |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1165 } | 1165 } |
| 1166 return true; | 1166 return true; |
| 1167 } | 1167 } |
| 1168 | 1168 |
| 1169 void CanvasRenderingContext2D::resetUsageTracking() { | 1169 void CanvasRenderingContext2D::resetUsageTracking() { |
| 1170 UsageCounters newCounters; | 1170 UsageCounters newCounters; |
| 1171 m_usageCounters = newCounters; | 1171 m_usageCounters = newCounters; |
| 1172 } | 1172 } |
| 1173 | 1173 |
| 1174 } // namespace blink | 1174 } // namespace blink |
| OLD | NEW |