- WebCore/ChangeLog +16 lines
Lines 1-3 WebCore/ChangeLog_sec1
1
2009-11-12  Ben Murdoch  <benm@google.com>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Android] The Android specific files in page/Android are out of date.
6
        https://bugs.webkit.org/show_bug.cgi?id=31437
7
8
        No tests required.
9
10
        * page/android/DragControllerAndroid.cpp:
11
        (WebCore::DragController::dragOperation): Added.
12
        (WebCore::DragController::cleanupAfterSystemDrag):
13
        * page/android/EventHandlerAndroid.cpp:
14
        (WebCore::EventHandler::accessKeyModifiers): Added.
15
        * page/android/InspectorControllerAndroid.cpp: Removed.
16
1
2009-11-12  Jens Alfke  <snej@chromium.org>
17
2009-11-12  Jens Alfke  <snej@chromium.org>
2
18
3
        Reviewed by Dimitri Glazkov.
19
        Reviewed by Dimitri Glazkov.
- WebCore/page/android/DragControllerAndroid.cpp -1 / +5 lines
Lines 45-51 DragOperation DragController::dragOperat WebCore/page/android/DragControllerAndroid.cpp_sec1
45
        return DragOperationCopy;
45
        return DragOperationCopy;
46
46
47
    return DragOperationNone;
47
    return DragOperationNone;
48
} 
48
}
49
50
void DragController::cleanupAfterSystemDrag()
51
{
52
}
49
53
50
const float DragController::DragImageAlpha = 1.0f;
54
const float DragController::DragImageAlpha = 1.0f;
51
static IntSize dummy;
55
static IntSize dummy;
- WebCore/page/android/EventHandlerAndroid.cpp -2 / +5 lines
Lines 39-46 WebCore/page/android/EventHandlerAndroid.cpp_sec1
39
39
40
namespace WebCore {
40
namespace WebCore {
41
41
42
unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
43
44
bool EventHandler::tabsToAllControls(KeyboardEvent*) const
42
bool EventHandler::tabsToAllControls(KeyboardEvent*) const
45
{
43
{
46
    return true;
44
    return true;
Lines 123-128 PassRefPtr<Clipboard> EventHandler::crea WebCore/page/android/EventHandlerAndroid.cpp_sec2
123
    return PassRefPtr<Clipboard>(0);
121
    return PassRefPtr<Clipboard>(0);
124
}
122
}
125
123
124
unsigned EventHandler::accessKeyModifiers()
125
{
126
    return PlatformKeyboardEvent::AltKey;
127
}
128
126
const double EventHandler::TextDragDelay = 0.0;
129
const double EventHandler::TextDragDelay = 0.0;
127
130
128
}  // namespace WebCore
131
}  // namespace WebCore
- WebCore/page/android/InspectorControllerAndroid.cpp -106 lines
Lines 1-106 WebCore/page/android/InspectorControllerAndroid.cpp_sec1
1
/*
2
 * Copyright 2007, The Android Open Source Project
3
 *
4
 * Redistribution and use in source and binary forms, with or without
5
 * modification, are permitted provided that the following conditions
6
 * are met:
7
 *  * Redistributions of source code must retain the above copyright
8
 *    notice, this list of conditions and the following disclaimer.
9
 *  * Redistributions in binary form must reproduce the above copyright
10
 *    notice, this list of conditions and the following disclaimer in the
11
 *    documentation and/or other materials provided with the distribution.
12
 *
13
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24
 */
25
26
#include "config.h"
27
#include "InspectorController.h"
28
29
#include "Frame.h"
30
#include "Node.h"
31
#include "Profile.h"
32
33
// This stub file was created to avoid building and linking in all the
34
// Inspector codebase. If you would like to enable the Inspector, do the
35
// following steps:
36
// 1. Replace this file in WebCore/Android.mk with the common
37
//    implementation, ie page/InsepctorController.cpp
38
// 2. Add the JS API files to JavaScriptCore/Android.mk:
39
// ?  API/JSBase.cpp \
40
//      API/JSCallbackConstructor.cpp \
41
//      API/JSCallbackFunction.cpp \
42
//      API/JSCallbackObject.cpp \
43
//      API/JSClassRef.cpp \
44
//      API/JSContextRef.cpp \
45
//      API/JSObjectRef.cpp \
46
//      API/JSStringRef.cpp \
47
//      API/JSValueRef.cpp
48
// 3. Add the following LOCAL_C_INCLUDES to JavaScriptCore/Android.mk:
49
// ?$(LOCAL_PATH)/API \
50
//      $(LOCAL_PATH)/ForwardingHeaders \
51
//      $(LOCAL_PATH)/../../WebKit \
52
// 4. Rebuild WebKit
53
//
54
// Note, for a functional Inspector, you must implement InspectorClientAndroid.
55
56
namespace WebCore {
57
58
struct InspectorResource : public RefCounted<InspectorResource> {
59
};
60
61
struct InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
62
};
63
64
InspectorController::InspectorController(Page*, InspectorClient*)
65
    : m_startProfiling(this, 0)
66
{
67
}
68
69
InspectorController::~InspectorController() {}
70
71
void InspectorController::windowScriptObjectAvailable() {}
72
void InspectorController::didCommitLoad(DocumentLoader*) {}
73
void InspectorController::identifierForInitialRequest(unsigned long, DocumentLoader*, ResourceRequest const&) {}
74
void InspectorController::willSendRequest(DocumentLoader*, unsigned long, ResourceRequest&, ResourceResponse const&) {}
75
void InspectorController::didReceiveResponse(DocumentLoader*, unsigned long, ResourceResponse const&) {}
76
void InspectorController::didReceiveContentLength(DocumentLoader*, unsigned long, int) {}
77
void InspectorController::didFinishLoading(DocumentLoader*, unsigned long) {}
78
void InspectorController::didLoadResourceFromMemoryCache(DocumentLoader*, ResourceRequest const&, ResourceResponse const&, int) {}
79
void InspectorController::frameDetachedFromParent(Frame*) {}
80
81
void InspectorController::addMessageToConsole(MessageSource, MessageLevel, JSC::ExecState*, JSC::ArgList const&, unsigned int, String const&) {}
82
void InspectorController::addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID) {}
83
#if ENABLE(DATABASE)
84
void InspectorController::didOpenDatabase(Database*, String const&, String const&, String const&) {}
85
#endif
86
bool InspectorController::enabled() const { return false; }
87
void InspectorController::inspect(Node*) {}
88
bool InspectorController::windowVisible() { return false; }
89
void InspectorController::addProfile(PassRefPtr<JSC::Profile>, unsigned int, const JSC::UString&) {}
90
void InspectorController::inspectedPageDestroyed() {}
91
void InspectorController::resourceRetrievedByXMLHttpRequest(unsigned long identifier, JSC::UString& sourceString) {}
92
93
void InspectorController::inspectedWindowScriptObjectCleared(Frame* frame) {}
94
void InspectorController::startGroup(MessageSource source, JSC::ExecState* exec, const JSC::ArgList& arguments, unsigned lineNumber, const String& sourceURL) {}
95
void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL) {}
96
void InspectorController::startTiming(const JSC::UString& title) {}
97
bool InspectorController::stopTiming(const JSC::UString& title, double& elapsed) { return false; }
98
void InspectorController::count(const JSC::UString& title, unsigned lineNumber, const String& sourceID) {}
99
100
void InspectorController::mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) {}
101
void InspectorController::handleMousePressOnNode(Node*) {}
102
void InspectorController::failedToParseSource(JSC::ExecState* exec, const JSC::SourceCode& source, int errorLine, const JSC::UString& errorMessage) {}    
103
void InspectorController::didParseSource(JSC::ExecState* exec, const JSC::SourceCode& source) {}
104
void InspectorController::didPause() {}
105
106
}  // namespace WebCore

Return to Bug 31437