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

Side by Side Diff: Source/core/dom/StyleEngine.cpp

Issue 761113003: Make Document.inputEncoding an explicit alias of Document.characterSet (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: drop FIXME Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.idl ('k') | Source/core/frame/UseCounter.h » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 } 624 }
625 625
626 ASSERT(styleSheet); 626 ASSERT(styleSheet);
627 styleSheet->setTitle(e->title()); 627 styleSheet->setTitle(e->title());
628 return styleSheet; 628 return styleSheet;
629 } 629 }
630 630
631 PassRefPtrWillBeRawPtr<CSSStyleSheet> StyleEngine::parseSheet(Element* e, const String& text, TextPosition startPosition, bool createdByParser) 631 PassRefPtrWillBeRawPtr<CSSStyleSheet> StyleEngine::parseSheet(Element* e, const String& text, TextPosition startPosition, bool createdByParser)
632 { 632 {
633 RefPtrWillBeRawPtr<CSSStyleSheet> styleSheet = nullptr; 633 RefPtrWillBeRawPtr<CSSStyleSheet> styleSheet = nullptr;
634 styleSheet = CSSStyleSheet::createInline(e, KURL(), startPosition, e->docume nt().inputEncoding()); 634 styleSheet = CSSStyleSheet::createInline(e, KURL(), startPosition, e->docume nt().characterSet());
635 styleSheet->contents()->parseStringAtPosition(text, startPosition, createdBy Parser); 635 styleSheet->contents()->parseStringAtPosition(text, startPosition, createdBy Parser);
636 return styleSheet; 636 return styleSheet;
637 } 637 }
638 638
639 void StyleEngine::removeSheet(StyleSheetContents* contents) 639 void StyleEngine::removeSheet(StyleSheetContents* contents)
640 { 640 {
641 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString>::ite rator it = m_sheetToTextCache.find(contents); 641 WillBeHeapHashMap<RawPtrWillBeMember<StyleSheetContents>, AtomicString>::ite rator it = m_sheetToTextCache.find(contents);
642 if (it == m_sheetToTextCache.end()) 642 if (it == m_sheetToTextCache.end())
643 return; 643 return;
644 644
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 visitor->trace(m_styleSheetCollectionMap); 682 visitor->trace(m_styleSheetCollectionMap);
683 visitor->trace(m_resolver); 683 visitor->trace(m_resolver);
684 visitor->trace(m_fontSelector); 684 visitor->trace(m_fontSelector);
685 visitor->trace(m_textToSheetCache); 685 visitor->trace(m_textToSheetCache);
686 visitor->trace(m_sheetToTextCache); 686 visitor->trace(m_sheetToTextCache);
687 #endif 687 #endif
688 CSSFontSelectorClient::trace(visitor); 688 CSSFontSelectorClient::trace(visitor);
689 } 689 }
690 690
691 } 691 }
OLDNEW
« no previous file with comments | « Source/core/dom/Document.idl ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698