Title: [94817] trunk/Source/WebCore
- Revision
- 94817
- Author
- aba...@webkit.org
- Date
- 2011-09-08 16:15:48 -0700 (Thu, 08 Sep 2011)
Log Message
Second attempt to fix Chromium build.
* dom/Document.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94816 => 94817)
--- trunk/Source/WebCore/ChangeLog 2011-09-08 23:03:46 UTC (rev 94816)
+++ trunk/Source/WebCore/ChangeLog 2011-09-08 23:15:48 UTC (rev 94817)
@@ -1,3 +1,9 @@
+2011-09-08 Adam Barth <aba...@webkit.org>
+
+ Second attempt to fix Chromium build.
+
+ * dom/Document.h:
+
2011-09-08 Oliver Hunt <oli...@apple.com>
Use bump allocator for initial property storage
Modified: trunk/Source/WebCore/dom/Document.h (94816 => 94817)
--- trunk/Source/WebCore/dom/Document.h 2011-09-08 23:03:46 UTC (rev 94816)
+++ trunk/Source/WebCore/dom/Document.h 2011-09-08 23:15:48 UTC (rev 94817)
@@ -365,11 +365,13 @@
String readyState() const;
String defaultCharset() const;
-
+
String inputEncoding() const { return Document::encoding(); }
String charset() const { return Document::encoding(); }
String characterSet() const { return Document::encoding(); }
+ String encoding() const;
+
void setCharset(const String&);
void setContent(const String&);
@@ -1126,8 +1128,6 @@
virtual double minimumTimerInterval() const;
- String encoding() const;
-
void updateTitle(const StringWithDirection&);
void updateFocusAppearanceTimerFired(Timer<Document>*);
void updateBaseURL();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
