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

Side by Side Diff: WebCore/svg/SVGFontFaceElement.cpp

Issue 5601001: Merge 72924 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « WebCore/css/StyleSheet.cpp ('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 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
3 * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 } 308 }
309 } 309 }
310 310
311 document()->styleSelectorChanged(DeferRecalcStyle); 311 document()->styleSelectorChanged(DeferRecalcStyle);
312 } 312 }
313 313
314 void SVGFontFaceElement::insertedIntoDocument() 314 void SVGFontFaceElement::insertedIntoDocument()
315 { 315 {
316 SVGElement::insertedIntoDocument(); 316 SVGElement::insertedIntoDocument();
317 document()->mappedElementSheet()->append(m_fontFaceRule); 317 document()->mappedElementSheet()->append(m_fontFaceRule);
318 m_fontFaceRule->setParent(document()->mappedElementSheet());
318 rebuildFontFace(); 319 rebuildFontFace();
319 } 320 }
320 321
321 void SVGFontFaceElement::removedFromDocument() 322 void SVGFontFaceElement::removedFromDocument()
322 { 323 {
323 removeFromMappedElementSheet(); 324 removeFromMappedElementSheet();
324 SVGElement::removedFromDocument(); 325 SVGElement::removedFromDocument();
325 } 326 }
326 327
327 void SVGFontFaceElement::childrenChanged(bool changedByParser, Node* beforeChang e, Node* afterChange, int childCountDelta) 328 void SVGFontFaceElement::childrenChanged(bool changedByParser, Node* beforeChang e, Node* afterChange, int childCountDelta)
(...skipping 14 matching lines...) Expand all
342 mappedElementSheet->remove(i); 343 mappedElementSheet->remove(i);
343 break; 344 break;
344 } 345 }
345 } 346 }
346 document()->styleSelectorChanged(DeferRecalcStyle); 347 document()->styleSelectorChanged(DeferRecalcStyle);
347 } 348 }
348 349
349 } // namespace WebCore 350 } // namespace WebCore
350 351
351 #endif // ENABLE(SVG_FONTS) 352 #endif // ENABLE(SVG_FONTS)
OLDNEW
« no previous file with comments | « WebCore/css/StyleSheet.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698