Attachment #87766 for bug #57515

View Details Raw Unified Return to Bug 57515

| Differences between



2011-03-31  Chang Shu  <cshu@webkit.org>

        Reviewed by NOBODY (OOPS!).

        [Mac] [WK2] Implement KeyDown function for WebKit2 EventSender.
        https://bugs.webkit.org/show_bug.cgi?id=57515

        The following code change builds up the infrastructure for
        WebKitTestRunner EventSender to send messages from the InjectedBundle
        in WebProcess to UIProcess of WebKitTestRunner.

        The basic KeyDown functionality is implemented except the local implementation.

        * Shared/API/c/WKArgumentDecoder.cpp: Added.
        (WKCreateArgumentDecoder):
        (WKDecodeUInt32):
        (WKDecodeString):
        * Shared/API/c/WKArgumentDecoder.h: Added.
        * Shared/API/c/WKBase.h:
        * Shared/API/c/WKMessageID.h: Added.
        * Shared/API/c/WKSharedAPICast.h:
        * Shared/EventSenderProxyMessages.h: Added.
        (Messages::EventSenderProxy::KeyDown::KeyDown):
        (Messages::EventSenderProxy::KeyDown::encode):
        * UIProcess/WebContextUserMessageCoders.h:
        (WebKit::WebContextUserMessageDecoder::decode):
        * WebKit2.xcodeproj/project.pbxproj:
        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
        (WKBundleGetEventSender):
        * WebProcess/InjectedBundle/API/c/WKBundle.h:
        * WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
        * WebProcess/InjectedBundle/API/c/WKBundleEventSender.cpp: Added.
        (WKBundleEventSenderKeyDown):
        * WebProcess/InjectedBundle/API/c/WKBundleEventSender.h: Added.
        * WebProcess/InjectedBundle/InjectedBundle.cpp:
        (WebKit::InjectedBundle::InjectedBundle):
        * WebProcess/InjectedBundle/InjectedBundle.h:
        (WebKit::InjectedBundle::eventSender):
        * WebProcess/InjectedBundle/InjectedBundleEventSender.cpp: Added.
        (WebKit::InjectedBundleEventSender::create):
        (WebKit::InjectedBundleEventSender::InjectedBundleEventSender):
        (WebKit::InjectedBundleEventSender::~InjectedBundleEventSender):
        (WebKit::InjectedBundleEventSender::keyDown):
        * WebProcess/InjectedBundle/InjectedBundleEventSender.h: Added.
        * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
        (WebKit::InjectedBundleUserMessageEncoder::encode):

2011-03-31  John Sullivan  <sullivan@apple.com>

        Reviewed by Darin Adler and Adam Roben.



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef EventSenderProxyMessages_h
#define EventSenderProxyMessages_h

#include "Arguments.h"
#include "MessageID.h"
#include "WKMessageID.h"
#include <wtf/text/WTFString.h>

namespace Messages {

namespace EventSenderProxy {

struct KeyDown : CoreIPC::Arguments3<const String&, uint32_t, uint32_t> {
    static const Kind messageID = KeyDownID;
    typedef CoreIPC::Arguments3<const String&, uint32_t, uint32_t> DecodeType;
    KeyDown(const String& key, uint32_t modifiers, uint32_t location)
        : CoreIPC::Arguments3<const String&, uint32_t, uint32_t>(key, modifiers, location)
    {
    }
    void encode(CoreIPC::ArgumentEncoder* encoder) const
    {
        encoder->encode(static_cast<uint32_t>(messageID));
        DecodeType::encode(encoder);
    }
};

} // namespace EventSenderProxy

} // namespace Messages

namespace CoreIPC {

template<> struct MessageKindTraits<Messages::EventSenderProxy::Kind> {
    static const MessageClass messageClass = MessageClassWebContextLegacy;
};

} // namespace CoreIPC

#endif // EventSenderProxyMessages_h



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WKArgumentDecoder.h"

#include "APIObject.h"
#include "ArgumentCoders.h"
#include "Connection.h"
#include "EventSenderProxyMessages.h"
#include "HandleMessage.h"
#include "WKAPICast.h"
#include "WKString.h"

using namespace WebKit;

WKArgumentDecoderRef WKCreateArgumentDecoder(const unsigned char* data, size_t length)
{
    CoreIPC::ArgumentDecoder* argumentDecoder = new CoreIPC::ArgumentDecoder(data, length);
    return toAPI(argumentDecoder);
}

bool WKDecodeUInt32(WKArgumentDecoderRef argumentDecoderRef, uint32_t& value)
{
    return toImpl(argumentDecoderRef)->decode(value);
}

bool WKDecodeString(WKArgumentDecoderRef argumentDecoderRef, WKStringRef& strRef)
{
    String str;
    if (toImpl(argumentDecoderRef)->decode(str)) {
        strRef = WKStringCreateWithUTF8CString(str.utf8().data());
        return true;
    }
    return false;
}



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef WKArgumentDecoder_h
#define WKArgumentDecoder_h

#include <WebKit2/WKBase.h>
#include <WebKit2/WKMessageID.h>

#ifdef __cplusplus
extern "C" {
#endif

WK_EXPORT WKArgumentDecoderRef WKCreateArgumentDecoder(const unsigned char*, size_t);
WK_EXPORT bool WKDecodeUInt32(WKArgumentDecoderRef, uint32_t&);

WK_EXPORT bool WKDecodeString(WKArgumentDecoderRef, WKStringRef&);

#ifdef __cplusplus
}
#endif


#endif /* WKArgumentDecoder_h */

Lines 65-70 typedef const struct OpaqueWKURLRequest* Source/WebKit2/Shared/API/c/WKBase.h_sec1
- Source/WebKit2/Shared/API/c/WKBase.h +3 lines
65	typedef const struct OpaqueWKURLResponse* WKURLResponseRef;	65	typedef const struct OpaqueWKURLResponse* WKURLResponseRef;
66	typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;	66	typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef;
67		67
		68	typedef const struct OpaqueWKArgumentDecoder* WKArgumentDecoderRef;
		69
68	/* WebKit2 main API types */	70	/* WebKit2 main API types */
69		71
70	typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;	72	typedef const struct OpaqueWKApplicationCacheManager* WKApplicationCacheManagerRef;
Lines 103-108 typedef const struct OpaqueWKBundle* WKB Source/WebKit2/Shared/API/c/WKBase.h_sec2
103	typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;	105	typedef const struct OpaqueWKBundleBackForwardList* WKBundleBackForwardListRef;
104	typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;	106	typedef const struct OpaqueWKBundleBackForwardListItem* WKBundleBackForwardListItemRef;
105	typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;	107	typedef const struct OpaqueWKBundleDOMCSSStyleDeclaration* WKBundleCSSStyleDeclarationRef;
		108	typedef const struct OpaqueWKBundleEventSender* WKBundleEventSenderRef;
106	typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;	109	typedef const struct OpaqueWKBundleFrame* WKBundleFrameRef;
107	typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;	110	typedef const struct OpaqueWKBundleHitTestResult* WKBundleHitTestResultRef;
108	typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;	111	typedef const struct OpaqueWKBundleInspector* WKBundleInspectorRef;



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef WKMessageID_h
#define WKMessageID_h

namespace Messages {

namespace EventSenderProxy {

enum Kind {
    KeyDownID,
};

} // namespace EventSenderProxy

} // namespace Messages

#endif // WKMessageID_h

Lines 49-54 Source/WebKit2/Shared/API/c/WKSharedAPICast.h_sec1
- Source/WebKit2/Shared/API/c/WKSharedAPICast.h +6 lines
49	#include <WebCore/IntRect.h>	49	#include <WebCore/IntRect.h>
50	#include <wtf/TypeTraits.h>	50	#include <wtf/TypeTraits.h>
51		51
		52	namespace CoreIPC {
		53	class ArgumentDecoder;
		54	}
		55
52	namespace WebKit {	56	namespace WebKit {
53		57
54	class ImmutableArray;	58	class ImmutableArray;
Lines 95-100 WK_ADD_API_MAPPING(WKURLRequestRef, WebU Source/WebKit2/Shared/API/c/WKSharedAPICast.h_sec2
95	WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)	99	WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse)
96	WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)	100	WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern)
97		101
		102	WK_ADD_API_MAPPING(WKArgumentDecoderRef, CoreIPC::ArgumentDecoder)
		103
98	template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>	104	template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>
99	class ProxyingRefPtr {	105	class ProxyingRefPtr {
100	public:	106	public:

Lines 25-30 Source/WebKit2/UIProcess/WebContextUserMessageCoders.h_sec1
- Source/WebKit2/UIProcess/WebContextUserMessageCoders.h +9 lines
25		25
26	#include "UserMessageCoders.h"	26	#include "UserMessageCoders.h"
27	#include "WebContext.h"	27	#include "WebContext.h"
		28	#include "WebData.h"
28	#include "WebFrameProxy.h"	29	#include "WebFrameProxy.h"
29	#include "WebPageGroup.h"	30	#include "WebPageGroup.h"
30	#include "WebPageGroupData.h"	31	#include "WebPageGroupData.h"
Lines 127-132 public: Source/WebKit2/UIProcess/WebContextUserMessageCoders.h_sec2
127	coder.m_root = WebPageGroup::get(pageGroupID);	128	coder.m_root = WebPageGroup::get(pageGroupID);
128	break;	129	break;
129	}	130	}
		131	case APIObject::TypeData: {
		132	Vector<uint8_t> bytes;
		133	if (!decoder->decodeBytes(bytes))
		134	return false;
		135	RefPtr<WebData> webData = WebData::create(bytes.releaseBuffer(), bytes.size());
		136	coder.m_root = webData.release();
		137	break;
		138	}
130	default:	139	default:
131	return false;	140	return false;
132	}	141	}

Lines 356-361 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec1
- Source/WebKit2/WebKit2.xcodeproj/project.pbxproj +34 lines
356	51D02F6A132EC73700BEAA96 /* WebIconDatabaseMessages.h in Headers / = {isa = PBXBuildFile; fileRef = 51D02F67132EC73700BEAA96 / WebIconDatabaseMessages.h */; };	356	51D02F6A132EC73700BEAA96 /* WebIconDatabaseMessages.h in Headers / = {isa = PBXBuildFile; fileRef = 51D02F67132EC73700BEAA96 / WebIconDatabaseMessages.h */; };
357	51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources / = {isa = PBXBuildFile; fileRef = 51D02F68132EC73700BEAA96 / WebIconDatabaseProxyMessageReceiver.cpp */; };	357	51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources / = {isa = PBXBuildFile; fileRef = 51D02F68132EC73700BEAA96 / WebIconDatabaseProxyMessageReceiver.cpp */; };
358	51D02F6C132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h in Headers / = {isa = PBXBuildFile; fileRef = 51D02F69132EC73700BEAA96 / WebIconDatabaseProxyMessages.h */; };	358	51D02F6C132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h in Headers / = {isa = PBXBuildFile; fileRef = 51D02F69132EC73700BEAA96 / WebIconDatabaseProxyMessages.h */; };
		359	56BC6D7613439C9C006BD7A3 /* WKArgumentDecoder.cpp in Sources / = {isa = PBXBuildFile; fileRef = 56BC6D7513439C9C006BD7A3 / WKArgumentDecoder.cpp */; };
		360	56BC6D7813439F04006BD7A3 /* WKArgumentDecoder.h in Headers / = {isa = PBXBuildFile; fileRef = 56BC6D7713439F04006BD7A3 / WKArgumentDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
		361	56BC6D7C1343B92E006BD7A3 /* WKMessageID.h in Headers / = {isa = PBXBuildFile; fileRef = 56BC6D7B1343B92E006BD7A3 / WKMessageID.h */; settings = {ATTRIBUTES = (Public, ); }; };
		362	56CE714B1333BAB10049D89E /* InjectedBundleEventSender.cpp in Sources / = {isa = PBXBuildFile; fileRef = 56CE714A1333BAB10049D89E / InjectedBundleEventSender.cpp */; };
		363	56CE714D1333BAED0049D89E /* InjectedBundleEventSender.h in Headers / = {isa = PBXBuildFile; fileRef = 56CE714C1333BAED0049D89E / InjectedBundleEventSender.h */; };
		364	56CE714F1333BB2A0049D89E /* EventSenderProxyMessages.h in Headers / = {isa = PBXBuildFile; fileRef = 56CE714E1333BB2A0049D89E / EventSenderProxyMessages.h */; };
		365	56CE715A1333BBC10049D89E /* WKBundleEventSender.cpp in Sources / = {isa = PBXBuildFile; fileRef = 56CE71581333BBC10049D89E / WKBundleEventSender.cpp */; };
		366	56CE715B1333BBC10049D89E /* WKBundleEventSender.h in Headers / = {isa = PBXBuildFile; fileRef = 56CE71591333BBC10049D89E / WKBundleEventSender.h */; settings = {ATTRIBUTES = (Public, ); }; };
		367	56D01DC81343BC440098DE06 /* WKArray.h in CopyFiles / = {isa = PBXBuildFile; fileRef = BC4075D8124FF0270068F20A / WKArray.h */; };
359	6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A / WKBundleInspector.cpp */; };	368	6501BD1A12F1243400E9F248 /* WKBundleInspector.cpp in Sources / = {isa = PBXBuildFile; fileRef = 65B86F1712F11D7B00B7DD8A / WKBundleInspector.cpp */; };
360	659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6546A82913000164000CEB1C / InjectedBundlePageResourceLoadClient.cpp */; };	369	659C551E130006410025C0C2 /* InjectedBundlePageResourceLoadClient.cpp in Sources / = {isa = PBXBuildFile; fileRef = 6546A82913000164000CEB1C / InjectedBundlePageResourceLoadClient.cpp */; };
361	65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers / = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A / WKBundleInspector.h */; settings = {ATTRIBUTES = (Public, ); }; };	370	65B86F1E12F11DE300B7DD8A /* WKBundleInspector.h in Headers / = {isa = PBXBuildFile; fileRef = 65B86F1812F11D7B00B7DD8A / WKBundleInspector.h */; settings = {ATTRIBUTES = (Public, ); }; };
Lines 868-873 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec2
868	1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */,	877	1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */,
869	BCDE0ABF13272708001259FB /* PluginProcess.app in CopyFiles */,	878	BCDE0ABF13272708001259FB /* PluginProcess.app in CopyFiles */,
870	F6389550133BEF38008941D5 /* HTTPCookieAcceptPolicy.h in CopyFiles */,	879	F6389550133BEF38008941D5 /* HTTPCookieAcceptPolicy.h in CopyFiles */,
		880	56D01DC81343BC440098DE06 /* WKArray.h in CopyFiles */,
871	);	881	);
872	runOnlyForDeploymentPostprocessing = 0;	882	runOnlyForDeploymentPostprocessing = 0;
873	};	883	};
Lines 1241-1246 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec3
1241	51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseMessages.h; sourceTree = "<group>"; };	1251	51D02F67132EC73700BEAA96 /* WebIconDatabaseMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseMessages.h; sourceTree = "<group>"; };
1242	51D02F68132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseProxyMessageReceiver.cpp; sourceTree = "<group>"; };	1252	51D02F68132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseProxyMessageReceiver.cpp; sourceTree = "<group>"; };
1243	51D02F69132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseProxyMessages.h; sourceTree = "<group>"; };	1253	51D02F69132EC73700BEAA96 /* WebIconDatabaseProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseProxyMessages.h; sourceTree = "<group>"; };
		1254	56BC6D7513439C9C006BD7A3 /* WKArgumentDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKArgumentDecoder.cpp; sourceTree = "<group>"; };
		1255	56BC6D7713439F04006BD7A3 /* WKArgumentDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKArgumentDecoder.h; sourceTree = "<group>"; };
		1256	56BC6D7B1343B92E006BD7A3 /* WKMessageID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageID.h; sourceTree = "<group>"; };
		1257	56CE714A1333BAB10049D89E /* InjectedBundleEventSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleEventSender.cpp; sourceTree = "<group>"; };
		1258	56CE714C1333BAED0049D89E /* InjectedBundleEventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleEventSender.h; sourceTree = "<group>"; };
		1259	56CE714E1333BB2A0049D89E /* EventSenderProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSenderProxyMessages.h; sourceTree = "<group>"; };
		1260	56CE71581333BBC10049D89E /* WKBundleEventSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleEventSender.cpp; sourceTree = "<group>"; };
		1261	56CE71591333BBC10049D89E /* WKBundleEventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleEventSender.h; sourceTree = "<group>"; };
1244	5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcess.xcconfig; sourceTree = "<group>"; };	1262	5DAD7294116FF70B00EE5396 /* WebProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebProcess.xcconfig; sourceTree = "<group>"; };
1245	5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };	1263	5DAD73F1116FF90C00EE5396 /* BaseTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = BaseTarget.xcconfig; sourceTree = "<group>"; };
1246	6546A82913000164000CEB1C /* InjectedBundlePageResourceLoadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageResourceLoadClient.cpp; sourceTree = "<group>"; };	1264	6546A82913000164000CEB1C /* InjectedBundlePageResourceLoadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageResourceLoadClient.cpp; sourceTree = "<group>"; };
Lines 2040-2045 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec4
2040	BCE81D97131AE02100241910 /* DictionaryPopupInfo.h */,	2058	BCE81D97131AE02100241910 /* DictionaryPopupInfo.h */,
2041	C517388012DF8F4F00EE3F47 /* DragControllerAction.h */,	2059	C517388012DF8F4F00EE3F47 /* DragControllerAction.h */,
2042	0FB659221208B4DB0044816C /* DrawingAreaInfo.h */,	2060	0FB659221208B4DB0044816C /* DrawingAreaInfo.h */,
		2061	56CE714E1333BB2A0049D89E /* EventSenderProxyMessages.h */,
2043	762B7481120BBA0100819339 /* FontSmoothingLevel.h */,	2062	762B7481120BBA0100819339 /* FontSmoothingLevel.h */,
2044	F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */,	2063	F638954F133BEF38008941D5 /* HTTPCookieAcceptPolicy.h */,
2045	BCCF6B2312C93E7A008F9C35 /* ImageOptions.h */,	2064	BCCF6B2312C93E7A008F9C35 /* ImageOptions.h */,
Lines 2808-2813 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec5
2808	935EEB921277615D003322B8 /* InjectedBundleBackForwardListItem.h */,	2827	935EEB921277615D003322B8 /* InjectedBundleBackForwardListItem.h */,
2809	BCEE7DC4128B645D009827DA /* InjectedBundleClient.cpp */,	2828	BCEE7DC4128B645D009827DA /* InjectedBundleClient.cpp */,
2810	BCEE7DC3128B645D009827DA /* InjectedBundleClient.h */,	2829	BCEE7DC3128B645D009827DA /* InjectedBundleClient.h */,
		2830	56CE714A1333BAB10049D89E /* InjectedBundleEventSender.cpp */,
		2831	56CE714C1333BAED0049D89E /* InjectedBundleEventSender.h */,
2811	BC498617124D10E200D834E1 /* InjectedBundleHitTestResult.cpp */,	2832	BC498617124D10E200D834E1 /* InjectedBundleHitTestResult.cpp */,
2812	BC498616124D10E200D834E1 /* InjectedBundleHitTestResult.h */,	2833	BC498616124D10E200D834E1 /* InjectedBundleHitTestResult.h */,
2813	BC8147D412F66D31007B2C32 /* InjectedBundleNavigationAction.cpp */,	2834	BC8147D412F66D31007B2C32 /* InjectedBundleNavigationAction.cpp */,
Lines 2859-2864 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec6
2859	935EEB961277616D003322B8 /* WKBundleBackForwardList.h */,	2880	935EEB961277616D003322B8 /* WKBundleBackForwardList.h */,
2860	935EEB971277616D003322B8 /* WKBundleBackForwardListItem.cpp */,	2881	935EEB971277616D003322B8 /* WKBundleBackForwardListItem.cpp */,
2861	935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */,	2882	935EEB981277616D003322B8 /* WKBundleBackForwardListItem.h */,
		2883	56CE71581333BBC10049D89E /* WKBundleEventSender.cpp */,
		2884	56CE71591333BBC10049D89E /* WKBundleEventSender.h */,
2862	BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */,	2885	BCD25F1611D6BDE100169B0E /* WKBundleFrame.cpp */,
2863	BCD25F1511D6BDE100169B0E /* WKBundleFrame.h */,	2886	BCD25F1511D6BDE100169B0E /* WKBundleFrame.h */,
2864	BCF049E411FE20F600F86A58 /* WKBundleFramePrivate.h */,	2887	BCF049E411FE20F600F86A58 /* WKBundleFramePrivate.h */,
Lines 3044-3049 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec7
3044	BC4075D5124FEFFA0068F20A /* cf */,	3067	BC4075D5124FEFFA0068F20A /* cf */,
3045	BCCF6AC412C91F3B008F9C35 /* cg */,	3068	BCCF6AC412C91F3B008F9C35 /* cg */,
3046	BC4075D6124FF0000068F20A /* mac */,	3069	BC4075D6124FF0000068F20A /* mac */,
		3070	56BC6D7513439C9C006BD7A3 /* WKArgumentDecoder.cpp */,
		3071	56BC6D7713439F04006BD7A3 /* WKArgumentDecoder.h */,
3047	BC4075D7124FF0270068F20A /* WKArray.cpp */,	3072	BC4075D7124FF0270068F20A /* WKArray.cpp */,
3048	BC4075D8124FF0270068F20A /* WKArray.h */,	3073	BC4075D8124FF0270068F20A /* WKArray.h */,
3049	BCDDB316124EBD130048D13C /* WKBase.h */,	3074	BCDDB316124EBD130048D13C /* WKBase.h */,
Lines 3065-3070 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec8
3065	BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */,	3090	BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */,
3066	BCCF6AC012C91F34008F9C35 /* WKImage.cpp */,	3091	BCCF6AC012C91F34008F9C35 /* WKImage.cpp */,
3067	BCCF6AC112C91F34008F9C35 /* WKImage.h */,	3092	BCCF6AC112C91F34008F9C35 /* WKImage.h */,
		3093	56BC6D7B1343B92E006BD7A3 /* WKMessageID.h */,
3068	BC4075E1124FF0270068F20A /* WKMutableArray.cpp */,	3094	BC4075E1124FF0270068F20A /* WKMutableArray.cpp */,
3069	BC4075E2124FF0270068F20A /* WKMutableArray.h */,	3095	BC4075E2124FF0270068F20A /* WKMutableArray.h */,
3070	BC4075E3124FF0270068F20A /* WKMutableDictionary.cpp */,	3096	BC4075E3124FF0270068F20A /* WKMutableDictionary.cpp */,
Lines 3651-3656 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec9
3651	C064504A133BE709003470E2 /* LayerTreeHostCA.h in Headers */,	3677	C064504A133BE709003470E2 /* LayerTreeHostCA.h in Headers */,
3652	5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,	3678	5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,
3653	5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */,	3679	5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */,
		3680	56CE714D1333BAED0049D89E /* InjectedBundleEventSender.h in Headers */,
		3681	56CE714F1333BB2A0049D89E /* EventSenderProxyMessages.h in Headers */,
		3682	56CE715B1333BBC10049D89E /* WKBundleEventSender.h in Headers */,
		3683	56BC6D7813439F04006BD7A3 /* WKArgumentDecoder.h in Headers */,
		3684	56BC6D7C1343B92E006BD7A3 /* WKMessageID.h in Headers */,
3654	);	3685	);
3655	runOnlyForDeploymentPostprocessing = 0;	3686	runOnlyForDeploymentPostprocessing = 0;
3656	};	3687	};
Lines 4275-4280 Source/WebKit2/WebKit2.xcodeproj/project.pbxproj_sec10
4275	5123CF1B133D260A0056F800 /* WKIconDatabaseCG.cpp in Sources */,	4306	5123CF1B133D260A0056F800 /* WKIconDatabaseCG.cpp in Sources */,
4276	F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,	4307	F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */,
4277	F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */,	4308	F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */,
		4309	56CE714B1333BAB10049D89E /* InjectedBundleEventSender.cpp in Sources */,
		4310	56CE715A1333BBC10049D89E /* WKBundleEventSender.cpp in Sources */,
		4311	56BC6D7613439C9C006BD7A3 /* WKArgumentDecoder.cpp in Sources */,
4278	);	4312	);
4279	runOnlyForDeploymentPostprocessing = 0;	4313	runOnlyForDeploymentPostprocessing = 0;
4280	};	4314	};

Lines 28-33 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp_sec1
- Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp +4 lines
28		28
29	#include "Arguments.h"	29	#include "Arguments.h"
30	#include "ImmutableArray.h"	30	#include "ImmutableArray.h"
		31	#include "InjectedBundleEventSender.h"
31	#include "InjectedBundleMessageKinds.h"	32	#include "InjectedBundleMessageKinds.h"
32	#include "InjectedBundleScriptWorld.h"	33	#include "InjectedBundleScriptWorld.h"
33	#include "InjectedBundleUserMessageCoders.h"	34	#include "InjectedBundleUserMessageCoders.h"
Lines 57-62 InjectedBundle::InjectedBundle(const Str Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp_sec2
57	: m_path(path)	58	: m_path(path)
58	, m_platformBundle(0)	59	, m_platformBundle(0)
59	{	60	{
		61	#if PLATFORM(MAC)
		62	m_eventSender = toAPI(InjectedBundleEventSender::create());
		63	#endif
60	initializeClient(0);	64	initializeClient(0);
61	}	65	}
62		66




#include "APIObject.h"
#include "InjectedBundleClient.h"
#include "InjectedBundleEventSender.h"
#include "SandboxExtension.h"
#include "WKBundle.h"
#include <WebCore/UserContentTypes.h>


    // API
    void initializeClient(WKBundleClient*);
    static void postMessage(const String&, APIObject*);
    void postSynchronousMessage(const String&, APIObject*, RefPtr<APIObject>& returnData);
    WKBundleEventSenderRef eventSender() const { return m_eventSender; }
#if PLATFORM(WIN)
    void setHostAllowsAnyHTTPSCertificate(const String&);
    void setClientCertificate(const String&, const WebCertificateInfo*);

    String m_path;
    PlatformBundle m_platformBundle; // This is leaked right now, since we never unload the bundle/module.

    WKBundleEventSenderRef m_eventSender;
    RefPtr<SandboxExtension> m_sandboxExtension;

    InjectedBundleClient m_client;



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "InjectedBundleEventSender.h"

#include "APIObject.h"
#include "ArgumentCoders.h"
#include "EventSenderProxyMessages.h"
#include <InjectedBundle.h>
#include <MessageID.h>
#include <WKString.h>
#include <WebContextMessageKinds.h>
#include <WebCore/UserContentTypes.h>
#include <WebCore/UserScriptTypes.h>
#include <WebData.h>
#include <WebKit2/WKRetainPtr.h>
#include <WebProcess.h>
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>

namespace WebKit {

InjectedBundleEventSender* InjectedBundleEventSender::create()
{
    return new InjectedBundleEventSender();
}

InjectedBundleEventSender::InjectedBundleEventSender()
{
}

InjectedBundleEventSender::~InjectedBundleEventSender()
{
}

void InjectedBundleEventSender::keyDown(const String& key, unsigned int modif, unsigned int location)
{
    OwnPtr<CoreIPC::ArgumentEncoder> argumentEncoder = CoreIPC::ArgumentEncoder::create(0);
    argumentEncoder->encode(Messages::EventSenderProxy::KeyDown(key, modif, location));
    RefPtr<WebData> webData = WebData::create(argumentEncoder->buffer(), argumentEncoder->bufferSize());
    InjectedBundle::postMessage("EventSender", webData.release().get());
}

} // namespace WebKit




/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef InjectedBundleEventSender_h
#define InjectedBundleEventSender_h

#include "APIObject.h"
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>

namespace WebKit {

class InjectedBundleEventSender {
public:
    static InjectedBundleEventSender* create();
    ~InjectedBundleEventSender();

    void keyDown(const String& key, unsigned int modif, unsigned int location);

private:
    InjectedBundleEventSender();
};

} // namespace WebKit

#endif // InjectedBundleEventSender_h

Lines 27-32 Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h_sec1
- Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h +6 lines
27	#define InjectedBundleUserMessageCoders_h	27	#define InjectedBundleUserMessageCoders_h
28		28
29	#include "UserMessageCoders.h"	29	#include "UserMessageCoders.h"
		30	#include "WebData.h"
30	#include "WebFrame.h"	31	#include "WebFrame.h"
31	#include "WebPage.h"	32	#include "WebPage.h"
32	#include "WebPageGroupData.h"	33	#include "WebPageGroupData.h"
Lines 71-76 public: Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h_sec2
71	encoder->encode(pageGroup->pageGroupID());	72	encoder->encode(pageGroup->pageGroupID());
72	break;	73	break;
73	}	74	}
		75	case APIObject::TypeData: {
		76	WebData* webData = static_cast<WebData*>(m_root);
		77	encoder->encodeBytes(webData->bytes(), webData->size());
		78	break;
		79	}
74	default:	80	default:
75	ASSERT_NOT_REACHED();	81	ASSERT_NOT_REACHED();
76	break;	82	break;

Lines 45-50 void WKBundleSetClient(WKBundleRef bundl Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp_sec1
- Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp +5 lines
45	toImpl(bundleRef)->initializeClient(wkClient);	45	toImpl(bundleRef)->initializeClient(wkClient);
46	}	46	}
47		47
		48	WKBundleEventSenderRef WKBundleGetEventSender(WKBundleRef bundleRef)
		49	{
		50	return toImpl(bundleRef)->eventSender();
		51	}
		52
48	void WKBundlePostMessage(WKBundleRef bundleRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)	53	void WKBundlePostMessage(WKBundleRef bundleRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
49	{	54	{
50	toImpl(bundleRef)->postMessage(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));	55	toImpl(bundleRef)->postMessage(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));

Lines 51-56 typedef struct WKBundleClient WKBundleCl Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h_sec1
- Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h +2 lines
51		51
52	WK_EXPORT WKTypeID WKBundleGetTypeID();	52	WK_EXPORT WKTypeID WKBundleGetTypeID();
53		53
		54	WK_EXPORT WKBundleEventSenderRef WKBundleGetEventSender(WKBundleRef bundleRef);
		55
54	WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClient * client);	56	WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClient * client);
55		57
56	WK_EXPORT void WKBundlePostMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody);	58	WK_EXPORT void WKBundlePostMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody);



class InjectedBundle;
class InjectedBundleBackForwardList;
class InjectedBundleBackForwardListItem;
class InjectedBundleEventSender;
class InjectedBundleHitTestResult;
class InjectedBundleNavigationAction;
class InjectedBundleNodeHandle;

WK_ADD_API_MAPPING(WKBundleBackForwardListItemRef, InjectedBundleBackForwardListItem)
WK_ADD_API_MAPPING(WKBundleBackForwardListRef, InjectedBundleBackForwardList)
WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, WebCore::CSSStyleDeclaration)
WK_ADD_API_MAPPING(WKBundleEventSenderRef, InjectedBundleEventSender)
WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame)
WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult)
WK_ADD_API_MAPPING(WKBundleInspectorRef, WebInspector)



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "WKBundleEventSender.h"

#include "InjectedBundleEventSender.h"
#include "WKBundleAPICast.h"

using namespace WebKit;

void WKBundleEventSenderKeyDown(WKBundleEventSenderRef eventSenderRef, WKStringRef keyRef, uint32_t modif, uint32_t location)
{
    toImpl(eventSenderRef)->keyDown(toImpl(keyRef)->string(), static_cast<unsigned int>(toImpl(modif)), toImpl(location));
}




/*
 * Copyright (C) 2010 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef WKBundleEventSender_h
#define WKBundleEventSender_h

#include <WebKit2/WKBase.h>

#ifdef __cplusplus
extern "C" {
#endif

WK_EXPORT WKTypeID WKBundleEventSenderGetTypeID();

WK_EXPORT void WKBundleEventSenderKeyDown(WKBundleEventSenderRef eventSenderRef, WKStringRef keyRef, uint32_t modif, uint32_t location);

#ifdef __cplusplus
}
#endif

#endif // WKBundleEventSender_h



2011-03-31  Chang Shu  <cshu@webkit.org>

        Reviewed by NOBODY (OOPS!).

        [Mac] [WK2] Implement KeyDown function for WebKit2 EventSender.
        https://bugs.webkit.org/show_bug.cgi?id=57515

        The following code change builds up the infrastructure for
        WebKitTestRunner EventSender to send messages from the InjectedBundle
        in WebProcess to UIProcess of WebKitTestRunner.

        The basic KeyDown functionality is implemented except the local implementation.

        * WebKitTestRunner/EventSenderProxy.cpp: Added.
        (WTR::EventSenderProxy::create):
        (WTR::EventSenderProxy::EventSenderProxy):
        (WTR::EventSenderProxy::didReceiveEventSenderProxyMessage):
        * WebKitTestRunner/EventSenderProxy.h: Added.
        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
        (WTR::EventSendingController::keyDown):
        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
        (WTR::InjectedBundle::eventSender):
        * WebKitTestRunner/TestController.cpp:
        (WTR::TestController::TestController):
        (WTR::TestController::didReceiveMessageFromInjectedBundle):
        * WebKitTestRunner/TestController.h:
        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
        * WebKitTestRunner/mac/EventSender.h: Added.
        * WebKitTestRunner/mac/EventSenderMac.mm: Added.

2011-03-31  Sergio Villar Senin  <svillar@igalia.com>

        Reviewed by Martin Robinson.

Lines 505-510 if (isGtk()) { Tools/Scripts/build-webkit_sec1
- Tools/Scripts/build-webkit +1 lines
505	push @options, "--install-headers=" . $installHeaders if defined($installHeaders);	505	push @options, "--install-headers=" . $installHeaders if defined($installHeaders);
506	push @options, "--install-libs=" . $installLibs if defined($installLibs);	506	push @options, "--install-libs=" . $installLibs if defined($installLibs);
507	push @options, "--makeargs=" . $makeArgs if $makeArgs;	507	push @options, "--makeargs=" . $makeArgs if $makeArgs;
		508	push @options, "--qmakearg=CONFIG+=webkit2" if !$noWebKit2;
508		509
509	foreach (@features) {	510	foreach (@features) {
510	push @options, "DEFINES+=$_->{define}=${$_->{value}}" if ${$_->{value}} != $_->{default};	511	push @options, "DEFINES+=$_->{define}=${$_->{value}}" if ${$_->{value}} != $_->{default};



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 "EventSenderProxy.h"

#include <WebKit2/WKArgumentDecoder.h>
#include <WebKit2/WKArray.h>
#include <WebKit2/WKMessageID.h>

namespace WTR {

EventSenderProxy* EventSenderProxy::create(TestController* testController)
{
    return new EventSenderProxy(testController);
}

EventSenderProxy::EventSenderProxy(TestController* testController)
    : m_testController(testController)
{
// TODO    m_eventSender = new EventSender();
};

void EventSenderProxy::didReceiveEventSenderProxyMessage(WKDataRef webData)
{
    WKArgumentDecoderRef argumentDecoderRef = WKCreateArgumentDecoder(WKDataGetBytes(webData), WKDataGetSize(webData));
    uint32_t messageIDUint32;
    if (!WKDecodeUInt32(argumentDecoderRef, messageIDUint32))
        return;
    switch (static_cast<Messages::EventSenderProxy::Kind>(messageIDUint32)) {
    case Messages::EventSenderProxy::KeyDownID:
        WKStringRef key;
        uint32_t modifiers;
        uint32_t location;
        if (WKDecodeString(argumentDecoderRef, key) && WKDecodeUInt32(argumentDecoderRef, modifiers) && WKDecodeUInt32(argumentDecoderRef, location))
            fputs("Implement keyDown in WTR.\n", stderr); // TODO m_eventSender->keyDown(key, modifiers, location);
        break;
    default:
        ASSERT_NOT_REACHED();
    }
}

} // namespace WebKit



/*
 * Copyright (C) 2011 Apple Inc. All rights reserved.
 * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
 *
 * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
 */

#ifndef EventSenderProxy_h
#define EventSenderProxy_h

//TODO #include "EventSender.h"
#include "TestController.h"
#include "WebKit2/WKString.h"

using namespace WebKit;

namespace WTR {

class EventSenderProxy {
public:

    static EventSenderProxy* create(TestController*);

    void didReceiveEventSenderProxyMessage(WKDataRef);

private:
    EventSenderProxy(TestController*);

    TestController* m_testController;
// TODO    EventSender* m_eventSender;
};

} // namespace WebKit

#endif // WebPageProxy_h

Lines 26-31 Tools/WebKitTestRunner/TestController.cpp_sec1
- Tools/WebKitTestRunner/TestController.cpp +13 lines
26	#include "config.h"	26	#include "config.h"
27	#include "TestController.h"	27	#include "TestController.h"
28		28
		29	#if PLATFORM(MAC)
		30	#include <EventSenderProxy.h>
		31	#endif
29	#include "PlatformWebView.h"	32	#include "PlatformWebView.h"
30	#include "StringFunctions.h"	33	#include "StringFunctions.h"
31	#include "TestInvocation.h"	34	#include "TestInvocation.h"
Lines 66-71 TestController::TestController(int argc, Tools/WebKitTestRunner/TestController.cpp_sec2
66	, m_shortTimeout(defaultShortTimeout)	69	, m_shortTimeout(defaultShortTimeout)
67	, m_didPrintWebProcessCrashedMessage(false)	70	, m_didPrintWebProcessCrashedMessage(false)
68	, m_shouldExitWhenWebProcessCrashes(true)	71	, m_shouldExitWhenWebProcessCrashes(true)
		72	#if PLATFORM(MAC)
		73	, m_eventSenderProxy(EventSenderProxy::create(this))
		74	#endif
69	{	75	{
70	initialize(argc, argv);	76	initialize(argc, argv);
71	controller = this;	77	controller = this;
Lines 458-463 void TestController::didReceiveSynchrono Tools/WebKitTestRunner/TestController.cpp_sec3
458		464
459	void TestController::didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody)	465	void TestController::didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody)
460	{	466	{
		467	#if PLATFORM(MAC)
		468	if (WKStringIsEqualToUTF8CString(messageName, "EventSender")) {
		469	ASSERT(WKGetTypeID(messageBody) == WKDataGetTypeID());
		470	m_eventSenderProxy->didReceiveEventSenderProxyMessage(static_cast<WKDataRef>(messageBody));
		471	return;
		472	}
		473	#endif
461	if (!m_currentInvocation)	474	if (!m_currentInvocation)
462	return;	475	return;
463	m_currentInvocation->didReceiveMessageFromInjectedBundle(messageName, messageBody);	476	m_currentInvocation->didReceiveMessageFromInjectedBundle(messageName, messageBody);

Lines 35-40 namespace WTR { Tools/WebKitTestRunner/TestController.h_sec1
- Tools/WebKitTestRunner/TestController.h +3 lines
35		35
36	class TestInvocation;	36	class TestInvocation;
37	class PlatformWebView;	37	class PlatformWebView;
		38	class EventSenderProxy;
38		39
39	// FIXME: Rename this TestRunner?	40	// FIXME: Rename this TestRunner?
40	class TestController {	41	class TestController {
Lines 120-125 private: Tools/WebKitTestRunner/TestController.h_sec2
120		121
121	bool m_didPrintWebProcessCrashedMessage;	122	bool m_didPrintWebProcessCrashedMessage;
122	bool m_shouldExitWhenWebProcessCrashes;	123	bool m_shouldExitWhenWebProcessCrashes;
		124
		125	EventSenderProxy* m_eventSenderProxy;
123	};	126	};
124		127
125	} // namespace WTR	128	} // namespace WTR



#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
#include "JSEventSendingController.h"
#include "StringFunctions.h"
#if PLATFORM(MAC)
#include <WebKit2/WKBundleEventSender.h>
#endif
#include <WebKit2/WKBundlePage.h>
#include <WebKit2/WKBundlePagePrivate.h>
#include <WebKit2/WKBundlePrivate.h>


void EventSendingController::keyDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
#if PLATFORM(MAC)
    if (!JSValueIsString(context, arguments[0]))
        return;
    JSRetainPtr<JSStringRef> jsKeyStrRef = JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, arguments[0], 0));
    
    unsigned int modif = 0;
    if (JSValueIsObject(context, arguments[1])) {
        JSObjectRef modifObjRef = JSValueToObject(context, arguments[1], exception);
        for (int i = 0; i < 4; i++) {
            JSValueRef modifValueRef = JSObjectGetPropertyAtIndex(context, modifObjRef, i, exception);
            if (JSValueIsString(context, modifValueRef)) {
                JSRetainPtr<JSStringRef> jsModifStrRef = JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, modifValueRef, 0));
                if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "ctrlKey"))
                    modif |= kWKEventModifiersControlKey;
                else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "shiftKey"))
                    modif |= kWKEventModifiersShiftKey;
                else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "altKey"))
                    modif |= kWKEventModifiersAltKey;
                else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "metaKey"))
                    modif |= kWKEventModifiersMetaKey;
            }
        }
    }
    unsigned int location = 0;
    if (JSValueIsNumber(context, arguments[2]))
        location = static_cast<unsigned int>(JSValueToNumber(context, arguments[2], exception));

    WKBundleEventSenderKeyDown(InjectedBundle::shared().eventSender(), toWK(jsKeyStrRef).get(), modif, location);
#else
    setExceptionForString(context, exception, "EventSender.keyDown is not yet supported.");
#endif
}

void EventSendingController::contextClick(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)

Lines 30-35 Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h_sec1
- Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +3 lines
30	#include "GCController.h"	30	#include "GCController.h"
31	#include "LayoutTestController.h"	31	#include "LayoutTestController.h"
32	#include <WebKit2/WKBase.h>	32	#include <WebKit2/WKBase.h>
		33	#include <WebKit2/WKBundle.h>
33	#include <WebKit2/WKRetainPtr.h>	34	#include <WebKit2/WKRetainPtr.h>
34	#include <wtf/OwnPtr.h>	35	#include <wtf/OwnPtr.h>
35	#include <wtf/RefPtr.h>	36	#include <wtf/RefPtr.h>
Lines 51-56 public: Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h_sec2
51	WKBundleRef bundle() const { return m_bundle; }	52	WKBundleRef bundle() const { return m_bundle; }
52	WKBundlePageGroupRef pageGroup() const { return m_pageGroup; }	53	WKBundlePageGroupRef pageGroup() const { return m_pageGroup; }
53		54
		55	WKBundleEventSenderRef eventSender() const { return WKBundleGetEventSender(m_bundle); }
		56
54	LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }	57	LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }
55	GCController* gcController() { return m_gcController.get(); }	58	GCController* gcController() { return m_gcController.get(); }
56	EventSendingController* eventSendingController() { return m_eventSendingController.get(); }	59	EventSendingController* eventSendingController() { return m_eventSendingController.get(); }

Lines 21-26 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj_sec1
- Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj +12 lines
21	/* End PBXAggregateTarget section */	21	/* End PBXAggregateTarget section */
22		22
23	/* Begin PBXBuildFile section */	23	/* Begin PBXBuildFile section */
		24	561781761344CC3B007A90A8 /* EventSenderMac.mm in Sources / = {isa = PBXBuildFile; fileRef = 561781751344CC3B007A90A8 / EventSenderMac.mm */; };
		25	56CE71801333C7140049D89E /* EventSenderProxy.cpp in Sources / = {isa = PBXBuildFile; fileRef = 56CE717E1333C7140049D89E / EventSenderProxy.cpp */; };
24	6510A78211EC643800410867 /* AHEM____.TTF in Resources / = {isa = PBXBuildFile; fileRef = 6510A77711EC643800410867 / AHEM____.TTF */; };	26	6510A78211EC643800410867 /* AHEM____.TTF in Resources / = {isa = PBXBuildFile; fileRef = 6510A77711EC643800410867 / AHEM____.TTF */; };
25	6510A78311EC643800410867 /* ColorBits.ttf in Resources / = {isa = PBXBuildFile; fileRef = 6510A77811EC643800410867 / ColorBits.ttf */; };	27	6510A78311EC643800410867 /* ColorBits.ttf in Resources / = {isa = PBXBuildFile; fileRef = 6510A77811EC643800410867 / ColorBits.ttf */; };
26	6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources / = {isa = PBXBuildFile; fileRef = 6510A77911EC643800410867 / WebKitWeightWatcher100.ttf */; };	28	6510A78411EC643800410867 /* WebKitWeightWatcher100.ttf in Resources / = {isa = PBXBuildFile; fileRef = 6510A77911EC643800410867 / WebKitWeightWatcher100.ttf */; };
Lines 78-83 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj_sec2
78		80
79	/* Begin PBXFileReference section */	81	/* Begin PBXFileReference section */
80	378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };	82	378D442213346D00006A777B /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
		83	561781741344CC28007A90A8 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
		84	561781751344CC3B007A90A8 /* EventSenderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventSenderMac.mm; sourceTree = "<group>"; };
		85	56CE717E1333C7140049D89E /* EventSenderProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventSenderProxy.cpp; sourceTree = "<group>"; };
		86	56CE717F1333C7140049D89E /* EventSenderProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSenderProxy.h; sourceTree = "<group>"; };
81	6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };	87	6510A77711EC643800410867 /* AHEM____.TTF */ = {isa = PBXFileReference; lastKnownFileType = file; name = "AHEM____.TTF"; path = "fonts/AHEM____.TTF"; sourceTree = "<group>"; };
82	6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };	88	6510A77811EC643800410867 /* ColorBits.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ColorBits.ttf; path = fonts/ColorBits.ttf; sourceTree = "<group>"; };
83	6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher100.ttf; path = fonts/WebKitWeightWatcher100.ttf; sourceTree = "<group>"; };	89	6510A77911EC643800410867 /* WebKitWeightWatcher100.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = WebKitWeightWatcher100.ttf; path = fonts/WebKitWeightWatcher100.ttf; sourceTree = "<group>"; };
Lines 185-190 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj_sec3
185	children = (	191	children = (
186	BC9192021333E4CD003011DC /* cg */,	192	BC9192021333E4CD003011DC /* cg */,
187	BC7933FE118F7C74005EA8E2 /* mac */,	193	BC7933FE118F7C74005EA8E2 /* mac */,
		194	56CE717E1333C7140049D89E /* EventSenderProxy.cpp */,
		195	56CE717F1333C7140049D89E /* EventSenderProxy.h */,
188	BC251A1711D16774002EBC01 /* WebKitTestRunnerPrefix.h */,	196	BC251A1711D16774002EBC01 /* WebKitTestRunnerPrefix.h */,
189	BC7934DD119066EC005EA8E2 /* PlatformWebView.h */,	197	BC7934DD119066EC005EA8E2 /* PlatformWebView.h */,
190	BC79342F118F7F19005EA8E2 /* TestController.h */,	198	BC79342F118F7F19005EA8E2 /* TestController.h */,
Lines 276-281 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj_sec4
276	BC7933FE118F7C74005EA8E2 /* mac */ = {	284	BC7933FE118F7C74005EA8E2 /* mac */ = {
277	isa = PBXGroup;	285	isa = PBXGroup;
278	children = (	286	children = (
		287	561781751344CC3B007A90A8 /* EventSenderMac.mm */,
		288	561781741344CC28007A90A8 /* EventSender.h */,
279	BC7933FF118F7C84005EA8E2 /* main.mm */,	289	BC7933FF118F7C84005EA8E2 /* main.mm */,
280	BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */,	290	BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */,
281	BC8C795B11D2785D004535A1 /* TestControllerMac.mm */,	291	BC8C795B11D2785D004535A1 /* TestControllerMac.mm */,
Lines 452-457 Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj_sec5
452	BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */,	462	BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */,
453	BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */,	463	BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */,
454	BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */,	464	BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */,
		465	56CE71801333C7140049D89E /* EventSenderProxy.cpp in Sources */,
		466	561781761344CC3B007A90A8 /* EventSenderMac.mm in Sources */,
455	);	467	);
456	runOnlyForDeploymentPostprocessing = 0;	468	runOnlyForDeploymentPostprocessing = 0;
457	};	469	};



/*
 * Copyright (C) 2011 Apple Inc. 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. 
 * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
 *     its contributors may be used to endorse or promote products derived
 *     from this software without specific prior written permission. 
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
 */

#if 0 // TODO
#import <Cocoa/Cocoa.h>
#import <WebKit/WebKit.h>

@interface EventSender : NSObject <DOMEventListener> {
    BOOL leftMouseButtonDown;
    BOOL dragMode;
    int clickCount;
    NSTimeInterval lastClick;
    int eventNumber;
    double timeOffset;
}

+ (void)saveEvent:(NSInvocation *)event;
+ (void)replaySavedEvents;
+ (void)clearSavedEvents;

- (void)scheduleAsynchronousClick;

- (void)enableDOMUIEventLogging:(WebScriptObject *)node;

- (void)handleEvent:(DOMEvent *)event;

@end

extern NSPoint lastMousePosition;
extern NSPoint lastClickPosition;
#endif



/*
 * Copyright (C) 2011 Apple Inc. 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. 
 * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
 *     its contributors may be used to endorse or promote products derived
 *     from this software without specific prior written permission. 
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
 */

#if 0
#import "config.h"
#import "EventSender.h"

#import "DumpRenderTree.h"
#import "DumpRenderTreeDraggingInfo.h"
#import "DumpRenderTreeFileDraggingSource.h"

#import <Carbon/Carbon.h>                           // for GetCurrentEventTime()
#import <WebKit/DOMPrivate.h>
#import <WebKit/WebKit.h>
#import <WebKit/WebViewPrivate.h>

extern "C" void _NSNewKillRingSequence();

enum MouseAction {
    MouseDown,
    MouseUp,
    MouseDragged
};

// Match the DOM spec (sadly the DOM spec does not provide an enum)
enum MouseButton {
    LeftMouseButton = 0,
    MiddleMouseButton = 1,
    RightMouseButton = 2,
    NoMouseButton = -1
};

NSPoint lastMousePosition;
NSPoint lastClickPosition;
int lastClickButton = NoMouseButton;
NSArray *webkitDomEventNames;
NSMutableArray *savedMouseEvents; // mouse events sent between mouseDown and mouseUp are stored here, and then executed at once.
BOOL replayingSavedEvents;

@implementation EventSender

+ (void)initialize
{
    webkitDomEventNames = [[NSArray alloc] initWithObjects:
        @"abort",
        @"beforecopy",
        @"beforecut",
        @"beforepaste",
        @"blur",
        @"change",
        @"click",
        @"contextmenu",
        @"copy",
        @"cut",
        @"dblclick",
        @"drag",
        @"dragend",
        @"dragenter",
        @"dragleave",
        @"dragover",
        @"dragstart",
        @"drop",
        @"error",
        @"focus",
        @"input",
        @"keydown",
        @"keypress",
        @"keyup",
        @"load",
        @"mousedown",
        @"mousemove",
        @"mouseout",
        @"mouseover",
        @"mouseup",
        @"mousewheel",
        @"beforeunload",
        @"paste",
        @"readystatechange",
        @"reset",
        @"resize", 
        @"scroll", 
        @"search",
        @"select",
        @"selectstart",
        @"submit", 
        @"textInput", 
        @"textzoomin",
        @"textzoomout",
        @"unload",
        @"zoom",
        nil];
}

+ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
{
    if (aSelector == @selector(beginDragWithFiles:)
            || aSelector == @selector(clearKillRing)
            || aSelector == @selector(contextClick)
            || aSelector == @selector(enableDOMUIEventLogging:)
            || aSelector == @selector(fireKeyboardEventsToElement:)
            || aSelector == @selector(keyDown:withModifiers:withLocation:)
            || aSelector == @selector(leapForward:)
            || aSelector == @selector(mouseDown:withModifiers:)
            || aSelector == @selector(mouseMoveToX:Y:)
            || aSelector == @selector(mouseUp:withModifiers:)
            || aSelector == @selector(scheduleAsynchronousClick)
            || aSelector == @selector(textZoomIn)
            || aSelector == @selector(textZoomOut)
            || aSelector == @selector(zoomPageIn)
            || aSelector == @selector(zoomPageOut)
            || aSelector == @selector(mouseScrollByX:andY:)
            || aSelector == @selector(continuousMouseScrollByX:andY:))
        return NO;
    return YES;
}

+ (BOOL)isKeyExcludedFromWebScript:(const char*)name
{
    if (strcmp(name, "dragMode") == 0)
        return NO;
    return YES;
}

+ (NSString *)webScriptNameForSelector:(SEL)aSelector
{
    if (aSelector == @selector(beginDragWithFiles:))
        return @"beginDragWithFiles";
    if (aSelector == @selector(contextClick))
        return @"contextClick";
    if (aSelector == @selector(enableDOMUIEventLogging:))
        return @"enableDOMUIEventLogging";
    if (aSelector == @selector(fireKeyboardEventsToElement:))
        return @"fireKeyboardEventsToElement";
    if (aSelector == @selector(keyDown:withModifiers:withLocation:))
        return @"keyDown";
    if (aSelector == @selector(leapForward:))
        return @"leapForward";
    if (aSelector == @selector(mouseDown:withModifiers:))
        return @"mouseDown";
    if (aSelector == @selector(mouseUp:withModifiers:))
        return @"mouseUp";
    if (aSelector == @selector(mouseMoveToX:Y:))
        return @"mouseMoveTo";
    if (aSelector == @selector(setDragMode:))
        return @"setDragMode";
    if (aSelector == @selector(mouseScrollByX:andY:))
        return @"mouseScrollBy";
    if (aSelector == @selector(continuousMouseScrollByX:andY:))
        return @"continuousMouseScrollBy";
    return nil;
}

- (id)init
{
    self = [super init];
    if (self)
        dragMode = YES;
    return self;
}

- (void)dealloc
{
    [super dealloc];
}

- (double)currentEventTime
{
    return GetCurrentEventTime() + timeOffset;
}

- (void)leapForward:(int)milliseconds
{
    if (dragMode && leftMouseButtonDown && !replayingSavedEvents) {
        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[EventSender instanceMethodSignatureForSelector:@selector(leapForward:)]];
        [invocation setTarget:self];
        [invocation setSelector:@selector(leapForward:)];
        [invocation setArgument:&milliseconds atIndex:2];
        
        [EventSender saveEvent:invocation];
        
        return;
    }

    timeOffset += milliseconds / 1000.0;
}

- (void)clearKillRing
{
    _NSNewKillRingSequence();
}

static NSEventType eventTypeForMouseButtonAndAction(int button, MouseAction action)
{
    switch (button) {
        case LeftMouseButton:
            switch (action) {
                case MouseDown:
                    return NSLeftMouseDown;
                case MouseUp:
                    return NSLeftMouseUp;
                case MouseDragged:
                    return NSLeftMouseDragged;
            }
        case RightMouseButton:
            switch (action) {
                case MouseDown:
                    return NSRightMouseDown;
                case MouseUp:
                    return NSRightMouseUp;
                case MouseDragged:
                    return NSRightMouseDragged;
            }
        default:
            switch (action) {
                case MouseDown:
                    return NSOtherMouseDown;
                case MouseUp:
                    return NSOtherMouseUp;
                case MouseDragged:
                    return NSOtherMouseDragged;
            }
    }
    assert(0);
    return static_cast<NSEventType>(0);
}

- (void)beginDragWithFiles:(WebScriptObject*)jsFilePaths
{
    assert(!draggingInfo);
    assert([jsFilePaths isKindOfClass:[WebScriptObject class]]);

    NSPasteboard *pboard = [NSPasteboard pasteboardWithUniqueName];
    [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil];

    NSURL *currentTestURL = [NSURL URLWithString:[[mainFrame webView] mainFrameURL]];

    NSMutableArray *filePaths = [NSMutableArray array];
    for (unsigned i = 0; [[jsFilePaths webScriptValueAtIndex:i] isKindOfClass:[NSString class]]; i++) {
        NSString *filePath = (NSString *)[jsFilePaths webScriptValueAtIndex:i];
        // Have NSURL encode the name so that we handle '?' in file names correctly.
        NSURL *fileURL = [NSURL fileURLWithPath:filePath];
        NSURL *absoluteFileURL = [NSURL URLWithString:[fileURL relativeString]  relativeToURL:currentTestURL];
        [filePaths addObject:[absoluteFileURL path]];
    }

    [pboard setPropertyList:filePaths forType:NSFilenamesPboardType];
    assert([pboard propertyListForType:NSFilenamesPboardType]); // setPropertyList will silently fail on error, assert that it didn't fail

    // Provide a source, otherwise [DumpRenderTreeDraggingInfo draggingSourceOperationMask] defaults to NSDragOperationNone
    DumpRenderTreeFileDraggingSource *source = [[[DumpRenderTreeFileDraggingSource alloc] init] autorelease];
    draggingInfo = [[DumpRenderTreeDraggingInfo alloc] initWithImage:nil offset:NSZeroSize pasteboard:pboard source:source];
    [[mainFrame webView] draggingEntered:draggingInfo];

    dragMode = NO; // dragMode saves events and then replays them later.  We don't need/want that.
    leftMouseButtonDown = YES; // Make the rest of eventSender think a drag is in progress
}

- (void)updateClickCountForButton:(int)buttonNumber
{
    if (([self currentEventTime] - lastClick >= 1) ||
        !NSEqualPoints(lastMousePosition, lastClickPosition) ||
        lastClickButton != buttonNumber) {
        clickCount = 1;
        lastClickButton = buttonNumber;
    } else
        clickCount++;
}

static int buildModifierFlags(const WebScriptObject* modifiers)
{
    int flags = 0;
    if (![modifiers isKindOfClass:[WebScriptObject class]])
        return flags;
    for (unsigned i = 0; [[modifiers webScriptValueAtIndex:i] isKindOfClass:[NSString class]]; i++) {
        NSString* modifierName = (NSString*)[modifiers webScriptValueAtIndex:i];
        if ([modifierName isEqual:@"ctrlKey"])
            flags |= NSControlKeyMask;
        else if ([modifierName isEqual:@"shiftKey"] || [modifierName isEqual:@"rangeSelectionKey"])
            flags |= NSShiftKeyMask;
        else if ([modifierName isEqual:@"altKey"])
            flags |= NSAlternateKeyMask;
        else if ([modifierName isEqual:@"metaKey"] || [modifierName isEqual:@"addSelectionKey"])
            flags |= NSCommandKeyMask;
    }
    return flags;
}

- (void)mouseDown:(int)buttonNumber withModifiers:(WebScriptObject*)modifiers
{
    [[[mainFrame frameView] documentView] layout];
    [self updateClickCountForButton:buttonNumber];
    
    NSEventType eventType = eventTypeForMouseButtonAndAction(buttonNumber, MouseDown);
    NSEvent *event = [NSEvent mouseEventWithType:eventType
                                        location:lastMousePosition 
                                   modifierFlags:buildModifierFlags(modifiers)
                                       timestamp:[self currentEventTime]
                                    windowNumber:[[[mainFrame webView] window] windowNumber] 
                                         context:[NSGraphicsContext currentContext] 
                                     eventNumber:++eventNumber 
                                      clickCount:clickCount 
                                        pressure:0.0];

    NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
    if (subView) {
        [subView mouseDown:event];
        if (buttonNumber == LeftMouseButton)
            leftMouseButtonDown = YES;
    }
}

- (void)mouseDown:(int)buttonNumber
{
    [self mouseDown:buttonNumber withModifiers:nil];
}

- (void)textZoomIn
{
    [[mainFrame webView] makeTextLarger:self];
}

- (void)textZoomOut
{
    [[mainFrame webView] makeTextSmaller:self];
}

- (void)zoomPageIn
{
    [[mainFrame webView] zoomPageIn:self];
}

- (void)zoomPageOut
{
    [[mainFrame webView] zoomPageOut:self];
}

- (void)mouseUp:(int)buttonNumber withModifiers:(WebScriptObject*)modifiers
{
    if (dragMode && !replayingSavedEvents) {
        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[EventSender instanceMethodSignatureForSelector:@selector(mouseUp:withModifiers:)]];
        [invocation setTarget:self];
        [invocation setSelector:@selector(mouseUp:withModifiers:)];
        [invocation setArgument:&buttonNumber atIndex:2];
        [invocation setArgument:&modifiers atIndex:3];
        
        [EventSender saveEvent:invocation];
        [EventSender replaySavedEvents];

        return;
    }

    [[[mainFrame frameView] documentView] layout];
    NSEventType eventType = eventTypeForMouseButtonAndAction(buttonNumber, MouseUp);
    NSEvent *event = [NSEvent mouseEventWithType:eventType
                                        location:lastMousePosition 
                                   modifierFlags:buildModifierFlags(modifiers)
                                       timestamp:[self currentEventTime]
                                    windowNumber:[[[mainFrame webView] window] windowNumber] 
                                         context:[NSGraphicsContext currentContext] 
                                     eventNumber:++eventNumber 
                                      clickCount:clickCount 
                                        pressure:0.0];

    NSView *targetView = [[mainFrame webView] hitTest:[event locationInWindow]];
    // FIXME: Silly hack to teach DRT to respect capturing mouse events outside the WebView.
    // The right solution is just to use NSApplication's built-in event sending methods, 
    // instead of rolling our own algorithm for selecting an event target.
    targetView = targetView ? targetView : [[mainFrame frameView] documentView];
    assert(targetView);
    [targetView mouseUp:event];
    if (buttonNumber == LeftMouseButton)
        leftMouseButtonDown = NO;
    lastClick = [event timestamp];
    lastClickPosition = lastMousePosition;
    if (draggingInfo) {
        WebView *webView = [mainFrame webView];
        
        NSDragOperation dragOperation = [webView draggingUpdated:draggingInfo];
        
        if (dragOperation != NSDragOperationNone)
            [webView performDragOperation:draggingInfo];
        else
            [webView draggingExited:draggingInfo];
        // Per NSDragging.h: draggingSources may not implement draggedImage:endedAt:operation:
        if ([[draggingInfo draggingSource] respondsToSelector:@selector(draggedImage:endedAt:operation:)])
            [[draggingInfo draggingSource] draggedImage:[draggingInfo draggedImage] endedAt:lastMousePosition operation:dragOperation];
        [draggingInfo release];
        draggingInfo = nil;
    }
}

- (void)mouseUp:(int)buttonNumber
{
    [self mouseUp:buttonNumber withModifiers:nil];
}

- (void)mouseMoveToX:(int)x Y:(int)y
{
    if (dragMode && leftMouseButtonDown && !replayingSavedEvents) {
        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[EventSender instanceMethodSignatureForSelector:@selector(mouseMoveToX:Y:)]];
        [invocation setTarget:self];
        [invocation setSelector:@selector(mouseMoveToX:Y:)];
        [invocation setArgument:&x atIndex:2];
        [invocation setArgument:&y atIndex:3];
        
        [EventSender saveEvent:invocation];
        return;
    }

    NSView *view = [mainFrame webView];
    lastMousePosition = [view convertPoint:NSMakePoint(x, [view frame].size.height - y) toView:nil];
    NSEvent *event = [NSEvent mouseEventWithType:(leftMouseButtonDown ? NSLeftMouseDragged : NSMouseMoved)
                                        location:lastMousePosition 
                                   modifierFlags:0 
                                       timestamp:[self currentEventTime]
                                    windowNumber:[[view window] windowNumber] 
                                         context:[NSGraphicsContext currentContext] 
                                     eventNumber:++eventNumber 
                                      clickCount:(leftMouseButtonDown ? clickCount : 0) 
                                        pressure:0.0];

    NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
    if (subView) {
        if (leftMouseButtonDown) {
            if (draggingInfo) {
                // Per NSDragging.h: draggingSources may not implement draggedImage:movedTo:
                if ([[draggingInfo draggingSource] respondsToSelector:@selector(draggedImage:movedTo:)])
                    [[draggingInfo draggingSource] draggedImage:[draggingInfo draggedImage] movedTo:lastMousePosition];
                [[mainFrame webView] draggingUpdated:draggingInfo];
            } else
                [subView mouseDragged:event];
        } else
            [subView mouseMoved:event];
    }
}

- (void)mouseScrollByX:(int)x andY:(int)y continuously:(BOOL)c
{
    // CGEventCreateScrollWheelEvent() was introduced in 10.5
#if !defined(BUILDING_ON_TIGER)
    CGScrollEventUnit unit = c?kCGScrollEventUnitPixel:kCGScrollEventUnitLine;
    CGEventRef cgScrollEvent = CGEventCreateScrollWheelEvent(NULL, unit, 2, y, x);
    
    // CGEvent locations are in global display coordinates.
    CGPoint lastGlobalMousePosition = {
        lastMousePosition.x,
        [[NSScreen mainScreen] frame].size.height - lastMousePosition.y
    };
    CGEventSetLocation(cgScrollEvent, lastGlobalMousePosition);

    NSEvent *scrollEvent = [NSEvent eventWithCGEvent:cgScrollEvent];
    CFRelease(cgScrollEvent);

    NSView *subView = [[mainFrame webView] hitTest:[scrollEvent locationInWindow]];
    if (subView)
        [subView scrollWheel:scrollEvent];
#endif
}

- (void)continuousMouseScrollByX:(int)x andY:(int)y
{
    [self mouseScrollByX:x andY:y continuously:YES];
}

- (void)mouseScrollByX:(int)x andY:(int)y
{
    [self mouseScrollByX:x andY:y continuously:NO];
}

- (NSArray *)contextClick
{
    [[[mainFrame frameView] documentView] layout];
    [self updateClickCountForButton:RightMouseButton];

    NSEvent *event = [NSEvent mouseEventWithType:NSRightMouseDown
                                        location:lastMousePosition 
                                   modifierFlags:0 
                                       timestamp:[self currentEventTime]
                                    windowNumber:[[[mainFrame webView] window] windowNumber] 
                                         context:[NSGraphicsContext currentContext] 
                                     eventNumber:++eventNumber 
                                      clickCount:clickCount 
                                        pressure:0.0];

    NSView *subView = [[mainFrame webView] hitTest:[event locationInWindow]];
    NSMutableArray *menuItemStrings = [NSMutableArray array];
    
    if (subView) {
        NSMenu* menu = [subView menuForEvent:event];

        for (int i = 0; i < [menu numberOfItems]; ++i) {
            NSMenuItem* menuItem = [menu itemAtIndex:i];
            if (!strcmp("Inspect Element", [[menuItem title] UTF8String]))
                continue;

            if ([menuItem isSeparatorItem])
                [menuItemStrings addObject:@"<separator>"];
            else
                [menuItemStrings addObject:[menuItem title]];
        }
    }
    
    return menuItemStrings;
}

- (void)scheduleAsynchronousClick
{
    [self performSelector:@selector(mouseDown:) withObject:nil afterDelay:0];
    [self performSelector:@selector(mouseUp:) withObject:nil afterDelay:0];
}

+ (void)saveEvent:(NSInvocation *)event
{
    if (!savedMouseEvents)
        savedMouseEvents = [[NSMutableArray alloc] init];
    [savedMouseEvents addObject:event];
}

+ (void)replaySavedEvents
{
    replayingSavedEvents = YES;
    while ([savedMouseEvents count]) {
        // if a drag is initiated, the remaining saved events will be dispatched from our dragging delegate
        NSInvocation *invocation = [[[savedMouseEvents objectAtIndex:0] retain] autorelease];
        [savedMouseEvents removeObjectAtIndex:0];
        [invocation invoke];
    }
    replayingSavedEvents = NO;
}

+ (void)clearSavedEvents
{
    [savedMouseEvents release];
    savedMouseEvents = nil;
}

- (void)keyDown:(NSString *)character withModifiers:(WebScriptObject *)modifiers withLocation:(unsigned long)keyLocation
{
    NSString *eventCharacter = character;
    unsigned short keyCode = 0;
    if ([character isEqualToString:@"leftArrow"]) {
        const unichar ch = NSLeftArrowFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x7B;
    } else if ([character isEqualToString:@"rightArrow"]) {
        const unichar ch = NSRightArrowFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x7C;
    } else if ([character isEqualToString:@"upArrow"]) {
        const unichar ch = NSUpArrowFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x7E;
    } else if ([character isEqualToString:@"downArrow"]) {
        const unichar ch = NSDownArrowFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x7D;
    } else if ([character isEqualToString:@"pageUp"]) {
        const unichar ch = NSPageUpFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x74;
    } else if ([character isEqualToString:@"pageDown"]) {
        const unichar ch = NSPageDownFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x79;
    } else if ([character isEqualToString:@"home"]) {
        const unichar ch = NSHomeFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x73;
    } else if ([character isEqualToString:@"end"]) {
        const unichar ch = NSEndFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x77;
    } else if ([character isEqualToString:@"insert"]) {
        const unichar ch = NSInsertFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x72;
    } else if ([character isEqualToString:@"delete"]) {
        const unichar ch = NSDeleteFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x75;
    } else if ([character isEqualToString:@"printScreen"]) {
        const unichar ch = NSPrintScreenFunctionKey;
        eventCharacter = [NSString stringWithCharacters:&ch length:1];
        keyCode = 0x0; // There is no known virtual key code for PrintScreen.
    }

    // Compare the input string with the function-key names defined by the DOM spec (i.e. "F1",...,"F24").
    // If the input string is a function-key name, set its key code.
    for (unsigned i = 1; i <= 24; i++) {
        if ([character isEqualToString:[NSString stringWithFormat:@"F%u", i]]) {
            const unichar ch = NSF1FunctionKey + (i - 1);
            eventCharacter = [NSString stringWithCharacters:&ch length:1];
            switch (i) {
                case 1: keyCode = 0x7A; break;
                case 2: keyCode = 0x78; break;
                case 3: keyCode = 0x63; break;
                case 4: keyCode = 0x76; break;
                case 5: keyCode = 0x60; break;
                case 6: keyCode = 0x61; break;
                case 7: keyCode = 0x62; break;
                case 8: keyCode = 0x64; break;
                case 9: keyCode = 0x65; break;
                case 10: keyCode = 0x6D; break;
                case 11: keyCode = 0x67; break;
                case 12: keyCode = 0x6F; break;
                case 13: keyCode = 0x69; break;
                case 14: keyCode = 0x6B; break;
                case 15: keyCode = 0x71; break;
                case 16: keyCode = 0x6A; break;
                case 17: keyCode = 0x40; break;
                case 18: keyCode = 0x4F; break;
                case 19: keyCode = 0x50; break;
                case 20: keyCode = 0x5A; break;
            }
        }
    }

    // FIXME: No keyCode is set for most keys.
    if ([character isEqualToString:@"\t"])
        keyCode = 0x30;
    else if ([character isEqualToString:@" "])
        keyCode = 0x31;
    else if ([character isEqualToString:@"\r"])
        keyCode = 0x24;
    else if ([character isEqualToString:@"\n"])
        keyCode = 0x4C;
    else if ([character isEqualToString:@"\x8"])
        keyCode = 0x33;
    else if ([character isEqualToString:@"7"])
        keyCode = 0x1A;
    else if ([character isEqualToString:@"5"])
        keyCode = 0x17;
    else if ([character isEqualToString:@"9"])
        keyCode = 0x19;
    else if ([character isEqualToString:@"0"])
        keyCode = 0x1D;
    else if ([character isEqualToString:@"a"])
        keyCode = 0x00;
    else if ([character isEqualToString:@"b"])
        keyCode = 0x0B;
    else if ([character isEqualToString:@"d"])
        keyCode = 0x02;
    else if ([character isEqualToString:@"e"])
        keyCode = 0x0E;

    NSString *charactersIgnoringModifiers = eventCharacter;

    int modifierFlags = 0;

    if ([character length] == 1 && [character characterAtIndex:0] >= 'A' && [character characterAtIndex:0] <= 'Z') {
        modifierFlags |= NSShiftKeyMask;
        charactersIgnoringModifiers = [character lowercaseString];
    }

    modifierFlags |= buildModifierFlags(modifiers);

    if (keyLocation == DOM_KEY_LOCATION_NUMPAD)
        modifierFlags |= NSNumericPadKeyMask;

    [[[mainFrame frameView] documentView] layout];

    NSEvent *event = [NSEvent keyEventWithType:NSKeyDown
                        location:NSMakePoint(5, 5)
                        modifierFlags:modifierFlags
                        timestamp:[self currentEventTime]
                        windowNumber:[[[mainFrame webView] window] windowNumber]
                        context:[NSGraphicsContext currentContext]
                        characters:eventCharacter
                        charactersIgnoringModifiers:charactersIgnoringModifiers
                        isARepeat:NO
                        keyCode:keyCode];

    [[[[mainFrame webView] window] firstResponder] keyDown:event];

    event = [NSEvent keyEventWithType:NSKeyUp
                        location:NSMakePoint(5, 5)
                        modifierFlags:modifierFlags
                        timestamp:[self currentEventTime]
                        windowNumber:[[[mainFrame webView] window] windowNumber]
                        context:[NSGraphicsContext currentContext]
                        characters:eventCharacter
                        charactersIgnoringModifiers:charactersIgnoringModifiers
                        isARepeat:NO
                        keyCode:keyCode];

    [[[[mainFrame webView] window] firstResponder] keyUp:event];
}

- (void)enableDOMUIEventLogging:(WebScriptObject *)node
{
    NSEnumerator *eventEnumerator = [webkitDomEventNames objectEnumerator];
    id eventName;
    while ((eventName = [eventEnumerator nextObject])) {
        [(id<DOMEventTarget>)node addEventListener:eventName listener:self useCapture:NO];
    }
}

- (void)handleEvent:(DOMEvent *)event
{
    DOMNode *target = [event target];

    printf("event type:      %s\n", [[event type] UTF8String]);
    printf("  target:        <%s>\n", [[[target nodeName] lowercaseString] UTF8String]);
    
    if ([event isKindOfClass:[DOMEvent class]]) {
        printf("  eventPhase:    %d\n", [event eventPhase]);
        printf("  bubbles:       %d\n", [event bubbles] ? 1 : 0);
        printf("  cancelable:    %d\n", [event cancelable] ? 1 : 0);
    }
    
    if ([event isKindOfClass:[DOMUIEvent class]]) {
        printf("  detail:        %d\n", [(DOMUIEvent*)event detail]);
        
        DOMAbstractView *view = [(DOMUIEvent*)event view];
        if (view) {
            printf("  view:          OK");            
            if ([view document])
                printf(" (document: OK)");
            printf("\n");
        }
    }
    
    if ([event isKindOfClass:[DOMKeyboardEvent class]]) {
        printf("  keyIdentifier: %s\n", [[(DOMKeyboardEvent*)event keyIdentifier] UTF8String]);
        printf("  keyLocation:   %d\n", [(DOMKeyboardEvent*)event keyLocation]);
        printf("  modifier keys: c:%d s:%d a:%d m:%d\n", 
               [(DOMKeyboardEvent*)event ctrlKey] ? 1 : 0, 
               [(DOMKeyboardEvent*)event shiftKey] ? 1 : 0, 
               [(DOMKeyboardEvent*)event altKey] ? 1 : 0, 
               [(DOMKeyboardEvent*)event metaKey] ? 1 : 0);
        printf("  keyCode:       %d\n", [(DOMKeyboardEvent*)event keyCode]);
        printf("  charCode:      %d\n", [(DOMKeyboardEvent*)event charCode]);
    }
    
    if ([event isKindOfClass:[DOMMouseEvent class]]) {
        printf("  button:        %d\n", [(DOMMouseEvent*)event button]);
        printf("  clientX:       %d\n", [(DOMMouseEvent*)event clientX]);
        printf("  clientY:       %d\n", [(DOMMouseEvent*)event clientY]);
        printf("  screenX:       %d\n", [(DOMMouseEvent*)event screenX]);
        printf("  screenY:       %d\n", [(DOMMouseEvent*)event screenY]);
        printf("  modifier keys: c:%d s:%d a:%d m:%d\n", 
               [(DOMMouseEvent*)event ctrlKey] ? 1 : 0, 
               [(DOMMouseEvent*)event shiftKey] ? 1 : 0, 
               [(DOMMouseEvent*)event altKey] ? 1 : 0, 
               [(DOMMouseEvent*)event metaKey] ? 1 : 0);
        id relatedTarget = [(DOMMouseEvent*)event relatedTarget];
        if (relatedTarget) {
            printf("  relatedTarget: %s", [[[relatedTarget class] description] UTF8String]);
            if ([relatedTarget isKindOfClass:[DOMNode class]])
                printf(" (nodeName: %s)", [[(DOMNode*)relatedTarget nodeName] UTF8String]);
            printf("\n");
        }
    }
    
    if ([event isKindOfClass:[DOMMutationEvent class]]) {
        printf("  prevValue:     %s\n", [[(DOMMutationEvent*)event prevValue] UTF8String]);
        printf("  newValue:      %s\n", [[(DOMMutationEvent*)event newValue] UTF8String]);
        printf("  attrName:      %s\n", [[(DOMMutationEvent*)event attrName] UTF8String]);
        printf("  attrChange:    %d\n", [(DOMMutationEvent*)event attrChange]);
        DOMNode *relatedNode = [(DOMMutationEvent*)event relatedNode];
        if (relatedNode) {
            printf("  relatedNode:   %s (nodeName: %s)\n", 
                   [[[relatedNode class] description] UTF8String],
                   [[relatedNode nodeName] UTF8String]);
        }
    }
    
    if ([event isKindOfClass:[DOMWheelEvent class]]) {
        printf("  clientX:       %d\n", [(DOMWheelEvent*)event clientX]);
        printf("  clientY:       %d\n", [(DOMWheelEvent*)event clientY]);
        printf("  screenX:       %d\n", [(DOMWheelEvent*)event screenX]);
        printf("  screenY:       %d\n", [(DOMWheelEvent*)event screenY]);
        printf("  modifier keys: c:%d s:%d a:%d m:%d\n", 
               [(DOMWheelEvent*)event ctrlKey] ? 1 : 0, 
               [(DOMWheelEvent*)event shiftKey] ? 1 : 0, 
               [(DOMWheelEvent*)event altKey] ? 1 : 0, 
               [(DOMWheelEvent*)event metaKey] ? 1 : 0);
        printf("  isHorizontal:  %d\n", [(DOMWheelEvent*)event isHorizontal] ? 1 : 0);
        printf("  wheelDelta:    %d\n", [(DOMWheelEvent*)event wheelDelta]);
    }
}

// FIXME: It's not good to have a test hard-wired into this controller like this.
// Instead we need to get testing framework based on the Objective-C bindings
// to work well enough that we can test that way instead.
- (void)fireKeyboardEventsToElement:(WebScriptObject *)element {
    
    if (![element isKindOfClass:[DOMHTMLElement class]])
        return;
    
    DOMHTMLElement *target = (DOMHTMLElement*)element;
    DOMDocument *document = [target ownerDocument];
    
    // Keyboard Event 1
    
    DOMEvent *domEvent = [document createEvent:@"KeyboardEvent"];
    [(DOMKeyboardEvent*)domEvent initKeyboardEvent:@"keydown" 
                                         canBubble:YES
                                        cancelable:YES
                                              view:[document defaultView]
                                     keyIdentifier:@"U+000041" 
                                       keyLocation:0
                                           ctrlKey:YES
                                            altKey:NO
                                          shiftKey:NO
                                           metaKey:NO];
    [target dispatchEvent:domEvent];  
        
    // Keyboard Event 2
    
    domEvent = [document createEvent:@"KeyboardEvent"];
    [(DOMKeyboardEvent*)domEvent initKeyboardEvent:@"keypress" 
                                         canBubble:YES
                                        cancelable:YES
                                              view:[document defaultView]
                                     keyIdentifier:@"U+000045" 
                                       keyLocation:1
                                           ctrlKey:NO
                                            altKey:YES
                                          shiftKey:NO
                                           metaKey:NO];
    [target dispatchEvent:domEvent];    
    
    // Keyboard Event 3
    
    domEvent = [document createEvent:@"KeyboardEvent"];
    [(DOMKeyboardEvent*)domEvent initKeyboardEvent:@"keyup" 
                                         canBubble:YES
                                        cancelable:YES
                                              view:[document defaultView]
                                     keyIdentifier:@"U+000056" 
                                       keyLocation:0
                                           ctrlKey:NO
                                            altKey:NO
                                          shiftKey:NO
                                           metaKey:NO];
    [target dispatchEvent:domEvent];   
    
}

@end
#endif

Return to Bug 57515

Lines 1-3 Source/WebKit2/ChangeLog_sec1
- Source/WebKit2/ChangeLog +47 lines
		1	2011-03-31 Chang Shu <cshu@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Mac] [WK2] Implement KeyDown function for WebKit2 EventSender.
		6	https://bugs.webkit.org/show_bug.cgi?id=57515
		7
		8	The following code change builds up the infrastructure for
		9	WebKitTestRunner EventSender to send messages from the InjectedBundle
		10	in WebProcess to UIProcess of WebKitTestRunner.
		11
		12	The basic KeyDown functionality is implemented except the local implementation.
		13
		14	* Shared/API/c/WKArgumentDecoder.cpp: Added.
		15	(WKCreateArgumentDecoder):
		16	(WKDecodeUInt32):
		17	(WKDecodeString):
		18	* Shared/API/c/WKArgumentDecoder.h: Added.
		19	* Shared/API/c/WKBase.h:
		20	* Shared/API/c/WKMessageID.h: Added.
		21	* Shared/API/c/WKSharedAPICast.h:
		22	* Shared/EventSenderProxyMessages.h: Added.
		23	(Messages::EventSenderProxy::KeyDown::KeyDown):
		24	(Messages::EventSenderProxy::KeyDown::encode):
		25	* UIProcess/WebContextUserMessageCoders.h:
		26	(WebKit::WebContextUserMessageDecoder::decode):
		27	* WebKit2.xcodeproj/project.pbxproj:
		28	* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
		29	(WKBundleGetEventSender):
		30	* WebProcess/InjectedBundle/API/c/WKBundle.h:
		31	* WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
		32	* WebProcess/InjectedBundle/API/c/WKBundleEventSender.cpp: Added.
		33	(WKBundleEventSenderKeyDown):
		34	* WebProcess/InjectedBundle/API/c/WKBundleEventSender.h: Added.
		35	* WebProcess/InjectedBundle/InjectedBundle.cpp:
		36	(WebKit::InjectedBundle::InjectedBundle):
		37	* WebProcess/InjectedBundle/InjectedBundle.h:
		38	(WebKit::InjectedBundle::eventSender):
		39	* WebProcess/InjectedBundle/InjectedBundleEventSender.cpp: Added.
		40	(WebKit::InjectedBundleEventSender::create):
		41	(WebKit::InjectedBundleEventSender::InjectedBundleEventSender):
		42	(WebKit::InjectedBundleEventSender::~InjectedBundleEventSender):
		43	(WebKit::InjectedBundleEventSender::keyDown):
		44	* WebProcess/InjectedBundle/InjectedBundleEventSender.h: Added.
		45	* WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
		46	(WebKit::InjectedBundleUserMessageEncoder::encode):
		47
1	2011-03-31 John Sullivan <sullivan@apple.com>	48	2011-03-31 John Sullivan <sullivan@apple.com>
2		49
3	Reviewed by Darin Adler and Adam Roben.	50	Reviewed by Darin Adler and Adam Roben.

Line 0 Source/WebKit2/Shared/EventSenderProxyMessages.h_sec1
- Source/WebKit2/Shared/EventSenderProxyMessages.h +64 lines
	1	/*
	2	* Copyright (C) 2011 Apple Inc. All rights reserved.
	3	* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions
	7	* are met:
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
	15	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	17	* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
	18	* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	19	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
	20	* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	21	* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
	22	* OR TORT (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	#ifndef EventSenderProxyMessages_h
	27	#define EventSenderProxyMessages_h
	28
	29	#include "Arguments.h"
	30	#include "MessageID.h"
	31	#include "WKMessageID.h"
	32	#include <wtf/text/WTFString.h>
	33
	34	namespace Messages {
	35
	36	namespace EventSenderProxy {
	37
	38	struct KeyDown : CoreIPC::Arguments3<const String&, uint32_t, uint32_t> {
	39	static const Kind messageID = KeyDownID;
	40	typedef CoreIPC::Arguments3<const String&, uint32_t, uint32_t> DecodeType;
	41	KeyDown(const String& key, uint32_t modifiers, uint32_t location)
	42	: CoreIPC::Arguments3<const String&, uint32_t, uint32_t>(key, modifiers, location)
	43	{
	44	}
	45	void encode(CoreIPC::ArgumentEncoder* encoder) const
	46	{
	47	encoder->encode(static_cast<uint32_t>(messageID));
	48	DecodeType::encode(encoder);
	49	}
	50	};
	51
	52	} // namespace EventSenderProxy
	53
	54	} // namespace Messages
	55
	56	namespace CoreIPC {
	57
	58	template<> struct MessageKindTraits<Messages::EventSenderProxy::Kind> {
	59	static const MessageClass messageClass = MessageClassWebContextLegacy;
	60	};
	61
	62	} // namespace CoreIPC
	63
	64	#endif // EventSenderProxyMessages_h

Line 0 Source/WebKit2/Shared/API/c/WKArgumentDecoder.cpp_sec1
- Source/WebKit2/Shared/API/c/WKArgumentDecoder.cpp +59 lines
	1	/*
	2	* Copyright (C) 2011 Apple Inc. All rights reserved.
	3	* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions
	7	* are met:
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	15	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	16	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	17	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	18	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	19	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	20	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	21	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	22	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	23	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	24	* THE POSSIBILITY OF SUCH DAMAGE.
	25	*/
	26
	27	#include "config.h"
	28	#include "WKArgumentDecoder.h"
	29
	30	#include "APIObject.h"
	31	#include "ArgumentCoders.h"
	32	#include "Connection.h"
	33	#include "EventSenderProxyMessages.h"
	34	#include "HandleMessage.h"
	35	#include "WKAPICast.h"
	36	#include "WKString.h"
	37
	38	using namespace WebKit;
	39
	40	WKArgumentDecoderRef WKCreateArgumentDecoder(const unsigned char* data, size_t length)
	41	{
	42	CoreIPC::ArgumentDecoder* argumentDecoder = new CoreIPC::ArgumentDecoder(data, length);
	43	return toAPI(argumentDecoder);
	44	}
	45
	46	bool WKDecodeUInt32(WKArgumentDecoderRef argumentDecoderRef, uint32_t& value)
	47	{
	48	return toImpl(argumentDecoderRef)->decode(value);
	49	}
	50
	51	bool WKDecodeString(WKArgumentDecoderRef argumentDecoderRef, WKStringRef& strRef)
	52	{
	53	String str;
	54	if (toImpl(argumentDecoderRef)->decode(str)) {
	55	strRef = WKStringCreateWithUTF8CString(str.utf8().data());
	56	return true;
	57	}
	58	return false;
	59	}

Line 0 Source/WebKit2/Shared/API/c/WKMessageID.h_sec1
- Source/WebKit2/Shared/API/c/WKMessageID.h +41 lines
	1	/*
	2	* Copyright (C) 2011 Apple Inc. All rights reserved.
	3	* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions
	7	* are met:
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
	15	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	16	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	17	* DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
	18	* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	19	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
	20	* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	21	* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
	22	* OR TORT (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	#ifndef WKMessageID_h
	27	#define WKMessageID_h
	28
	29	namespace Messages {
	30
	31	namespace EventSenderProxy {
	32
	33	enum Kind {
	34	KeyDownID,
	35	};
	36
	37	} // namespace EventSenderProxy
	38
	39	} // namespace Messages
	40
	41	#endif // WKMessageID_h

Lines 44-49 namespace WebKit { Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h_sec1
- Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h +2 lines
44	class InjectedBundle;	44	class InjectedBundle;
45	class InjectedBundleBackForwardList;	45	class InjectedBundleBackForwardList;
46	class InjectedBundleBackForwardListItem;	46	class InjectedBundleBackForwardListItem;
		47	class InjectedBundleEventSender;
47	class InjectedBundleHitTestResult;	48	class InjectedBundleHitTestResult;
48	class InjectedBundleNavigationAction;	49	class InjectedBundleNavigationAction;
49	class InjectedBundleNodeHandle;	50	class InjectedBundleNodeHandle;
Lines 58-63 class WebPageGroupProxy; Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h_sec2
58	WK_ADD_API_MAPPING(WKBundleBackForwardListItemRef, InjectedBundleBackForwardListItem)	59	WK_ADD_API_MAPPING(WKBundleBackForwardListItemRef, InjectedBundleBackForwardListItem)
59	WK_ADD_API_MAPPING(WKBundleBackForwardListRef, InjectedBundleBackForwardList)	60	WK_ADD_API_MAPPING(WKBundleBackForwardListRef, InjectedBundleBackForwardList)
60	WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, WebCore::CSSStyleDeclaration)	61	WK_ADD_API_MAPPING(WKBundleCSSStyleDeclarationRef, WebCore::CSSStyleDeclaration)
		62	WK_ADD_API_MAPPING(WKBundleEventSenderRef, InjectedBundleEventSender)
61	WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame)	63	WK_ADD_API_MAPPING(WKBundleFrameRef, WebFrame)
62	WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult)	64	WK_ADD_API_MAPPING(WKBundleHitTestResultRef, InjectedBundleHitTestResult)
63	WK_ADD_API_MAPPING(WKBundleInspectorRef, WebInspector)	65	WK_ADD_API_MAPPING(WKBundleInspectorRef, WebInspector)

Line 0 Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleEventSender.h_sec1
- Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleEventSender.h +44 lines
	1	/*
	2	* Copyright (C) 2010 Apple Inc. All rights reserved.
	3	* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions
	7	* are met:
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	*
	14	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	15	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	16	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	17	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	18	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	19	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	20	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	21	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	22	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	23	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	24	* THE POSSIBILITY OF SUCH DAMAGE.
	25	*/
	26
	27	#ifndef WKBundleEventSender_h
	28	#define WKBundleEventSender_h
	29
	30	#include <WebKit2/WKBase.h>
	31
	32	#ifdef __cplusplus
	33	extern "C" {
	34	#endif
	35
	36	WK_EXPORT WKTypeID WKBundleEventSenderGetTypeID();
	37
	38	WK_EXPORT void WKBundleEventSenderKeyDown(WKBundleEventSenderRef eventSenderRef, WKStringRef keyRef, uint32_t modif, uint32_t location);
	39
	40	#ifdef __cplusplus
	41	}
	42	#endif
	43
	44	#endif // WKBundleEventSender_h

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +30 lines
		1	2011-03-31 Chang Shu <cshu@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[Mac] [WK2] Implement KeyDown function for WebKit2 EventSender.
		6	https://bugs.webkit.org/show_bug.cgi?id=57515
		7
		8	The following code change builds up the infrastructure for
		9	WebKitTestRunner EventSender to send messages from the InjectedBundle
		10	in WebProcess to UIProcess of WebKitTestRunner.
		11
		12	The basic KeyDown functionality is implemented except the local implementation.
		13
		14	* WebKitTestRunner/EventSenderProxy.cpp: Added.
		15	(WTR::EventSenderProxy::create):
		16	(WTR::EventSenderProxy::EventSenderProxy):
		17	(WTR::EventSenderProxy::didReceiveEventSenderProxyMessage):
		18	* WebKitTestRunner/EventSenderProxy.h: Added.
		19	* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
		20	(WTR::EventSendingController::keyDown):
		21	* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
		22	(WTR::InjectedBundle::eventSender):
		23	* WebKitTestRunner/TestController.cpp:
		24	(WTR::TestController::TestController):
		25	(WTR::TestController::didReceiveMessageFromInjectedBundle):
		26	* WebKitTestRunner/TestController.h:
		27	* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
		28	* WebKitTestRunner/mac/EventSender.h: Added.
		29	* WebKitTestRunner/mac/EventSenderMac.mm: Added.
		30
1	2011-03-31 Sergio Villar Senin <svillar@igalia.com>	31	2011-03-31 Sergio Villar Senin <svillar@igalia.com>
2		32
3	Reviewed by Martin Robinson.	33	Reviewed by Martin Robinson.

Line 0 Tools/WebKitTestRunner/EventSenderProxy.cpp_sec1
- Tools/WebKitTestRunner/EventSenderProxy.cpp +66 lines
		1	/*
		2	* Copyright (C) 2011 Apple Inc. All rights reserved.
		3	* Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
		4	*
		5	* Redistribution and use in source and binary forms, with or without
		6	* modification, are permitted provided that the following conditions
		7	* are met:
		8	* 1. Redistributions of source code must retain the above copyright
		9	* notice, this list of conditions and the following disclaimer.
		10	* 2. Redistributions in binary form must reproduce the above copyright
		11	* notice, this list of conditions and the following disclaimer in the
		12	* documentation and/or other materials provided with the distribution.
		13	*
		14	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
		15	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		16	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		17	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		18	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		19	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		20	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		21	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		22	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		23	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		24	* THE POSSIBILITY OF SUCH DAMAGE.
		25	*/
		26
		27	#include "config.h"
		28	#include "EventSenderProxy.h"
		29
		30	#include <WebKit2/WKArgumentDecoder.h>
		31	#include <WebKit2/WKArray.h>
		32	#include <WebKit2/WKMessageID.h>
		33
		34	namespace WTR {
		35
		36	EventSenderProxy* EventSenderProxy::create(TestController* testController)
		37	{
		38	return new EventSenderProxy(testController);
		39	}
		40
		41	EventSenderProxy::EventSenderProxy(TestController* testController)
		42	: m_testController(testController)
		43	{
		44	// TODO m_eventSender = new EventSender();
		45	};
		46
		47	void EventSenderProxy::didReceiveEventSenderProxyMessage(WKDataRef webData)
		48	{
		49	WKArgumentDecoderRef argumentDecoderRef = WKCreateArgumentDecoder(WKDataGetBytes(webData), WKDataGetSize(webData));
		50	uint32_t messageIDUint32;
		51	if (!WKDecodeUInt32(argumentDecoderRef, messageIDUint32))
		52	return;
		53	switch (static_cast<Messages::EventSenderProxy::Kind>(messageIDUint32)) {
		54	case Messages::EventSenderProxy::KeyDownID:
		55	WKStringRef key;
		56	uint32_t modifiers;
		57	uint32_t location;
		58	if (WKDecodeString(argumentDecoderRef, key) && WKDecodeUInt32(argumentDecoderRef, modifiers) && WKDecodeUInt32(argumentDecoderRef, location))
		59	fputs("Implement keyDown in WTR.\n", stderr); // TODO m_eventSender->keyDown(key, modifiers, location);
		60	break;
		61	default:
		62	ASSERT_NOT_REACHED();
		63	}
		64	}
65
66	} // namespace WebKit

Lines 29-34 Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp_sec1
- Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp +34 lines
29	#include "InjectedBundle.h"	29	#include "InjectedBundle.h"
30	#include "InjectedBundlePage.h"	30	#include "InjectedBundlePage.h"
31	#include "JSEventSendingController.h"	31	#include "JSEventSendingController.h"
		32	#include "StringFunctions.h"
		33	#if PLATFORM(MAC)
		34	#include <WebKit2/WKBundleEventSender.h>
		35	#endif
32	#include <WebKit2/WKBundlePage.h>	36	#include <WebKit2/WKBundlePage.h>
33	#include <WebKit2/WKBundlePagePrivate.h>	37	#include <WebKit2/WKBundlePagePrivate.h>
34	#include <WebKit2/WKBundlePrivate.h>	38	#include <WebKit2/WKBundlePrivate.h>
Lines 78-84 void EventSendingController::mouseMoveTo Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp_sec2
78		82
79	void EventSendingController::keyDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)	83	void EventSendingController::keyDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
80	{	84	{
		85	#if PLATFORM(MAC)
		86	if (!JSValueIsString(context, arguments[0]))
		87	return;
		88	JSRetainPtr<JSStringRef> jsKeyStrRef = JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, arguments[0], 0));
		89
		90	unsigned int modif = 0;
		91	if (JSValueIsObject(context, arguments[1])) {
		92	JSObjectRef modifObjRef = JSValueToObject(context, arguments[1], exception);
		93	for (int i = 0; i < 4; i++) {
		94	JSValueRef modifValueRef = JSObjectGetPropertyAtIndex(context, modifObjRef, i, exception);
		95	if (JSValueIsString(context, modifValueRef)) {
		96	JSRetainPtr<JSStringRef> jsModifStrRef = JSRetainPtr<JSStringRef>(Adopt, JSValueToStringCopy(context, modifValueRef, 0));
		97	if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "ctrlKey"))
		98	modif \|= kWKEventModifiersControlKey;
		99	else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "shiftKey"))
		100	modif \|= kWKEventModifiersShiftKey;
		101	else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "altKey"))
		102	modif \|= kWKEventModifiersAltKey;
		103	else if (JSStringIsEqualToUTF8CString(jsModifStrRef.get(), "metaKey"))
		104	modif \|= kWKEventModifiersMetaKey;
		105	}
		106	}
		107	}
		108	unsigned int location = 0;
		109	if (JSValueIsNumber(context, arguments[2]))
		110	location = static_cast<unsigned int>(JSValueToNumber(context, arguments[2], exception));
		111
		112	WKBundleEventSenderKeyDown(InjectedBundle::shared().eventSender(), toWK(jsKeyStrRef).get(), modif, location);
		113	#else
81	setExceptionForString(context, exception, "EventSender.keyDown is not yet supported.");	114	setExceptionForString(context, exception, "EventSender.keyDown is not yet supported.");
		115	#endif
82	}	116	}
83		117
84	void EventSendingController::contextClick(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)	118	void EventSendingController::contextClick(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)

Line 0 Tools/WebKitTestRunner/mac/EventSender.h_sec1
- Tools/WebKitTestRunner/mac/EventSender.h +56 lines
	1	/*
	2	* Copyright (C) 2011 Apple Inc. All rights reserved.
	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	*
	8	* 1. Redistributions of source code must retain the above copyright
	9	* notice, this list of conditions and the following disclaimer.
	10	* 2. Redistributions in binary form must reproduce the above copyright
	11	* notice, this list of conditions and the following disclaimer in the
	12	* documentation and/or other materials provided with the distribution.
	13	* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
	14	* its contributors may be used to endorse or promote products derived
	15	* from this software without specific prior written permission.
	16	*
	17	* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
	18	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	19	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	20	* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
	21	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	22	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	23	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	24	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	25	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
	26	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	27	*/
	28
	29	#if 0 // TODO
	30	#import <Cocoa/Cocoa.h>
	31	#import <WebKit/WebKit.h>
	32
	33	@interface EventSender : NSObject <DOMEventListener> {
	34	BOOL leftMouseButtonDown;
	35	BOOL dragMode;
	36	int clickCount;
	37	NSTimeInterval lastClick;
	38	int eventNumber;
	39	double timeOffset;
	40	}
	41
	42	+ (void)saveEvent:(NSInvocation *)event;
	43	+ (void)replaySavedEvents;
	44	+ (void)clearSavedEvents;
	45
	46	- (void)scheduleAsynchronousClick;
	47
	48	- (void)enableDOMUIEventLogging:(WebScriptObject *)node;
	49
	50	- (void)handleEvent:(DOMEvent *)event;
	51
	52	@end
	53
	54	extern NSPoint lastMousePosition;
	55	extern NSPoint lastClickPosition;
	56	#endif