Changeset 88609 in webkit

Timestamp:

Jun 11, 2011 5:51:11 PM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-11 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

DocumentParser::appendBytes shouldn't have a "flush" boolean parameter
​https://bugs.webkit.org/show_bug.cgi?id=62499

This patch removes the "flush" Boolean parameter from
DocumentParser::appendBytes in favor of a new flush method. This makes
some code in DocumentWriter look less ridiculous.

There's still lots of on contorting to do here, but it's a start.

• dom/DecodedDataDocumentParser.cpp: (WebCore::DecodedDataDocumentParser::appendBytes): (WebCore::DecodedDataDocumentParser::flush):
• dom/DecodedDataDocumentParser.h:
• dom/DocumentParser.h:
• dom/RawDataDocumentParser.h: (WebCore::RawDataDocumentParser::flush):
• html/ImageDocument.cpp: (WebCore::ImageDocumentParser::appendBytes):
• html/MediaDocument.cpp: (WebCore::MediaDocumentParser::appendBytes):
• html/PluginDocument.cpp: (WebCore::PluginDocumentParser::appendBytes):
• loader/DocumentWriter.cpp: (WebCore::DocumentWriter::reportDataReceived): (WebCore::DocumentWriter::addData): (WebCore::DocumentWriter::endIfNotLoadingMainResource):
• loader/DocumentWriter.h:
• loader/SinkDocument.cpp: (WebCore::SinkDocumentParser::appendBytes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (3 diffs)
• dom/DecodedDataDocumentParser.cpp (modified) (1 diff)
• dom/DecodedDataDocumentParser.h (modified) (1 diff)
• dom/DocumentParser.h (modified) (1 diff)
• dom/RawDataDocumentParser.h (modified) (1 diff)
• html/ImageDocument.cpp (modified) (2 diffs)
• html/MediaDocument.cpp (modified) (2 diffs)
• html/PluginDocument.cpp (modified) (2 diffs)
• loader/DocumentWriter.cpp (modified) (6 diffs)
• loader/DocumentWriter.h (modified) (2 diffs)
• loader/SinkDocument.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-11  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        DocumentParser::appendBytes shouldn't have a "flush" boolean parameter
+        https://bugs.webkit.org/show_bug.cgi?id=62499
+
+        This patch removes the "flush" Boolean parameter from
+        DocumentParser::appendBytes in favor of a new flush method.  This makes
+        some code in DocumentWriter look less ridiculous.
+
+        There's still lots of on contorting to do here, but it's a start.
+
+        * dom/DecodedDataDocumentParser.cpp:
+        (WebCore::DecodedDataDocumentParser::appendBytes):
+        (WebCore::DecodedDataDocumentParser::flush):
+        * dom/DecodedDataDocumentParser.h:
+        * dom/DocumentParser.h:
+        * dom/RawDataDocumentParser.h:
+        (WebCore::RawDataDocumentParser::flush):
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocumentParser::appendBytes):
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocumentParser::appendBytes):
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocumentParser::appendBytes):
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::reportDataReceived):
+        (WebCore::DocumentWriter::addData):
+        (WebCore::DocumentWriter::endIfNotLoadingMainResource):
+        * loader/DocumentWriter.h:
+        * loader/SinkDocument.cpp:
+        (WebCore::SinkDocumentParser::appendBytes):
+
 2011-06-11  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -7438 +7438 @@
                 417DA4CE13734326007C57FB /* Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Internals.h; sourceTree = "<group>"; };
                 417DA4CF13734326007C57FB /* Internals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Internals.cpp; sourceTree = "<group>"; };
-                417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = WebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+                417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                 417DA71B13735DFA007C57FB /* JSInternals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInternals.cpp; sourceTree = "<group>"; };
                 417DA71C13735DFA007C57FB /* JSInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInternals.h; sourceTree = "<group>"; };
@@ -12731 +12731 @@
                         children = (
                                 5D87BB4F11E3EAEB00702B6F /* WebCoreExportFileGenerator */,
-                                417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */,
+                                417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */,
                                 93F19B1A08245E5A001E9ABC /* WebCore.framework */,
                         );
@@ -23195 +23195 @@
                         name = WebCoreTestSupport;
                         productName = WebCoreTestSupport;
-                        productReference = 417DA6D013734E02007C57FB /* WebCoreTestSupport.dylib */;
+                        productReference = 417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */;
                         productType = "com.apple.product-type.library.dynamic";
                 };

trunk/Source/WebCore/dom/DecodedDataDocumentParser.cpp

@@ -38 +38 @@
 }
 
-void DecodedDataDocumentParser::appendBytes(DocumentWriter* writer , const char* data, int length, bool shouldFlush)
+void DecodedDataDocumentParser::appendBytes(DocumentWriter* writer, const char* data, int length)
 {
-    if (!length && !shouldFlush)
+    if (!length)
         return;
 
-    TextResourceDecoder* decoder = writer->createDecoderIfNeeded();
-    String decoded = decoder->decode(data, length);
-    if (shouldFlush)
-        decoded += decoder->flush();
+    String decoded = writer->createDecoderIfNeeded()->decode(data, length);
     if (decoded.isEmpty())
         return;
 
     writer->reportDataReceived();
-
     append(decoded);
 }
 
+void DecodedDataDocumentParser::flush(DocumentWriter* writer)
+{
+    String remainingData = writer->createDecoderIfNeeded()->flush();
+    if (remainingData.isEmpty())
+        return;
+
+    writer->reportDataReceived();
+    append(remainingData);
+}
+
 };
-

trunk/Source/WebCore/dom/DecodedDataDocumentParser.h

@@ -41 +41 @@
 
 private:
-    // append is used by DocumentWriter::replaceDocument
+    // append is used by DocumentWriter::replaceDocument.
     virtual void append(const SegmentedString&) = 0;
 
-    // appendBytes is used by DocumentWriter (the loader)
-    virtual void appendBytes(DocumentWriter*, const char* bytes, int length, bool flush);
+    // appendBytes and flush are used by DocumentWriter (the loader).
+    virtual void appendBytes(DocumentWriter*, const char* bytes, int length);
+    virtual void flush(DocumentWriter*);
 };
 

trunk/Source/WebCore/dom/DocumentParser.h

@@ -43 +43 @@
     virtual bool hasInsertionPoint() { return true; }
 
-    // insert is used by document.write
+    // insert is used by document.write.
     virtual void insert(const SegmentedString&) = 0;
 
-    // appendBytes is used by DocumentWriter (the loader)
-    virtual void appendBytes(DocumentWriter*, const char* bytes, int length, bool flush) = 0;
+    // appendBytes and flush are used by DocumentWriter (the loader).
+    virtual void appendBytes(DocumentWriter*, const char* bytes, int length) = 0;
+    virtual void flush(DocumentWriter*) = 0;
 
     // FIXME: append() should be private, but DocumentWriter::replaceDocument

trunk/Source/WebCore/dom/RawDataDocumentParser.h

@@ -45 +45 @@
 
 private:
+    virtual void flush(DocumentWriter* writer)
+    {
+        // Make sure appendBytes is called at least once.
+        appendBytes(writer, 0, 0);
+    }
+
     virtual void insert(const SegmentedString&)
     {

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -91 +91 @@
     }
 
-    virtual void appendBytes(DocumentWriter*, const char*, int, bool);
+    virtual void appendBytes(DocumentWriter*, const char*, int);
     virtual void finish();
 };
@@ -125 +125 @@
 }
 
-void ImageDocumentParser::appendBytes(DocumentWriter*, const char*, int, bool)
+void ImageDocumentParser::appendBytes(DocumentWriter*, const char*, int)
 {
     Frame* frame = document()->frame();

trunk/Source/WebCore/html/MediaDocument.cpp

@@ -61 +61 @@
     }
 
-    virtual void appendBytes(DocumentWriter*, const char*, int, bool);
+    virtual void appendBytes(DocumentWriter*, const char*, int);
 
     void createDocumentStructure();
@@ -104 +104 @@
 }
 
-void MediaDocumentParser::appendBytes(DocumentWriter*, const char*, int, bool)
+void MediaDocumentParser::appendBytes(DocumentWriter*, const char*, int)
 {
     if (m_mediaElement)

trunk/Source/WebCore/html/PluginDocument.cpp

@@ -59 +59 @@
     }
 
-    virtual void appendBytes(DocumentWriter*, const char*, int, bool);
+    virtual void appendBytes(DocumentWriter*, const char*, int);
 
     void createDocumentStructure();
@@ -104 +104 @@
 }
 
-void PluginDocumentParser::appendBytes(DocumentWriter*, const char*, int, bool)
+void PluginDocumentParser::appendBytes(DocumentWriter*, const char*, int)
 {
     if (m_embedElement)

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -57 +57 @@
 DocumentWriter::DocumentWriter(Frame* frame)
     : m_frame(frame)
-    , m_receivedData(false)
+    , m_hasReceivedSomeData(false)
     , m_encodingWasChosenByUser(false)
 {
@@ -71 +71 @@
 
     if (!source.isNull()) {
-        if (!m_receivedData) {
-            m_receivedData = true;
+        if (!m_hasReceivedSomeData) {
+            m_hasReceivedSomeData = true;
             m_frame->document()->setCompatibilityMode(Document::NoQuirksMode);
         }
@@ -88 +88 @@
 {
     m_decoder = 0;
-    m_receivedData = false;
+    m_hasReceivedSomeData = false;
     if (!m_encodingWasChosenByUser)
         m_encoding = String();
@@ -145 +145 @@
     document->implicitOpen();
 
+    // We grab a reference to the parser so that we'll always send data to the
+    // original parser, even if the document acquires a new parser (e.g., via
+    // document.open).
     m_parser = document->parser();
 
@@ -188 +191 @@
 {
     ASSERT(m_decoder);
-    if (!m_receivedData) {
-        m_receivedData = true;
-        if (m_decoder->encoding().usesVisualOrdering())
-            m_frame->document()->setVisuallyOrdered();
-        m_frame->document()->recalcStyle(Node::Force);
-    }
-}
-
-void DocumentWriter::addData(const char* str, int len, bool flush)
-{
-    if (len == -1)
-        len = strlen(str);
-
-    m_parser->appendBytes(this, str, len, flush);
+    if (m_hasReceivedSomeData)
+        return;
+    m_hasReceivedSomeData = true;
+    if (m_decoder->encoding().usesVisualOrdering())
+        m_frame->document()->setVisuallyOrdered();
+    m_frame->document()->recalcStyle(Node::Force);
+}
+
+void DocumentWriter::addData(const char* bytes, int length)
+{
+    if (length == -1)
+        length = strlen(bytes);
+
+    m_parser->appendBytes(this, bytes, length);
 }
 
@@ -220 +223 @@
     RefPtr<Frame> protector(m_frame);
 
-    // FIXME: Can we remove this call? Finishing the parser should flush anyway.
-    addData(0, 0, true);
-
+    // FIXME: m_parser->finish() should imply m_parser->flush().
+    m_parser->flush(this);
     if (!m_parser)
         return;

trunk/Source/WebCore/loader/DocumentWriter.h

@@ -52 +52 @@
     void begin();
     void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityOrigin* forcedSecurityOrigin = 0);
-    void addData(const char* string, int length = -1, bool flush = false);
+    void addData(const char* bytes, int length = -1);
     void end();
     void endIfNotLoadingMainResource();
@@ -83 +83 @@
     Frame* m_frame;
 
-    bool m_receivedData;
+    bool m_hasReceivedSomeData;
     String m_mimeType;
 

trunk/Source/WebCore/loader/SinkDocument.cpp

@@ -45 +45 @@
 
     // Ignore all data.
-    virtual void appendBytes(DocumentWriter*, const char*, int, bool) { }
+    virtual void appendBytes(DocumentWriter*, const char*, int) { }
 };