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

Side by Side Diff: Source/core/dom/Document.h

Issue 22909053: Store the Document's encoding on the Document (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months 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
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, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 PassRefPtr<NodeList> nodesFromRect(int centerX, int centerY, 344 PassRefPtr<NodeList> nodesFromRect(int centerX, int centerY,
345 unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsi gned leftPadding, 345 unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsi gned leftPadding,
346 HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent) const; 346 HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent) const;
347 Element* elementFromPoint(int x, int y) const; 347 Element* elementFromPoint(int x, int y) const;
348 PassRefPtr<Range> caretRangeFromPoint(int x, int y); 348 PassRefPtr<Range> caretRangeFromPoint(int x, int y);
349 349
350 String readyState() const; 350 String readyState() const;
351 351
352 String defaultCharset() const; 352 String defaultCharset() const;
353 353
354 String inputEncoding() const { return Document::encoding(); } 354 String inputEncoding() const { return Document::encodingName(); }
355 String charset() const { return Document::encoding(); } 355 String charset() const { return Document::encodingName(); }
356 String characterSet() const { return Document::encoding(); } 356 String characterSet() const { return Document::encodingName(); }
357 357
358 String encoding() const; 358 String encodingName() const;
359 359
360 void setCharset(const String&); 360 void setCharset(const String&);
361 361
362 void setContent(const String&); 362 void setContent(const String&);
363 363
364 String suggestedMIMEType() const; 364 String suggestedMIMEType() const;
365 365
366 String contentLanguage() const { return m_contentLanguage; } 366 String contentLanguage() const { return m_contentLanguage; }
367 void setContentLanguage(const String&); 367 void setContentLanguage(const String&);
368 368
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 void suspendScriptedAnimationControllerCallbacks(); 887 void suspendScriptedAnimationControllerCallbacks();
888 void resumeScriptedAnimationControllerCallbacks(); 888 void resumeScriptedAnimationControllerCallbacks();
889 889
890 void finishedParsing(); 890 void finishedParsing();
891 891
892 void documentWillBecomeInactive(); 892 void documentWillBecomeInactive();
893 893
894 void setDecoder(PassRefPtr<TextResourceDecoder>); 894 void setDecoder(PassRefPtr<TextResourceDecoder>);
895 TextResourceDecoder* decoder() const { return m_decoder.get(); } 895 TextResourceDecoder* decoder() const { return m_decoder.get(); }
896 896
897 void setEncoding(const WTF::TextEncoding&);
898 const WTF::TextEncoding& encoding() const { return m_encoding; }
899
897 String displayStringModifiedByEncoding(const String&) const; 900 String displayStringModifiedByEncoding(const String&) const;
898 PassRefPtr<StringImpl> displayStringModifiedByEncoding(PassRefPtr<StringImpl >) const; 901 PassRefPtr<StringImpl> displayStringModifiedByEncoding(PassRefPtr<StringImpl >) const;
899 void displayBufferModifiedByEncoding(LChar* buffer, unsigned len) const 902 void displayBufferModifiedByEncoding(LChar* buffer, unsigned len) const
900 { 903 {
901 displayBufferModifiedByEncodingInternal(buffer, len); 904 displayBufferModifiedByEncodingInternal(buffer, len);
902 } 905 }
903 void displayBufferModifiedByEncoding(UChar* buffer, unsigned len) const 906 void displayBufferModifiedByEncoding(UChar* buffer, unsigned len) const
904 { 907 {
905 displayBufferModifiedByEncodingInternal(buffer, len); 908 displayBufferModifiedByEncodingInternal(buffer, len);
906 } 909 }
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 RefPtr<Document> m_transformSourceDocument; 1278 RefPtr<Document> m_transformSourceDocument;
1276 1279
1277 String m_xmlEncoding; 1280 String m_xmlEncoding;
1278 String m_xmlVersion; 1281 String m_xmlVersion;
1279 unsigned m_xmlStandalone : 2; 1282 unsigned m_xmlStandalone : 2;
1280 unsigned m_hasXMLDeclaration : 1; 1283 unsigned m_hasXMLDeclaration : 1;
1281 1284
1282 String m_contentLanguage; 1285 String m_contentLanguage;
1283 1286
1284 RefPtr<TextResourceDecoder> m_decoder; 1287 RefPtr<TextResourceDecoder> m_decoder;
1288 WTF::TextEncoding m_encoding;
1285 1289
1286 InheritedBool m_designMode; 1290 InheritedBool m_designMode;
1287 1291
1288 HashSet<LiveNodeListBase*> m_listsInvalidatedAtDocument; 1292 HashSet<LiveNodeListBase*> m_listsInvalidatedAtDocument;
1289 unsigned m_nodeListCounts[numNodeListInvalidationTypes]; 1293 unsigned m_nodeListCounts[numNodeListInvalidationTypes];
1290 1294
1291 OwnPtr<SVGDocumentExtensions> m_svgExtensions; 1295 OwnPtr<SVGDocumentExtensions> m_svgExtensions;
1292 1296
1293 Vector<AnnotatedRegionValue> m_annotatedRegions; 1297 Vector<AnnotatedRegionValue> m_annotatedRegions;
1294 bool m_hasAnnotatedRegions; 1298 bool m_hasAnnotatedRegions;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 inline bool Node::isDocumentNode() const 1432 inline bool Node::isDocumentNode() const
1429 { 1433 {
1430 return this == documentInternal(); 1434 return this == documentInternal();
1431 } 1435 }
1432 1436
1433 Node* eventTargetNodeForDocument(Document*); 1437 Node* eventTargetNodeForDocument(Document*);
1434 1438
1435 } // namespace WebCore 1439 } // namespace WebCore
1436 1440
1437 #endif // Document_h 1441 #endif // Document_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698