Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 154 insertions, 0 deletions

diff --git a/Source/WebCore/notifications/Notification.h b/Source/WebCore/notifications/Notification.h
new file mode 100644
index 0000000..f14a302
--- /dev/null
+++ b/Source/WebCore/notifications/Notification.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2009 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 Notification_h  
+#define Notification_h
+
+#include "ActiveDOMObject.h"
+#include "Event.h"
+#include "EventListener.h"
+#include "EventNames.h"
+#include "EventTarget.h"
+#include "ExceptionCode.h"
+#include "KURL.h"
+#include "NotificationPresenter.h"
+#include "NotificationContents.h"
+#include "RegisteredEventListener.h"
+#include "SharedBuffer.h"
+#include "TextDirection.h"
+#include "ThreadableLoader.h"
+#include "ThreadableLoaderClient.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+#include <wtf/text/AtomicStringHash.h>
+
+#if ENABLE(NOTIFICATIONS)
+namespace WebCore {
+
+    class NotificationCenter;
+    class WorkerContext;
+
+    class Notification : public RefCounted<Notification>, public ActiveDOMObject, public ThreadableLoaderClient, public EventTarget {
+    public:
+        static PassRefPtr<Notification> create(const KURL& url, ScriptExecutionContext* context, ExceptionCode& ec, PassRefPtr<NotificationCenter> provider);
+        static PassRefPtr<Notification> create(const NotificationContents& contents, ScriptExecutionContext* context, ExceptionCode& ec, PassRefPtr<NotificationCenter> provider);
+        
+        virtual ~Notification();
+
+        void show();
+        void cancel();
+    
+        bool isHTML() { return m_isHTML; }
+        KURL url() { return m_notificationURL; }
+        KURL iconURL() { return m_contents.icon(); }
+        NotificationContents& contents() { return m_contents; }
+
+        String dir() const { return m_direction; }
+        void setDir(const String& dir) { m_direction = dir; }
+        String replaceId() const { return m_replaceId; }
+        void setReplaceId(const String& replaceId) { m_replaceId = replaceId; }
+
+        TextDirection direction() const { return dir() == "rtl" ? RTL : LTR; }
+
+        DEFINE_ATTRIBUTE_EVENT_LISTENER(display);
+        DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
+        DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
+        DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
+    
+        using RefCounted<Notification>::ref;
+        using RefCounted<Notification>::deref;
+    
+        // EventTarget interface
+        virtual ScriptExecutionContext* scriptExecutionContext() const { return ActiveDOMObject::scriptExecutionContext(); }
+        virtual Notification* toNotification() { return this; }
+
+        // ActiveDOMObject interface
+        virtual void contextDestroyed();
+
+        void stopLoading();
+
+        SharedBuffer* iconData() { return m_iconData.get(); }
+        void releaseIconData() { m_iconData = 0; }
+
+        // Deprecated. Use functions from NotificationCenter.
+        void detachPresenter() { }
+
+        virtual void didReceiveResponse(const ResourceResponse&);
+        virtual void didReceiveData(const char* data, int lengthReceived);
+        virtual void didFinishLoading(unsigned long identifier);
+        virtual void didFail(const ResourceError&);
+        virtual void didFailRedirectCheck();
+        virtual void didReceiveAuthenticationCancellation(const ResourceResponse&);
+
+    private:
+        Notification(const KURL&, ScriptExecutionContext*, ExceptionCode&, PassRefPtr<NotificationCenter>);
+        Notification(const NotificationContents&, ScriptExecutionContext*, ExceptionCode&, PassRefPtr<NotificationCenter>);
+
+        // EventTarget interface
+        virtual void refEventTarget() { ref(); }
+        virtual void derefEventTarget() { deref(); }
+        virtual EventTargetData* eventTargetData();
+        virtual EventTargetData* ensureEventTargetData();
+
+        void startLoading();
+        void finishLoading();
+
+        bool m_isHTML;
+        KURL m_notificationURL;
+        NotificationContents m_contents;
+
+        String m_direction;
+        String m_replaceId;
+
+        enum NotificationState {
+            Idle = 0,
+            Loading = 1,
+            Showing = 2,
+            Cancelled = 3
+        };
+
+        NotificationState m_state;
+
+        RefPtr<NotificationCenter> m_notificationCenter;
+        
+        EventTargetData m_eventTargetData;
+
+        RefPtr<ThreadableLoader> m_loader;
+        RefPtr<SharedBuffer> m_iconData;
+    };
+
+} // namespace WebCore
+
+#endif // ENABLE(NOTIFICATIONS)
+
+#endif // Notifications_h