diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
50 files changed, 74 insertions, 1477 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 0f97bfe..75a0bc4 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -259,34 +259,21 @@ #if defined(__ARMEB__) #define WTF_PLATFORM_BIG_ENDIAN 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#elif !defined(__ARM_EABI__) && !defined(__EABI__) && !defined(__VFP_FP__) -#if !defined(ANDROID) -======= #elif !defined(__ARM_EABI__) \ && !defined(__EABI__) \ && !defined(__VFP_FP__) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h +#if !defined(ANDROID) #define WTF_PLATFORM_MIDDLE_ENDIAN 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #endif -#if !defined(__ARM_EABI__) && !defined(__EABI__) -#define WTF_PLATFORM_FORCE_PACK 1 -#endif -#define ARM_ARCH_VERSION 3 -#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) -#undef ARM_ARCH_VERSION -======= /* Set ARM_ARCH_VERSION */ #if defined(__ARM_ARCH_4__) \ || defined(__ARM_ARCH_4T__) \ || defined(__MARM_ARMV4__) \ || defined(_ARMV4I_) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define ARM_ARCH_VERSION 4 #elif defined(__ARM_ARCH_5__) \ @@ -517,12 +504,8 @@ #endif #define HAVE_READLINE 1 #define HAVE_RUNLOOP_TIMER 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #define HAVE_PTHREAD_RWLOCK 1 -#endif -======= #endif /* PLATFORM(MAC) && !PLATFORM(IPHONE) */ ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #if PLATFORM(CHROMIUM) && PLATFORM(DARWIN) #define WTF_PLATFORM_CF 1 @@ -577,12 +560,9 @@ #define HAVE_SIGNAL_H 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(ANDROID) -======= #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \ - && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h + && !PLATFORM(SYMBIAN) && !PLATFORM(HAIKU) && !COMPILER(RVCT) \ + && !PLATFORM(ANDROID) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 @@ -633,17 +613,19 @@ #define HAVE_SYS_PARAM_H 1 #endif -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h -#elif PLATFORM(ANDROID) -======= #elif PLATFORM(QNX) ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define HAVE_ERRNO_H 1 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h +#define HAVE_MMAP 1 +#define HAVE_SBRK 1 +#define HAVE_STRINGS_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_TIME_H 1 + +#elif PLATFORM(ANDROID) + +#define HAVE_ERRNO_H 1 #define HAVE_LANGINFO_H 0 -======= ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Platform.h #define HAVE_MMAP 1 #define HAVE_SBRK 1 #define HAVE_STRINGS_H 1 diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h index e4a0b05..34d744d 100644 --- a/JavaScriptCore/wtf/Threading.h +++ b/JavaScriptCore/wtf/Threading.h @@ -234,16 +234,12 @@ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(r inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -<<<<<<< HEAD:JavaScriptCore/wtf/Threading.h #elif defined ANDROID inline void atomicIncrement(int volatile* addend) { android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } -#elif COMPILER(GCC) -======= #elif COMPILER(GCC) && !PLATFORM(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc ->>>>>>> webkit.org at 49305:JavaScriptCore/wtf/Threading.h #define WTF_USE_LOCKFREE_THREADSAFESHARED 1 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; } diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index 01db8ea..16a1e42 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -4701,9 +4701,6 @@ F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */; }; F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; }; F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; }; -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj - FE6FD4880F676E5700092873 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD4850F676E5700092873 /* Coordinates.h */; }; -======= FABE72F41059C1EB00D999DD /* MathMLElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D999DD /* MathMLElement.cpp */; }; FABE72F51059C1EB00D999DD /* MathMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FABE72EE1059C1EB00D999DD /* MathMLElement.h */; }; FABE72F61059C1EB00D999DD /* MathMLInlineContainerElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72EF1059C1EB00D999DD /* MathMLInlineContainerElement.cpp */; }; @@ -4713,7 +4710,6 @@ FABE72FD1059C21100D999DD /* MathMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72FB1059C21100D999DD /* MathMLElementFactory.cpp */; }; FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72FC1059C21100D999DD /* MathMLNames.cpp */; }; FE6FD4880F676E5700092873 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD4850F676E5700092873 /* Coordinates.h */; settings = {ATTRIBUTES = (Private, ); }; }; ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj FE6FD48D0F676E9300092873 /* JSCoordinates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */; }; FE6FD48E0F676E9300092873 /* JSCoordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD48C0F676E9300092873 /* JSCoordinates.h */; }; FE700DD10F92D81A008E2BFE /* JSCoordinatesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */; }; @@ -4724,11 +4720,7 @@ FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7A60E9C1ED2000D6F75 /* JSGeolocationCustom.cpp */; }; FE80D7C50E9C1F25000D6F75 /* Geolocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80D7B70E9C1F25000D6F75 /* Geolocation.cpp */; }; FE80D7C60E9C1F25000D6F75 /* Geolocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7B80E9C1F25000D6F75 /* Geolocation.h */; settings = {ATTRIBUTES = (Private, ); }; }; -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj - FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; }; -======= FE80D7C90E9C1F25000D6F75 /* Geoposition.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BB0E9C1F25000D6F75 /* Geoposition.h */; settings = {ATTRIBUTES = (Private, ); }; }; ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj FE80D7CB0E9C1F25000D6F75 /* PositionCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BD0E9C1F25000D6F75 /* PositionCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80D7CD0E9C1F25000D6F75 /* PositionError.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7BF0E9C1F25000D6F75 /* PositionError.h */; settings = {ATTRIBUTES = (Private, ); }; }; FE80D7CF0E9C1F25000D6F75 /* PositionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80D7C10E9C1F25000D6F75 /* PositionErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -17892,8 +17884,6 @@ 49484FC8102CF23C00187DD3 /* CanvasPixelArray.h in Headers */, 49484FCB102CF23C00187DD3 /* CanvasRenderingContext2D.h in Headers */, 49484FCE102CF23C00187DD3 /* CanvasStyle.h in Headers */, -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj -======= 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */, B5C1123C102B6C4600096578 /* SQLTransactionCoordinator.h in Headers */, D8B6152F1032495100C8554A /* Cookie.h in Headers */, @@ -17958,10 +17948,7 @@ 49EED1431051969400099FAB /* JSCanvasRenderingContext.h in Headers */, 49EED1451051969400099FAB /* JSCanvasRenderingContext2D.h in Headers */, 49EED1471051969400099FAB /* JSCanvasRenderingContext3D.h in Headers */, ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj 59C77F2B10545B3B00506104 /* GeolocationServiceMock.h in Headers */, -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj -======= 51A052331058774F00CC9E95 /* CredentialStorage.h in Headers */, 51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */, BC8BF151105813BF00A40A07 /* UserStyleSheet.h in Headers */, @@ -17987,7 +17974,6 @@ A75E497610752ACB00C9B896 /* SerializedScriptValue.h in Headers */, 97059978107D975200A50A7C /* PolicyCallback.h in Headers */, 9705997A107D975200A50A7C /* PolicyChecker.h in Headers */, ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj ); runOnlyForDeploymentPostprocessing = 0; }; @@ -20018,8 +20004,6 @@ 49484FC7102CF23C00187DD3 /* CanvasPixelArray.cpp in Sources */, 49484FCA102CF23C00187DD3 /* CanvasRenderingContext2D.cpp in Sources */, 49484FCD102CF23C00187DD3 /* CanvasStyle.cpp in Sources */, -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj -======= 9392262D1032107B006E7D5D /* JSHTMLCanvasElementCustom.cpp in Sources */, 9392262F10321084006E7D5D /* JSCSSRuleListCustom.cpp in Sources */, B5C1123B102B6C4600096578 /* SQLTransactionCoordinator.cpp in Sources */, @@ -20091,10 +20075,7 @@ 49EED14E1051971A00099FAB /* JSCanvasRenderingContext2DCustom.cpp in Sources */, 49EED14F1051971A00099FAB /* JSCanvasRenderingContext3DCustom.cpp in Sources */, 49EED1501051971A00099FAB /* JSCanvasRenderingContextCustom.cpp in Sources */, ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj 59C77F2A10545B3B00506104 /* GeolocationServiceMock.cpp in Sources */, -<<<<<<< HEAD:WebCore/WebCore.xcodeproj/project.pbxproj -======= 51A052341058774F00CC9E95 /* CredentialStorage.cpp in Sources */, 510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */, 51ABAE441043AB4A008C5260 /* WebSocketHandshake.cpp in Sources */, @@ -20116,7 +20097,6 @@ A75E497710752ACB00C9B896 /* SerializedScriptValue.cpp in Sources */, 97059977107D975200A50A7C /* PolicyCallback.cpp in Sources */, 97059979107D975200A50A7C /* PolicyChecker.cpp in Sources */, ->>>>>>> webkit.org at 49305:WebCore/WebCore.xcodeproj/project.pbxproj ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WebCore/bindings/js/JSCustomPositionCallback.cpp b/WebCore/bindings/js/JSCustomPositionCallback.cpp index 07788a8..e5f83aa 100644 --- a/WebCore/bindings/js/JSCustomPositionCallback.cpp +++ b/WebCore/bindings/js/JSCustomPositionCallback.cpp @@ -48,20 +48,7 @@ void JSCustomPositionCallback::handleEvent(Geoposition* geoposition) ExecState* exec = m_data.globalObject()->globalExec(); MarkedArgumentBuffer args; args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), geoposition)); -<<<<<<< HEAD:WebCore/bindings/js/JSCustomPositionCallback.cpp - - globalObject->globalData()->timeoutChecker.start(); - call(exec, function, callType, callData, m_callback, args); - globalObject->globalData()->timeoutChecker.stop(); - - if (exec->hadException()) { - reportCurrentException(exec); - } - - Document::updateStyleForAllDocuments(); -======= m_data.invokeCallback(args); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSCustomPositionCallback.cpp } } // namespace WebCore diff --git a/WebCore/bindings/js/JSCustomPositionCallback.h b/WebCore/bindings/js/JSCustomPositionCallback.h index dff34fe..ad5528d 100644 --- a/WebCore/bindings/js/JSCustomPositionCallback.h +++ b/WebCore/bindings/js/JSCustomPositionCallback.h @@ -42,11 +42,6 @@ public: return adoptRef(new JSCustomPositionCallback(callback, globalObject)); } -<<<<<<< HEAD:WebCore/bindings/js/JSCustomPositionCallback.h - virtual void handleEvent(Geoposition*); - -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSCustomPositionCallback.h private: JSCustomPositionCallback(JSC::JSObject* callback, JSDOMGlobalObject*); diff --git a/WebCore/bindings/js/JSGeolocationCustom.cpp b/WebCore/bindings/js/JSGeolocationCustom.cpp index 23a4c00..530b89b 100644 --- a/WebCore/bindings/js/JSGeolocationCustom.cpp +++ b/WebCore/bindings/js/JSGeolocationCustom.cpp @@ -41,58 +41,32 @@ using namespace std; namespace WebCore { -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp -static PassRefPtr<PositionCallback> createPositionCallback(ExecState* exec, JSValue value) -======= static PassRefPtr<PositionCallback> createPositionCallback(ExecState* exec, JSDOMGlobalObject* globalObject, JSValue value) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp { // The spec specifies 'FunctionOnly' for this object. -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - if (!value.isObject(&InternalFunction::info)) { -======= if (!value.inherits(&InternalFunction::info)) { ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp setDOMException(exec, TYPE_MISMATCH_ERR); return 0; } JSObject* object = asObject(value); -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - Frame* frame = toJSDOMWindow(exec->lexicalGlobalObject())->impl()->frame(); - return JSCustomPositionCallback::create(object, frame); -======= return JSCustomPositionCallback::create(object, globalObject); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp } -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp -static PassRefPtr<PositionErrorCallback> createPositionErrorCallback(ExecState* exec, JSValue value) -======= static PassRefPtr<PositionErrorCallback> createPositionErrorCallback(ExecState* exec, JSDOMGlobalObject* globalObject, JSValue value) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp { // Argument is optional (hence undefined is allowed), and null is allowed. if (value.isUndefinedOrNull()) return 0; // The spec specifies 'FunctionOnly' for this object. -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - if (!value.isObject(&InternalFunction::info)) { -======= if (!value.inherits(&InternalFunction::info)) { ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp setDOMException(exec, TYPE_MISMATCH_ERR); return 0; } JSObject* object = asObject(value); -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - Frame* frame = toJSDOMWindow(exec->lexicalGlobalObject())->impl()->frame(); - return JSCustomPositionErrorCallback::create(object, frame); -======= return JSCustomPositionErrorCallback::create(object, globalObject); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp } static PassRefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValue value) @@ -163,20 +137,12 @@ JSValue JSGeolocation::getCurrentPosition(ExecState* exec, const ArgList& args) { // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, args.at(0)); -======= RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(0)); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp if (exec->hadException()) return jsUndefined(); ASSERT(positionCallback); -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, args.at(1)); -======= RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(1)); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp if (exec->hadException()) return jsUndefined(); @@ -193,20 +159,12 @@ JSValue JSGeolocation::watchPosition(ExecState* exec, const ArgList& args) { // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, args.at(0)); -======= RefPtr<PositionCallback> positionCallback = createPositionCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(0)); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp if (exec->hadException()) return jsUndefined(); ASSERT(positionCallback); -<<<<<<< HEAD:WebCore/bindings/js/JSGeolocationCustom.cpp - RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, args.at(1)); -======= RefPtr<PositionErrorCallback> positionErrorCallback = createPositionErrorCallback(exec, static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject()), args.at(1)); ->>>>>>> webkit.org at 49305:WebCore/bindings/js/JSGeolocationCustom.cpp if (exec->hadException()) return jsUndefined(); diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index aaf4163..b69ef2b 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -135,11 +135,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S return handleException(scriptState); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp #if ENABLE(JAVASCRIPT_DEBUGGER) -======= #if ENABLE(INSPECTOR) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { JSLock lock(SilenceAssertionsOnly); @@ -147,11 +144,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, Inspect globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value)); return handleException(scriptState); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -#endif -======= #endif // ENABLE(INSPECTOR) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp +#endif bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value) { diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h index 682ce79..275d56d 100644 --- a/WebCore/bindings/v8/DOMObjectsInclude.h +++ b/WebCore/bindings/v8/DOMObjectsInclude.h @@ -234,15 +234,14 @@ #include "V8SVGPODTypeWrapper.h" #endif // SVG -<<<<<<< HEAD:WebCore/bindings/v8/DOMObjectsInclude.h #if ENABLE(TOUCH_EVENTS) #include "Touch.h" #include "TouchList.h" #include "TouchEvent.h" -======= +#endif + #if ENABLE(WEB_SOCKETS) #include "WebSocket.h" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DOMObjectsInclude.h #endif #if ENABLE(WORKERS) diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index 1dec0b1..b7c6132 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -207,20 +207,6 @@ #include "bindings/V8Screen.cpp" #include "bindings/V8StyleSheet.cpp" #include "bindings/V8StyleSheetList.cpp" -#include "bindings/V8Text.cpp" -#include "bindings/V8TextEvent.cpp" -#include "bindings/V8TextMetrics.cpp" -#include "bindings/V8TimeRanges.cpp" -#include "bindings/V8TreeWalker.cpp" -#include "bindings/V8UIEvent.cpp" -#include "bindings/V8ValidityState.cpp" -#include "bindings/V8WebKitAnimationEvent.cpp" -#include "bindings/V8WebKitCSSKeyframeRule.cpp" -#include "bindings/V8WebKitCSSKeyframesRule.cpp" -#include "bindings/V8WebKitCSSMatrix.cpp" -#include "bindings/V8WebKitCSSTransformValue.cpp" -#include "bindings/V8WebKitPoint.cpp" -#include "bindings/V8WebKitTransitionEvent.cpp" #include "bindings/V8WheelEvent.cpp" #include "bindings/V8XMLHttpRequest.cpp" #include "bindings/V8XMLHttpRequestException.cpp" @@ -357,8 +343,8 @@ #include "bindings/V8SVGUseElement.cpp" #include "bindings/V8SVGViewElement.cpp" #include "bindings/V8SVGZoomEvent.cpp" -<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp -======= +#endif + #include "bindings/V8Text.cpp" #include "bindings/V8TextEvent.cpp" #include "bindings/V8TextMetrics.cpp" @@ -373,19 +359,15 @@ #include "bindings/V8WebKitCSSTransformValue.cpp" #include "bindings/V8WebKitPoint.cpp" #include "bindings/V8WebKitTransitionEvent.cpp" + #if ENABLE(WEB_SOCKETS) #include "bindings/V8WebSocket.cpp" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #endif -<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #if ENABLE(WORKERS) #include "bindings/V8AbstractWorker.cpp" #include "bindings/V8DedicatedWorkerContext.cpp" #include "bindings/V8SharedWorker.cpp" -======= -#include "bindings/V8WheelEvent.cpp" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #include "bindings/V8Worker.cpp" #include "bindings/V8WorkerContext.cpp" #include "bindings/V8WorkerLocation.cpp" diff --git a/WebCore/bindings/v8/V8Binding.cpp b/WebCore/bindings/v8/V8Binding.cpp index 7d84243..9ac7eae 100644 --- a/WebCore/bindings/v8/V8Binding.cpp +++ b/WebCore/bindings/v8/V8Binding.cpp @@ -207,19 +207,7 @@ String v8NonStringValueToWebCoreString(v8::Handle<v8::Value> object) throwError(block.Exception()); return StringImpl::empty(); } -<<<<<<< HEAD:WebCore/bindings/v8/V8Binding.cpp - return v8StringToWebCoreString(v8String, DoNotExternalize, PlainStringType); -} - -AtomicString v8ValueToAtomicWebCoreString(v8::Handle<v8::Value> v8Value) -{ - if (v8Value->IsString()) - return v8StringToAtomicWebCoreString(v8::Handle<v8::String>::Cast(v8Value)); - String string = v8ValueToWebCoreString(v8Value); - return AtomicString(string); -======= return v8StringToWebCoreString<String>(v8String, DoNotExternalize); ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Binding.cpp } AtomicString v8NonStringValueToAtomicWebCoreString(v8::Handle<v8::Value> object) diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index df8e833..4b0e895 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -31,14 +31,10 @@ #include "config.h" #include "V8DOMWrapper.h" -<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp +#include "CSSMutableStyleDeclaration.h" #if PLATFORM(CHROMIUM) #include "ChromiumBridge.h" #endif -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8DOMWrapper.cpp -#include "CSSMutableStyleDeclaration.h" -#include "ChromiumBridge.h" #include "DOMObjectsInclude.h" #include "DocumentLoader.h" #include "FrameLoaderClient.h" diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 1d2b9c0..5782aac 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -404,7 +404,6 @@ #include "V8SharedWorker.h" #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp #if ENABLE(GEOLOCATION) #include "V8Coordinates.h" #include "V8Geolocation.h" @@ -428,7 +427,8 @@ #if ENABLE(XSLT) #include "V8XSLTProcessor.h" -======= +#endif + #if ENABLE(3D_CANVAS) #include "V8CanvasRenderingContext3D.h" #include "V8CanvasArrayBuffer.h" @@ -446,7 +446,6 @@ #include "V8CanvasUnsignedByteArray.h" #include "V8CanvasUnsignedIntArray.h" #include "V8CanvasUnsignedShortArray.h" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.cpp #endif namespace WebCore { diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index b73100c..e91ffd7 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -460,14 +460,16 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #define DOM_OBJECT_WORKERS_TYPES(V) #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h #if ENABLE(GEOLOCATION) #define DOM_OBJECT_GEOLOCATION_TYPES(V) \ V(COORDINATES, Coordinates) \ V(GEOLOCATION, Geolocation) \ V(GEOPOSITION, Geoposition) \ V(POSITIONERROR, PositionError) -======= +#else +#define DOM_OBJECT_GEOLOCATION_TYPES(V) +#endif + #if ENABLE(3D_CANVAS) #define DOM_OBJECT_3D_CANVAS_TYPES(V) \ V(CANVASARRAY, CanvasArray) \ @@ -486,16 +488,10 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(CANVASUNSIGNEDBYTEARRAY, CanvasUnsignedByteArray) \ V(CANVASUNSIGNEDINTARRAY, CanvasUnsignedIntArray) \ V(CANVASUNSIGNEDSHORTARRAY, CanvasUnsignedShortArray) ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h #else -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h -#define DOM_OBJECT_GEOLOCATION_TYPES(V) -======= #define DOM_OBJECT_3D_CANVAS_TYPES(V) ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h #if ENABLE(TOUCH_EVENTS) #define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ V(TOUCHLIST, TouchList) \ @@ -506,15 +502,13 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #endif #if PLATFORM(CHROMIUM) -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h #define DOM_OBJECT_TYPES(V) \ DOM_OBJECT_TYPES_1(V) \ DOM_OBJECT_TYPES_2(V) \ DOM_OBJECT_DATABASE_TYPES(V) \ DOM_OBJECT_STORAGE_TYPES(V) \ DOM_OBJECT_WORKERS_TYPES(V) \ -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h + DOM_OBJECT_3D_CANVAS_TYPES(V) \ DOM_OBJECT_XPATH_TYPES(V) \ DOM_OBJECT_XSLT_TYPES(V) \ V(INSPECTORBACKEND, InspectorBackend) @@ -528,9 +522,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ DOM_OBJECT_WORKERS_TYPES(V) #endif -======= - DOM_OBJECT_3D_CANVAS_TYPES(V) ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Index.h #if ENABLE(SVG) // SVG_OBJECT_TYPES are svg non-node, non-pod types. diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index 5e0c8b6..fa2370c 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -32,11 +32,8 @@ #include "V8Proxy.h" #include "CSSMutableStyleDeclaration.h" -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp #include "CString.h" -======= #include "DateExtension.h" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp #include "DOMObjectsInclude.h" #include "DocumentLoader.h" #include "FrameLoaderClient.h" @@ -378,24 +375,6 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod ASSERT(v8::Context::InContext()); LOCK_V8; -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - // Compile the script. - v8::Local<v8::String> code = v8ExternalString(source.source()); -#if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - ChromiumBridge::traceEventBegin("v8.compile", node, ""); -#endif - - // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at - // 1, whereas v8 starts at 0. - v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1); -#if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - ChromiumBridge::traceEventEnd("v8.compile", node, ""); - ChromiumBridge::traceEventBegin("v8.run", node, ""); -#endif -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp v8::Local<v8::Value> result; { // Isolate exceptions that occur when compiling and executing @@ -407,14 +386,20 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod // Compile the script. v8::Local<v8::String> code = v8ExternalString(source.source()); +#if PLATFORM(CHROMIUM) + // TODO(andreip): ChromeBridge->BrowserBridge? ChromiumBridge::traceEventBegin("v8.compile", node, ""); +#endif // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at // 1, whereas v8 starts at 0. v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1); +#if PLATFORM(CHROMIUM) + // TODO(andreip): ChromeBridge->BrowserBridge? ChromiumBridge::traceEventEnd("v8.compile", node, ""); ChromiumBridge::traceEventBegin("v8.run", node, ""); +#endif // Set inlineCode to true for <a href="javascript:doSomething()"> // and false for <script>doSomething</script>. We make a rough guess at // this based on whether the script source has a URL. @@ -496,16 +481,9 @@ v8::Local<v8::Value> V8Proxy::runScriptInternal(v8::Handle<v8::Script> script, b v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[]) { -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptExecuteTimeCounter); #endif - - // For now, we don't put any artificial limitations on the depth - // of recursion that stems from calling functions. This is in - // contrast to the script evaluations. -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp v8::Local<v8::Value> result; { V8ConsoleMessage::Scope scope; @@ -817,14 +795,10 @@ void V8Proxy::resetIsolatedWorlds() void V8Proxy::clearForClose() { -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - if (!m_context.IsEmpty()) { - LOCK_V8; -======= resetIsolatedWorlds(); if (!context().IsEmpty()) { ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp + LOCK_V8; v8::HandleScope handleScope; clearDocumentWrapper(); @@ -837,12 +811,8 @@ void V8Proxy::clearForNavigation() disconnectEventListeners(); resetIsolatedWorlds(); -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - if (!m_context.IsEmpty()) { - LOCK_V8; -======= if (!context().IsEmpty()) { ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.cpp + LOCK_V8; v8::HandleScope handle; clearDocumentWrapper(); diff --git a/WebCore/bindings/v8/V8Proxy.h b/WebCore/bindings/v8/V8Proxy.h index c68f6b7..30f682d 100644 --- a/WebCore/bindings/v8/V8Proxy.h +++ b/WebCore/bindings/v8/V8Proxy.h @@ -31,13 +31,6 @@ #ifndef V8Proxy_h #define V8Proxy_h -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h -#include "Node.h" -#include "NodeFilter.h" -#include "PlatformString.h" // for WebCore::String -======= -#include "ChromiumBridge.h" ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h #include "ScriptSourceCode.h" // for WebCore::ScriptSourceCode #include "SecurityOrigin.h" // for WebCore::SecurityOrigin #include "SharedPersistent.h" @@ -49,12 +42,8 @@ #include <wtf/PassRefPtr.h> // so generated bindings don't have to #include <wtf/Vector.h> -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h #if defined(ENABLE_DOM_STATS_COUNTERS) && PLATFORM(CHROMIUM) #include "ChromiumBridge.h" -======= -#ifdef ENABLE_DOM_STATS_COUNTERS ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h #define INC_STATS(name) ChromiumBridge::incrementStatsCounter(name) #else #define INC_STATS(name) @@ -115,11 +104,7 @@ namespace WebCore { int group; v8::Extension* extension; }; -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.h - typedef WTF::Vector<V8ExtensionInfo> V8ExtensionList; -======= typedef WTF::Vector<V8ExtensionInfo> V8Extensions; ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/V8Proxy.h class V8Proxy { public: diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp index 8ef65b3..90c1f6f 100644 --- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp +++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp @@ -403,30 +403,6 @@ v8::Local<v8::Value> WorkerContextExecutionProxy::runScript(v8::Handle<v8::Scrip return result; } -<<<<<<< HEAD:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp -PassRefPtr<V8EventListener> WorkerContextExecutionProxy::findOrCreateEventListenerHelper(v8::Local<v8::Value> object, bool isInline, bool findOnly, bool createObjectEventListener) -{ - if (!object->IsObject()) - return 0; - - V8EventListener* listener = m_listeners->find(object->ToObject(), isInline); - if (findOnly) - return listener; - - // Create a new one, and add to cache. - RefPtr<V8EventListener> newListener; - if (createObjectEventListener) - newListener = V8WorkerContextObjectEventListener::create(this, v8::Local<v8::Object>::Cast(object), isInline); - else - newListener = V8WorkerContextEventListener::create(this, v8::Local<v8::Object>::Cast(object), isInline); - - m_listeners->add(newListener.get()); - - return newListener.release(); -} - -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp PassRefPtr<V8EventListener> WorkerContextExecutionProxy::findOrCreateEventListener(v8::Local<v8::Value> object, bool isInline, bool findOnly) { return findOnly ? V8EventListenerList::findWrapper(object, isInline) : V8EventListenerList::findOrCreateWrapper<V8WorkerContextEventListener>(this, m_listenerGuard, object, isInline); diff --git a/WebCore/bindings/v8/custom/V8CustomBinding.h b/WebCore/bindings/v8/custom/V8CustomBinding.h index 3f381be..82ce1c1 100644 --- a/WebCore/bindings/v8/custom/V8CustomBinding.h +++ b/WebCore/bindings/v8/custom/V8CustomBinding.h @@ -626,14 +626,13 @@ namespace WebCore { DECLARE_CALLBACK(SharedWorkerConstructor); #endif -<<<<<<< HEAD:WebCore/bindings/v8/custom/V8CustomBinding.h DECLARE_CALLBACK(GeolocationGetCurrentPosition); DECLARE_CALLBACK(GeolocationWatchPosition); DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitude); DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesAltitudeAccuracy); DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesHeading); DECLARE_PROPERTY_ACCESSOR_GETTER(CoordinatesSpeed); -======= + #if ENABLE(WEB_SOCKETS) DECLARE_PROPERTY_ACCESSOR(WebSocketOnopen); DECLARE_PROPERTY_ACCESSOR(WebSocketOnmessage); @@ -642,7 +641,6 @@ namespace WebCore { DECLARE_CALLBACK(WebSocketSend); DECLARE_CALLBACK(WebSocketClose); #endif ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/custom/V8CustomBinding.h #undef DECLARE_INDEXED_ACCESS_CHECK #undef DECLARE_NAMED_ACCESS_CHECK diff --git a/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp b/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp index 1b81257..134de95 100644 --- a/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp @@ -43,66 +43,6 @@ namespace WebCore { -<<<<<<< HEAD:WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp -static const bool kFindOnly = true; -static const bool kFindOrCreate = false; - -static PassRefPtr<EventListener> argumentToEventListener(DOMApplicationCache* appcache, v8::Local<v8::Value> value, bool findOnly) -{ - V8Proxy* proxy = V8Proxy::retrieve(appcache->scriptExecutionContext()); - if (proxy) - return findOnly ? proxy->objectListeners()->findWrapper(value, false) - : proxy->objectListeners()->findOrCreateWrapper<V8ObjectEventListener>(proxy->frame(), value, false); - return 0; -} - -static v8::Local<v8::Object> eventListenerToV8Object(EventListener* listener) -{ - return (static_cast<V8ObjectEventListener*>(listener))->getListenerObject(); -} - -static inline ApplicationCacheHost::EventID toEventID(v8::Local<v8::String> value) -{ - String key = toWebCoreString(value); - ASSERT(key.startsWith("on")); - return DOMApplicationCache::toEventID(key.substring(2)); -} - -// Handles appcache.onfooevent attribute getting -ACCESSOR_GETTER(DOMApplicationCacheEventHandler) -{ - INC_STATS("DOMApplicationCache.onevent_getter"); - DOMApplicationCache* appcache = V8DOMWrapper::convertToNativeObject<DOMApplicationCache>(V8ClassIndex::DOMAPPLICATIONCACHE, info.Holder()); - EventListener* listener = appcache->getAttributeEventListener(toEventID(name)); - if (!listener) - return v8::Null(); - return eventListenerToV8Object(listener); -} - -// Handles appcache.onfooevent attribute setting -ACCESSOR_SETTER(DOMApplicationCacheEventHandler) -{ - INC_STATS("DOMApplicationCache.onevent_setter"); - DOMApplicationCache* appcache = V8DOMWrapper::convertToNativeObject<DOMApplicationCache>(V8ClassIndex::DOMAPPLICATIONCACHE, info.Holder()); - ApplicationCacheHost::EventID eventType = toEventID(name); - - if (EventListener* oldListener = appcache->getAttributeEventListener(eventType)) { - v8::Local<v8::Object> object = eventListenerToV8Object(oldListener); - removeHiddenDependency(info.Holder(), object, V8Custom::kDOMApplicationCacheCacheIndex); - appcache->clearAttributeEventListener(eventType); - } - - if (value->IsFunction()) { - RefPtr<EventListener> newListener = argumentToEventListener(appcache, value, kFindOrCreate); - if (newListener) { - createHiddenDependency(info.Holder(), value, V8Custom::kDOMApplicationCacheCacheIndex); - appcache->setAttributeEventListener(eventType, newListener); - } - } -} - -======= ->>>>>>> webkit.org at 49305:WebCore/bindings/v8/custom/V8DOMApplicationCacheCustom.cpp // Handles appcache.addEventListner(name, func, capture) method calls CALLBACK_FUNC_DECL(DOMApplicationCacheAddEventListener) { diff --git a/WebCore/config.h b/WebCore/config.h index 7460946..888644b 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -75,16 +75,6 @@ #endif /* PLATFORM(WIN_OS) */ -<<<<<<< HEAD:WebCore/config.h -// On MSW, wx headers need to be included before windows.h is. -// The only way we can always ensure this is if we include wx here. -#if PLATFORM(WX) -// The defines in KeyboardCodes.h conflict with Windows as well, and the only way I've found -// to address the problem is include KeyboarddCodes.h before windows.h, so do it here. -#include "KeyboardCodes.h" -#include <wx/defs.h> -#endif - // ANDROID def should be after all PLATFORM to avoid override. // USE_SYSTEM_MALLOC needs to be defined before include FastMalloc.h #if PLATFORM(ANDROID) @@ -140,8 +130,6 @@ #define ENABLE_GEOLOCATION 1 #endif // PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at 49305:WebCore/config.h #ifdef __cplusplus // These undefs match up with defines in WebCorePrefix.h for Mac OS X. diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp index bee07cd..a305837 100644 --- a/WebCore/dom/Node.cpp +++ b/WebCore/dom/Node.cpp @@ -2413,18 +2413,16 @@ bool Node::addEventListener(const AtomicString& eventType, PassRefPtr<EventListe if (Document* document = this->document()) document->addListenerTypeIfNeeded(eventType); updateSVGElementInstancesAfterEventListenerChange(this); -<<<<<<< HEAD:WebCore/dom/Node.cpp #if ENABLE(TOUCH_EVENTS) // Android - if (eventType == eventNames().touchstartEvent || - eventType == eventNames().touchendEvent || - eventType == eventNames().touchmoveEvent || - eventType == eventNames().touchcancelEvent) - document->addTouchEventListener(this); + if (this->document() && + (eventType == eventNames().touchstartEvent || + eventType == eventNames().touchendEvent || + eventType == eventNames().touchmoveEvent || + eventType == eventNames().touchcancelEvent)) + this->document()->addTouchEventListener(this); #endif -======= return true; ->>>>>>> webkit.org at 49305:WebCore/dom/Node.cpp } bool Node::removeEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture) @@ -2432,22 +2430,17 @@ bool Node::removeEventListener(const AtomicString& eventType, EventListener* lis if (!EventTarget::removeEventListener(eventType, listener, useCapture)) return false; -<<<<<<< HEAD:WebCore/dom/Node.cpp - updateSVGElementInstancesAfterEventListenerChange(this); + updateSVGElementInstancesAfterEventListenerChange(this); + #if ENABLE(TOUCH_EVENTS) // Android - if (eventType == eventNames().touchstartEvent || - eventType == eventNames().touchendEvent || - eventType == eventNames().touchmoveEvent || - eventType == eventNames().touchcancelEvent) - document()->removeTouchEventListener(this); + if (this->document() && + (eventType == eventNames().touchstartEvent || + eventType == eventNames().touchendEvent || + eventType == eventNames().touchmoveEvent || + eventType == eventNames().touchcancelEvent)) + this->document()->removeTouchEventListener(this); #endif - return; - } - } -======= - updateSVGElementInstancesAfterEventListenerChange(this); return true; ->>>>>>> webkit.org at 49305:WebCore/dom/Node.cpp } EventTargetData* Node::eventTargetData() @@ -2455,20 +2448,9 @@ EventTargetData* Node::eventTargetData() return hasRareData() ? rareData()->eventTargetData() : 0; } -<<<<<<< HEAD:WebCore/dom/Node.cpp -#if ENABLE(TOUCH_EVENTS) // Android - document()->removeTouchEventListener(this); -#endif - - size_t size = listeners->size(); - for (size_t i = 0; i < size; ++i) - listeners->at(i)->setRemoved(true); - listeners->clear(); -======= EventTargetData* Node::ensureEventTargetData() { return ensureRareData()->ensureEventTargetData(); ->>>>>>> webkit.org at 49305:WebCore/dom/Node.cpp } void Node::handleLocalEvents(Event* event) @@ -2912,387 +2894,6 @@ void Node::defaultEventHandler(Event* event) } } -<<<<<<< HEAD:WebCore/dom/Node.cpp -EventListener* Node::onabort() const -{ - return getAttributeEventListener(eventNames().abortEvent); -} - -void Node::setOnabort(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().abortEvent, eventListener); -} - -EventListener* Node::onblur() const -{ - return getAttributeEventListener(eventNames().blurEvent); -} - -void Node::setOnblur(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().blurEvent, eventListener); -} - -EventListener* Node::onchange() const -{ - return getAttributeEventListener(eventNames().changeEvent); -} - -void Node::setOnchange(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().changeEvent, eventListener); -} - -EventListener* Node::onclick() const -{ - return getAttributeEventListener(eventNames().clickEvent); -} - -void Node::setOnclick(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().clickEvent, eventListener); -} - -EventListener* Node::oncontextmenu() const -{ - return getAttributeEventListener(eventNames().contextmenuEvent); -} - -void Node::setOncontextmenu(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().contextmenuEvent, eventListener); -} - -EventListener* Node::ondblclick() const -{ - return getAttributeEventListener(eventNames().dblclickEvent); -} - -void Node::setOndblclick(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dblclickEvent, eventListener); -} - -EventListener* Node::onerror() const -{ - return getAttributeEventListener(eventNames().errorEvent); -} - -void Node::setOnerror(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().errorEvent, eventListener); -} - -EventListener* Node::onfocus() const -{ - return getAttributeEventListener(eventNames().focusEvent); -} - -void Node::setOnfocus(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().focusEvent, eventListener); -} - -EventListener* Node::oninput() const -{ - return getAttributeEventListener(eventNames().inputEvent); -} - -void Node::setOninput(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().inputEvent, eventListener); -} - -EventListener* Node::onkeydown() const -{ - return getAttributeEventListener(eventNames().keydownEvent); -} - -void Node::setOnkeydown(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().keydownEvent, eventListener); -} - -EventListener* Node::onkeypress() const -{ - return getAttributeEventListener(eventNames().keypressEvent); -} - -void Node::setOnkeypress(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().keypressEvent, eventListener); -} - -EventListener* Node::onkeyup() const -{ - return getAttributeEventListener(eventNames().keyupEvent); -} - -void Node::setOnkeyup(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().keyupEvent, eventListener); -} - -EventListener* Node::onload() const -{ - return getAttributeEventListener(eventNames().loadEvent); -} - -void Node::setOnload(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().loadEvent, eventListener); -} - -EventListener* Node::onmousedown() const -{ - return getAttributeEventListener(eventNames().mousedownEvent); -} - -void Node::setOnmousedown(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mousedownEvent, eventListener); -} - -EventListener* Node::onmousemove() const -{ - return getAttributeEventListener(eventNames().mousemoveEvent); -} - -void Node::setOnmousemove(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mousemoveEvent, eventListener); -} - -EventListener* Node::onmouseout() const -{ - return getAttributeEventListener(eventNames().mouseoutEvent); -} - -void Node::setOnmouseout(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mouseoutEvent, eventListener); -} - -EventListener* Node::onmouseover() const -{ - return getAttributeEventListener(eventNames().mouseoverEvent); -} - -void Node::setOnmouseover(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mouseoverEvent, eventListener); -} - -EventListener* Node::onmouseup() const -{ - return getAttributeEventListener(eventNames().mouseupEvent); -} - -void Node::setOnmouseup(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mouseupEvent, eventListener); -} - -EventListener* Node::onmousewheel() const -{ - return getAttributeEventListener(eventNames().mousewheelEvent); -} - -void Node::setOnmousewheel(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().mousewheelEvent, eventListener); -} - -EventListener* Node::ondragenter() const -{ - return getAttributeEventListener(eventNames().dragenterEvent); -} - -void Node::setOndragenter(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragenterEvent, eventListener); -} - -EventListener* Node::ondragover() const -{ - return getAttributeEventListener(eventNames().dragoverEvent); -} - -void Node::setOndragover(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragoverEvent, eventListener); -} - -EventListener* Node::ondragleave() const -{ - return getAttributeEventListener(eventNames().dragleaveEvent); -} - -void Node::setOndragleave(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragleaveEvent, eventListener); -} - -EventListener* Node::ondrop() const -{ - return getAttributeEventListener(eventNames().dropEvent); -} - -void Node::setOndrop(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dropEvent, eventListener); -} - -EventListener* Node::ondragstart() const -{ - return getAttributeEventListener(eventNames().dragstartEvent); -} - -void Node::setOndragstart(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragstartEvent, eventListener); -} - -EventListener* Node::ondrag() const -{ - return getAttributeEventListener(eventNames().dragEvent); -} - -void Node::setOndrag(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragEvent, eventListener); -} - -EventListener* Node::ondragend() const -{ - return getAttributeEventListener(eventNames().dragendEvent); -} - -void Node::setOndragend(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().dragendEvent, eventListener); -} - -EventListener* Node::onscroll() const -{ - return getAttributeEventListener(eventNames().scrollEvent); -} - -void Node::setOnscroll(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().scrollEvent, eventListener); -} - -EventListener* Node::onselect() const -{ - return getAttributeEventListener(eventNames().selectEvent); -} - -void Node::setOnselect(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().selectEvent, eventListener); -} - -EventListener* Node::onsubmit() const -{ - return getAttributeEventListener(eventNames().submitEvent); -} - -void Node::setOnsubmit(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().submitEvent, eventListener); -} - -EventListener* Node::onbeforecut() const -{ - return getAttributeEventListener(eventNames().beforecutEvent); -} - -void Node::setOnbeforecut(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().beforecutEvent, eventListener); -} - -EventListener* Node::oncut() const -{ - return getAttributeEventListener(eventNames().cutEvent); -} - -void Node::setOncut(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().cutEvent, eventListener); -} - -EventListener* Node::onbeforecopy() const -{ - return getAttributeEventListener(eventNames().beforecopyEvent); -} - -void Node::setOnbeforecopy(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().beforecopyEvent, eventListener); -} - -EventListener* Node::oncopy() const -{ - return getAttributeEventListener(eventNames().copyEvent); -} - -void Node::setOncopy(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().copyEvent, eventListener); -} - -EventListener* Node::onbeforepaste() const -{ - return getAttributeEventListener(eventNames().beforepasteEvent); -} - -void Node::setOnbeforepaste(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().beforepasteEvent, eventListener); -} - -EventListener* Node::onpaste() const -{ - return getAttributeEventListener(eventNames().pasteEvent); -} - -void Node::setOnpaste(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().pasteEvent, eventListener); -} - -EventListener* Node::onreset() const -{ - return getAttributeEventListener(eventNames().resetEvent); -} - -void Node::setOnreset(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().resetEvent, eventListener); -} - -EventListener* Node::onsearch() const -{ - return getAttributeEventListener(eventNames().searchEvent); -} - -void Node::setOnsearch(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().searchEvent, eventListener); -} - -EventListener* Node::onselectstart() const -{ - return getAttributeEventListener(eventNames().selectstartEvent); -} - -void Node::setOnselectstart(PassRefPtr<EventListener> eventListener) -{ - setAttributeEventListener(eventNames().selectstartEvent, eventListener); -} - #if ENABLE(TOUCH_EVENTS) // Android EventListener* Node::ontouchstart() const { @@ -3335,8 +2936,6 @@ void Node::setOntouchcancel(PassRefPtr<EventListener> eventListener) } #endif // ENABLE(TOUCH_EVENT) -======= ->>>>>>> webkit.org at 49305:WebCore/dom/Node.cpp } // namespace WebCore #ifndef NDEBUG diff --git a/WebCore/dom/Node.h b/WebCore/dom/Node.h index c57c49f..8c6cce7 100644 --- a/WebCore/dom/Node.h +++ b/WebCore/dom/Node.h @@ -511,7 +511,6 @@ public: unsigned short compareDocumentPosition(Node*); -<<<<<<< HEAD:WebCore/dom/Node.h #ifdef ANDROID_INSTRUMENT // Overridden to prevent the normal new from being called. void* operator new(size_t) throw(); @@ -522,21 +521,6 @@ public: static size_t reportDOMNodesSize(); #endif -protected: - virtual void willMoveToNewOwnerDocument(); - virtual void didMoveToNewOwnerDocument(); - - virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const { } - void setTabIndexExplicitly(short); - - bool hasRareData() const { return m_hasRareData; } - - NodeRareData* rareData() const; - NodeRareData* ensureRareData(); - -public: -======= ->>>>>>> webkit.org at 49305:WebCore/dom/Node.h virtual Node* toNode() { return this; } virtual ScriptExecutionContext* scriptExecutionContext() const; @@ -582,91 +566,6 @@ public: */ virtual bool disabled() const; -<<<<<<< HEAD:WebCore/dom/Node.h - const RegisteredEventListenerVector& eventListeners() const; - - // These 4 attribute event handler attributes are overrided by HTMLBodyElement - // and HTMLFrameSetElement to forward to the DOMWindow. - virtual EventListener* onblur() const; - virtual void setOnblur(PassRefPtr<EventListener>); - virtual EventListener* onerror() const; - virtual void setOnerror(PassRefPtr<EventListener>); - virtual EventListener* onfocus() const; - virtual void setOnfocus(PassRefPtr<EventListener>); - virtual EventListener* onload() const; - virtual void setOnload(PassRefPtr<EventListener>); - - EventListener* onabort() const; - void setOnabort(PassRefPtr<EventListener>); - EventListener* onchange() const; - void setOnchange(PassRefPtr<EventListener>); - EventListener* onclick() const; - void setOnclick(PassRefPtr<EventListener>); - EventListener* oncontextmenu() const; - void setOncontextmenu(PassRefPtr<EventListener>); - EventListener* ondblclick() const; - void setOndblclick(PassRefPtr<EventListener>); - EventListener* oninput() const; - void setOninput(PassRefPtr<EventListener>); - EventListener* onkeydown() const; - void setOnkeydown(PassRefPtr<EventListener>); - EventListener* onkeypress() const; - void setOnkeypress(PassRefPtr<EventListener>); - EventListener* onkeyup() const; - void setOnkeyup(PassRefPtr<EventListener>); - EventListener* onmousedown() const; - void setOnmousedown(PassRefPtr<EventListener>); - EventListener* onmousemove() const; - void setOnmousemove(PassRefPtr<EventListener>); - EventListener* onmouseout() const; - void setOnmouseout(PassRefPtr<EventListener>); - EventListener* onmouseover() const; - void setOnmouseover(PassRefPtr<EventListener>); - EventListener* onmouseup() const; - void setOnmouseup(PassRefPtr<EventListener>); - EventListener* onmousewheel() const; - void setOnmousewheel(PassRefPtr<EventListener>); - EventListener* ondragenter() const; - void setOndragenter(PassRefPtr<EventListener>); - EventListener* ondragover() const; - void setOndragover(PassRefPtr<EventListener>); - EventListener* ondragleave() const; - void setOndragleave(PassRefPtr<EventListener>); - EventListener* ondrop() const; - void setOndrop(PassRefPtr<EventListener>); - EventListener* ondragstart() const; - void setOndragstart(PassRefPtr<EventListener>); - EventListener* ondrag() const; - void setOndrag(PassRefPtr<EventListener>); - EventListener* ondragend() const; - void setOndragend(PassRefPtr<EventListener>); - EventListener* onscroll() const; - void setOnscroll(PassRefPtr<EventListener>); - EventListener* onselect() const; - void setOnselect(PassRefPtr<EventListener>); - EventListener* onsubmit() const; - void setOnsubmit(PassRefPtr<EventListener>); - - // WebKit extensions - EventListener* onbeforecut() const; - void setOnbeforecut(PassRefPtr<EventListener>); - EventListener* oncut() const; - void setOncut(PassRefPtr<EventListener>); - EventListener* onbeforecopy() const; - void setOnbeforecopy(PassRefPtr<EventListener>); - EventListener* oncopy() const; - void setOncopy(PassRefPtr<EventListener>); - EventListener* onbeforepaste() const; - void setOnbeforepaste(PassRefPtr<EventListener>); - EventListener* onpaste() const; - void setOnpaste(PassRefPtr<EventListener>); - EventListener* onreset() const; - void setOnreset(PassRefPtr<EventListener>); - EventListener* onsearch() const; - void setOnsearch(PassRefPtr<EventListener>); - EventListener* onselectstart() const; - void setOnselectstart(PassRefPtr<EventListener>); - #if ENABLE(TOUCH_EVENTS) // Android EventListener* ontouchstart() const; void setOntouchstart(PassRefPtr<EventListener>); @@ -678,8 +577,6 @@ public: void setOntouchcancel(PassRefPtr<EventListener>); #endif -======= ->>>>>>> webkit.org at 49305:WebCore/dom/Node.h using TreeShared<Node>::ref; using TreeShared<Node>::deref; diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp index 5689e73..5050237 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -60,13 +60,10 @@ #include "RenderTextControlSingleLine.h" #include "RenderTheme.h" #include "TextEvent.h" -<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS #include "WebViewCore.h" #endif -======= #include <wtf/MathExtras.h> ->>>>>>> webkit.org at 49305:WebCore/html/HTMLInputElement.cpp #include <wtf/StdLibExtras.h> using namespace std; diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp index e90db4a..0136e08 100644 --- a/WebCore/html/HTMLMediaElement.cpp +++ b/WebCore/html/HTMLMediaElement.cpp @@ -1630,20 +1630,11 @@ void HTMLMediaElement::updatePlayState() m_playbackProgressTimer.stop(); m_playing = false; float time = currentTime(); -<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp - if (m_lastSeekTime < time) - m_playedTimeRanges->add(m_lastSeekTime, time); -======= if (time > m_lastSeekTime) addPlayedRange(m_lastSeekTime, time); ->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp } else if (couldPlayIfEnoughData() && playerPaused) m_player->prepareToPlay(); -<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp if (renderer()) renderer()->updateFromElement(); } diff --git a/WebCore/inspector/InspectorController.h b/WebCore/inspector/InspectorController.h index 6c6fcfb..dcbfe38 100644 --- a/WebCore/inspector/InspectorController.h +++ b/WebCore/inspector/InspectorController.h @@ -64,11 +64,8 @@ class GraphicsContext; class HitTestResult; class InspectorClient; class InspectorDOMAgent; -<<<<<<< HEAD:WebCore/inspector/InspectorController.h -======= class InspectorFrontend; class InspectorTimelineAgent; ->>>>>>> webkit.org at 49305:WebCore/inspector/InspectorController.h class JavaScriptCallFrame; class KURL; class Node; @@ -303,11 +300,7 @@ public: private: #if !PLATFORM(ANDROID) friend class InspectorBackend; -<<<<<<< HEAD:WebCore/inspector/InspectorController.h #endif - -======= ->>>>>>> webkit.org at 49305:WebCore/inspector/InspectorController.h // Following are used from InspectorBackend and internally. void scriptObjectReady(); void moveWindowBy(float x, float y) const; @@ -398,15 +391,12 @@ private: #if !PLATFORM(ANDROID) OwnPtr<InspectorFrontend> m_frontend; RefPtr<InspectorBackend> m_inspectorBackend; -<<<<<<< HEAD:WebCore/inspector/InspectorController.h #endif -======= HashMap<String, ScriptValue> m_idToWrappedObject; ObjectGroupsMap m_objectGroups; long m_lastBoundObjectId; Vector<pair<long, String> > m_pendingEvaluateTestCommands; ->>>>>>> webkit.org at 49305:WebCore/inspector/InspectorController.h #if ENABLE(JAVASCRIPT_DEBUGGER) bool m_debuggerEnabled; bool m_attachDebuggerWhenShown; diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h index 1220a0e..1fa2b65 100644 --- a/WebCore/loader/DocumentLoader.h +++ b/WebCore/loader/DocumentLoader.h @@ -43,11 +43,7 @@ namespace WebCore { class Archive; class ArchiveResource; class ArchiveResourceCollection; -<<<<<<< HEAD:WebCore/loader/DocumentLoader.h #endif - class CachedPage; -======= ->>>>>>> webkit.org at 49305:WebCore/loader/DocumentLoader.h class Frame; class FrameLoader; class MainResourceLoader; diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 9dfefcd..fffd6ee 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -114,7 +114,6 @@ #include "SVGViewSpec.h" #endif -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #include "RenderArena.h" @@ -122,10 +121,10 @@ #if PLATFORM(ANDROID) #include "WebCoreFrameBridge.h" -======= +#endif + #if PLATFORM(MAC) || PLATFORM(WIN) #define PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS ->>>>>>> webkit.org at 49305:WebCore/loader/FrameLoader.cpp #endif namespace WebCore { diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h index 7973ca5..a20bd43 100644 --- a/WebCore/loader/FrameLoaderClient.h +++ b/WebCore/loader/FrameLoaderClient.h @@ -73,15 +73,11 @@ namespace WebCore { class String; class Widget; -<<<<<<< HEAD:WebCore/loader/FrameLoaderClient.h #ifdef ANDROID_HISTORY_CLIENT class BackForwardList; #endif - typedef void (FrameLoader::*FramePolicyFunction)(PolicyAction); -======= typedef void (PolicyChecker::*FramePolicyFunction)(PolicyAction); ->>>>>>> webkit.org at 49305:WebCore/loader/FrameLoaderClient.h class FrameLoaderClient { public: diff --git a/WebCore/loader/appcache/DOMApplicationCache.cpp b/WebCore/loader/appcache/DOMApplicationCache.cpp index 1496b8a..29c1bd5 100644 --- a/WebCore/loader/appcache/DOMApplicationCache.cpp +++ b/WebCore/loader/appcache/DOMApplicationCache.cpp @@ -120,14 +120,11 @@ EventTargetData* DOMApplicationCache::eventTargetData() return &m_eventTargetData; } -<<<<<<< HEAD:WebCore/loader/appcache/DOMApplicationCache.cpp -======= EventTargetData* DOMApplicationCache::ensureEventTargetData() { return &m_eventTargetData; } ->>>>>>> webkit.org at 49305:WebCore/loader/appcache/DOMApplicationCache.cpp } // namespace WebCore #endif // ENABLE(OFFLINE_WEB_APPLICATIONS) diff --git a/WebCore/page/Coordinates.h b/WebCore/page/Coordinates.h index bd29d42..50003ce 100644 --- a/WebCore/page/Coordinates.h +++ b/WebCore/page/Coordinates.h @@ -50,11 +50,7 @@ public: bool canProvideAltitudeAccuracy() const { return m_canProvideAltitudeAccuracy; } bool canProvideHeading() const { return m_canProvideHeading; } bool canProvideSpeed() const { return m_canProvideSpeed; } -<<<<<<< HEAD:WebCore/page/Coordinates.h - -======= ->>>>>>> webkit.org at 49305:WebCore/page/Coordinates.h private: Coordinates(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed) : m_latitude(latitude) diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 3e3cbb4..b9b700b 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -248,110 +248,7 @@ namespace WebCore { using EventTarget::dispatchEvent; bool dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget); void dispatchLoadEvent(); -<<<<<<< HEAD:WebCore/page/DOMWindow.h - void dispatchUnloadEvent(RegisteredEventListenerVector* = 0); - PassRefPtr<BeforeUnloadEvent> dispatchBeforeUnloadEvent(RegisteredEventListenerVector* = 0); -======= ->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h - -<<<<<<< HEAD:WebCore/page/DOMWindow.h - // Used for legacy "onEvent" property APIs. - void setAttributeEventListener(const AtomicString& eventType, PassRefPtr<EventListener>); - void clearAttributeEventListener(const AtomicString& eventType); - EventListener* getAttributeEventListener(const AtomicString& eventType) const; - - const RegisteredEventListenerVector& eventListeners() const { return m_eventListeners; } - bool hasEventListener(const AtomicString& eventType); - void removeAllEventListeners(); - - EventListener* onabort() const; - void setOnabort(PassRefPtr<EventListener>); - EventListener* onblur() const; - void setOnblur(PassRefPtr<EventListener>); - EventListener* onchange() const; - void setOnchange(PassRefPtr<EventListener>); - EventListener* onclick() const; - void setOnclick(PassRefPtr<EventListener>); - EventListener* ondblclick() const; - void setOndblclick(PassRefPtr<EventListener>); - EventListener* ondrag() const; - void setOndrag(PassRefPtr<EventListener>); - EventListener* ondragend() const; - void setOndragend(PassRefPtr<EventListener>); - EventListener* ondragenter() const; - void setOndragenter(PassRefPtr<EventListener>); - EventListener* ondragleave() const; - void setOndragleave(PassRefPtr<EventListener>); - EventListener* ondragover() const; - void setOndragover(PassRefPtr<EventListener>); - EventListener* ondragstart() const; - void setOndragstart(PassRefPtr<EventListener>); - EventListener* ondrop() const; - void setOndrop(PassRefPtr<EventListener>); - EventListener* onerror() const; - void setOnerror(PassRefPtr<EventListener>); - EventListener* onfocus() const; - void setOnfocus(PassRefPtr<EventListener>); - EventListener* onkeydown() const; - void setOnkeydown(PassRefPtr<EventListener>); - EventListener* onkeypress() const; - void setOnkeypress(PassRefPtr<EventListener>); - EventListener* onkeyup() const; - void setOnkeyup(PassRefPtr<EventListener>); - EventListener* onload() const; - void setOnload(PassRefPtr<EventListener>); - EventListener* onmousedown() const; - void setOnmousedown(PassRefPtr<EventListener>); - EventListener* onmousemove() const; - void setOnmousemove(PassRefPtr<EventListener>); - EventListener* onmouseout() const; - void setOnmouseout(PassRefPtr<EventListener>); - EventListener* onmouseover() const; - void setOnmouseover(PassRefPtr<EventListener>); - EventListener* onmouseup() const; - void setOnmouseup(PassRefPtr<EventListener>); - EventListener* onmousewheel() const; - void setOnmousewheel(PassRefPtr<EventListener>); - EventListener* onoffline() const; - void setOnoffline(PassRefPtr<EventListener>); - EventListener* ononline() const; - void setOnonline(PassRefPtr<EventListener>); - EventListener* onreset() const; - void setOnreset(PassRefPtr<EventListener>); - EventListener* onresize() const; - void setOnresize(PassRefPtr<EventListener>); - EventListener* onscroll() const; - void setOnscroll(PassRefPtr<EventListener>); - EventListener* onsearch() const; - void setOnsearch(PassRefPtr<EventListener>); - EventListener* onselect() const; - void setOnselect(PassRefPtr<EventListener>); - EventListener* onstorage() const; - void setOnstorage(PassRefPtr<EventListener>); - EventListener* onsubmit() const; - void setOnsubmit(PassRefPtr<EventListener>); - EventListener* onunload() const; - void setOnunload(PassRefPtr<EventListener>); - EventListener* onbeforeunload() const; - void setOnbeforeunload(PassRefPtr<EventListener>); - EventListener* onwebkitanimationstart() const; - void setOnwebkitanimationstart(PassRefPtr<EventListener>); - EventListener* onwebkitanimationiteration() const; - void setOnwebkitanimationiteration(PassRefPtr<EventListener>); - EventListener* onwebkitanimationend() const; - void setOnwebkitanimationend(PassRefPtr<EventListener>); - EventListener* onwebkittransitionend() const; - void setOnwebkittransitionend(PassRefPtr<EventListener>); -#if ENABLE(TOUCH_EVENTS) // Android - EventListener* ontouchstart() const; - void setOntouchstart(PassRefPtr<EventListener>); - EventListener* ontouchend() const; - void setOntouchend(PassRefPtr<EventListener>); - EventListener* ontouchmove() const; - void setOntouchmove(PassRefPtr<EventListener>); - EventListener* ontouchcancel() const; - void setOntouchcancel(PassRefPtr<EventListener>); -======= + DEFINE_ATTRIBUTE_EVENT_LISTENER(abort); DEFINE_ATTRIBUTE_EVENT_LISTENER(blur); DEFINE_ATTRIBUTE_EVENT_LISTENER(change); @@ -416,63 +313,23 @@ namespace WebCore { DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid); #if ENABLE(ORIENTATION_EVENTS) DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange); ->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h #endif -<<<<<<< HEAD:WebCore/page/DOMWindow.h - - EventListener* oncanplay() const; - void setOncanplay(PassRefPtr<EventListener>); - EventListener* oncanplaythrough() const; - void setOncanplaythrough(PassRefPtr<EventListener>); - EventListener* ondurationchange() const; - void setOndurationchange(PassRefPtr<EventListener>); - EventListener* onemptied() const; - void setOnemptied(PassRefPtr<EventListener>); - EventListener* onended() const; - void setOnended(PassRefPtr<EventListener>); - EventListener* onloadeddata() const; - void setOnloadeddata(PassRefPtr<EventListener>); - EventListener* onloadedmetadata() const; - void setOnloadedmetadata(PassRefPtr<EventListener>); - EventListener* onpause() const; - void setOnpause(PassRefPtr<EventListener>); - EventListener* onplay() const; - void setOnplay(PassRefPtr<EventListener>); - EventListener* onplaying() const; - void setOnplaying(PassRefPtr<EventListener>); - EventListener* onratechange() const; - void setOnratechange(PassRefPtr<EventListener>); - EventListener* onseeked() const; - void setOnseeked(PassRefPtr<EventListener>); - EventListener* onseeking() const; - void setOnseeking(PassRefPtr<EventListener>); - EventListener* ontimeupdate() const; - void setOntimeupdate(PassRefPtr<EventListener>); - EventListener* onvolumechange() const; - void setOnvolumechange(PassRefPtr<EventListener>); - EventListener* onwaiting() const; - void setOnwaiting(PassRefPtr<EventListener>); - EventListener* onloadstart() const; - void setOnloadstart(PassRefPtr<EventListener>); - EventListener* onprogress() const; - void setOnprogress(PassRefPtr<EventListener>); - EventListener* onstalled() const; - void setOnstalled(PassRefPtr<EventListener>); - EventListener* onsuspend() const; - void setOnsuspend(PassRefPtr<EventListener>); - EventListener* oninput() const; - void setOninput(PassRefPtr<EventListener>); - EventListener* onmessage() const; - void setOnmessage(PassRefPtr<EventListener>); - EventListener* oncontextmenu() const; - void setOncontextmenu(PassRefPtr<EventListener>); -======= DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart); DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration); DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd); DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd); ->>>>>>> webkit.org at 49305:WebCore/page/DOMWindow.h + +#if ENABLE(TOUCH_EVENTS) // Android + EventListener* ontouchstart() const; + void setOntouchstart(PassRefPtr<EventListener>); + EventListener* ontouchend() const; + void setOntouchend(PassRefPtr<EventListener>); + EventListener* ontouchmove() const; + void setOntouchmove(PassRefPtr<EventListener>); + EventListener* ontouchcancel() const; + void setOntouchcancel(PassRefPtr<EventListener>); +#endif void captureEvents(); void releaseEvents(); diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 3348366..daf5a67 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -143,14 +143,11 @@ public: bool handleMouseReleaseEvent(const PlatformMouseEvent&); bool handleWheelEvent(PlatformWheelEvent&); -<<<<<<< HEAD:WebCore/page/EventHandler.h #if ENABLE(TOUCH_EVENTS) // Android bool handleTouchEvent(const PlatformTouchEvent&); #endif -======= #if ENABLE(CONTEXT_MENUS) ->>>>>>> webkit.org at 49305:WebCore/page/EventHandler.h bool sendContextMenuEvent(const PlatformMouseEvent&); #endif diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 1ded2af..bf877e6 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -41,11 +41,8 @@ namespace WebCore { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp static const char* permissionDeniedErrorMessage = "User denied Geolocation"; -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp Geolocation::GeoNotifier::GeoNotifier(Geolocation* geolocation, PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) : m_geolocation(geolocation) , m_successCallback(successCallback) @@ -63,30 +60,15 @@ Geolocation::GeoNotifier::GeoNotifier(Geolocation* geolocation, PassRefPtr<Posit void Geolocation::GeoNotifier::setFatalError(PassRefPtr<PositionError> error) { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp m_fatalError = error; m_timer.startOneShot(0); -======= - ASSERT(m_successCallback); - // If no options were supplied from JS, we should have created a default set - // of options in JSGeolocationCustom.cpp. - ASSERT(m_options); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp void Geolocation::GeoNotifier::setCachedPosition(Geoposition* cachedPosition) -======= -bool Geolocation::GeoNotifier::hasZeroTimeout() const ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp // We do not take owenership from the caller, but add our own ref count. m_cachedPosition = cachedPosition; m_timer.startOneShot(0); -======= - return m_options->hasTimeout() && m_options->timeout() == 0; ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp } void Geolocation::GeoNotifier::startTimerIfNeeded() @@ -99,7 +81,6 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) { m_timer.stop(); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp if (m_fatalError) { if (m_errorCallback) m_errorCallback->handleEvent(m_fatalError.get()); @@ -114,14 +95,8 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) return; } -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp if (m_errorCallback) { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timed out"); -======= - RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timeout expired"); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp m_errorCallback->handleEvent(error.get()); } m_geolocation->requestTimedOut(this); @@ -299,55 +274,23 @@ void Geolocation::disconnectFrame() void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp RefPtr<GeoNotifier> notifier = makeRequest(successCallback, errorCallback, options); ASSERT(notifier); -======= - RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options); - - if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get())) - notifier->startTimerIfNeeded(); - else { - if (notifier->m_errorCallback) { - RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "Unable to Start"); - notifier->m_errorCallback->handleEvent(error.get()); - } - return; - } ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp m_oneShots.add(notifier); } int Geolocation::watchPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp RefPtr<GeoNotifier> notifier = makeRequest(successCallback, errorCallback, options); ASSERT(notifier); -======= - RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get())) - notifier->startTimerIfNeeded(); - else { - if (notifier->m_errorCallback) { - RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "Unable to Start"); - notifier->m_errorCallback->handleEvent(error.get()); - } - return 0; - } - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp static int sIdentifier = 0; m_watchers.set(++sIdentifier, notifier); return sIdentifier; } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp PassRefPtr<Geolocation::GeoNotifier> Geolocation::makeRequest(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { RefPtr<GeoNotifier> notifier = GeoNotifier::create(this, successCallback, errorCallback, options); @@ -391,8 +334,6 @@ void Geolocation::fatalErrorOccurred(Geolocation::GeoNotifier* notifier) m_service->stopUpdating(); } -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp void Geolocation::requestTimedOut(GeoNotifier* notifier) { // If this is a one-shot request, stop it. @@ -402,7 +343,6 @@ void Geolocation::requestTimedOut(GeoNotifier* notifier) m_service->stopUpdating(); } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp void Geolocation::requestReturnedCachedPosition(GeoNotifier* notifier) { // If this is a one-shot request, stop it. @@ -432,8 +372,6 @@ bool Geolocation::haveSuitableCachedPosition(PositionOptions* options) return m_cachedPositionManager->cachedPosition()->timestamp() > currentTimeMillis - options->maximumAge(); } -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp void Geolocation::clearWatch(int watchId) { m_watchers.remove(watchId); @@ -459,17 +397,9 @@ void Geolocation::setIsAllowed(bool allowed) // This may be due to either a new position from the service, or a cached // position. m_allowGeolocation = allowed ? Yes : No; -<<<<<<< HEAD:WebCore/page/Geolocation.cpp if (!isAllowed()) { RefPtr<WebCore::PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage); -======= - - if (isAllowed()) - makeSuccessCallbacks(); - else { - RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, "User disallowed Geolocation"); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp error->setIsFatal(true); handleError(error.get()); return; @@ -506,10 +436,7 @@ void Geolocation::sendPosition(Vector<RefPtr<GeoNotifier> >& notifiers, Geoposit RefPtr<GeoNotifier> notifier = *it; ASSERT(notifier->m_successCallback); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp notifier->m_timer.stop(); -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp notifier->m_successCallback->handleEvent(position); } } @@ -548,29 +475,15 @@ void Geolocation::stopTimers() void Geolocation::handleError(PositionError* error) { ASSERT(error); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - - Vector<RefPtr<GeoNotifier> > oneShotsCopy; - copyToVector(m_oneShots, oneShotsCopy); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp -<<<<<<< HEAD:WebCore/page/Geolocation.cpp Vector<RefPtr<GeoNotifier> > oneShotsCopy; copyToVector(m_oneShots, oneShotsCopy); -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp Vector<RefPtr<GeoNotifier> > watchersCopy; copyValuesToVector(m_watchers, watchersCopy); // Clear the lists before we make the callbacks, to avoid clearing notifiers -<<<<<<< HEAD:WebCore/page/Geolocation.cpp // added by calls to Geolocation methods from the callbacks. -======= - // added by calls to Geolocation methods from the callbacks, and to prevent - // further callbacks to these notifiers. ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp m_oneShots.clear(); if (error->isFatal()) m_watchers.clear(); @@ -602,32 +515,17 @@ void Geolocation::requestPermission() void Geolocation::geolocationServicePositionChanged(GeolocationService*) { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - ASSERT_UNUSED(service, service == m_service); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp ASSERT(m_service->lastPosition()); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp m_cachedPositionManager->setCachedPosition(m_service->lastPosition()); -======= ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp // Stop all currently running timers. stopTimers(); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp if (!isAllowed()) { // requestPermission() will ask the chrome for permission. This may be // implemented synchronously or asynchronously. In both cases, -<<<<<<< HEAD:WebCore/page/Geolocation.cpp // makeSucessCallbacks() will be called if permission is granted, so -======= - // makeSuccessCallbacks() will be called if permission is granted, so ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp // there's nothing more to do here. requestPermission(); return; @@ -640,32 +538,15 @@ void Geolocation::makeSuccessCallbacks() { ASSERT(m_service->lastPosition()); ASSERT(isAllowed()); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp Vector<RefPtr<GeoNotifier> > oneShotsCopy; copyToVector(m_oneShots, oneShotsCopy); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp Vector<RefPtr<GeoNotifier> > watchersCopy; copyValuesToVector(m_watchers, watchersCopy); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp // Clear the lists before we make the callbacks, to avoid clearing notifiers -<<<<<<< HEAD:WebCore/page/Geolocation.cpp // added by calls to Geolocation methods from the callbacks. -======= - // added by calls to Geolocation methods from the callbacks, and to prevent - // further callbacks to these notifiers. ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.cpp m_oneShots.clear(); sendPosition(oneShotsCopy, m_service->lastPosition()); diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 5b3d156..9b3b43f 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -82,12 +82,8 @@ private: public: static PassRefPtr<GeoNotifier> create(Geolocation* geolocation, PassRefPtr<PositionCallback> positionCallback, PassRefPtr<PositionErrorCallback> positionErrorCallback, PassRefPtr<PositionOptions> options) { return adoptRef(new GeoNotifier(geolocation, positionCallback, positionErrorCallback, options)); } -<<<<<<< HEAD:WebCore/page/Geolocation.h void setFatalError(PassRefPtr<PositionError> error); void setCachedPosition(Geoposition* cachedPosition); -======= - bool hasZeroTimeout() const; ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h void startTimerIfNeeded(); void timerFired(Timer<GeoNotifier>*); @@ -100,22 +96,14 @@ private: RefPtr<Geoposition> m_cachedPosition; private: -<<<<<<< HEAD:WebCore/page/Geolocation.h GeoNotifier(Geolocation* geolocation, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); -======= - GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h }; bool hasListeners() const { return !m_oneShots.isEmpty() || !m_watchers.isEmpty(); } void sendError(Vector<RefPtr<GeoNotifier> >&, PositionError*); void sendPosition(Vector<RefPtr<GeoNotifier> >&, Geoposition*); -<<<<<<< HEAD:WebCore/page/Geolocation.h -======= - ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h static void stopTimer(Vector<RefPtr<GeoNotifier> >&); void stopTimersForOneShots(); void stopTimersForWatchers(); @@ -131,20 +119,13 @@ private: virtual void geolocationServicePositionChanged(GeolocationService*); virtual void geolocationServiceErrorOccurred(GeolocationService*); -<<<<<<< HEAD:WebCore/page/Geolocation.h // EventListener virtual void handleEvent(Event*, bool isWindowEvent); -======= -<<<<<<< HEAD:WebCore/page/Geolocation.h ->>>>>>> Merge webkit.org at R49305 : Automatic merge by git.:WebCore/page/Geolocation.h void fatalErrorOccurred(GeoNotifier* notifier); void requestTimedOut(GeoNotifier* notifier); void requestReturnedCachedPosition(GeoNotifier* notifier); bool haveSuitableCachedPosition(PositionOptions*); -======= - void requestTimedOut(GeoNotifier*); ->>>>>>> webkit.org at 49305:WebCore/page/Geolocation.h typedef HashSet<RefPtr<GeoNotifier> > GeoNotifierSet; typedef HashMap<int, RefPtr<GeoNotifier> > GeoNotifierMap; diff --git a/WebCore/page/PositionCallback.h b/WebCore/page/PositionCallback.h index 30da2c1..9f36d7a 100644 --- a/WebCore/page/PositionCallback.h +++ b/WebCore/page/PositionCallback.h @@ -36,11 +36,7 @@ namespace WebCore { class PositionCallback : public RefCounted<PositionCallback> { public: virtual ~PositionCallback() { } -<<<<<<< HEAD:WebCore/page/PositionCallback.h - virtual void handleEvent(Geoposition* position) = 0; -======= virtual void handleEvent(Geoposition*) = 0; ->>>>>>> webkit.org at 49305:WebCore/page/PositionCallback.h }; } // namespace WebCore diff --git a/WebCore/page/PositionError.h b/WebCore/page/PositionError.h index 5c26fcc..f6f56f0 100644 --- a/WebCore/page/PositionError.h +++ b/WebCore/page/PositionError.h @@ -46,11 +46,7 @@ public: ErrorCode code() const { return m_code; } const String& message() const { return m_message; } void setIsFatal(bool isFatal) { m_isFatal = isFatal; } -<<<<<<< HEAD:WebCore/page/PositionError.h - bool isFatal() { return m_isFatal; } -======= bool isFatal() const { return m_isFatal; } ->>>>>>> webkit.org at 49305:WebCore/page/PositionError.h private: PositionError(ErrorCode code, const String& message) diff --git a/WebCore/page/PositionOptions.h b/WebCore/page/PositionOptions.h index b1746a8..5cb66f7 100644 --- a/WebCore/page/PositionOptions.h +++ b/WebCore/page/PositionOptions.h @@ -33,11 +33,7 @@ namespace WebCore { class PositionOptions : public RefCounted<PositionOptions> { public: -<<<<<<< HEAD:WebCore/page/PositionOptions.h - static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions); } -======= static PassRefPtr<PositionOptions> create() { return adoptRef(new PositionOptions()); } ->>>>>>> webkit.org at 49305:WebCore/page/PositionOptions.h bool enableHighAccuracy() const { return m_highAccuracy; } void setEnableHighAccuracy(bool enable) { m_highAccuracy = enable; } diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index 00bd7ed..f9b7ff3 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -74,13 +74,10 @@ namespace WebCore { typedef wxDragImage* DragImageRef; #elif PLATFORM(GTK) typedef GdkPixbuf* DragImageRef; -<<<<<<< HEAD:WebCore/platform/DragImage.h -#elif PLATFORM(ANDROID) - typedef void* DragImageRef; -======= #elif PLATFORM(HAIKU) typedef BBitmap* DragImageRef; ->>>>>>> webkit.org at 49305:WebCore/platform/DragImage.h +#elif PLATFORM(ANDROID) + typedef void* DragImageRef; #endif IntSize dragImageSize(DragImageRef); diff --git a/WebCore/platform/graphics/FloatPoint.h b/WebCore/platform/graphics/FloatPoint.h index 06b280b..7d32bcf 100644 --- a/WebCore/platform/graphics/FloatPoint.h +++ b/WebCore/platform/graphics/FloatPoint.h @@ -95,16 +95,12 @@ public: operator QPointF() const; #endif -<<<<<<< HEAD:WebCore/platform/graphics/FloatPoint.h -#if (PLATFORM(SKIA) || PLATFORM(SGL)) -======= #if PLATFORM(HAIKU) FloatPoint(const BPoint&); operator BPoint() const; #endif -#if PLATFORM(SKIA) ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/FloatPoint.h +#if (PLATFORM(SKIA) || PLATFORM(SGL)) operator SkPoint() const; FloatPoint(const SkPoint&); #endif diff --git a/WebCore/platform/graphics/FloatRect.h b/WebCore/platform/graphics/FloatRect.h index 704241a..50cb095 100644 --- a/WebCore/platform/graphics/FloatRect.h +++ b/WebCore/platform/graphics/FloatRect.h @@ -51,15 +51,11 @@ QT_END_NAMESPACE class wxRect2DDouble; #endif -<<<<<<< HEAD:WebCore/platform/graphics/FloatRect.h -#if (PLATFORM(SKIA) || PLATFORM(SGL)) -======= #if PLATFORM(HAIKU) class BRect; #endif -#if PLATFORM(SKIA) ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/FloatRect.h +#if (PLATFORM(SKIA) || PLATFORM(SGL)) struct SkRect; #endif @@ -147,16 +143,12 @@ public: operator wxRect2DDouble() const; #endif -<<<<<<< HEAD:WebCore/platform/graphics/FloatRect.h -#if (PLATFORM(SKIA) || PLATFORM(SGL)) -======= #if PLATFORM(HAIKU) FloatRect(const BRect&); operator BRect() const; #endif -#if PLATFORM(SKIA) ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/FloatRect.h +#if (PLATFORM(SKIA) || PLATFORM(SGL)) FloatRect(const SkRect&); operator SkRect() const; #endif diff --git a/WebCore/platform/graphics/ImageSource.h b/WebCore/platform/graphics/ImageSource.h index eabeeab..19c7bf7 100644 --- a/WebCore/platform/graphics/ImageSource.h +++ b/WebCore/platform/graphics/ImageSource.h @@ -70,7 +70,6 @@ typedef CGImageRef NativeImagePtr; class ImageDecoderQt; typedef ImageDecoderQt* NativeImageSourcePtr; typedef QPixmap* NativeImagePtr; -<<<<<<< HEAD:WebCore/platform/graphics/ImageSource.h #elif PLATFORM(ANDROID) #if PLATFORM(SGL) class String; @@ -91,10 +90,7 @@ class ImageDecoder; typedef ImageDecoder* NativeImageSourcePtr; typedef NativeImageSkia* NativeImagePtr; #endif -#elif PLATFORM(CAIRO) -======= #else ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/ImageSource.h class ImageDecoder; typedef ImageDecoder* NativeImageSourcePtr; #if PLATFORM(WX) diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp index 3898386..b64f82b 100644 --- a/WebCore/platform/graphics/MediaPlayer.cpp +++ b/WebCore/platform/graphics/MediaPlayer.cpp @@ -262,19 +262,11 @@ bool MediaPlayer::canLoadPoster() const { return m_private->canLoadPoster(); } -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::setPoster(const String& url) { m_private->setPoster(url); -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp -} -======= } ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::cancelLoad() { @@ -285,11 +277,7 @@ void MediaPlayer::prepareToPlay() { m_private->prepareToPlay(); } -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::play() { m_private->play(); diff --git a/WebCore/platform/graphics/MediaPlayerPrivate.h b/WebCore/platform/graphics/MediaPlayerPrivate.h index 925e563..f5687b3 100644 --- a/WebCore/platform/graphics/MediaPlayerPrivate.h +++ b/WebCore/platform/graphics/MediaPlayerPrivate.h @@ -44,11 +44,8 @@ public: virtual void cancelLoad() = 0; virtual void prepareToPlay() { } -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayerPrivate.h -======= virtual PlatformMedia platformMedia() const { return NoPlatformMedia; } ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayerPrivate.h virtual void play() = 0; virtual void pause() = 0; diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h index 37196fe..8c9b7f1 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.h +++ b/WebCore/platform/image-decoders/ImageDecoder.h @@ -58,11 +58,7 @@ namespace WebCore { DisposeOverwriteBgcolor, // Clear frame to transparent DisposeOverwritePrevious, // Clear frame to previous framebuffer contents }; -<<<<<<< HEAD:WebCore/platform/image-decoders/ImageDecoder.h -#if (PLATFORM(SKIA) || PLATFORM(SGL)) -======= -#if PLATFORM(SKIA) || PLATFORM(QT) ->>>>>>> webkit.org at 49305:WebCore/platform/image-decoders/ImageDecoder.h +#if (PLATFORM(SKIA) || PLATFORM(QT) || PLATFORM(SGL)) typedef uint32_t PixelData; #else typedef unsigned PixelData; @@ -152,13 +148,7 @@ namespace WebCore { inline PixelData* getAddr(int x, int y) { -<<<<<<< HEAD:WebCore/platform/image-decoders/ImageDecoder.h -#if PLATFORM(CAIRO) || PLATFORM(WX) - return m_bytes.data() + (y * width()) + x; -#elif (PLATFORM(SKIA) || PLATFORM(SGL)) -======= -#if PLATFORM(SKIA) ->>>>>>> webkit.org at 49305:WebCore/platform/image-decoders/ImageDecoder.h +#if (PLATFORM(SKIA) || PLATFORM(SGL)) return m_bitmap.getAddr32(x, y); #elif PLATFORM(QT) return reinterpret_cast<QRgb*>(m_image.scanLine(y)) + x; @@ -183,7 +173,7 @@ namespace WebCore { } } -#if PLATFORM(SKIA) +#if (PLATFORM(SKIA) || PLATFORM(SGL)) NativeImageSkia m_bitmap; #elif PLATFORM(QT) mutable QImage m_image; @@ -194,11 +184,6 @@ namespace WebCore { IntSize m_size; // The size of the buffer. This should be the // same as ImageDecoder::m_size. bool m_hasAlpha; // Whether or not any of the pixels in the buffer have transparency. -<<<<<<< HEAD:WebCore/platform/image-decoders/ImageDecoder.h -#elif (PLATFORM(SKIA) || PLATFORM(SGL)) - NativeImageSkia m_bitmap; -======= ->>>>>>> webkit.org at 49305:WebCore/platform/image-decoders/ImageDecoder.h #endif IntRect m_rect; // The rect of the original specified frame within the overall buffer. // This will always just be the entire buffer except for GIF frames diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp index a568cc7..ee11bcb 100644 --- a/WebCore/platform/network/ResourceRequestBase.cpp +++ b/WebCore/platform/network/ResourceRequestBase.cpp @@ -358,11 +358,7 @@ void ResourceRequestBase::updateResourceRequest() const m_resourceRequestUpdated = true; } -<<<<<<< HEAD:WebCore/platform/network/ResourceRequestBase.cpp -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !PLATFORM(ANDROID) -======= -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) ->>>>>>> webkit.org at 49305:WebCore/platform/network/ResourceRequestBase.cpp +#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(ANDROID) unsigned initializeMaximumHTTPConnectionCountPerHost() { // This is used by the loader to control the number of issued parallel load requests. diff --git a/WebCore/platform/wx/TemporaryLinkStubs.cpp b/WebCore/platform/wx/TemporaryLinkStubs.cpp index 5aa6e2c..8b13789 100644 --- a/WebCore/platform/wx/TemporaryLinkStubs.cpp +++ b/WebCore/platform/wx/TemporaryLinkStubs.cpp @@ -1,183 +1 @@ -<<<<<<< HEAD:WebCore/platform/wx/TemporaryLinkStubs.cpp -/* - * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2008 Collabora, Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#include "config.h" - -#include <stdio.h> -#include <stdlib.h> -#include <float.h> - -#include "AffineTransform.h" -#include "AXObjectCache.h" -#include "BitmapImage.h" -#include "CachedResource.h" -#include "Clipboard.h" -#include "ContextMenu.h" -#include "ContextMenuItem.h" -#include "CookieJar.h" -#include "Cursor.h" -#include "DNS.h" -#include "DocumentFragment.h" -#include "DocumentLoader.h" -#include "DragController.h" -#include "Editor.h" -#include "EditCommand.h" -#include "EventHandler.h" -#include "FileChooser.h" -#include "Font.h" -#include "Frame.h" -#include "FrameLoader.h" -#include "FrameView.h" -#include "Icon.h" -#include "IconDatabase.h" -#include "IconLoader.h" -#include "IntPoint.h" -#include "GraphicsContext.h" -#include "History.h" -#include "KURL.h" -#include "Language.h" -#include "loader.h" -#include "Node.h" -#include "NotImplemented.h" -#include "Pasteboard.h" -#include "Path.h" -#include "PlatformMenuDescription.h" -#include "PlatformMouseEvent.h" -#include "PopupMenu.h" -#include "RenderTheme.h" -#include "ResourceHandle.h" -#include "ResourceHandleInternal.h" -#include "ResourceLoader.h" -#include "Screen.h" -#include "ScrollbarTheme.h" -#include "SearchPopupMenu.h" -#include "Scrollbar.h" -#include "SharedBuffer.h" -#include "SharedTimer.h" -#include "TextBoundaries.h" -#include "Widget.h" - -using namespace WebCore; - -Vector<char> loadResourceIntoArray(const char* resourceName) -{ - Vector<char> resource; - return resource; -} - -int findNextSentenceFromIndex(UChar const*,int,int,bool) { notImplemented(); return 0; } -void findSentenceBoundary(UChar const*,int,int,int*,int*) { notImplemented(); } - -int WebCore::findNextWordFromIndex(UChar const*,int,int,bool) { notImplemented(); return 0; } - -DragImageRef Frame::dragImageForSelection() { notImplemented(); return 0; } - -void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect, int thickness) { notImplemented(); } - -/********************************************************/ -/* Completely empty stubs (mostly to allow DRT to run): */ -/********************************************************/ -static WebCore::Cursor localCursor; -const WebCore::Cursor& WebCore::moveCursor() { return localCursor; } - -void WebCore::findWordBoundary(UChar const* str,int len,int position,int* start, int* end) { notImplemented(); *start=position; *end=position; } - -void Widget::setIsSelected(bool) { notImplemented(); } - -void GraphicsContext::setPlatformShadow(IntSize const&,int,Color const&) { notImplemented(); } -void GraphicsContext::clearPlatformShadow() { notImplemented(); } -void GraphicsContext::beginTransparencyLayer(float) { notImplemented(); } -void GraphicsContext::endTransparencyLayer() { notImplemented(); } -void GraphicsContext::clearRect(const FloatRect&) { notImplemented(); } -void GraphicsContext::strokeRect(const FloatRect&, float) { notImplemented(); } -void GraphicsContext::setLineCap(LineCap) { notImplemented(); } -void GraphicsContext::setLineJoin(LineJoin) { notImplemented(); } -void GraphicsContext::setMiterLimit(float) { notImplemented(); } -void GraphicsContext::setAlpha(float) { notImplemented(); } - -void Image::drawPattern(GraphicsContext*, const FloatRect& srcRect, const TransformationMatrix& patternTransform, const FloatPoint& phase, CompositeOperator, const FloatRect& destRect) { notImplemented(); } - -ScrollbarTheme* ScrollbarTheme::nativeTheme() { notImplemented(); static ScrollbarTheme theme; return &theme; } - -String FileChooser::basenameForWidth(const Font&, int width) const { notImplemented(); return String(); } - -Icon::~Icon() { } -PassRefPtr<Icon> Icon::createIconForFile(const String& filename) { notImplemented(); return 0; } -PassRefPtr<Icon> Icon::createIconForFiles(const Vector<String>& filenames) { notImplemented(); return 0; } -void Icon::paint(GraphicsContext*, const IntRect&) { notImplemented(); } - -ContextMenu::ContextMenu(const HitTestResult& result) : m_hitTestResult(result) { notImplemented(); } -ContextMenu::~ContextMenu() { notImplemented(); } -void ContextMenu::appendItem(ContextMenuItem&) { notImplemented(); } -void ContextMenu::setPlatformDescription(PlatformMenuDescription) { notImplemented(); } - -ContextMenuItem::ContextMenuItem(PlatformMenuItemDescription) { notImplemented(); } -ContextMenuItem::ContextMenuItem(ContextMenu*) { notImplemented(); } -ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction action, const String& title, ContextMenu* subMenu) { notImplemented(); } -ContextMenuItem::~ContextMenuItem() { notImplemented(); } -PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { notImplemented(); return m_platformDescription; } -ContextMenuItemType ContextMenuItem::type() const { notImplemented(); return ActionType; } -void ContextMenuItem::setType(ContextMenuItemType) { notImplemented(); } -ContextMenuAction ContextMenuItem::action() const { notImplemented(); return ContextMenuItemTagNoAction; } -void ContextMenuItem::setAction(ContextMenuAction) { notImplemented(); } -String ContextMenuItem::title() const { notImplemented(); return String(); } -void ContextMenuItem::setTitle(const String&) { notImplemented(); } -//PlatformMenuDescription ContextMenuItem::platformSubMenu() const { notImplemented(); return 0; } -void ContextMenuItem::setSubMenu(ContextMenu*) { notImplemented(); } -void ContextMenuItem::setChecked(bool) { notImplemented(); } -void ContextMenuItem::setEnabled(bool) { notImplemented(); } - -void Editor::showColorPanel() { notImplemented(); } -void Editor::showFontPanel() { notImplemented(); } -void Editor::showStylesPanel() { notImplemented(); } - -bool EventHandler::tabsToAllControls(KeyboardEvent* event) const { notImplemented(); return false; } -bool EventHandler::passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe, HitTestResult*) { notImplemented(); return false; } -bool EventHandler::passMouseDownEventToWidget(Widget*) { notImplemented(); return false; } -bool EventHandler::passWheelEventToWidget(PlatformWheelEvent&, Widget*) { notImplemented(); return false; } - -void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<String>& searchItems) { notImplemented(); } -void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) { notImplemented(); } -SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) : PopupMenu(client) { notImplemented(); } -bool SearchPopupMenu::enabled() { return true; } - -namespace WebCore { -float userIdleTime() { notImplemented(); return FLT_MAX; } // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed -void getSupportedKeySizes(Vector<String>&) { notImplemented(); } -String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String &challengeString, const KURL &url) { return String(); } -const char* currentSearchLocaleID() { notImplemented(); return ""; } -const char* currentTextBreakLocaleID() { notImplemented(); return "en_us"; } - -String KURL::fileSystemPath() const { notImplemented(); return String(); } - -PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String&) { notImplemented(); return 0; } - -void prefetchDNS(const String& hostname) { notImplemented(); } - -} -======= ->>>>>>> webkit.org at 49305:WebCore/platform/wx/TemporaryLinkStubs.cpp diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 02fcbce..976e3ea 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -164,20 +164,16 @@ void PluginView::handleEvent(Event* event) handleMouseEvent(static_cast<MouseEvent*>(event)); else if (event->isKeyboardEvent()) handleKeyboardEvent(static_cast<KeyboardEvent*>(event)); -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp #if defined(ANDROID_PLUGINS) else if (event->isTouchEvent()) handleTouchEvent(static_cast<TouchEvent*>(event)); -======= +#endif #if defined(Q_WS_X11) else if (event->type() == eventNames().DOMFocusOutEvent) handleFocusOutEvent(); else if (event->type() == eventNames().DOMFocusInEvent) handleFocusInEvent(); ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp -======= } void PluginView::init() @@ -220,7 +216,6 @@ bool PluginView::startOrAddToUnstartedList() } return start(); ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp } @@ -332,13 +327,10 @@ void PluginView::stop() m_isStarted = false; #if USE(JSC) JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp #endif -======= #if ENABLE(NETSCAPE_PLUGIN_API) #if !PLATFORM(WX) // FIXME: Revisit this when implementing plugins for wx ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp #ifdef XP_WIN // Unsubclass the window if (m_isWindowed) { diff --git a/WebCore/rendering/RenderFlexibleBox.cpp b/WebCore/rendering/RenderFlexibleBox.cpp index 531477e..f32e6e3 100644 --- a/WebCore/rendering/RenderFlexibleBox.cpp +++ b/WebCore/rendering/RenderFlexibleBox.cpp @@ -242,10 +242,6 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren) #endif setHeight(0); -<<<<<<< HEAD:WebCore/rendering/RenderFlexibleBox.cpp - m_overflowHeight = 0; -======= ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderFlexibleBox.cpp m_flexingChildren = m_stretchingChildren = false; initMaxMarginValues(); diff --git a/WebCore/rendering/RenderPartObject.cpp b/WebCore/rendering/RenderPartObject.cpp index cba341b..3867581 100644 --- a/WebCore/rendering/RenderPartObject.cpp +++ b/WebCore/rendering/RenderPartObject.cpp @@ -396,13 +396,8 @@ void RenderPartObject::layout() #else calcWidth(); calcHeight(); -<<<<<<< HEAD:WebCore/rendering/RenderPartObject.cpp #endif - adjustOverflowForBoxShadowAndReflect(); -======= ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderPartObject.cpp - RenderPart::layout(); m_overflow.clear(); diff --git a/WebCore/rendering/RenderTextControlMultiLine.cpp b/WebCore/rendering/RenderTextControlMultiLine.cpp index f1f60ab..6ff9235 100644 --- a/WebCore/rendering/RenderTextControlMultiLine.cpp +++ b/WebCore/rendering/RenderTextControlMultiLine.cpp @@ -27,13 +27,10 @@ #include "Frame.h" #include "HTMLNames.h" #include "HTMLTextAreaElement.h" -<<<<<<< HEAD:WebCore/rendering/RenderTextControlMultiLine.cpp +#include "HitTestResult.h" #ifdef ANDROID_LAYOUT #include "Settings.h" #endif -======= -#include "HitTestResult.h" ->>>>>>> webkit.org at 49305:WebCore/rendering/RenderTextControlMultiLine.cpp namespace WebCore { diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index 8b0b432..3a8225b 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -104,11 +104,7 @@ static inline void updateGuidVersionMap(int guid, String newVersion) // FIXME: This is a quite-awkward restriction to have to program with. // Map null string to empty string (see comment above). -<<<<<<< HEAD:WebCore/storage/Database.cpp - guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.copy()); -======= guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.threadsafeCopy()); ->>>>>>> Merge webkit.org at R49305 : Automatic merge by git.:WebCore/storage/Database.cpp } typedef HashMap<int, HashSet<Database*>*> GuidDatabaseMap; @@ -171,14 +167,8 @@ Database::Database(Document* document, const String& name, const String& expecte #if USE(JSC) JSC::initializeThreading(); -<<<<<<< HEAD:WebCore/storage/Database.cpp - // Database code violates the normal JSCore contract by calling jsUnprotect from a secondary thread, and thus needs additional locking. - JSDOMWindow::commonJSGlobalData()->heap.setGCProtectNeedsLocking(); #elif USE(V8) - // TODO(benm): do we need the extra locking in V8 too? (See JSC comment above) V8::initializeThreading(); -======= ->>>>>>> webkit.org at 49305:WebCore/storage/Database.cpp #endif m_guid = guidForOriginAndName(m_securityOrigin->toString(), name); @@ -655,11 +645,7 @@ Vector<String> Database::tableNames() void Database::setExpectedVersion(const String& version) { -<<<<<<< HEAD:WebCore/storage/Database.cpp - m_expectedVersion = version.copy(); -======= m_expectedVersion = version.threadsafeCopy(); ->>>>>>> Merge webkit.org at R49305 : Automatic merge by git.:WebCore/storage/Database.cpp // Update the in memory database version map. MutexLocker locker(guidMutex()); updateGuidVersionMap(m_guid, version); |