[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:43:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7185fa4b8c5b32bea79b64b14cd68ec2a64545ca
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 4 18:43:16 2001 +0000
Still more compilation updates
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQRegion.h b/WebCore/kwq/KWQRegion.h
index 86962ef..4d4998f 100644
--- a/WebCore/kwq/KWQRegion.h
+++ b/WebCore/kwq/KWQRegion.h
@@ -36,8 +36,12 @@
class QRegion {
public:
+ // NOTE: alphabetical order
+ enum RegionType { Ellipse, Rectangle };
+
QRegion();
- QRegion(int, int, int, int);
+ QRegion(int, int, int, int, RegionType = Rectangle);
+ QRegion(const QPointArray &);
bool contains(const QPoint &) const;
};
diff --git a/WebCore/kwq/qt/qregion.h b/WebCore/kwq/qt/qregion.h
index 86962ef..4d4998f 100644
--- a/WebCore/kwq/qt/qregion.h
+++ b/WebCore/kwq/qt/qregion.h
@@ -36,8 +36,12 @@
class QRegion {
public:
+ // NOTE: alphabetical order
+ enum RegionType { Ellipse, Rectangle };
+
QRegion();
- QRegion(int, int, int, int);
+ QRegion(int, int, int, int, RegionType = Rectangle);
+ QRegion(const QPointArray &);
bool contains(const QPoint &) const;
};
diff --git a/WebCore/src/kwq/qt/qregion.h b/WebCore/src/kwq/qt/qregion.h
index 86962ef..4d4998f 100644
--- a/WebCore/src/kwq/qt/qregion.h
+++ b/WebCore/src/kwq/qt/qregion.h
@@ -36,8 +36,12 @@
class QRegion {
public:
+ // NOTE: alphabetical order
+ enum RegionType { Ellipse, Rectangle };
+
QRegion();
- QRegion(int, int, int, int);
+ QRegion(int, int, int, int, RegionType = Rectangle);
+ QRegion(const QPointArray &);
bool contains(const QPoint &) const;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list