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

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

Issue 1365923002: Make Document.charset an alias of characterSet, as per spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.idl » ('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, 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 297
298 Element* elementFromPoint(int x, int y) const; 298 Element* elementFromPoint(int x, int y) const;
299 Vector<Element*> elementsFromPoint(int x, int y) const; 299 Vector<Element*> elementsFromPoint(int x, int y) const;
300 PassRefPtrWillBeRawPtr<Range> caretRangeFromPoint(int x, int y); 300 PassRefPtrWillBeRawPtr<Range> caretRangeFromPoint(int x, int y);
301 Element* scrollingElement(); 301 Element* scrollingElement();
302 302
303 String readyState() const; 303 String readyState() const;
304 304
305 String defaultCharset() const; 305 String defaultCharset() const;
306 306
307 AtomicString charset() const { return Document::encodingName(); }
308 AtomicString characterSet() const { return Document::encodingName(); } 307 AtomicString characterSet() const { return Document::encodingName(); }
309 308
310 AtomicString encodingName() const; 309 AtomicString encodingName() const;
311 310
312 void setContent(const String&); 311 void setContent(const String&);
313 312
314 String suggestedMIMEType() const; 313 String suggestedMIMEType() const;
315 void setMimeType(const AtomicString&); 314 void setMimeType(const AtomicString&);
316 AtomicString contentType() const; // DOM 4 document.contentType 315 AtomicString contentType() const; // DOM 4 document.contentType
317 316
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1432 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1434 1433
1435 } // namespace blink 1434 } // namespace blink
1436 1435
1437 #ifndef NDEBUG 1436 #ifndef NDEBUG
1438 // Outside the WebCore namespace for ease of invocation from gdb. 1437 // Outside the WebCore namespace for ease of invocation from gdb.
1439 CORE_EXPORT void showLiveDocumentInstances(); 1438 CORE_EXPORT void showLiveDocumentInstances();
1440 #endif 1439 #endif
1441 1440
1442 #endif // Document_h 1441 #endif // Document_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/Document.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698