Introduce EventSourceParser

third_party/WebKit/Source/core/page/EventSource.h

 /*
  * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved.
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 17 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef EventSource_h
 #define EventSource_h
 
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "core/loader/ThreadableLoaderClient.h"
+#include "core/page/EventSourceParser.h"
 #include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/RefPtr.h"

[tyoshino (SeeGerritForStatus), 2016/01/28 07:31:43]

add wtf/Forward.h for AtomicString

[yhirano, 2016/01/28 08:45:36]

Done.

-#include "wtf/Vector.h"
 
 namespace blink {
 
 class EventSourceInit;
 class ExceptionState;
-class MessageEvent;
 class ResourceResponse;
-class TextResourceDecoder;
 class ThreadableLoader;
 
-class CORE_EXPORT EventSource final : public RefCountedGarbageCollectedEventTargetWithInlineData<EventSource>, private ThreadableLoaderClient, public ActiveDOMObject {
+class CORE_EXPORT EventSource final : public RefCountedGarbageCollectedEventTargetWithInlineData<EventSource>, private ThreadableLoaderClient, public ActiveDOMObject, public EventSourceParser::Client {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(EventSource);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(EventSource);
+    USING_GARBAGE_COLLECTED_MIXIN(EventSource);
 public:
     static EventSource* create(ExecutionContext*, const String& url, const EventSourceInit&, ExceptionState&);
     ~EventSource() override;
 
     static const unsigned long long defaultReconnectDelay;
 
     String url() const;
     bool withCredentials() const;
 
     enum State : unsigned short {
@@ skipping 18 matching lines @@
     // Note: suspend() is noop since ScopedPageLoadDeferrer calls
     // Page::setDefersLoading() and it defers delivery of events from the
     // loader, and therefore the methods of this class for receiving
     // asynchronous events from the loader won't be invoked.
     void stop() override;
 
     bool hasPendingActivity() const override;
 
     DECLARE_VIRTUAL_TRACE();
 
-    void setStateForTest(State state) { m_state = state; }
-    void setRequestInFlightForTest(bool b) { m_requestInFlight = b; }
-    ThreadableLoaderClient* asThreadableLoaderClientForTest() { return this; }
-    unsigned long long reconnectDelayForTest() const { return m_reconnectDelay; }
-
 private:
     EventSource(ExecutionContext*, const KURL&, const EventSourceInit&);
 
     void didReceiveResponse(unsigned long, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
     void didReceiveData(const char*, unsigned) override;
     void didFinishLoading(unsigned long, double) override;
     void didFail(const ResourceError&) override;
     void didFailAccessControlCheck(const ResourceError&) override;
     void didFailRedirectCheck() override;
 
+    void onMessageEvent(const AtomicString& event, const String& data, const AtomicString& id) override;
+    void onReconnectionTimeSet(unsigned long long reconnectionTime) override;
+
     void scheduleInitialConnect();
     void connect();
     void networkRequestEnded();
     void scheduleReconnect();
     void connectTimerFired(Timer<EventSource>*);
     void abortConnectionAttempt();
-    void parseEventStream();
-    void parseEventStreamLine(unsigned pos, int fieldLength, int lineLength);
-    PassRefPtrWillBeRawPtr<MessageEvent> createMessageEvent();
 
     KURL m_url;
     bool m_withCredentials;
     State m_state;
 
-    OwnPtr<TextResourceDecoder> m_decoder;
+    Member<EventSourceParser> m_parser;
     RefPtr<ThreadableLoader> m_loader;
     Timer<EventSource> m_connectTimer;
-    Vector<UChar> m_receiveBuf;
-    bool m_discardTrailingNewline;
     bool m_requestInFlight;
-
-    AtomicString m_eventName;
-    Vector<UChar> m_data;
-    AtomicString m_currentlyParsedEventId;
-    AtomicString m_lastEventId;
     unsigned long long m_reconnectDelay;
     String m_eventStreamOrigin;
 };
 
 } // namespace blink
 
 #endif // EventSource_h