summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp92
-rw-r--r--Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h6
-rw-r--r--Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp4
-rw-r--r--Source/WebCore/loader/SubresourceLoader.cpp2
-rw-r--r--Source/WebCore/loader/cache/CachedResourceLoader.cpp3
-rw-r--r--Source/WebCore/platform/MIMETypeRegistry.cpp1
-rw-r--r--Source/WebCore/plugins/android/PluginViewAndroid.cpp2
-rw-r--r--Source/WebCore/rendering/RenderLayer.cpp12
8 files changed, 38 insertions, 84 deletions
diff --git a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
index 4becdfd..30e344d 100644
--- a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
+++ b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
@@ -30,7 +30,9 @@
#include "JavaInstanceV8.h"
#include "JavaNPObjectV8.h"
+#if PLATFORM(ANDROID)
#include "npruntime_impl.h"
+#endif // PLATFORM(ANDROID)
#include <wtf/text/CString.h>
namespace JSC {
@@ -46,6 +48,7 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
switch (jniType) {
case array_type:
+#if PLATFORM(ANDROID)
{
JNIEnv* env = getJNIEnv();
jobject javaArray;
@@ -55,17 +58,9 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
if (!success) {
// No length property so we don't know how many elements to put into the array.
// Treat this as an error.
-#ifdef EMULATE_JSC_BINDINGS
// JSC sends null for an array that is not an array of strings or basic types,
// do this also in the unknown length case.
memset(&result, 0, sizeof(jvalue));
-#else
- // Sending NULL as JSC does seems dangerous. (Imagine the java method that asks
- // for the length of the array it was passed). Here we send a 0 length array.
- jclass objectClass = env->FindClass("java/lang/Object");
- javaArray = env->NewObjectArray(0, objectClass, 0);
- env->DeleteLocalRef(objectClass);
-#endif
break;
}
@@ -202,28 +197,19 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
}
}
} else {
-#ifdef EMULATE_JSC_BINDINGS
// JSC sends null for an array that is not an array of strings or basic types.
memset(&result, 0, sizeof(jvalue));
break;
-#else
- // Sending NULL as JSC does seems dangerous. (Imagine the java method that asks
- // for the length of the array it was passed). Here we send a 0 length array.
- jclass objectClass = env->FindClass("java/lang/Object");
- javaArray = env->NewObjectArray(0, objectClass, 0);
- env->DeleteLocalRef(objectClass);
-#endif
}
result.l = javaArray;
}
break;
+#endif // PLATFORM(ANDROID)
case object_type:
{
- JNIEnv* env = getJNIEnv();
result.l = static_cast<jobject>(0);
- jobject javaString;
// First see if we have a Java instance.
if (type == NPVariantType_Object) {
@@ -237,6 +223,7 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
if (!result.l && !strcmp(javaClassName.data(), "java.lang.String")) {
#ifdef CONVERT_NULL_TO_EMPTY_STRING
if (type == NPVariantType_Null) {
+ JNIEnv* env = getJNIEnv();
jchar buf[2];
jobject javaString = env->functions->NewString(env, buf, 0);
result.l = javaString;
@@ -246,38 +233,32 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
#endif
{
NPString src = NPVARIANT_TO_STRING(value);
- javaString = env->NewStringUTF(src.UTF8Characters);
+ JNIEnv* env = getJNIEnv();
+ jobject javaString = env->NewStringUTF(src.UTF8Characters);
result.l = javaString;
- } else if (type == NPVariantType_Int32) {
+ }
+#if PLATFORM(ANDROID)
+ else if (type == NPVariantType_Int32) {
jint src = NPVARIANT_TO_INT32(value);
- jclass integerClass = env->FindClass("java/lang/Integer");
- jmethodID toString = env->GetStaticMethodID(integerClass, "toString", "(I)Ljava/lang/String;");
- javaString = env->CallStaticObjectMethod(integerClass, toString, src);
- result.l = javaString;
- env->DeleteLocalRef(integerClass);
+ jclass integerClass = getJNIEnv()->FindClass("java/lang/Integer");
+ jmethodID toString = getJNIEnv()->GetStaticMethodID(integerClass, "toString", "(I)Ljava/lang/String;");
+ result.l = getJNIEnv()->CallStaticObjectMethod(integerClass, toString, src);
+ getJNIEnv()->DeleteLocalRef(integerClass);
} else if (type == NPVariantType_Bool) {
jboolean src = NPVARIANT_TO_BOOLEAN(value);
- jclass booleanClass = env->FindClass("java/lang/Boolean");
- jmethodID toString = env->GetStaticMethodID(booleanClass, "toString", "(Z)Ljava/lang/String;");
- javaString = env->CallStaticObjectMethod(booleanClass, toString, src);
- result.l = javaString;
- env->DeleteLocalRef(booleanClass);
+ jclass booleanClass = getJNIEnv()->FindClass("java/lang/Boolean");
+ jmethodID toString = getJNIEnv()->GetStaticMethodID(booleanClass, "toString", "(Z)Ljava/lang/String;");
+ result.l = getJNIEnv()->CallStaticObjectMethod(booleanClass, toString, src);
+ getJNIEnv()->DeleteLocalRef(booleanClass);
} else if (type == NPVariantType_Double) {
jdouble src = NPVARIANT_TO_DOUBLE(value);
- jclass doubleClass = env->FindClass("java/lang/Double");
- jmethodID toString = env->GetStaticMethodID(doubleClass, "toString", "(D)Ljava/lang/String;");
- javaString = env->CallStaticObjectMethod(doubleClass, toString, src);
- result.l = javaString;
- env->DeleteLocalRef(doubleClass);
- }
-#ifdef EMULATE_JSC_BINDINGS
- // For the undefined value, JSC sends the String "undefined". Feels to me like we
- // should send null in this case.
- else if (!NPVARIANT_IS_NULL(value)) {
- javaString = env->NewStringUTF("undefined");
- result.l = javaString;
- }
-#endif
+ jclass doubleClass = getJNIEnv()->FindClass("java/lang/Double");
+ jmethodID toString = getJNIEnv()->GetStaticMethodID(doubleClass, "toString", "(D)Ljava/lang/String;");
+ result.l = getJNIEnv()->CallStaticObjectMethod(doubleClass, toString, src);
+ getJNIEnv()->DeleteLocalRef(doubleClass);
+ } else if (!NPVARIANT_IS_NULL(value))
+ result.l = getJNIEnv()->NewStringUTF("undefined");
+#endif // PLATFORM(ANDROID)
} else if (!result.l)
memset(&result, 0, sizeof(jvalue)); // Handle it the same as a void case
}
@@ -307,15 +288,6 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
{
if (type == NPVariantType_Int32)
result.c = static_cast<char>(NPVARIANT_TO_INT32(value));
-#ifndef EMULATE_JSC_BINDINGS
- // There is no char type in JavaScript - just strings 1 character
- // long. So just converting it to an int above doesn't work. Again,
- // we emulate the behavior for now for maximum compatability.
- else if (type == NPVariantType_String) {
- NPString str = NPVARIANT_TO_STRING(value);
- result.c = str.UTF8Characters[0];
- }
-#endif
else
memset(&result, 0, sizeof(jvalue));
}
@@ -376,6 +348,8 @@ jvalue convertNPVariantToJValue(NPVariant value, const WTF::String& javaType)
}
break;
+ break;
+
case invalid_type:
default:
case void_type:
@@ -427,17 +401,7 @@ void convertJValueToNPVariant(jvalue value, JNIType jniType, const char* javaTyp
case char_type:
{
-#ifndef EMULATE_JSC_BINDINGS
- // There is no char type in JavaScript - just strings 1 character
- // long. So just converting it to an int above doesn't work. Again,
- // we emulate the behavior for now for maximum compatability.
- if (!strcmp(javaTypeName, "char")) {
- const char c = value.c;
- const char* v = strndup(&c, 1);
- STRINGZ_TO_NPVARIANT(v, *result);
- } else
-#endif
- INT32_TO_NPVARIANT(value.c, *result);
+ INT32_TO_NPVARIANT(value.c, *result);
}
break;
diff --git a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h
index 5aa2921..df73a9e 100644
--- a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h
+++ b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h
@@ -32,12 +32,6 @@
#include "npruntime.h"
#include <wtf/text/WTFString.h>
-// FIXME: While fully implementing the bindings I noticed some differences between what
-// I wrote and seemed intuitive and what JSC does. Need to verify if my intuition is wrong
-// or there are bugs in the JSC bindings. For now, this macro makes the V8 bindings do the
-// same as the JSC bindings.
-#define EMULATE_JSC_BINDINGS 1
-
namespace JSC {
namespace Bindings {
diff --git a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index da6cf4a..0d7c3fb 100644
--- a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -156,7 +156,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant*
if (!field)
return false;
-#ifdef EMULATE_JSC_BINDINGS
+#if PLATFORM(ANDROID)
// JSC does not seem to support returning object properties so we emulate that
// behaviour here.
jvalue value;
@@ -168,7 +168,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant*
field->getJNIType(),
field->name().utf8(),
field->type());
-#endif
+#endif // PLATFORM(ANDROID)
convertJValueToNPVariant(value, field->getJNIType(), field->type(), result);
return true;
diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
index 6f6adaf..f948ec3 100644
--- a/Source/WebCore/loader/SubresourceLoader.cpp
+++ b/Source/WebCore/loader/SubresourceLoader.cpp
@@ -75,7 +75,7 @@ PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, Subresourc
FrameLoader::reportLocalLoadFailed(frame, request.url().string());
return 0;
}
-
+
if (SecurityOrigin::shouldHideReferrer(request.url(), fl->outgoingReferrer()))
newRequest.clearHTTPReferrer();
else if (!request.httpReferrer())
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 71edb1b..56715c6 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -85,11 +85,10 @@ CachedResourceLoader::CachedResourceLoader(Document* document)
, m_autoLoadImages(true)
, m_loadFinishing(false)
, m_allowStaleResources(false)
- , m_isInMethod(0)
#ifdef ANDROID_BLOCK_NETWORK_IMAGE
, m_blockNetworkImage(false)
#endif
-
+ , m_isInMethod(0)
{
}
diff --git a/Source/WebCore/platform/MIMETypeRegistry.cpp b/Source/WebCore/platform/MIMETypeRegistry.cpp
index 4f9be57..e76906e 100644
--- a/Source/WebCore/platform/MIMETypeRegistry.cpp
+++ b/Source/WebCore/platform/MIMETypeRegistry.cpp
@@ -113,6 +113,7 @@ static void initializeSupportedImageMIMETypes()
#elif PLATFORM(ANDROID)
static const char* types[] = {
"image/jpeg",
+ "image/webp",
"image/png",
"image/gif",
"image/bmp",
diff --git a/Source/WebCore/plugins/android/PluginViewAndroid.cpp b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
index 8b737ea..78d0217 100644
--- a/Source/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/Source/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -106,6 +106,7 @@ extern void ANPSurfaceInterfaceV0_Init(ANPInterface* value);
extern void ANPTypefaceInterfaceV0_Init(ANPInterface* value);
extern void ANPWindowInterfaceV0_Init(ANPInterface* value);
extern void ANPWindowInterfaceV1_Init(ANPInterface* value);
+extern void ANPWindowInterfaceV2_Init(ANPInterface* value);
extern void ANPSystemInterfaceV0_Init(ANPInterface* value);
extern void ANPSystemInterfaceV1_Init(ANPInterface* value);
extern void ANPSystemInterfaceV2_Init(ANPInterface* value);
@@ -135,6 +136,7 @@ static const VarProcPair gVarProcs[] = {
{ VARPROCLINE(TypefaceInterfaceV0) },
{ VARPROCLINE(WindowInterfaceV0) },
{ VARPROCLINE(WindowInterfaceV1) },
+ { VARPROCLINE(WindowInterfaceV2) },
{ VARPROCLINE(SystemInterfaceV0) },
{ VARPROCLINE(SystemInterfaceV1) },
{ VARPROCLINE(SystemInterfaceV2) },
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index 5f32933..bc0d440 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -2633,16 +2633,10 @@ void RenderLayer::paintPaginatedChildLayer(RenderLayer* childLayer, RenderLayer*
Vector<RenderLayer*> columnLayers;
RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
- if (curr->renderer()->hasColumns())
+ if (curr->renderer()->hasColumns() && checkContainingBlockChainForPagination(childLayer->renderer(), curr->renderBox()))
columnLayers.append(curr);
-#ifdef ANDROID
- // Bug filed: 56107
if (curr == ancestorLayer)
break;
-#else
- if (curr == ancestorLayer || (curr->parent() && curr->parent()->renderer()->isPositioned()))
- break;
-#endif
}
ASSERT(columnLayers.size());
@@ -3122,9 +3116,9 @@ RenderLayer* RenderLayer::hitTestPaginatedChildLayer(RenderLayer* childLayer, Re
Vector<RenderLayer*> columnLayers;
RenderLayer* ancestorLayer = isNormalFlowOnly() ? parent() : stackingContext();
for (RenderLayer* curr = childLayer->parent(); curr; curr = curr->parent()) {
- if (curr->renderer()->hasColumns())
+ if (curr->renderer()->hasColumns() && checkContainingBlockChainForPagination(childLayer->renderer(), curr->renderBox()))
columnLayers.append(curr);
- if (curr == ancestorLayer || (curr->parent() && curr->parent()->renderer()->isPositioned()))
+ if (curr == ancestorLayer)
break;
}
generated by cgit v1.1 at 2025-09-16 21:56:25 +0000