[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
jorlow at chromium.org
jorlow at chromium.org
Thu Oct 29 20:48:23 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 1ddc953f65cd023a4b4216f412aeaf4c633249b2
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 20 01:32:47 2009 +0000
2009-10-19 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Dmitri Titov.
Remove "source" from storage events
https://bugs.webkit.org/show_bug.cgi?id=30536
Remove "source" from storage events per
http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-October/023703.html
This was removed because it makes it introduces synchronous access that can
cross the event loop boundry (since a storage event can fire from one process
and be handled in another).
* inspector/InspectorDOMStorageResource.cpp:
(WebCore::InspectorDOMStorageResource::handleEvent):
* storage/StorageEvent.cpp:
(WebCore::StorageEvent::create):
(WebCore::StorageEvent::StorageEvent):
(WebCore::StorageEvent::initStorageEvent):
* storage/StorageEvent.h:
(WebCore::StorageEvent::uri):
* storage/StorageEvent.idl:
* storage/StorageEventDispatcher.cpp:
(WebCore::StorageEventDispatcher::dispatch):
2009-10-19 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Dmitri Titov.
Remove "source" from storage events
https://bugs.webkit.org/show_bug.cgi?id=30536
Remove "source" from storage events per
http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-October/023703.html
* storage/domstorage/localstorage/iframe-events-expected.txt:
* storage/domstorage/localstorage/iframe-events.html:
* storage/domstorage/localstorage/resources/iframe-events-second.html:
* storage/domstorage/localstorage/simple-events-expected.txt:
* storage/domstorage/localstorage/simple-events.html:
* storage/domstorage/sessionstorage/iframe-events-expected.txt:
* storage/domstorage/sessionstorage/iframe-events.html:
* storage/domstorage/sessionstorage/resources/iframe-events-second.html:
* storage/domstorage/sessionstorage/simple-events-expected.txt:
* storage/domstorage/sessionstorage/simple-events.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49830 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0cc2532..fd57556 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2009-10-19 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Dmitri Titov.
+
+ Remove "source" from storage events
+ https://bugs.webkit.org/show_bug.cgi?id=30536
+
+ Remove "source" from storage events per
+ http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-October/023703.html
+
+ * storage/domstorage/localstorage/iframe-events-expected.txt:
+ * storage/domstorage/localstorage/iframe-events.html:
+ * storage/domstorage/localstorage/resources/iframe-events-second.html:
+ * storage/domstorage/localstorage/simple-events-expected.txt:
+ * storage/domstorage/localstorage/simple-events.html:
+ * storage/domstorage/sessionstorage/iframe-events-expected.txt:
+ * storage/domstorage/sessionstorage/iframe-events.html:
+ * storage/domstorage/sessionstorage/resources/iframe-events-second.html:
+ * storage/domstorage/sessionstorage/simple-events-expected.txt:
+ * storage/domstorage/sessionstorage/simple-events.html:
+
2009-10-19 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/storage/domstorage/localstorage/iframe-events-expected.txt b/LayoutTests/storage/domstorage/localstorage/iframe-events-expected.txt
index 6c5dc86..d09ff0f 100644
--- a/LayoutTests/storage/domstorage/localstorage/iframe-events-expected.txt
+++ b/LayoutTests/storage/domstorage/localstorage/iframe-events-expected.txt
@@ -6,7 +6,6 @@ Key - Main Frame
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe received storage event:
@@ -14,7 +13,6 @@ Key - Main Frame
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe about to change localStorage...
@@ -23,7 +21,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
Storage Area - This window's window.localStorage
Subframe received storage event:
@@ -31,7 +28,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
Storage Area - This window's window.localStorage
Main frame about to run removeItem on localStorage...
@@ -40,7 +36,6 @@ Key - Main Frame
New Value - null
Old Value - SET
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe received storage event:
@@ -48,7 +43,6 @@ Key - Main Frame
New Value - null
Old Value - SET
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe about to change localStorage...
@@ -58,7 +52,6 @@ Key -
New Value - null
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe received storage event:
@@ -66,7 +59,6 @@ Key -
New Value - null
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/localstorage/iframe-events.html
Storage Area - This window's window.localStorage
Subframe about to change localStorage...
@@ -75,7 +67,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
Storage Area - This window's window.localStorage
Subframe received storage event:
@@ -83,7 +74,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
Storage Area - This window's window.localStorage
diff --git a/LayoutTests/storage/domstorage/localstorage/iframe-events.html b/LayoutTests/storage/domstorage/localstorage/iframe-events.html
index e928ca6..9f93157 100644
--- a/LayoutTests/storage/domstorage/localstorage/iframe-events.html
+++ b/LayoutTests/storage/domstorage/localstorage/iframe-events.html
@@ -31,7 +31,6 @@ function handleStorageEvent(e)
log("New Value - " + e.newValue);
log("Old Value - " + e.oldValue);
log("URI - " + normalizeURL(e.uri));
- log("Source - " + normalizeURL(e.source.location.href));
log("Storage Area - " + ((e.storageArea == window.localStorage) ? "This window's window.localStorage" : "Another window's window.localStorage"));
log("");
diff --git a/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html b/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
index 0734447..2ab8ba1 100644
--- a/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
+++ b/LayoutTests/storage/domstorage/localstorage/resources/iframe-events-second.html
@@ -8,7 +8,6 @@ function handleStorageEvent(e)
parent.log("New Value - " + e.newValue);
parent.log("Old Value - " + e.oldValue);
parent.log("URI - " + parent.normalizeURL(e.uri));
- parent.log("Source - " + parent.normalizeURL(e.source.location.href));
parent.log("Storage Area - " + ((e.storageArea == window.localStorage) ? "This window's window.localStorage" : "Another window's window.localStorage"));
parent.log("");
diff --git a/LayoutTests/storage/domstorage/localstorage/simple-events-expected.txt b/LayoutTests/storage/domstorage/localstorage/simple-events-expected.txt
index b6e7fcb..899a032 100644
--- a/LayoutTests/storage/domstorage/localstorage/simple-events-expected.txt
+++ b/LayoutTests/storage/domstorage/localstorage/simple-events-expected.txt
@@ -4,27 +4,23 @@ Key - FOO
New Value - BAR
Old Value - null
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FU
New Value - BAR
Old Value - null
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FOO
New Value - null
Old Value - BAR
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FU
New Value - null
Old Value - BAR
Event has a URI
-Event has a source DOMWindow
diff --git a/LayoutTests/storage/domstorage/localstorage/simple-events.html b/LayoutTests/storage/domstorage/localstorage/simple-events.html
index ec039e2..8b0bf9e 100644
--- a/LayoutTests/storage/domstorage/localstorage/simple-events.html
+++ b/LayoutTests/storage/domstorage/localstorage/simple-events.html
@@ -27,8 +27,6 @@ function handleStorageEvent(e)
log("Old Value - " + e.oldValue);
if (e.uri)
log("Event has a URI");
- if (e.source)
- log("Event has a source DOMWindow");
log("");
}
diff --git a/LayoutTests/storage/domstorage/sessionstorage/iframe-events-expected.txt b/LayoutTests/storage/domstorage/sessionstorage/iframe-events-expected.txt
index 852ab88..73c7b9d 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/iframe-events-expected.txt
+++ b/LayoutTests/storage/domstorage/sessionstorage/iframe-events-expected.txt
@@ -6,7 +6,6 @@ Key - Main Frame
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe received storage event:
@@ -14,7 +13,6 @@ Key - Main Frame
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe about to change sessionStorage...
@@ -23,7 +21,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
Storage Area - This window's window.sessionStorage
Subframe received storage event:
@@ -31,7 +28,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
Storage Area - This window's window.sessionStorage
Main frame about to run removeItem on sessionStorage...
@@ -40,7 +36,6 @@ Key - Main Frame
New Value - null
Old Value - SET
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe received storage event:
@@ -48,7 +43,6 @@ Key - Main Frame
New Value - null
Old Value - SET
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe about to change sessionStorage...
@@ -58,7 +52,6 @@ Key -
New Value - null
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe received storage event:
@@ -66,7 +59,6 @@ Key -
New Value - null
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
-Source - LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
Storage Area - This window's window.sessionStorage
Subframe about to change sessionStorage...
@@ -75,7 +67,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
Storage Area - This window's window.sessionStorage
Subframe received storage event:
@@ -83,7 +74,6 @@ Key - Subframe
New Value - SET
Old Value - null
URI - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
-Source - LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
Storage Area - This window's window.sessionStorage
diff --git a/LayoutTests/storage/domstorage/sessionstorage/iframe-events.html b/LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
index 7b056f4..1775e62 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
+++ b/LayoutTests/storage/domstorage/sessionstorage/iframe-events.html
@@ -31,7 +31,6 @@ function handleStorageEvent(e)
log("New Value - " + e.newValue);
log("Old Value - " + e.oldValue);
log("URI - " + normalizeURL(e.uri));
- log("Source - " + normalizeURL(e.source.location.href));
log("Storage Area - " + ((e.storageArea == window.sessionStorage) ? "This window's window.sessionStorage" : "Another window's window.sessionStorage"));
log("");
diff --git a/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html b/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
index 7268681..2d7b004 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
+++ b/LayoutTests/storage/domstorage/sessionstorage/resources/iframe-events-second.html
@@ -8,7 +8,6 @@ function handleStorageEvent(e)
parent.log("New Value - " + e.newValue);
parent.log("Old Value - " + e.oldValue);
parent.log("URI - " + parent.normalizeURL(e.uri));
- parent.log("Source - " + parent.normalizeURL(e.source.location.href));
parent.log("Storage Area - " + ((e.storageArea == window.sessionStorage) ? "This window's window.sessionStorage" : "Another window's window.sessionStorage"));
parent.log("");
diff --git a/LayoutTests/storage/domstorage/sessionstorage/simple-events-expected.txt b/LayoutTests/storage/domstorage/sessionstorage/simple-events-expected.txt
index 29e2a07..c9133c0 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/simple-events-expected.txt
+++ b/LayoutTests/storage/domstorage/sessionstorage/simple-events-expected.txt
@@ -4,27 +4,23 @@ Key - FOO
New Value - BAR
Old Value - null
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FU
New Value - BAR
Old Value - null
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FOO
New Value - null
Old Value - BAR
Event has a URI
-Event has a source DOMWindow
Storage event fired:
Key - FU
New Value - null
Old Value - BAR
Event has a URI
-Event has a source DOMWindow
diff --git a/LayoutTests/storage/domstorage/sessionstorage/simple-events.html b/LayoutTests/storage/domstorage/sessionstorage/simple-events.html
index 216ebb5..0b0b11f 100644
--- a/LayoutTests/storage/domstorage/sessionstorage/simple-events.html
+++ b/LayoutTests/storage/domstorage/sessionstorage/simple-events.html
@@ -27,8 +27,6 @@ function handleStorageEvent(e)
log("Old Value - " + e.oldValue);
if (e.uri)
log("Event has a URI");
- if (e.source)
- log("Event has a source DOMWindow");
log("");
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c84847d..7c84b88 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2009-10-19 Jeremy Orlow <jorlow at chromium.org>
+
+ Reviewed by Dmitri Titov.
+
+ Remove "source" from storage events
+ https://bugs.webkit.org/show_bug.cgi?id=30536
+
+ Remove "source" from storage events per
+ http://lists.whatwg.org/htdig.cgi/whatwg-whatwg.org/2009-October/023703.html
+
+ This was removed because it makes it introduces synchronous access that can
+ cross the event loop boundry (since a storage event can fire from one process
+ and be handled in another).
+
+ * inspector/InspectorDOMStorageResource.cpp:
+ (WebCore::InspectorDOMStorageResource::handleEvent):
+ * storage/StorageEvent.cpp:
+ (WebCore::StorageEvent::create):
+ (WebCore::StorageEvent::StorageEvent):
+ (WebCore::StorageEvent::initStorageEvent):
+ * storage/StorageEvent.h:
+ (WebCore::StorageEvent::uri):
+ * storage/StorageEvent.idl:
+ * storage/StorageEventDispatcher.cpp:
+ (WebCore::StorageEventDispatcher::dispatch):
+
2009-10-19 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/inspector/InspectorDOMStorageResource.cpp b/WebCore/inspector/InspectorDOMStorageResource.cpp
index 37818e7..c93e987 100644
--- a/WebCore/inspector/InspectorDOMStorageResource.cpp
+++ b/WebCore/inspector/InspectorDOMStorageResource.cpp
@@ -104,7 +104,7 @@ void InspectorDOMStorageResource::handleEvent(ScriptExecutionContext*, Event* ev
ASSERT(eventNames().storageEvent == event->type());
StorageEvent* storageEvent = static_cast<StorageEvent*>(event);
Storage* storage = storageEvent->storageArea();
- bool isLocalStorage = storageEvent->source()->localStorage() == storage;
+ bool isLocalStorage = storage->frame()->domWindow()->localStorage() == storage;
if (isSameHostAndType(storage->frame(), isLocalStorage))
m_frontend->updateDOMStorage(m_id);
}
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> StorageEvent::create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea)
+PassRefPtr<StorageEvent> 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<DOMWindow> 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<DOMWindow> 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;
}
diff --git a/WebCore/storage/StorageEvent.h b/WebCore/storage/StorageEvent.h
index 7e2bcff..fa7535b 100644
--- a/WebCore/storage/StorageEvent.h
+++ b/WebCore/storage/StorageEvent.h
@@ -33,37 +33,34 @@
namespace WebCore {
- class DOMWindow;
class Storage;
class StorageEvent : public Event {
public:
static PassRefPtr<StorageEvent> create();
- static PassRefPtr<StorageEvent> create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea);
+ static PassRefPtr<StorageEvent> create(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea);
const String& key() const { return m_key; }
const String& oldValue() const { return m_oldValue; }
const String& newValue() const { return m_newValue; }
const String& uri() const { return m_uri; }
- DOMWindow* source() const { return m_source.get(); }
Storage* storageArea() const { return m_storageArea.get(); }
- void initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea);
+ void initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea);
// Needed once we support init<blank>EventNS
- // void initStorageEventNS(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString uriArg, in Window sourceArg, Storage storageAreaArg);
+ // void initStorageEventNS(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString uriArg, Storage storageAreaArg);
virtual bool isStorageEvent() const { return true; }
private:
StorageEvent();
- StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source, Storage* storageArea);
+ StorageEvent(const AtomicString& type, const String& key, const String& oldValue, const String& newValue, const String& uri, Storage* storageArea);
String m_key;
String m_oldValue;
String m_newValue;
String m_uri;
- RefPtr<DOMWindow> m_source;
RefPtr<Storage> m_storageArea;
};
diff --git a/WebCore/storage/StorageEvent.idl b/WebCore/storage/StorageEvent.idl
index 5a3f993..7c87561 100644
--- a/WebCore/storage/StorageEvent.idl
+++ b/WebCore/storage/StorageEvent.idl
@@ -33,12 +33,11 @@ module storage {
readonly attribute [ConvertNullStringTo=Null] DOMString oldValue;
readonly attribute [ConvertNullStringTo=Null] DOMString newValue;
readonly attribute DOMString uri;
- readonly attribute DOMWindow source;
readonly attribute Storage storageArea;
- void initStorageEvent(in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in [ConvertNullToNullString] DOMString oldValueArg, in [ConvertNullToNullString] DOMString newValueArg, in DOMString uriArg, in DOMWindow sourceArg, in Storage storageAreaArg);
+ void initStorageEvent(in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in [ConvertNullToNullString] DOMString oldValueArg, in [ConvertNullToNullString] DOMString newValueArg, in DOMString uriArg, in Storage storageAreaArg);
// Needed once we support init<blank>EventNS
- // void initStorageEventNS(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString uriArg, in DOMWindow sourceArg, in Storage storageAreaArg);
+ // void initStorageEventNS(in DOMString namespaceURI, in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg, in DOMString keyArg, in DOMString oldValueArg, in DOMString newValueArg, in DOMString uriArg, in Storage storageAreaArg);
};
}
diff --git a/WebCore/storage/StorageEventDispatcher.cpp b/WebCore/storage/StorageEventDispatcher.cpp
index 496ff6d..d2eab66 100644
--- a/WebCore/storage/StorageEventDispatcher.cpp
+++ b/WebCore/storage/StorageEventDispatcher.cpp
@@ -55,7 +55,7 @@ void StorageEventDispatcher::dispatch(const String& key, const String& oldValue,
}
for (unsigned i = 0; i < frames.size(); ++i)
- frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), sourceFrame->domWindow(), frames[i]->domWindow()->sessionStorage()));
+ frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), frames[i]->domWindow()->sessionStorage()));
} else {
// Send events to every page.
const HashSet<Page*>& pages = page->group().pages();
@@ -68,7 +68,7 @@ void StorageEventDispatcher::dispatch(const String& key, const String& oldValue,
}
for (unsigned i = 0; i < frames.size(); ++i)
- frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), sourceFrame->domWindow(), frames[i]->domWindow()->localStorage()));
+ frames[i]->document()->dispatchWindowEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->documentURI(), frames[i]->domWindow()->localStorage()));
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list