[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zoltan at webkit.org
zoltan at webkit.org
Wed Dec 22 12:25:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b2368ab7932c3aa3be31a2d7f43d5d001c79903c
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 23 12:34:50 2010 +0000
[Qt] Build fix.
* DerivedSources.pro:
* WebKit2.pro:
* WebProcess/Plugins/Netscape/qt: Added.
* WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp: Added.
(WebKit::NetscapePlugin::platformPostInitialize):
(WebKit::NetscapePlugin::platformPaint):
(WebKit::toNP):
(WebKit::NetscapePlugin::platformHandleMouseEvent):
(WebKit::NetscapePlugin::platformHandleWheelEvent):
(WebKit::NetscapePlugin::platformSetFocus):
(WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
(WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65805 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 64bc969..ed92fd3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-23 Zoltan Horvath <zoltan at webkit.org>
+
+ [Qt] Build fix.
+
+ * DerivedSources.pro:
+ * WebKit2.pro:
+ * WebProcess/Plugins/Netscape/qt: Added.
+ * WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp: Added.
+ (WebKit::NetscapePlugin::platformPostInitialize):
+ (WebKit::NetscapePlugin::platformPaint):
+ (WebKit::toNP):
+ (WebKit::NetscapePlugin::platformHandleMouseEvent):
+ (WebKit::NetscapePlugin::platformHandleWheelEvent):
+ (WebKit::NetscapePlugin::platformSetFocus):
+ (WebKit::NetscapePlugin::platformHandleMouseEnterEvent):
+ (WebKit::NetscapePlugin::platformHandleMouseLeaveEvent):
+
2010-08-22 Juha Savolainen <juha.savolainen at weego.fi>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 8e36ae5..9a13101 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -16,6 +16,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
dom/KeyboardEvent.h \
dom/Node.h \
dom/Range.h \
+ dom/UIEventWithKeyState.h \
dom/UserTypingGestureIndicator.h \
editing/EditCommand.h \
editing/EditorInsertAction.h \
@@ -140,6 +141,7 @@ WEBKIT2_API_HEADERS += \
UIProcess/API/C/WKPagePrivate.h \
UIProcess/API/C/WKPreferences.h \
UIProcess/API/C/WKString.h \
+ UIProcess/API/C/WKType.h \
UIProcess/API/C/WKURL.h \
UIProcess/API/C/WebKit2.h \
UIProcess/API/cpp/WKRetainPtr.h \
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 7476168..95d4328 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -181,6 +181,7 @@ HEADERS += \
UIProcess/API/C/WKPagePrivate.h \
UIProcess/API/C/WKPreferences.h \
UIProcess/API/C/WKString.h \
+ UIProcess/API/C/WKType.h \
UIProcess/API/C/WKURL.h \
UIProcess/API/qt/qgraphicswkview.h \
UIProcess/API/qt/qwkpage.h \
@@ -275,6 +276,7 @@ SOURCES += \
UIProcess/API/C/WKPageNamespace.cpp \
UIProcess/API/C/WKPreferences.cpp \
UIProcess/API/C/WKString.cpp \
+ UIProcess/API/C/WKType.cpp \
UIProcess/API/C/WKURL.cpp \
UIProcess/API/qt/ClientImpl.cpp \
UIProcess/API/qt/qgraphicswkview.cpp \
@@ -327,6 +329,7 @@ SOURCES += \
WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
+ WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp \
WebProcess/WebCoreSupport/WebChromeClient.cpp \
WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
WebProcess/WebCoreSupport/WebDragClient.cpp \
diff --git a/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
new file mode 100644
index 0000000..b8bbb87
--- /dev/null
+++ b/WebKit2/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 University of Szeged
+ *
+ * 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 "NetscapePlugin.h"
+
+#include "NotImplemented.h"
+#include "WebEvent.h"
+#include <WebCore/GraphicsContext.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+bool NetscapePlugin::platformPostInitialize()
+{
+ notImplemented();
+ return true;
+}
+
+void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirtyRect)
+{
+ notImplemented();
+}
+
+NPEvent toNP(const WebMouseEvent& event)
+{
+ NPEvent npEvent;
+
+ notImplemented();
+
+ return npEvent;
+}
+
+bool NetscapePlugin::platformHandleMouseEvent(const WebMouseEvent& event)
+{
+ if (m_isWindowed)
+ return false;
+
+ NPEvent npEvent = toNP(event);
+ NPP_HandleEvent(&npEvent);
+ return true;
+}
+
+bool NetscapePlugin::platformHandleWheelEvent(const WebWheelEvent&)
+{
+ notImplemented();
+ return false;
+}
+
+void NetscapePlugin::platformSetFocus(bool)
+{
+ notImplemented();
+}
+
+bool NetscapePlugin::platformHandleMouseEnterEvent(const WebMouseEvent& event)
+{
+ if (m_isWindowed)
+ return false;
+
+ NPEvent npEvent = toNP(event);
+ NPP_HandleEvent(&npEvent);
+ return true;
+}
+
+bool NetscapePlugin::platformHandleMouseLeaveEvent(const WebMouseEvent& event)
+{
+ if (m_isWindowed)
+ return false;
+
+ NPEvent npEvent = toNP(event);
+ NPP_HandleEvent(&npEvent);
+ return true;
+}
+
+} // namespace WebKit
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list