Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 5 insertions, 9 deletions

diff --git a/WebCore/page/EventSource.h b/WebCore/page/EventSource.h
index d0d45cb..ffed592 100644
--- a/WebCore/page/EventSource.h
+++ b/WebCore/page/EventSource.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2009 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
@@ -35,15 +36,10 @@
 #if ENABLE(EVENTSOURCE)
 
 #include "ActiveDOMObject.h"
-#include "AtomicStringHash.h"
-#include "EventNames.h"
 #include "EventTarget.h"
 #include "KURL.h"
 #include "ThreadableLoaderClient.h"
 #include "Timer.h"
-
-#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
@@ -56,7 +52,7 @@ namespace WebCore {
 
     class EventSource : public RefCounted<EventSource>, public EventTarget, private ThreadableLoaderClient, public ActiveDOMObject {
     public:
-        static PassRefPtr<EventSource> create(const String& url, ScriptExecutionContext* context, ExceptionCode& ec) { return adoptRef(new EventSource(url, context, ec)); }
+        static PassRefPtr<EventSource> create(const String& url, ScriptExecutionContext*, ExceptionCode&);
         virtual ~EventSource();
 
         static const unsigned long long defaultReconnectDelay;
@@ -86,17 +82,17 @@ namespace WebCore {
         virtual void stop();
 
     private:
-        EventSource(const String& url, ScriptExecutionContext* context, ExceptionCode& ec);
+        EventSource(const KURL&, ScriptExecutionContext*);
 
         virtual void refEventTarget() { ref(); }
         virtual void derefEventTarget() { deref(); }
         virtual EventTargetData* eventTargetData();
         virtual EventTargetData* ensureEventTargetData();
 
-        virtual void didReceiveResponse(const ResourceResponse& response);
+        virtual void didReceiveResponse(const ResourceResponse&);
         virtual void didReceiveData(const char* data, int length);
         virtual void didFinishLoading(unsigned long);
-        virtual void didFail(const ResourceError& error);
+        virtual void didFail(const ResourceError&);
         virtual void didFailRedirectCheck();
 
         void connect();