From 3e34395828593d66c12bae3d43c414cdf8d3c9b2 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Nov 2009 18:22:33 -0800 Subject: Bring page/android in line with the versions on WebKit.org. Changes in this CL that require upstreaming: The deletion of InspectorControllerAndroid DragController::cleanupAfterSystemDrag Change-Id: I219a7aa49e3fc3d4193157593b90b11705d98fde --- WebCore/page/android/DragControllerAndroid.cpp | 5 +- .../page/android/InspectorControllerAndroid.cpp | 128 --------------------- 2 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 WebCore/page/android/InspectorControllerAndroid.cpp (limited to 'WebCore/page/android') diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp index e67a277..b20ab60 100644 --- a/WebCore/page/android/DragControllerAndroid.cpp +++ b/WebCore/page/android/DragControllerAndroid.cpp @@ -28,6 +28,7 @@ #include "DragController.h" #include "DragData.h" +#include "NotImplemented.h" namespace WebCore { @@ -39,12 +40,12 @@ bool DragController::isCopyKeyDown() DragOperation DragController::dragOperation(DragData* dragData) { // FIXME: This logic is incomplete - ASSERT(0); + notImplemented(); if (dragData->containsURL()) return DragOperationCopy; return DragOperationNone; -} +} void DragController::cleanupAfterSystemDrag() { diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp deleted file mode 100644 index c72cbf9..0000000 --- a/WebCore/page/android/InspectorControllerAndroid.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright 2007, The Android Open Source Project - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * 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 THE COPYRIGHT HOLDERS ``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 "InspectorController.h" - -#include "InspectorBackend.h" -#include "InspectorClient.h" -#include "InspectorDOMAgent.h" -#include "InspectorFrontend.h" -#include "InspectorTimelineAgent.h" - -#include "Frame.h" -#include "Node.h" -#if USE(JSC) -#include "Profile.h" -#endif - -// Now that Inspector call sites are properly guarded with ENABLE(INSPECTOR), -// this stub is no longer needed. -// TODO: Upstream this to webkit.org. - -// This stub file was created to avoid building and linking in all the -// Inspector codebase. If you would like to enable the Inspector, do the -// following steps: -// 1. Replace this file in WebCore/Android.mk with the common -// implementation, ie page/InsepctorController.cpp -// 2. Add the JS API files to JavaScriptCore/Android.mk: -// ? API/JSBase.cpp \ -// API/JSCallbackConstructor.cpp \ -// API/JSCallbackFunction.cpp \ -// API/JSCallbackObject.cpp \ -// API/JSClassRef.cpp \ -// API/JSContextRef.cpp \ -// API/JSObjectRef.cpp \ -// API/JSStringRef.cpp \ -// API/JSValueRef.cpp -// 3. Add the following LOCAL_C_INCLUDES to JavaScriptCore/Android.mk: -// ?$(LOCAL_PATH)/API \ -// $(LOCAL_PATH)/ForwardingHeaders \ -// $(LOCAL_PATH)/../../WebKit \ -// 4. Rebuild WebKit -// -// Note, for a functional Inspector, you must implement InspectorClientAndroid. - -namespace WebCore { - -struct InspectorResource : public RefCounted { -}; - -#if ENABLE(DATABASE) -struct InspectorDatabaseResource : public RefCounted { -}; -#endif - -#if ENABLE(DOM_STORAGE) -struct InspectorDOMStorageResource : public RefCounted { -}; -#endif - -InspectorController::InspectorController(Page*, InspectorClient* client) -{ - m_client = client; -} - -InspectorController::~InspectorController() { m_client->inspectorDestroyed(); } - -void InspectorController::windowScriptObjectAvailable() {} -void InspectorController::didCommitLoad(DocumentLoader*) {} -void InspectorController::identifierForInitialRequest(unsigned long, DocumentLoader*, ResourceRequest const&) {} -void InspectorController::willSendRequest(DocumentLoader*, unsigned long, ResourceRequest&, ResourceResponse const&) {} -void InspectorController::didReceiveResponse(DocumentLoader*, unsigned long, ResourceResponse const&) {} -void InspectorController::didReceiveContentLength(DocumentLoader*, unsigned long, int) {} -void InspectorController::didFinishLoading(DocumentLoader*, unsigned long) {} -void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader*, const CachedResource*) {} -void InspectorController::frameDetachedFromParent(Frame*) {} -void InspectorController::addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, WebCore::String const&, unsigned int, WebCore::String const&) {} -void InspectorController::addMessageToConsole(WebCore::MessageSource, WebCore::MessageType, WebCore::MessageLevel, ScriptCallStack*) {} -#if ENABLE(DATABASE) -void InspectorController::didOpenDatabase(Database*, String const&, String const&, String const&) {} -#endif -#if ENABLE(DOM_STORAGE) - void InspectorController::didUseDOMStorage(StorageArea* storageArea, bool isLocalStorage, Frame* frame) {} -#endif -bool InspectorController::enabled() const { return false; } -void InspectorController::inspect(Node*) {} -bool InspectorController::windowVisible() { return false; } -void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString) {} -void InspectorController::scriptImported(unsigned long identifier, const String& sourceString) {} -void InspectorController::inspectedPageDestroyed() {} - -void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame) {} -void InspectorController::startGroup(MessageSource source, ScriptCallStack* callFrame) {} -void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL) {} -void InspectorController::startTiming(const String& title) {} -bool InspectorController::stopTiming(const String& title, double& elapsed) { return false; } -void InspectorController::count(const String& title, unsigned lineNumber, const String& sourceID) {} - -void InspectorController::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) {} -void InspectorController::handleMousePressOnNode(Node*) {} - -#if ENABLE(JAVASCRIPT_DEBUGGER) -void InspectorController::didPause() {} -#endif - -} // namespace WebCore -- cgit v1.1