| 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 1668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1679 { | 1679 { |
| 1680 // The style resolution required for rendering text is not available in fram
e-less documents. | 1680 // The style resolution required for rendering text is not available in fram
e-less documents. |
| 1681 if (!canvas()->document().frame()) | 1681 if (!canvas()->document().frame()) |
| 1682 return; | 1682 return; |
| 1683 | 1683 |
| 1684 MutableStylePropertyMap::iterator i = m_fetchedFonts.find(newFont); | 1684 MutableStylePropertyMap::iterator i = m_fetchedFonts.find(newFont); |
| 1685 RefPtr<MutableStylePropertySet> parsedStyle = i != m_fetchedFonts.end() ? i-
>value : nullptr; | 1685 RefPtr<MutableStylePropertySet> parsedStyle = i != m_fetchedFonts.end() ? i-
>value : nullptr; |
| 1686 | 1686 |
| 1687 if (!parsedStyle) { | 1687 if (!parsedStyle) { |
| 1688 parsedStyle = MutableStylePropertySet::create(); | 1688 parsedStyle = MutableStylePropertySet::create(); |
| 1689 BisonCSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, newFont,
true, HTMLStandardMode, 0); | 1689 BisonCSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, newFont,
HTMLStandardMode, 0); |
| 1690 m_fetchedFonts.add(newFont, parsedStyle); | 1690 m_fetchedFonts.add(newFont, parsedStyle); |
| 1691 } | 1691 } |
| 1692 if (parsedStyle->isEmpty()) | 1692 if (parsedStyle->isEmpty()) |
| 1693 return; | 1693 return; |
| 1694 | 1694 |
| 1695 String fontValue = parsedStyle->getPropertyValue(CSSPropertyFont); | 1695 String fontValue = parsedStyle->getPropertyValue(CSSPropertyFont); |
| 1696 | 1696 |
| 1697 // According to http://lists.w3.org/Archives/Public/public-html/2009Jul/0947
.html, | 1697 // According to http://lists.w3.org/Archives/Public/public-html/2009Jul/0947
.html, |
| 1698 // the "inherit" and "initial" values must be ignored. | 1698 // the "inherit" and "initial" values must be ignored. |
| 1699 if (fontValue == "inherit" || fontValue == "initial") | 1699 if (fontValue == "inherit" || fontValue == "initial") |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2244 | 2244 |
| 2245 unsigned CanvasRenderingContext2D::hitRegionsCount() const | 2245 unsigned CanvasRenderingContext2D::hitRegionsCount() const |
| 2246 { | 2246 { |
| 2247 if (m_hitRegionManager) | 2247 if (m_hitRegionManager) |
| 2248 return m_hitRegionManager->getHitRegionsCount(); | 2248 return m_hitRegionManager->getHitRegionsCount(); |
| 2249 | 2249 |
| 2250 return 0; | 2250 return 0; |
| 2251 } | 2251 } |
| 2252 | 2252 |
| 2253 } // namespace blink | 2253 } // namespace blink |
| OLD | NEW |