diff options
Diffstat (limited to 'WebCore/bridge')
| -rw-r--r-- | WebCore/bridge/c/c_instance.cpp | 6 | ||||
| -rw-r--r-- | WebCore/bridge/jni/JNIBridge.cpp | 13 | ||||
| -rw-r--r-- | WebCore/bridge/npapi.h | 6 |
3 files changed, 10 insertions, 15 deletions
diff --git a/WebCore/bridge/c/c_instance.cpp b/WebCore/bridge/c/c_instance.cpp index 2db009e..03e72fc 100644 --- a/WebCore/bridge/c/c_instance.cpp +++ b/WebCore/bridge/c/c_instance.cpp @@ -165,7 +165,7 @@ JSValue CInstance::invokeMethod(ExecState* exec, RuntimeMethod* runtimeMethod) } if (!retval) - throwError(exec, createError(exec, "Error calling method on NPObject!")); + throwError(exec, createError(exec, "Error calling method on NPObject.")); for (i = 0; i < count; i++) _NPN_ReleaseVariantValue(&cArgs[i]); @@ -200,7 +200,7 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec) } if (!retval) - throwError(exec, createError(exec, "Error calling method on NPObject!")); + throwError(exec, createError(exec, "Error calling method on NPObject.")); for (i = 0; i < count; i++) _NPN_ReleaseVariantValue(&cArgs[i]); @@ -239,7 +239,7 @@ JSValue CInstance::invokeConstruct(ExecState* exec, const ArgList& args) } if (!retval) - throwError(exec, createError(exec, "Error calling method on NPObject!")); + throwError(exec, createError(exec, "Error calling method on NPObject.")); for (i = 0; i < count; i++) _NPN_ReleaseVariantValue(&cArgs[i]); diff --git a/WebCore/bridge/jni/JNIBridge.cpp b/WebCore/bridge/jni/JNIBridge.cpp index 8fa2678..c512ee7 100644 --- a/WebCore/bridge/jni/JNIBridge.cpp +++ b/WebCore/bridge/jni/JNIBridge.cpp @@ -29,14 +29,11 @@ #if ENABLE(JAVA_BRIDGE) -#include "StringBuilder.h" #include <wtf/text/CString.h> - +#include <wtf/text/StringBuilder.h> using namespace JSC; using namespace JSC::Bindings; -using namespace WebCore; - JavaParameter::JavaParameter(JNIEnv* env, jstring type) { @@ -132,7 +129,7 @@ const char* JavaMethod::signature() const #endif StringBuilder signatureBuilder; - signatureBuilder.append("("); + signatureBuilder.append('('); for (int i = 0; i < m_numParameters; i++) { JavaParameter* aParameter = parameterAt(i); JNIType type = aParameter->getJNIType(); @@ -142,11 +139,11 @@ const char* JavaMethod::signature() const signatureBuilder.append(signatureFromPrimitiveType(type)); if (type == object_type) { appendClassName(signatureBuilder, aParameter->type()); - signatureBuilder.append(";"); + signatureBuilder.append(';'); } } } - signatureBuilder.append(")"); + signatureBuilder.append(')'); const char* returnType = m_returnType.utf8(); if (m_JNIReturnType == array_type) @@ -155,7 +152,7 @@ const char* JavaMethod::signature() const signatureBuilder.append(signatureFromPrimitiveType(m_JNIReturnType)); if (m_JNIReturnType == object_type) { appendClassName(signatureBuilder, returnType); - signatureBuilder.append(";"); + signatureBuilder.append(';'); } } diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index 6b8556d..48e78c0 100644 --- a/WebCore/bridge/npapi.h +++ b/WebCore/bridge/npapi.h @@ -528,6 +528,8 @@ typedef struct _NPPrint #if defined(XP_MACOSX) #ifndef NP_NO_CARBON typedef EventRecord NPEvent; +#else +typedef void* NPEvent; #endif #elif defined(XP_SYMBIAN) typedef QEvent NPEvent; @@ -691,10 +693,6 @@ enum NPEventType { NPEventType_ScrollingBeginsEvent = 1000, NPEventType_ScrollingEndsEvent }; -/* Obsolete versions of the above */ -#define getFocusEvent (osEvt + 16) -#define loseFocusEvent (osEvt + 17) -#define adjustCursorEvent (osEvt + 18) #endif /* NP_NO_CARBON */ #endif /* XP_MACOSX */ |