[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abecsi at webkit.org
abecsi at webkit.org
Wed Dec 22 11:24:47 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit aa9a8bcc8b20b445315dae555edd451a7ac85d13
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 17:00:12 2010 +0000
WebCore: Ureviewed build fix.
Patch by Balazs Kelemen <kb at inf.u-szeged.hu> on 2010-07-22
[Qt] Fix WebKit2 build
https://bugs.webkit.org/show_bug.cgi?id=42638
* WebCore.pri:
* WebCore.pro:
WebKit2: Unreviewed build fix.
Patch by Balazs Kelemen <kb at inf.u-szeged.hu> on 2010-07-22
[Qt] Fix WebKit2 build
https://bugs.webkit.org/show_bug.cgi?id=42638
* UIProcess/API/qt/qwkpage_p.h:
(QWKPagePrivate::setCursor): Added empty implementation.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7ee19a0..c66dbef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Ureviewed build fix.
+
+ [Qt] Fix WebKit2 build
+
+ https://bugs.webkit.org/show_bug.cgi?id=42638
+
+ * WebCore.pri:
+ * WebCore.pro:
+
2010-07-22 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 7205add..c468f5b 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -702,11 +702,17 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
page/Page.h \
page/Settings.h \
page/WindowFeatures.h \
+ platform/Cursor.h \
platform/PlatformKeyboardEvent.h \
platform/PlatformMouseEvent.h \
platform/PlatformWheelEvent.h \
platform/Widget.h \
platform/KURL.h \
+ platform/graphics/Color.h \
+ platform/graphics/ColorSpace.h \
+ platform/graphics/GraphicsTypes.h \
+ platform/graphics/Image.h \
+ platform/graphics/ImageSource.h \
platform/graphics/FloatRect.h \
platform/graphics/GraphicsContext.h \
platform/graphics/GraphicsLayerClient.h \
@@ -716,6 +722,7 @@ WEBCORE_HEADERS_FOR_WEBKIT2 += \
platform/graphics/Tile.h \
platform/graphics/TiledBackingStore.h \
platform/graphics/TiledBackingStoreClient.h \
+ platform/sql/SQLiteDatabase.h \
platform/text/PlatformString.h \
platform/text/StringImpl.h \
platform/MIMETypeRegistry.h \
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 40e904c..45da312 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
2010-07-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+ Unreviewed build fix.
+
+ [Qt] Fix WebKit2 build
+
+ https://bugs.webkit.org/show_bug.cgi?id=42638
+
+ * UIProcess/API/qt/qwkpage_p.h:
+ (QWKPagePrivate::setCursor): Added empty implementation.
+
+2010-07-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
Reviewed by Antonio Gomes.
Lazy cursor creation should be guarded by #if USE(LAZY_NATIVE_CURSOR) in WebKit2
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 1aaafca..6409a5f 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -42,6 +42,7 @@ public:
virtual void processDidExit() {}
virtual void processDidRevive() {}
+ virtual void setCursor(const WebCore::Cursor&) {}
virtual void takeFocus(bool direction) {}
virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list