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, 114 insertions, 0 deletions

diff --git a/Source/WebCore/bindings/v8/DOMData.h b/Source/WebCore/bindings/v8/DOMData.h
new file mode 100644
index 0000000..78edf92
--- /dev/null
+++ b/Source/WebCore/bindings/v8/DOMData.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2009 Google 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 DOMData_h
+#define DOMData_h
+
+#include "DOMDataStore.h"
+#include "V8DOMWrapper.h"
+
+namespace WebCore {
+
+    // DOMData
+    //
+    // DOMData represents the all the DOM wrappers for a given thread.  In
+    // particular, DOMData holds wrappers for all the isolated worlds in the
+    // thread.  The DOMData for the main thread and the DOMData for child threads
+    // use different subclasses.
+    //
+    class DOMData : public Noncopyable {
+    public:
+        DOMData();
+        virtual ~DOMData();
+
+        static DOMData* getCurrent();
+        virtual DOMDataStore& getStore() = 0;
+
+        template<typename T>
+        static void handleWeakObject(DOMDataStore::DOMWrapperMapType, v8::Persistent<v8::Object>, T* domObject);
+
+        template<typename T>
+        static void removeObjectsFromWrapperMap(DOMDataStore* store, AbstractWeakReferenceMap<T, v8::Object>& domMap);
+
+        ThreadIdentifier owningThread() const { return m_owningThread; }
+
+    private:
+        static void derefObject(WrapperTypeInfo* type, void* domObject);
+
+        template<typename T>
+        class WrapperMapObjectRemover : public WeakReferenceMap<T, v8::Object>::Visitor {
+        public:
+            virtual void visitDOMWrapper(DOMDataStore* store, T* domObject, v8::Persistent<v8::Object> v8Object)
+            {
+                WrapperTypeInfo* type = V8DOMWrapper::domWrapperType(v8Object);
+                derefObject(type, domObject);
+                v8Object.Dispose();
+            }
+        };
+
+        ThreadIdentifier m_owningThread;
+    };
+
+    template<typename T>
+    void DOMData::handleWeakObject(DOMDataStore::DOMWrapperMapType mapType, v8::Persistent<v8::Object> v8Object, T* domObject)
+    {
+        WrapperTypeInfo* type = V8DOMWrapper::domWrapperType(v8Object);
+        DOMDataList& list = DOMDataStore::allStores();
+        bool found = false;
+        for (size_t i = 0; i < list.size(); ++i) {
+            DOMDataStore* store = list[i];
+            ASSERT(store->domData()->owningThread() == WTF::currentThread());
+
+            DOMWrapperMap<T>* domMap = static_cast<DOMWrapperMap<T>*>(store->getDOMWrapperMap(mapType));
+            if (domMap->removeIfPresent(domObject, v8Object)) {
+                derefObject(type, domObject);
+                found = true;
+            }
+        }
+
+        // If not found, it means map for the wrapper has been already destroyed, just dispose the
+        // handle and deref the object to fight memory leak.
+        if (!found) {
+            v8Object.Dispose();
+            derefObject(type, domObject);
+        }
+    }
+
+    template<typename T>
+    void DOMData::removeObjectsFromWrapperMap(DOMDataStore* store, AbstractWeakReferenceMap<T, v8::Object>& domMap)
+    {
+        WrapperMapObjectRemover<T> remover;
+        domMap.visit(store, &remover);
+        domMap.clear();
+    }
+
+} // namespace WebCore
+
+#endif // DOMData_h