am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':
diff --git a/Source/WebCore/editing/TextIterator.cpp b/Source/WebCore/editing/TextIterator.cpp
index 871d1f9..25bdbdd 100644
--- a/Source/WebCore/editing/TextIterator.cpp
+++ b/Source/WebCore/editing/TextIterator.cpp
@@ -287,6 +287,9 @@
, m_positionNode(0)
, m_textCharacters(0)
, m_textLength(0)
+#if OS(ANDROID)
+ , m_needsAnotherNewline(false)
+#endif
, m_remainingTextBox(0)
, m_firstLetterText(0)
, m_emitsCharactersBetweenAllVisiblePositions(behavior & TextIteratorEmitsCharactersBetweenAllVisiblePositions)
@@ -298,7 +301,6 @@
#if OS(ANDROID)
, m_stopsOnFormControls(behavior & TextIteratorStopsOnFormControls)
, m_shouldStop(false)
- , m_needsAnotherNewline(false)
#endif
{
if (!r)
diff --git a/Source/WebCore/platform/graphics/android/utils/LinearAllocator.cpp b/Source/WebCore/platform/graphics/android/utils/LinearAllocator.cpp
index b945944..636c30c 100644
--- a/Source/WebCore/platform/graphics/android/utils/LinearAllocator.cpp
+++ b/Source/WebCore/platform/graphics/android/utils/LinearAllocator.cpp
@@ -44,7 +44,14 @@
// Must be smaller than INITIAL_PAGE_SIZE
#define MAX_WASTE_SIZE ((size_t)1024)
-#define ALIGN(x) (x + (x % sizeof(int)))
+#if CPU(MIPS)
+#define ALIGN_SZ (sizeof(double))
+#else
+#define ALIGN_SZ (sizeof(int))
+#endif
+
+#define ALIGN(x) ((x + ALIGN_SZ - 1 ) & ~(ALIGN_SZ - 1))
+#define ALIGN_PTR(p) ((void*)(ALIGN((unsigned int)p)))
#if LOG_NDEBUG
#define ADD_ALLOCATION(size)
@@ -123,7 +130,7 @@
void* LinearAllocator::start(Page* p)
{
- return ((char*)p) + sizeof(Page);
+ return ALIGN_PTR(((char*)p) + sizeof(Page));
}
void* LinearAllocator::end(Page* p)
@@ -178,6 +185,7 @@
void LinearAllocator::rewindIfLastAlloc(void* ptr, size_t allocSize)
{
// Don't bother rewinding across pages
+ allocSize = ALIGN(allocSize);
if (ptr >= start(m_currentPage) && ptr < end(m_currentPage)
&& ptr == ((char*)m_next - allocSize)) {
m_totalAllocated -= allocSize;
@@ -188,7 +196,7 @@
LinearAllocator::Page* LinearAllocator::newPage(size_t pageSize)
{
- pageSize += sizeof(LinearAllocator::Page);
+ pageSize = ALIGN(pageSize + sizeof(LinearAllocator::Page));
ADD_ALLOCATION(pageSize);
m_totalAllocated += pageSize;
m_pageCount++;
diff --git a/Source/WebKit/Android.mk b/Source/WebKit/Android.mk
index 07634b6..6e23421 100644
--- a/Source/WebKit/Android.mk
+++ b/Source/WebKit/Android.mk
@@ -67,7 +67,7 @@
android/jni/GeolocationServiceBridge.cpp \
android/jni/JavaBridge.cpp \
android/jni/JavaSharedClient.cpp \
- android/jni/MIMETypeRegistry.cpp \
+ android/jni/MIMETypeRegistryAndroid.cpp \
android/jni/MockGeolocation.cpp \
android/jni/PicturePile.cpp \
android/jni/WebCoreFrameBridge.cpp \
@@ -105,7 +105,7 @@
android/plugins/SkANP.cpp \
\
android/wds/Command.cpp \
- android/wds/Connection.cpp \
+ android/wds/ConnectionAndroid.cpp \
android/wds/DebugServer.cpp
LOCAL_C_INCLUDES += \
diff --git a/Source/WebKit/android/jni/MIMETypeRegistry.cpp b/Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp
similarity index 100%
rename from Source/WebKit/android/jni/MIMETypeRegistry.cpp
rename to Source/WebKit/android/jni/MIMETypeRegistryAndroid.cpp
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index ecda831..4a9f21d 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1103,7 +1103,9 @@
pageClients.contextMenuClient = new ContextMenuClientAndroid;
pageClients.editorClient = editorC;
pageClients.dragClient = new DragClientAndroid;
+#if ENABLE(INSPECTOR)
pageClients.inspectorClient = new InspectorClientAndroid;
+#endif
pageClients.deviceMotionClient = deviceMotionC;
pageClients.deviceOrientationClient = deviceOrientationC;
pageClients.geolocationClient = geolocationC;
@@ -1902,7 +1904,7 @@
client->sslClientCert(privateKey.release(), certificate);
}
-static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jint ctx, jobjectArray chain)
+static void SslClientCertCtx(JNIEnv *env, jobject obj, int handle, jlong ctx, jobjectArray chain)
{
WebUrlLoaderClient* client = reinterpret_cast<WebUrlLoaderClient*>(handle);
EVP_PKEY* pkey = reinterpret_cast<EVP_PKEY*>(static_cast<uintptr_t>(ctx));
@@ -1977,7 +1979,7 @@
(void*) SslCertErrorProceed },
{ "nativeSslCertErrorCancel", "(II)V",
(void*) SslCertErrorCancel },
- { "nativeSslClientCert", "(II[[B)V",
+ { "nativeSslClientCert", "(IJ[[B)V",
(void*) SslClientCertCtx },
{ "nativeSslClientCert", "(I[B[[B)V",
(void*) SslClientCertPKCS8 },
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index aa38222..8779038 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -427,6 +427,7 @@
, m_maxYScroll(240/4)
, m_scrollOffsetX(0)
, m_scrollOffsetY(0)
+ , m_scrollSetTime(0)
, m_mousePos(WebCore::IntPoint(0,0))
, m_screenWidth(320)
, m_screenHeight(240)
@@ -567,6 +568,7 @@
m_javaGlue->m_obj = 0;
}
delete m_javaGlue;
+ delete m_textFieldInitDataGlue;
}
WebViewCore* WebViewCore::getWebViewCore(const WebCore::FrameView* view)
diff --git a/Source/WebKit/android/wds/Connection.cpp b/Source/WebKit/android/wds/ConnectionAndroid.cpp
similarity index 100%
rename from Source/WebKit/android/wds/Connection.cpp
rename to Source/WebKit/android/wds/ConnectionAndroid.cpp
