Merge WebKit at r62496: Initial merge by git

Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2

1 files changed, 13 insertions, 2 deletions

diff --git a/WebCore/html/HTMLInputStream.h b/WebCore/html/HTMLInputStream.h
index 9620388..d7c1c9c 100644
--- a/WebCore/html/HTMLInputStream.h
+++ b/WebCore/html/HTMLInputStream.h
@@ -64,8 +64,19 @@ public:
         m_first.append(string);
     }
 
-    void close() { m_last->close(); }
-    bool isClosed() { return m_last->isClosed(); }
+    void markEndOfFile()
+    {
+        // FIXME: This should use InputStreamPreprocessor::endOfFileMarker
+        // once InputStreamPreprocessor is split off into its own header.
+        static const UChar endOfFileMarker = 0;
+        m_last->append(SegmentedString(String(&endOfFileMarker, 1)));
+        m_last->close();
+    }
+
+    bool haveSeenEndOfFile()
+    {
+        return m_last->isClosed();
+    }
 
     SegmentedString& current() { return m_first; }