| OLD | NEW |
| 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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 m_documentTiming.domComplete = monotonicallyIncreasingTime(); | 1098 m_documentTiming.domComplete = monotonicallyIncreasingTime(); |
| 1099 break; | 1099 break; |
| 1100 } | 1100 } |
| 1101 | 1101 |
| 1102 m_readyState = readyState; | 1102 m_readyState = readyState; |
| 1103 dispatchEvent(Event::create(eventNames().readystatechangeEvent)); | 1103 dispatchEvent(Event::create(eventNames().readystatechangeEvent)); |
| 1104 } | 1104 } |
| 1105 | 1105 |
| 1106 String Document::encodingName() const | 1106 String Document::encodingName() const |
| 1107 { | 1107 { |
| 1108 // TextEncoding::domName() returns a char*, no need to allocate a new | 1108 // TextEncoding::name() returns a char*, no need to allocate a new |
| 1109 // String for it each time. | 1109 // String for it each time. |
| 1110 // FIXME: We should fix TextEncoding to speak AtomicString anyway. | 1110 // FIXME: We should fix TextEncoding to speak AtomicString anyway. |
| 1111 return AtomicString(m_encoding.domName()); | 1111 return AtomicString(m_encoding.name()); |
| 1112 } | 1112 } |
| 1113 | 1113 |
| 1114 String Document::defaultCharset() const | 1114 String Document::defaultCharset() const |
| 1115 { | 1115 { |
| 1116 if (Settings* settings = this->settings()) | 1116 if (Settings* settings = this->settings()) |
| 1117 return settings->defaultTextEncodingName(); | 1117 return settings->defaultTextEncodingName(); |
| 1118 return String(); | 1118 return String(); |
| 1119 } | 1119 } |
| 1120 | 1120 |
| 1121 void Document::setCharset(const String& charset) | 1121 void Document::setCharset(const String& charset) |
| (...skipping 4199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5321 { | 5321 { |
| 5322 return DocumentLifecycleNotifier::create(this); | 5322 return DocumentLifecycleNotifier::create(this); |
| 5323 } | 5323 } |
| 5324 | 5324 |
| 5325 DocumentLifecycleNotifier* Document::lifecycleNotifier() | 5325 DocumentLifecycleNotifier* Document::lifecycleNotifier() |
| 5326 { | 5326 { |
| 5327 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec
ycleNotifier()); | 5327 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec
ycleNotifier()); |
| 5328 } | 5328 } |
| 5329 | 5329 |
| 5330 } // namespace WebCore | 5330 } // namespace WebCore |
| OLD | NEW |