Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: Source/WebCore/css/CSSFontFaceRule.cpp

Issue 8591013: Merge 99649 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/resources/gc.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2005, 2006, 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 2006, 2008 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 15 matching lines...) Expand all
26 26
27 namespace WebCore { 27 namespace WebCore {
28 28
29 CSSFontFaceRule::CSSFontFaceRule(CSSStyleSheet* parent) 29 CSSFontFaceRule::CSSFontFaceRule(CSSStyleSheet* parent)
30 : CSSRule(parent) 30 : CSSRule(parent)
31 { 31 {
32 } 32 }
33 33
34 CSSFontFaceRule::~CSSFontFaceRule() 34 CSSFontFaceRule::~CSSFontFaceRule()
35 { 35 {
36 if (m_style)
37 m_style->setParentRule(0);
36 } 38 }
37 39
38 void CSSFontFaceRule::setDeclaration(PassRefPtr<CSSMutableStyleDeclaration> styl e) 40 void CSSFontFaceRule::setDeclaration(PassRefPtr<CSSMutableStyleDeclaration> styl e)
39 { 41 {
40 m_style = style; 42 m_style = style;
41 } 43 }
42 44
43 String CSSFontFaceRule::cssText() const 45 String CSSFontFaceRule::cssText() const
44 { 46 {
45 String result("@font-face"); 47 String result("@font-face");
46 result += " { "; 48 result += " { ";
47 result += m_style->cssText(); 49 result += m_style->cssText();
48 result += "}"; 50 result += "}";
49 return result; 51 return result;
50 } 52 }
51 53
52 void CSSFontFaceRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls) 54 void CSSFontFaceRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
53 { 55 {
54 if (m_style) 56 if (m_style)
55 m_style->addSubresourceStyleURLs(urls); 57 m_style->addSubresourceStyleURLs(urls);
56 } 58 }
57 59
58 } // namespace WebCore 60 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/resources/gc.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698