diff options
24 files changed, 34 insertions, 297 deletions
diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index 38faa61..6cad5e3 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -272,10 +272,6 @@ void Mutex::unlock() } #if HAVE(PTHREAD_RWLOCK) -<<<<<<< HEAD:JavaScriptCore/wtf/ThreadingPthreads.cpp - -======= ->>>>>>> webkit.org at r50258.:JavaScriptCore/wtf/ThreadingPthreads.cpp ReadWriteLock::ReadWriteLock() { pthread_rwlock_init(&m_readWriteLock, NULL); diff --git a/WebCore/bindings/js/ScriptController.h b/WebCore/bindings/js/ScriptController.h index 60b18d9..f2a497d 100644 --- a/WebCore/bindings/js/ScriptController.h +++ b/WebCore/bindings/js/ScriptController.h @@ -90,8 +90,6 @@ public: m_windowShells.remove(world); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptController.h -======= ScriptValue executeScript(const ScriptSourceCode&); ScriptValue executeScript(const String& script, bool forceUserGesture = false); ScriptValue executeScriptInIsolatedWorld(unsigned worldID, const String& script, bool forceUserGesture = false); @@ -100,7 +98,6 @@ public: // Returns true if argument is a JavaScript URL. bool executeIfJavaScriptURL(const KURL&, bool userGesture = false, bool replaceDocument = true); ->>>>>>> webkit.org at r50258.:WebCore/bindings/js/ScriptController.h // This function must be called from the main thread. It is safe to call it repeatedly. // Darwin is an exception to this rule: it is OK to call this function from any thread, even reentrantly. static void initializeThreading(); diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index 4aeee0c..d8f2bae 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -254,10 +254,7 @@ #if ENABLE(SHARED_WORKERS) #include "bindings/V8SharedWorker.cpp" -<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp -======= #include "bindings/V8SharedWorkerContext.cpp" ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #endif #if ENABLE(SVG) @@ -386,7 +383,6 @@ #if ENABLE(INSPECTOR) #include "bindings/V8InspectorBackend.cpp" #endif -<<<<<<< HEAD:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp #if PLATFORM(ANDROID) // TODO: Upstream NOTIFICATIONS guard. @@ -395,5 +391,3 @@ #include "bindings/V8NotificationCenter.cpp" #endif #endif -======= ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/DerivedSourcesAllInOne.cpp diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h index c17650a..a958ead 100644 --- a/WebCore/bindings/v8/ScriptController.h +++ b/WebCore/bindings/v8/ScriptController.h @@ -60,15 +60,12 @@ namespace WebCore { // or this accessor should be made JSProxy* V8Proxy* proxy() { return m_proxy.get(); } -<<<<<<< HEAD:WebCore/bindings/v8/ScriptController.h -======= ScriptValue executeScript(const ScriptSourceCode&); ScriptValue executeScript(const String& script, bool forceUserGesture = false); // Returns true if argument is a JavaScript URL. bool executeIfJavaScriptURL(const KURL&, bool userGesture = false, bool replaceDocument = true); ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/ScriptController.h // This function must be called from the main thread. It is safe to call it repeatedly. static void initializeThreading(); diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 89a9f71..514b851 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -435,7 +435,6 @@ #include "V8InspectorBackend.h" #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp #if PLATFORM(ANDROID) // TODO: Upstream these guards to webkit.org #if ENABLE(GEOLOCATION) @@ -454,8 +453,6 @@ #include "V8VoidCallback.h" #endif // PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.cpp namespace WebCore { FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type) diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index ee64125..5478181 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -491,7 +491,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #define DOM_OBJECT_INSPECTOR_TYPES(V) #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h #if ENABLE(GEOLOCATION) #define DOM_OBJECT_GEOLOCATION_TYPES(V) \ V(COORDINATES, Coordinates) \ @@ -523,8 +522,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #if PLATFORM(ANDROID) // This block is modified, but is not Android-specific. -======= ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.h #define DOM_OBJECT_TYPES(V) \ DOM_OBJECT_TYPES_1(V) \ DOM_OBJECT_TYPES_2(V) \ @@ -534,17 +531,11 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); DOM_OBJECT_3D_CANVAS_TYPES(V) \ DOM_OBJECT_XPATH_TYPES(V) \ DOM_OBJECT_XSLT_TYPES(V) \ -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h DOM_OBJECT_GEOLOCATION_TYPES(V) \ DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ DOM_OBJECT_VOIDCALLBACK_TYPES(V) \ -======= ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Index.h DOM_OBJECT_INSPECTOR_TYPES(V) -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h #endif -======= ->>>>>>> webkit.org at r50258.: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 c78d009..d6f5b9f 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -809,12 +809,8 @@ void V8Proxy::clearForClose() { resetIsolatedWorlds(); -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - if (!context().IsEmpty()) { - LOCK_V8; -======= if (!m_context.IsEmpty()) { ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Proxy.cpp + LOCK_V8; v8::HandleScope handleScope; clearDocumentWrapper(); @@ -827,12 +823,8 @@ void V8Proxy::clearForNavigation() disconnectEventListeners(); resetIsolatedWorlds(); -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - if (!context().IsEmpty()) { - LOCK_V8; -======= if (!m_context.IsEmpty()) { ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8Proxy.cpp + LOCK_V8; v8::HandleScope handle; clearDocumentWrapper(); diff --git a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp index 79911ae..3800e04 100644 --- a/WebCore/bindings/v8/V8WorkerContextEventListener.cpp +++ b/WebCore/bindings/v8/V8WorkerContextEventListener.cpp @@ -36,11 +36,8 @@ #include "Event.h" #include "V8Binding.h" -<<<<<<< HEAD:WebCore/bindings/v8/V8WorkerContextEventListener.cpp #include "V8Utilities.h" -======= #include "WorkerContext.h" ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/V8WorkerContextEventListener.cpp #include "WorkerContextExecutionProxy.h" namespace WebCore { diff --git a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp index 128f486..b93619b 100644 --- a/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp +++ b/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp @@ -128,18 +128,16 @@ void WorkerContextExecutionProxy::initV8IfNeeded() v8::V8::IgnoreOutOfMemoryException(); v8::V8::SetFatalErrorHandler(reportFatalErrorInV8); -<<<<<<< HEAD:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp #if PLATFORM(ANDROID) const int workerThreadPreemptionIntervalMs = 5; v8::Locker::StartPreemption(workerThreadPreemptionIntervalMs); #endif -======= + v8::ResourceConstraints resource_constraints; uint32_t here; resource_constraints.set_stack_limit(&here - kWorkerMaxStackSize / sizeof(uint32_t*)); v8::SetResourceConstraints(&resource_constraints); ->>>>>>> webkit.org at r50258.:WebCore/bindings/v8/WorkerContextExecutionProxy.cpp v8Initialized = true; } diff --git a/WebCore/bridge/c/c_instance.cpp b/WebCore/bridge/c/c_instance.cpp index 7db19b6..81b33c8 100644 --- a/WebCore/bridge/c/c_instance.cpp +++ b/WebCore/bridge/c/c_instance.cpp @@ -121,13 +121,10 @@ JSValue CInstance::invokeMethod(ExecState* exec, const MethodList& methodList, c convertValueToNPVariant(exec, args.at(i), &cArgs[i]); // Invoke the 'C' method. -<<<<<<< HEAD:WebCore/bridge/c/c_instance.cpp #ifdef ANDROID_NPN_SETEXCEPTION SetGlobalException(0); #endif -======= bool retval = true; ->>>>>>> webkit.org at r50258.:WebCore/bridge/c/c_instance.cpp NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); @@ -166,13 +163,10 @@ JSValue CInstance::invokeDefaultMethod(ExecState* exec, const ArgList& args) convertValueToNPVariant(exec, args.at(i), &cArgs[i]); // Invoke the 'C' method. -<<<<<<< HEAD:WebCore/bridge/c/c_instance.cpp #ifdef ANDROID_NPN_SETEXCEPTION SetGlobalException(0); #endif -======= bool retval = true; ->>>>>>> webkit.org at r50258.:WebCore/bridge/c/c_instance.cpp NPVariant resultVariant; VOID_TO_NPVARIANT(resultVariant); { diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 9ac1092..174e58d 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -3058,17 +3058,14 @@ PassRefPtr<Event> Document::createEvent(const String& eventType, ExceptionCode& else if (eventType == "SVGZoomEvents") event = SVGZoomEvent::create(); #endif -<<<<<<< HEAD:WebCore/dom/Document.cpp #if ENABLE(TOUCH_EVENTS) // Android - if (eventType == "TouchEvent") - return TouchEvent::create(); + else if (eventType == "TouchEvent") + event = TouchEvent::create(); #endif -======= if (event) { event->setCreatedByDOM(true); return event.release(); } ->>>>>>> webkit.org at r50258.:WebCore/dom/Document.cpp ec = NOT_SUPPORTED_ERR; return 0; } diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 4e6b776..80fcff8 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -118,22 +118,11 @@ #include "SVGViewSpec.h" #endif -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #include "RenderArena.h" #endif -#if PLATFORM(ANDROID) -#include "WebCoreFrameBridge.h" -#endif - -#if PLATFORM(MAC) || PLATFORM(WIN) -#define PAGE_CACHE_ACCEPTS_UNLOAD_HANDLERS -#endif - -======= ->>>>>>> webkit.org at r50258.:WebCore/loader/FrameLoader.cpp namespace WebCore { #if ENABLE(SVG) @@ -1269,66 +1258,6 @@ String FrameLoader::encoding() const return settings ? settings->defaultTextEncodingName() : String(); } -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp -bool FrameLoader::gotoAnchor(const String& name) -{ - ASSERT(m_frame->document()); - - if (!m_frame->document()->haveStylesheetsLoaded()) { - m_frame->document()->setGotoAnchorNeededAfterStylesheetsLoad(true); - return false; - } - - m_frame->document()->setGotoAnchorNeededAfterStylesheetsLoad(false); - - Element* anchorNode = m_frame->document()->findAnchor(name); - -#if ENABLE(SVG) - if (m_frame->document()->isSVGDocument()) { - if (name.startsWith("xpointer(")) { - // We need to parse the xpointer reference here - } else if (name.startsWith("svgView(")) { - RefPtr<SVGSVGElement> svg = static_cast<SVGDocument*>(m_frame->document())->rootElement(); - if (!svg->currentView()->parseViewSpec(name)) - return false; - svg->setUseCurrentView(true); - } else { - if (anchorNode && anchorNode->hasTagName(SVGNames::viewTag)) { - RefPtr<SVGViewElement> viewElement = anchorNode->hasTagName(SVGNames::viewTag) ? static_cast<SVGViewElement*>(anchorNode) : 0; - if (viewElement.get()) { - RefPtr<SVGSVGElement> svg = static_cast<SVGSVGElement*>(SVGLocatable::nearestViewportElement(viewElement.get())); - svg->inheritViewAttributes(viewElement.get()); - } - } - } - // FIXME: need to decide which <svg> to focus on, and zoom to that one - // FIXME: need to actually "highlight" the viewTarget(s) - } -#endif - - m_frame->document()->setCSSTarget(anchorNode); // Setting to null will clear the current target. - - // Implement the rule that "" and "top" both mean top of page as in other browsers. - if (!anchorNode && !(name.isEmpty() || equalIgnoringCase(name, "top"))) - return false; - - if (FrameView* view = m_frame->view()) -#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR - { - // TODO(andreip): check with Grace if this is correct. - android::WebFrame::getWebFrame(m_frame)->setUserInitiatedClick(true); -#endif - view->maintainScrollPositionAtAnchor(anchorNode ? static_cast<Node*>(anchorNode) : m_frame->document()); -#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR - android::WebFrame::getWebFrame(m_frame)->setUserInitiatedClick(false); - } -#endif - - return true; -} - -======= ->>>>>>> webkit.org at r50258.:WebCore/loader/FrameLoader.cpp bool FrameLoader::requestObject(RenderPart* renderer, const String& url, const AtomicString& frameName, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) { diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h index 1323089..31351a3 100644 --- a/WebCore/loader/FrameLoader.h +++ b/WebCore/loader/FrameLoader.h @@ -45,42 +45,9 @@ namespace WebCore { -<<<<<<< HEAD:WebCore/loader/FrameLoader.h #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - class Archive; -#endif - class AuthenticationChallenge; - class CachedFrameBase; - class CachedPage; - class CachedResource; - class Document; - class DocumentLoader; - class Event; - class FormData; - class FormState; - class Frame; - class FrameLoaderClient; - class HistoryItem; - class HTMLAppletElement; - class HTMLFormElement; - class HTMLFrameOwnerElement; - class IconLoader; - class IntSize; - class NavigationAction; - class RenderPart; - class ResourceError; - class ResourceLoader; - class ResourceResponse; - class ScriptSourceCode; - class ScriptString; - class ScriptValue; - class SecurityOrigin; - class SharedBuffer; - class SubstituteData; - class TextResourceDecoder; - class Widget; -======= class Archive; +#endif class AuthenticationChallenge; class CachedFrameBase; class CachedPage; @@ -111,7 +78,6 @@ class SharedBuffer; class SubstituteData; class TextResourceDecoder; class Widget; ->>>>>>> webkit.org at r50258.:WebCore/loader/FrameLoader.h struct FrameLoadRequest; struct WindowFeatures; @@ -144,21 +110,13 @@ public: void loadFrameRequest(const FrameLoadRequest&, bool lockHistory, bool lockBackForwardList, // Called by submitForm, calls loadPostRequest and loadURL. PassRefPtr<Event>, PassRefPtr<FormState>, ReferrerPolicy); -<<<<<<< HEAD:WebCore/loader/FrameLoader.h - void load(const ResourceRequest&, bool lockHistory); // Called by WebFrame, calls load(ResourceRequest, SubstituteData). - void load(const ResourceRequest&, const SubstituteData&, bool lockHistory); // Called both by WebFrame and internally, calls load(DocumentLoader*). - void load(const ResourceRequest&, const String& frameName, bool lockHistory); // Called by WebPluginController. - -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - void loadArchive(PassRefPtr<Archive>); -#endif -======= void load(const ResourceRequest&, bool lockHistory); // Called by WebFrame, calls load(ResourceRequest, SubstituteData). void load(const ResourceRequest&, const SubstituteData&, bool lockHistory); // Called both by WebFrame and internally, calls load(DocumentLoader*). void load(const ResourceRequest&, const String& frameName, bool lockHistory); // Called by WebPluginController. +#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size void loadArchive(PassRefPtr<Archive>); ->>>>>>> webkit.org at r50258.:WebCore/loader/FrameLoader.h +#endif static void reportLocalLoadFailed(Frame*, const String& url); @@ -441,30 +399,23 @@ private: void dispatchDidCommitLoad(); -<<<<<<< HEAD:WebCore/loader/FrameLoader.h -#ifdef ANDROID_USER_GESTURE - void loadPostRequest(const ResourceRequest&, const String& referrer, // Called by loadFrameRequest, calls loadWithNavigationAction - const String& frameName, bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool); - void loadURL(const KURL&, const String& referrer, const String& frameName, // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate - bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool); -#else - void loadPostRequest(const ResourceRequest&, const String& referrer, // Called by loadFrameRequest, calls loadWithNavigationAction - const String& frameName, bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>); - void loadURL(const KURL&, const String& referrer, const String& frameName, // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate - bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>); -#endif -======= void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>); // Calls continueLoadAfterNavigationPolicy void load(DocumentLoader*); // Calls loadWithDocumentLoader ->>>>>>> webkit.org at r50258.:WebCore/loader/FrameLoader.h void loadWithNavigationAction(const ResourceRequest&, const NavigationAction&, // Calls loadWithDocumentLoader bool lockHistory, FrameLoadType, PassRefPtr<FormState>); +#ifdef ANDROID_USER_GESTURE + void loadPostRequest(const ResourceRequest&, const String& referrer, // Called by loadFrameRequest, calls loadWithNavigationAction + const String& frameName, bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool); + void loadURL(const KURL&, const String& referrer, const String& frameName, // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate + bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>, bool); +#else void loadPostRequest(const ResourceRequest&, const String& referrer, // Called by loadFrameRequest, calls loadWithNavigationAction const String& frameName, bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>); void loadURL(const KURL&, const String& referrer, const String& frameName, // Called by loadFrameRequest, calls loadWithNavigationAction or dispatches to navigation policy delegate bool lockHistory, FrameLoadType, PassRefPtr<Event>, PassRefPtr<FormState>); +#endif bool shouldReload(const KURL& currentURL, const KURL& destinationURL); diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp index 1935f56..7d0f697 100644 --- a/WebCore/page/Console.cpp +++ b/WebCore/page/Console.cpp @@ -46,15 +46,7 @@ #include "ScriptCallStack.h" #include <stdio.h> -<<<<<<< HEAD:WebCore/page/Console.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Console.cpp #include <wtf/UnusedParam.h> -<<<<<<< HEAD:WebCore/page/Console.cpp -#endif -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Console.cpp namespace WebCore { diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 5016fc7..944f215 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -74,6 +74,10 @@ #include "SVGViewSpec.h" #endif +#if PLATFORM(ANDROID) +#include "WebCoreFrameBridge.h" +#endif + namespace WebCore { @@ -858,7 +862,14 @@ bool FrameView::scrollToAnchor(const String& name) if (!anchorNode && !(name.isEmpty() || equalIgnoringCase(name, "top"))) return false; +#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR + // TODO(andreip): check with Grace if this is correct. + android::WebFrame::getWebFrame(m_frame.get())->setUserInitiatedClick(true); +#endif maintainScrollPositionAtAnchor(anchorNode ? static_cast<Node*>(anchorNode) : m_frame->document()); +#ifdef ANDROID_SCROLL_ON_GOTO_ANCHOR + android::WebFrame::getWebFrame(m_frame.get())->setUserInitiatedClick(false); +#endif return true; } diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 184ee57..775dcf4 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -34,13 +34,10 @@ #include "EventNames.h" #include "Frame.h" #include "Page.h" -<<<<<<< HEAD:WebCore/page/Geolocation.cpp #include "SQLiteDatabase.h" #include "SQLiteStatement.h" #include "SQLiteTransaction.h" #include "SQLValue.h" -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp namespace WebCore { @@ -98,15 +95,12 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) return; } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp if (m_cachedPosition) { m_successCallback->handleEvent(m_cachedPosition.get()); m_geolocation->requestReturnedCachedPosition(this); return; } -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp if (m_errorCallback) { RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timeout expired"); m_errorCallback->handleEvent(error.get()); @@ -154,7 +148,6 @@ void Geolocation::Watchers::getNotifiersVector(Vector<RefPtr<GeoNotifier> >& cop copyValuesToVector(m_idToNotifierMap, copy); } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp static const char* databaseName = "/CachedPosition.db"; class CachedPositionManager { @@ -293,8 +286,6 @@ RefPtr<Geoposition>* CachedPositionManager::s_cachedPosition; String CachedPositionManager::s_databaseFile; -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp Geolocation::Geolocation(Frame* frame) : EventListener(GeolocationEventListenerType) , m_frame(frame) @@ -331,12 +322,7 @@ void Geolocation::disconnectFrame() void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp ASSERT(notifier); -======= - if (!notifier) - return; ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp m_oneShots.add(notifier); } @@ -344,20 +330,12 @@ void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallbac int Geolocation::watchPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp ASSERT(notifier); -======= - if (!notifier) - return 0; ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp static int nextAvailableWatchId = 1; -<<<<<<< HEAD:WebCore/page/Geolocation.cpp -======= // In case of overflow, make sure the ID remains positive, but reuse the ID values. if (nextAvailableWatchId < 1) nextAvailableWatchId = 1; ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp m_watchers.set(nextAvailableWatchId, notifier.release()); return nextAvailableWatchId++; } @@ -371,7 +349,6 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi if (isDenied()) notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage)); else { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp if (haveSuitableCachedPosition(notifier->m_options.get())) { ASSERT(m_cachedPositionManager->cachedPosition()); if (isAllowed()) @@ -379,24 +356,12 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi else { m_requestsAwaitingCachedPosition.add(notifier); requestPermission(); -======= - 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()); ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp } -<<<<<<< HEAD:WebCore/page/Geolocation.cpp } else { if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get())) notifier->startTimerIfNeeded(); else notifier->setFatalError(PositionError::create(PositionError::UNKNOWN_ERROR, "Failed to start Geolocation service")); -======= - return 0; ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp } } @@ -476,15 +441,8 @@ 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()) { -======= - - if (isAllowed()) - makeSuccessCallbacks(); - else { ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.cpp RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage); error->setIsFatal(true); handleError(error.get()); diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index f5e05a6..d9b23c4 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -94,10 +94,7 @@ private: RefPtr<PositionOptions> m_options; Timer<GeoNotifier> m_timer; RefPtr<PositionError> m_fatalError; -<<<<<<< HEAD:WebCore/page/Geolocation.h RefPtr<Geoposition> m_cachedPosition; -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h private: GeoNotifier(Geolocation*, PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); @@ -139,13 +136,10 @@ private: PassRefPtr<GeoNotifier> startRequest(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>); -<<<<<<< HEAD:WebCore/page/Geolocation.h // EventListener virtual bool operator==(const EventListener&); virtual void handleEvent(ScriptExecutionContext*, Event*); -======= ->>>>>>> webkit.org at r50258.:WebCore/page/Geolocation.h void fatalErrorOccurred(GeoNotifier*); void requestTimedOut(GeoNotifier*); void requestReturnedCachedPosition(GeoNotifier*); diff --git a/WebCore/platform/android/ClipboardAndroid.h b/WebCore/platform/android/ClipboardAndroid.h index e30ea7d..723c991 100644 --- a/WebCore/platform/android/ClipboardAndroid.h +++ b/WebCore/platform/android/ClipboardAndroid.h @@ -35,21 +35,6 @@ namespace WebCore { class CachedImage; -<<<<<<< HEAD:WebCore/platform/android/ClipboardAndroid.h - class ClipboardAndroid : public Clipboard, public CachedResourceClient { - public: - ClipboardAndroid(ClipboardAccessPolicy policy, bool isForDragging); - ~ClipboardAndroid(); - - void clearData(const String&); - void clearAllData(); - String getData(const String&, bool& success) const; - bool setData(const String&, const String&); - - // extensions beyond IE's API - HashSet<String> types() const; - PassRefPtr<FileList> files() const; -======= class ClipboardAndroid : public Clipboard, public CachedResourceClient { public: ClipboardAndroid(ClipboardAccessPolicy policy, bool isForDragging); @@ -62,10 +47,10 @@ public: // extensions beyond IE's API HashSet<String> types() const; + PassRefPtr<FileList> files() const; void setDragImage(CachedImage*, const IntPoint&); void setDragImageElement(Node*, const IntPoint&); ->>>>>>> webkit.org at r50258.:WebCore/platform/android/ClipboardAndroid.h virtual DragImageRef createDragImage(IntPoint&) const; virtual void declareAndWriteDragImage(Element*, const KURL&, const String&, Frame*); diff --git a/WebCore/platform/android/FileChooserAndroid.cpp b/WebCore/platform/android/FileChooserAndroid.cpp index c8e1999..69d0883 100644 --- a/WebCore/platform/android/FileChooserAndroid.cpp +++ b/WebCore/platform/android/FileChooserAndroid.cpp @@ -36,20 +36,11 @@ String FileChooser::basenameForWidth(const Font& font, int width) const return String(); // FIXME: This could be a lot faster, but assuming the data will not // often be much longer than the provided width, this may be fast enough. -<<<<<<< HEAD:WebCore/platform/android/FileChooserAndroid.cpp // If this does not need to be threadsafe, we can use crossThreadString(). // See http://trac.webkit.org/changeset/49160. -======= ->>>>>>> webkit.org at r50258.:WebCore/platform/android/FileChooserAndroid.cpp String output = m_filenames[0].threadsafeCopy(); -<<<<<<< HEAD:WebCore/platform/android/FileChooserAndroid.cpp - while (font.width(TextRun(output.impl())) > width && output.length() > 4) { - output = output.replace(0, 4, String("...")); - } -======= while (font.width(TextRun(output.impl())) > width && output.length() > 4) - output = output.replace(output.length() - 4, 4, String("...")); ->>>>>>> webkit.org at r50258.:WebCore/platform/android/FileChooserAndroid.cpp + output = output.replace(0, 4, String("...")); return output; } diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp index 8ab72c1..936f26b 100644 --- a/WebCore/platform/network/ResourceRequestBase.cpp +++ b/WebCore/platform/network/ResourceRequestBase.cpp @@ -378,11 +378,7 @@ void ResourceRequestBase::updateResourceRequest() const m_resourceRequestUpdated = true; } -<<<<<<< HEAD:WebCore/platform/network/ResourceRequestBase.cpp -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(ANDROID) -======= -#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) ->>>>>>> webkit.org at r50258.:WebCore/platform/network/ResourceRequestBase.cpp +#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) unsigned initializeMaximumHTTPConnectionCountPerHost() { // This is used by the loader to control the number of issued parallel load requests. diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 3632774..0b2f6ec 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -162,7 +162,6 @@ 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)); @@ -171,10 +170,7 @@ void PluginView::handleEvent(Event* event) else if (event->type() == eventNames().DOMFocusInEvent) handleFocusEvent(true); #endif -#if defined(Q_WS_X11) -======= #if defined(Q_WS_X11) && ENABLE(NETSCAPE_PLUGIN_API) ->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.cpp else if (event->type() == eventNames().DOMFocusOutEvent) handleFocusOutEvent(); else if (event->type() == eventNames().DOMFocusInEvent) diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index c805352..8a5706f 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -292,27 +292,22 @@ namespace WebCore { void handleFocusOutEvent(); #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h +#if PLATFORM(WIN_OS) + void paintIntoTransformedContext(HDC); + PassRefPtr<Image> snapshot(); +#endif + #ifdef ANDROID_PLUGINS void handleFocusEvent(bool hasFocus); void handleTouchEvent(TouchEvent*); // called at the end of the base constructor void platformInit(); -======= -#if PLATFORM(WIN_OS) - void paintIntoTransformedContext(HDC); - PassRefPtr<Image> snapshot(); ->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_PLATFORM_SETVALUE // called if the default setValue does not recognize the variable NPError platformSetValue(NPPVariable variable, void* value); #endif -======= - ->>>>>>> webkit.org at r50258.:WebCore/plugins/PluginView.h int m_mode; int m_paramCount; char** m_paramNames; diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h index 2ea2304..674f062 100644 --- a/WebCore/rendering/style/RenderStyle.h +++ b/WebCore/rendering/style/RenderStyle.h @@ -1196,14 +1196,11 @@ public: static const Vector<StyleDashboardRegion>& noneDashboardRegions(); #endif -<<<<<<< HEAD:WebCore/rendering/style/RenderStyle.h #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR static Color initialTapHighlightColor() { return Color::tap; } #endif }; -======= ->>>>>>> webkit.org at r50258.:WebCore/rendering/style/RenderStyle.h } // namespace WebCore #endif // RenderStyle_h diff --git a/WebCore/workers/WorkerContext.cpp b/WebCore/workers/WorkerContext.cpp index e960514..9a88309 100644 --- a/WebCore/workers/WorkerContext.cpp +++ b/WebCore/workers/WorkerContext.cpp @@ -49,15 +49,7 @@ #include "WorkerThreadableLoader.h" #include "XMLHttpRequestException.h" #include <wtf/RefPtr.h> -<<<<<<< HEAD:WebCore/workers/WorkerContext.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r50258.:WebCore/workers/WorkerContext.cpp #include <wtf/UnusedParam.h> -<<<<<<< HEAD:WebCore/workers/WorkerContext.cpp -#endif -======= ->>>>>>> webkit.org at r50258.:WebCore/workers/WorkerContext.cpp #if ENABLE(NOTIFICATIONS) #include "NotificationCenter.h" |