| 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, 2013 Intel Corporation. All rights reserved. | 8 * Copyright (C) 2012, 2013 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 1938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1949 }; | 1949 }; |
| 1950 | 1950 |
| 1951 StyleResolver& styleResolver = canvas()->document().ensureStyleResolver(); | 1951 StyleResolver& styleResolver = canvas()->document().ensureStyleResolver(); |
| 1952 styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties
), newStyle.get()); | 1952 styleResolver.applyPropertiesToStyle(properties, WTF_ARRAY_LENGTH(properties
), newStyle.get()); |
| 1953 | 1953 |
| 1954 #if !ENABLE(OILPAN) | 1954 #if !ENABLE(OILPAN) |
| 1955 if (state().m_realizedFont) | 1955 if (state().m_realizedFont) |
| 1956 static_cast<CSSFontSelector*>(state().m_font.fontSelector())->unregister
ForInvalidationCallbacks(&modifiableState()); | 1956 static_cast<CSSFontSelector*>(state().m_font.fontSelector())->unregister
ForInvalidationCallbacks(&modifiableState()); |
| 1957 #endif | 1957 #endif |
| 1958 modifiableState().m_font = newStyle->font(); | 1958 modifiableState().m_font = newStyle->font(); |
| 1959 modifiableState().m_font.update(canvas()->document().styleEngine()->fontSele
ctor()); | 1959 modifiableState().m_font.update(canvas()->document().styleEngine().fontSelec
tor()); |
| 1960 modifiableState().m_realizedFont = true; | 1960 modifiableState().m_realizedFont = true; |
| 1961 canvas()->document().styleEngine()->fontSelector()->registerForInvalidationC
allbacks(&modifiableState()); | 1961 canvas()->document().styleEngine().fontSelector()->registerForInvalidationCa
llbacks(&modifiableState()); |
| 1962 } | 1962 } |
| 1963 | 1963 |
| 1964 String CanvasRenderingContext2D::textAlign() const | 1964 String CanvasRenderingContext2D::textAlign() const |
| 1965 { | 1965 { |
| 1966 return textAlignName(state().m_textAlign); | 1966 return textAlignName(state().m_textAlign); |
| 1967 } | 1967 } |
| 1968 | 1968 |
| 1969 void CanvasRenderingContext2D::setTextAlign(const String& s) | 1969 void CanvasRenderingContext2D::setTextAlign(const String& s) |
| 1970 { | 1970 { |
| 1971 TextAlign align; | 1971 TextAlign align; |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2489 if (imageType == NonOpaqueImage) | 2489 if (imageType == NonOpaqueImage) |
| 2490 return; | 2490 return; |
| 2491 if (alpha < 0xFF) | 2491 if (alpha < 0xFF) |
| 2492 return; | 2492 return; |
| 2493 } | 2493 } |
| 2494 | 2494 |
| 2495 canvas()->buffer()->willOverwriteCanvas(); | 2495 canvas()->buffer()->willOverwriteCanvas(); |
| 2496 } | 2496 } |
| 2497 | 2497 |
| 2498 } // namespace blink | 2498 } // namespace blink |
| OLD | NEW |