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

Side by Side Diff: trunk/Source/core/dom/Document.cpp

Issue 26184004: Revert 158972 "Canonical name change: windows-949 => EUC-KR" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 2 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, 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 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after
1095 m_documentTiming.domComplete = monotonicallyIncreasingTime(); 1095 m_documentTiming.domComplete = monotonicallyIncreasingTime();
1096 break; 1096 break;
1097 } 1097 }
1098 1098
1099 m_readyState = readyState; 1099 m_readyState = readyState;
1100 dispatchEvent(Event::create(eventNames().readystatechangeEvent)); 1100 dispatchEvent(Event::create(eventNames().readystatechangeEvent));
1101 } 1101 }
1102 1102
1103 String Document::encodingName() const 1103 String Document::encodingName() const
1104 { 1104 {
1105 // TextEncoding::name() returns a char*, no need to allocate a new 1105 // TextEncoding::domName() returns a char*, no need to allocate a new
1106 // String for it each time. 1106 // String for it each time.
1107 // FIXME: We should fix TextEncoding to speak AtomicString anyway. 1107 // FIXME: We should fix TextEncoding to speak AtomicString anyway.
1108 return AtomicString(m_encoding.name()); 1108 return AtomicString(m_encoding.domName());
1109 } 1109 }
1110 1110
1111 String Document::defaultCharset() const 1111 String Document::defaultCharset() const
1112 { 1112 {
1113 if (Settings* settings = this->settings()) 1113 if (Settings* settings = this->settings())
1114 return settings->defaultTextEncodingName(); 1114 return settings->defaultTextEncodingName();
1115 return String(); 1115 return String();
1116 } 1116 }
1117 1117
1118 void Document::setCharset(const String& charset) 1118 void Document::setCharset(const String& charset)
(...skipping 4193 matching lines...) Expand 10 before | Expand all | Expand 10 after
5312 { 5312 {
5313 return DocumentLifecycleNotifier::create(this); 5313 return DocumentLifecycleNotifier::create(this);
5314 } 5314 }
5315 5315
5316 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5316 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5317 { 5317 {
5318 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5318 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5319 } 5319 }
5320 5320
5321 } // namespace WebCore 5321 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698