Merge change 21263 into master-webkit-merge

* changes:
  And some more bindings fixes.

6 files changed, 31 insertions, 12 deletions

diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk
index f257618..7339400 100644
--- a/WebCore/Android.v8.mk
+++ b/WebCore/Android.v8.mk
@@ -621,6 +621,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/RenderArena.cpp \
 	rendering/RenderBR.cpp \
 	rendering/RenderBlock.cpp \
+	rendering/RenderBlockLineLayout.cpp \
 	rendering/RenderBox.cpp \
 	rendering/RenderBoxModelObject.cpp \
 	rendering/RenderButton.cpp \
@@ -707,7 +708,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	rendering/ScrollBehavior.cpp \
 	rendering/TextControlInnerElements.cpp \
 	rendering/TransformState.cpp \
-	rendering/bidi.cpp \
 	rendering/break_lines.cpp \
 	\
 	rendering/style/BindingURI.cpp \
@@ -746,22 +746,22 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	storage/DatabaseTask.cpp \
 	storage/DatabaseThread.cpp \
 	storage/DatabaseTracker.cpp \
-	storage/LocalStorage.cpp \
-	storage/LocalStorageArea.cpp \
 	storage/LocalStorageTask.cpp \
 	storage/LocalStorageThread.cpp \
 	storage/OriginQuotaManager.cpp \
 	storage/OriginUsageRecord.cpp \
-	storage/SessionStorage.cpp \
-	storage/SessionStorageArea.cpp \
 	storage/SQLResultSet.cpp \
 	storage/SQLResultSetRowList.cpp \
 	storage/SQLStatement.cpp \
 	storage/SQLTransaction.cpp \
 	storage/Storage.cpp \
-	storage/StorageArea.cpp \
+	storage/StorageAreaImpl.cpp \
+	storage/StorageAreaSync.cpp \
 	storage/StorageEvent.cpp \
 	storage/StorageMap.cpp \
+	storage/StorageNamespace.cpp \
+	storage/StorageNamespaceImpl.cpp \
+	storage/StorageSyncManager.cpp \
     
 ifeq ($(ENABLE_SVG), true)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
@@ -935,13 +935,21 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 endif
 
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
+	workers/AbstractWorker.cpp \
+	workers/DedicatedWorkerContext.cpp \
+	workers/DedicatedWorkerThread.cpp \
+	workers/DefaultSharedWorkerRepository.cpp \
+	workers/SharedWorker.cpp \
+	workers/SharedWorkerContext.cpp \
+	workers/SharedWorkerThread.cpp \
 	workers/Worker.cpp \
 	workers/WorkerContext.cpp \
-	workers/WorkerImportScriptsClient.cpp \
 	workers/WorkerLocation.cpp \
 	workers/WorkerMessagingProxy.cpp \
 	workers/WorkerRunLoop.cpp \
+	workers/WorkerScriptLoader.cpp \
 	workers/WorkerThread.cpp \
+	\
 	xml/DOMParser.cpp \
 	xml/XMLHttpRequest.cpp \
 	xml/XMLHttpRequestUpload.cpp \
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index 0fd9f89..cb2a6c1 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -28,7 +28,7 @@
 
 #include "NPV8Object.h"
 
-if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM)
 // TODO(andreip): upstream
 #include "ChromiumBridge.h"
 #endif
@@ -42,7 +42,11 @@ if PLATFORM(CHROMIUM)
 #include "V8Helpers.h"
 #include "V8NPUtils.h"
 #include "V8Proxy.h"
+#if PLATFORM(CHROMIUM)
 #include "bindings/npruntime.h"
+#else
+#include "bridge/npruntime.h"
+#endif
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
 
@@ -453,7 +457,12 @@ bool _NPN_Enumerate(NPP npp, NPObject* npObject, NPIdentifier** identifier, uint
         v8::Handle<v8::Value> enumeratorObj = script->Run();
         v8::Handle<v8::Function> enumerator = v8::Handle<v8::Function>::Cast(enumeratorObj);
         v8::Handle<v8::Value> argv[] = { obj };
+#if PLATFORM(ANDROID)
+// TODO(benm): implement an arry size function on android
+        v8::Local<v8::Value> propsObj = enumerator->Call(v8::Handle<v8::Object>::Cast(enumeratorObj), 1, argv);
+#else
         v8::Local<v8::Value> propsObj = enumerator->Call(v8::Handle<v8::Object>::Cast(enumeratorObj), ARRAYSIZE_UNSAFE(argv), argv);
+#endif
         if (propsObj.IsEmpty())
             return false;
 
diff --git a/WebCore/bindings/v8/V8DOMMap.h b/WebCore/bindings/v8/V8DOMMap.h
index 27a8007..754ac3a 100644
--- a/WebCore/bindings/v8/V8DOMMap.h
+++ b/WebCore/bindings/v8/V8DOMMap.h
@@ -97,6 +97,7 @@ namespace WebCore {
         class Visitor {
         public:
           virtual void visitDOMWrapper(KeyType* key, v8::Persistent<v8::Object> object) = 0;
+          virtual ~Visitor() { }
         };
     };
 
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index a4e6b62..f3b1376 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -313,7 +313,7 @@ public:
     {
 #if PLATFORM(ANDROID)
   // TODO(andreip): implement std::sort() and get rid of this.
-  std::stable_sort<GrouperList>(m_grouper.begin(), m_grouper.end(), compareGrouperItem);
+  std::stable_sort<GrouperItem>(m_grouper.begin(), m_grouper.end(), compareGrouperItem);
 #else
         // Group by sorting by the group id.
         std::sort(m_grouper.begin(), m_grouper.end());
diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp
index 6e65d92..8f32256 100644
--- a/WebCore/bindings/v8/V8Index.cpp
+++ b/WebCore/bindings/v8/V8Index.cpp
@@ -185,7 +185,7 @@
 #include "V8Range.h"
 #include "V8RangeException.h"
 #include "V8Rect.h"
-#iinclude "V8NodeIterator.h"
+#include "V8NodeIterator.h"
 #include "V8TextMetrics.h"
 #include "V8TreeWalker.h"
 #include "V8StyleSheetList.h"
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index b13fc77..e2c1e98 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -32,6 +32,7 @@
 #include "V8Proxy.h"
 
 #include "CSSMutableStyleDeclaration.h"
+#include "CString.h"
 #include "DOMObjectsInclude.h"
 #include "DocumentLoader.h"
 #include "FrameLoaderClient.h"
@@ -1292,14 +1293,14 @@ void V8Proxy::registerExtension(v8::Extension* extension, const String& schemeRe
 {
     registerExtensionWithV8(extension);
     V8ExtensionInfo info = {schemeRestriction, 0, extension};
-    m_extensions.push_back(info);
+    m_extensions.append(info);
 }
 
 void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup)
 {
     registerExtensionWithV8(extension);
     V8ExtensionInfo info = {String(), extensionGroup, extension};
-    m_extensions.push_back(info);
+    m_extensions.append(info);
 }
 
 bool V8Proxy::setContextDebugId(int debugId)