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

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

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 | « no previous file | 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 311
312 bool regionBasedColumnsEnabled() const; 312 bool regionBasedColumnsEnabled() const;
313 313
314 Element* elementFromPoint(int x, int y) const; 314 Element* elementFromPoint(int x, int y) const;
315 PassRefPtrWillBeRawPtr<Range> caretRangeFromPoint(int x, int y); 315 PassRefPtrWillBeRawPtr<Range> caretRangeFromPoint(int x, int y);
316 316
317 String readyState() const; 317 String readyState() const;
318 318
319 String defaultCharset() const; 319 String defaultCharset() const;
320 320
321 AtomicString inputEncoding() const { return Document::encodingName(); }
322 AtomicString charset() const { return Document::encodingName(); } 321 AtomicString charset() const { return Document::encodingName(); }
323 AtomicString characterSet() const { return Document::encodingName(); } 322 AtomicString characterSet() const { return Document::encodingName(); }
324 323
325 AtomicString encodingName() const; 324 AtomicString encodingName() const;
326 325
327 void setCharset(const String&); 326 void setCharset(const String&);
328 327
329 void setContent(const String&); 328 void setContent(const String&);
330 329
331 String suggestedMIMEType() const; 330 String suggestedMIMEType() const;
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true); 1420 DEFINE_TYPE_CASTS(TreeScope, Document, document, true, true);
1422 1421
1423 } // namespace blink 1422 } // namespace blink
1424 1423
1425 #ifndef NDEBUG 1424 #ifndef NDEBUG
1426 // Outside the WebCore namespace for ease of invocation from gdb. 1425 // Outside the WebCore namespace for ease of invocation from gdb.
1427 void showLiveDocumentInstances(); 1426 void showLiveDocumentInstances();
1428 #endif 1427 #endif
1429 1428
1430 #endif // Document_h 1429 #endif // Document_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698