Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4

* changes:
  Merge WebKit at r65615 : Update WebKit revision number
  Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
  Merge WebKit at r65615 : Android-specific results for Geolocation tests.
  Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
  Merge WebKit at r65615 : processingUserGesture() is now static.
  Merge WebKit at r65615 : UTF8String() becomes utf8().
  Merge WebKit at r65615 : Fix include paths for string headers.
  Merge WebKit at r65615 : Fix Makefiles.
  Merge WebKit at r65615 : Fix conflicts.
  Merge WebKit at r65615 : Initial merge by git.

9 files changed, 14 insertions, 13 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index ec1390e..d5cadad 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -163,7 +163,7 @@ Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&,
     if (features.fullscreen)
         dialog = false;
     WebCore::Frame* newFrame = m_webFrame->createWindow(dialog,
-            frame->script()->processingUserGesture(mainThreadNormalWorld()));
+            ScriptController::processingUserGesture());
     if (newFrame) {
         WebCore::Page* page = newFrame->page();
         page->setGroupName(frame->page()->groupName());
diff --git a/WebKit/android/WebCoreSupport/GeolocationPermissions.h b/WebKit/android/WebCoreSupport/GeolocationPermissions.h
index 9a1966a..f40619b 100644
--- a/WebKit/android/WebCoreSupport/GeolocationPermissions.h
+++ b/WebKit/android/WebCoreSupport/GeolocationPermissions.h
@@ -27,14 +27,13 @@
 #define GeolocationPermissions_h
 
 #include "PlatformString.h"
-// We must include this before before HashMap.h, as it provides specalizations
-// for String hash types instantiated there.
-#include "StringHash.h"
 #include "Timer.h"
+
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
 
 namespace WebCore {
     class Frame;
diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp
index 7472447..4e7351d 100644
--- a/WebKit/android/WebCoreSupport/V8Counters.cpp
+++ b/WebKit/android/WebCoreSupport/V8Counters.cpp
@@ -33,9 +33,9 @@
 #include "V8Counters.h"
 #include "NotImplemented.h"
 
-#include <StringHash.h>
 #include <utils/Log.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
 
 namespace WebCore {
 
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp
index e5a98f1..1ae6d6f 100644
--- a/WebKit/android/benchmark/Intercept.cpp
+++ b/WebKit/android/benchmark/Intercept.cpp
@@ -33,11 +33,12 @@
 #include "ResourceHandleClient.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
-#include "StringHash.h"
 #include "TextEncoding.h"
+
 #include <utils/Log.h>
 #include <wtf/HashMap.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
 
 PassRefPtr<WebCore::ResourceLoaderAndroid> MyResourceLoader::create(
         ResourceHandle* handle, String url)
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 8e85896..5715ae5 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -27,7 +27,6 @@
 
 #include "config.h"
 
-#include "AtomicString.h"
 #include "Cache.h"
 #include "Connection.h"
 #include "CookieClient.h"
@@ -54,6 +53,7 @@
 #include <utils/misc.h>
 #include <wtf/Platform.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/text/AtomicString.h>
 
 namespace android {
 
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index a868260..52f1551 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -29,7 +29,6 @@
 #include "WebCoreFrameBridge.h"
 
 #include "Arena.h"
-#include "AtomicString.h"
 #include "BackForwardList.h"
 #include "Cache.h"
 #include "Chrome.h"
@@ -97,6 +96,7 @@
 #include <utils/AssetManager.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/Platform.h>
+#include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 
 #if USE(JSC)
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 72b4eac..3b4872f 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "WebViewCore.h"
 
-#include "AtomicString.h"
 #include "BaseLayerAndroid.h"
 #include "CachedNode.h"
 #include "CachedRoot.h"
@@ -101,7 +100,6 @@
 #include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkUtils.h"
-#include "StringImpl.h"
 #include "Text.h"
 #include "TypingCommand.h"
 #include "WebCoreFrameBridge.h"
@@ -113,6 +111,8 @@
 #include <JNIUtility.h>
 #include <ui/KeycodeLabels.h>
 #include <wtf/CurrentTime.h>
+#include <wtf/text/AtomicString.h>
+#include <wtf/text/StringImpl.h>
 
 #if USE(V8)
 #include "ScriptController.h"
diff --git a/WebKit/android/nav/CachedNode.h b/WebKit/android/nav/CachedNode.h
index 0014e07..db48a66 100644
--- a/WebKit/android/nav/CachedNode.h
+++ b/WebKit/android/nav/CachedNode.h
@@ -26,12 +26,13 @@
 #ifndef CachedNode_H
 #define CachedNode_H
 
-#include "AtomicString.h"
 #include "CachedDebug.h"
 #include "CachedNodeType.h"
 #include "IntRect.h"
 #include "PlatformString.h"
-#include "wtf/Vector.h"
+
+#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
 
 class SkPicture;
 
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 2132957..a15ef39 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -29,7 +29,6 @@
 
 #include "AndroidAnimation.h"
 #include "AndroidLog.h"
-#include "AtomicString.h"
 #include "BaseLayerAndroid.h"
 #include "CachedFrame.h"
 #include "CachedNode.h"
@@ -68,6 +67,7 @@
 #include <JNIHelp.h>
 #include <jni.h>
 #include <ui/KeycodeLabels.h>
+#include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 
 namespace android {