Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

5 files changed, 48 insertions, 54 deletions

diff --git a/Source/WebCore/storage/Storage.idl b/Source/WebCore/storage/Storage.idl
index 1d5b327cb..55da55505 100644
--- a/Source/WebCore/storage/Storage.idl
+++ b/Source/WebCore/storage/Storage.idl
@@ -23,22 +23,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-module storage {
+[
+    NamedGetter,
+    JSGenerateIsReachable=ImplFrame,
+    CustomDeleteProperty,
+    CustomEnumerateProperty,
+    CustomNamedSetter,
+] interface Storage {
+    [NotEnumerable] readonly attribute unsigned long length;
+    [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString key(in unsigned long index);
+    [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString getItem(in DOMString key);
+    [NotEnumerable] void setItem(in DOMString key, in DOMString data) 
+        raises(DOMException);
+    [NotEnumerable] void removeItem(in DOMString key);
+    [NotEnumerable] void clear();
+};
 
-    interface [
-        NamedGetter,
-        JSGenerateIsReachable=ImplFrame,
-        CustomDeleteProperty,
-        CustomEnumerateProperty,
-        CustomNamedSetter,
-    ] Storage {
-        readonly attribute [NotEnumerable] unsigned long length;
-        [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString key(in unsigned long index);
-        [NotEnumerable, TreatReturnedNullStringAs=Null] DOMString getItem(in DOMString key);
-        [NotEnumerable] void setItem(in DOMString key, in DOMString data) 
-            raises(DOMException);
-        [NotEnumerable] void removeItem(in DOMString key);
-        [NotEnumerable] void clear();
-    };
-
-}
diff --git a/Source/WebCore/storage/StorageAreaSync.cpp b/Source/WebCore/storage/StorageAreaSync.cpp
index 44209c6f5..fcb126a1d 100644
--- a/Source/WebCore/storage/StorageAreaSync.cpp
+++ b/Source/WebCore/storage/StorageAreaSync.cpp
@@ -188,7 +188,7 @@ void StorageAreaSync::syncTimerFired(Timer<StorageAreaSync>*)
                 partialSync = true;
                 break;
             }
-            m_itemsPendingSync.set(changed_it->first.isolatedCopy(), changed_it->second.isolatedCopy());
+            m_itemsPendingSync.set(changed_it->key.isolatedCopy(), changed_it->value.isolatedCopy());
         }
 
         if (partialSync) {
@@ -198,7 +198,7 @@ void StorageAreaSync::syncTimerFired(Timer<StorageAreaSync>*)
             HashMap<String, String>::iterator pending_it = m_itemsPendingSync.begin();
             HashMap<String, String>::iterator pending_end = m_itemsPendingSync.end();
             for (; pending_it != pending_end; ++pending_it)
-                m_changedItems.remove(pending_it->first);
+                m_changedItems.remove(pending_it->key);
         }
 
         if (!m_syncScheduled) {
@@ -345,7 +345,7 @@ void StorageAreaSync::performImport()
     HashMap<String, String>::iterator end = itemMap.end();
 
     for (; it != end; ++it)
-        m_storageArea->importItem(it->first, it->second);
+        m_storageArea->importItem(it->key, it->value);
 
     markImported();
 }
@@ -439,13 +439,13 @@ void StorageAreaSync::sync(bool clearItems, const HashMap<String, String>& items
     transaction.begin();
     for (HashMap<String, String>::const_iterator it = items.begin(); it != end; ++it) {
         // Based on the null-ness of the second argument, decide whether this is an insert or a delete.
-        SQLiteStatement& query = it->second.isNull() ? remove : insert;
+        SQLiteStatement& query = it->value.isNull() ? remove : insert;
 
-        query.bindText(1, it->first);
+        query.bindText(1, it->key);
 
         // If the second argument is non-null, we're doing an insert, so bind it as the value.
-        if (!it->second.isNull())
-            query.bindBlob(2, it->second);
+        if (!it->value.isNull())
+            query.bindBlob(2, it->value);
 
         int result = query.step();
         if (result != SQLResultDone) {
diff --git a/Source/WebCore/storage/StorageEvent.idl b/Source/WebCore/storage/StorageEvent.idl
index 6e4770a76..6880d1905 100644
--- a/Source/WebCore/storage/StorageEvent.idl
+++ b/Source/WebCore/storage/StorageEvent.idl
@@ -23,28 +23,25 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-module storage {
+[
+    ConstructorTemplate=Event
+] interface StorageEvent : Event {
+    [InitializedByEventConstructor] readonly attribute DOMString key;
+    [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] readonly attribute DOMString oldValue;
+    [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] readonly attribute DOMString newValue;
+    [InitializedByEventConstructor] readonly attribute DOMString url;
+    [InitializedByEventConstructor] readonly attribute Storage storageArea;
 
-    interface [
-        ConstructorTemplate=Event
-    ] StorageEvent : Event {
-        readonly attribute [InitializedByEventConstructor] DOMString key;
-        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] DOMString oldValue;
-        readonly attribute [InitializedByEventConstructor, TreatReturnedNullStringAs=Null] DOMString newValue;
-        readonly attribute [InitializedByEventConstructor] DOMString url;
-        readonly attribute [InitializedByEventConstructor] Storage storageArea;
+    void initStorageEvent(in [Optional=DefaultIsUndefined] DOMString typeArg, 
+                          in [Optional=DefaultIsUndefined] boolean canBubbleArg, 
+                          in [Optional=DefaultIsUndefined] boolean cancelableArg, 
+                          in [Optional=DefaultIsUndefined] DOMString keyArg, 
+                          in [Optional=DefaultIsUndefined,TreatNullAs=NullString] DOMString oldValueArg, 
+                          in [Optional=DefaultIsUndefined,TreatNullAs=NullString] DOMString newValueArg, 
+                          in [Optional=DefaultIsUndefined] DOMString urlArg, 
+                          in [Optional=DefaultIsUndefined] Storage storageAreaArg);
 
-        void initStorageEvent(in [Optional=DefaultIsUndefined] DOMString typeArg, 
-                              in [Optional=DefaultIsUndefined] boolean canBubbleArg, 
-                              in [Optional=DefaultIsUndefined] boolean cancelableArg, 
-                              in [Optional=DefaultIsUndefined] DOMString keyArg, 
-                              in [Optional=DefaultIsUndefined,TreatNullAs=NullString] DOMString oldValueArg, 
-                              in [Optional=DefaultIsUndefined,TreatNullAs=NullString] DOMString newValueArg, 
-                              in [Optional=DefaultIsUndefined] DOMString urlArg, 
-                              in [Optional=DefaultIsUndefined] 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 urlArg, 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 urlArg, in Storage storageAreaArg);
-    };
-
-}
diff --git a/Source/WebCore/storage/StorageMap.cpp b/Source/WebCore/storage/StorageMap.cpp
index 8e42d2f17..40e1a38f1 100644
--- a/Source/WebCore/storage/StorageMap.cpp
+++ b/Source/WebCore/storage/StorageMap.cpp
@@ -89,7 +89,7 @@ String StorageMap::key(unsigned index)
         return String();
 
     setIteratorToIndex(index);
-    return m_iterator->first;
+    return m_iterator->key;
 }
 
 String StorageMap::getItem(const String& key) const
@@ -133,7 +133,7 @@ PassRefPtr<StorageMap> StorageMap::setItem(const String& key, const String& valu
 
     HashMap<String, String>::AddResult addResult = m_map.add(key, value);
     if (!addResult.isNewEntry)
-        addResult.iterator->second = value;
+        addResult.iterator->value = value;
 
     invalidateIterator();
 
diff --git a/Source/WebCore/storage/StorageNamespaceImpl.cpp b/Source/WebCore/storage/StorageNamespaceImpl.cpp
index 9d1ac517a..4501b11fb 100644
--- a/Source/WebCore/storage/StorageNamespaceImpl.cpp
+++ b/Source/WebCore/storage/StorageNamespaceImpl.cpp
@@ -55,7 +55,7 @@ PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(const S
         return storageNamespace.release();
     }
 
-    return it->second;
+    return it->value;
 }
 
 PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(unsigned quota)
@@ -97,7 +97,7 @@ PassRefPtr<StorageNamespace> StorageNamespaceImpl::copy()
 
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator i = m_storageAreaMap.begin(); i != end; ++i)
-        newNamespace->m_storageAreaMap.set(i->first, i->second->copy());
+        newNamespace->m_storageAreaMap.set(i->key, i->value->copy());
     return newNamespace.release();
 }
 
@@ -131,7 +131,7 @@ void StorageNamespaceImpl::close()
 
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it)
-        it->second->close();
+        it->value->close();
 
     if (m_syncManager)
         m_syncManager->close();
@@ -154,7 +154,7 @@ void StorageNamespaceImpl::clearAllOriginsForDeletion()
 
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it)
-        it->second->clearForOriginDeletion();
+        it->value->clearForOriginDeletion();
 }
     
 void StorageNamespaceImpl::sync()
@@ -162,7 +162,7 @@ void StorageNamespaceImpl::sync()
     ASSERT(isMainThread());
     StorageAreaMap::iterator end = m_storageAreaMap.end();
     for (StorageAreaMap::iterator it = m_storageAreaMap.begin(); it != end; ++it)
-        it->second->sync();
+        it->value->sync();
 }
 
 } // namespace WebCore