From cac0f67c402d107cdb10971b95719e2ff9c7c76b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Nov 2009 09:23:40 +0000 Subject: Merge webkit.org at r50258 : Initial merge by git. Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 --- WebCore/storage/StorageEvent.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'WebCore/storage/StorageEvent.cpp') diff --git a/WebCore/storage/StorageEvent.cpp b/WebCore/storage/StorageEvent.cpp index f3b3b70..13ccfe9 100644 --- a/WebCore/storage/StorageEvent.cpp +++ b/WebCore/storage/StorageEvent.cpp @@ -28,7 +28,6 @@ #if ENABLE(DOM_STORAGE) -#include "DOMWindow.h" #include "Storage.h" namespace WebCore { @@ -42,23 +41,22 @@ StorageEvent::StorageEvent() { } -PassRefPtr StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) +PassRefPtr StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea) { - return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, source, storageArea)); + return adoptRef(new StorageEvent(type, key, oldValue, newValue, uri, storageArea)); } -StorageEvent::StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) +StorageEvent::StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea) : Event(type, false, true) , m_key(key) , m_oldValue(oldValue) , m_newValue(newValue) , m_uri(uri) - , m_source(source) , m_storageArea(storageArea) { } -void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr source, Storage* storageArea) +void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea) { if (dispatched()) return; @@ -69,7 +67,6 @@ void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bo m_oldValue = oldValue; m_newValue = newValue; m_uri = uri; - m_source = source; m_storageArea = storageArea; } -- cgit v1.1