Merge change 23625 into eclair

* changes:
  Fix the DOM storage layout tests when running with V8. Change the custom bindings to ignore requests for the length attribute and update the event handling code to create Storage Events properly.

2 files changed, 5 insertions, 1 deletions

diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 5497732..8a9741a 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -1118,6 +1118,10 @@ v8::Handle<v8::Value> V8DOMWrapper::convertEventToV8Object(Event* event)
     else if (event->isErrorEvent())
         type = V8ClassIndex::ERROREVENT;
 #endif
+#if ENABLE(DOM_STORAGE)
+    else if (event->isStorageEvent())
+        type = V8ClassIndex::STORAGEEVENT;
+#endif
 
 
     v8::Handle<v8::Object> result = instantiateV8Object(type, V8ClassIndex::EVENT, event);
diff --git a/WebCore/bindings/v8/custom/V8StorageCustom.cpp b/WebCore/bindings/v8/custom/V8StorageCustom.cpp
index b54e50e..f3f4687 100755
--- a/WebCore/bindings/v8/custom/V8StorageCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8StorageCustom.cpp
@@ -60,7 +60,7 @@ static v8::Handle<v8::Value> storageGetter(v8::Local<v8::String> v8Name, const v
     Storage* storage = V8DOMWrapper::convertToNativeObject<Storage>(V8ClassIndex::STORAGE, info.Holder());
     String name = toWebCoreString(v8Name);
 
-    if (storage->contains(name))
+    if (storage->contains(name) && name != "length")
         return v8String(storage->getItem(name));
 
     return notHandledByInterceptor();