[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:23:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5eb153f4302b2aa0790aff9d55d4daa9b49a3d77
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 11 06:23:22 2002 +0000
- fixed 2978796 -- Client-side image map not working
* kwq/KWQRegion.mm: (QRegion::QRegion): Implement constructor that
takes a QPointArray.
* kwq/qt/qarray.h: Fix some const loopholes.
* kwq/KWQCString.mm:
(QCString::find): Use const char * instead of char *.
(QCString::contains): Use const char * instead of char *.
(QCString::right): Use const char * instead of char *.
(QCString::mid): Use const char * instead of char *.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1534 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 64cf975..3f8559d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-07-10 Darin Adler <darin at apple.com>
+
+ - fixed 2978796 -- Client-side image map not working
+
+ * kwq/KWQRegion.mm: (QRegion::QRegion): Implement constructor that
+ takes a QPointArray.
+
+ * kwq/qt/qarray.h: Fix some const loopholes.
+
+ * kwq/KWQCString.mm:
+ (QCString::find): Use const char * instead of char *.
+ (QCString::contains): Use const char * instead of char *.
+ (QCString::right): Use const char * instead of char *.
+ (QCString::mid): Use const char * instead of char *.
+
2002-07-10 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 64cf975..3f8559d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-07-10 Darin Adler <darin at apple.com>
+
+ - fixed 2978796 -- Client-side image map not working
+
+ * kwq/KWQRegion.mm: (QRegion::QRegion): Implement constructor that
+ takes a QPointArray.
+
+ * kwq/qt/qarray.h: Fix some const loopholes.
+
+ * kwq/KWQCString.mm:
+ (QCString::find): Use const char * instead of char *.
+ (QCString::contains): Use const char * instead of char *.
+ (QCString::right): Use const char * instead of char *.
+ (QCString::mid): Use const char * instead of char *.
+
2002-07-10 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 64cf975..3f8559d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-07-10 Darin Adler <darin at apple.com>
+
+ - fixed 2978796 -- Client-side image map not working
+
+ * kwq/KWQRegion.mm: (QRegion::QRegion): Implement constructor that
+ takes a QPointArray.
+
+ * kwq/qt/qarray.h: Fix some const loopholes.
+
+ * kwq/KWQCString.mm:
+ (QCString::find): Use const char * instead of char *.
+ (QCString::contains): Use const char * instead of char *.
+ (QCString::right): Use const char * instead of char *.
+ (QCString::mid): Use const char * instead of char *.
+
2002-07-10 Maciej Stachowiak <mjs at apple.com>
WebCore part of fix for:
diff --git a/WebCore/kwq/KWQCString.mm b/WebCore/kwq/KWQCString.mm
index 3a81537..8a86c01 100644
--- a/WebCore/kwq/KWQCString.mm
+++ b/WebCore/kwq/KWQCString.mm
@@ -69,7 +69,7 @@ bool QCString::isEmpty() const
int QCString::find(const char *s, int index, bool cs) const
{
int result;
- char *tmp;
+ const char *tmp;
result = -1;
@@ -108,7 +108,7 @@ int QCString::find(const char *s, int index, bool cs) const
int QCString::contains(char c, bool cs) const
{
int result;
- char *tmp;
+ const char *tmp;
result = 0;
tmp = data();
@@ -227,7 +227,7 @@ QCString QCString::right(uint len) const
if (len > l) {
len = l;
}
- char *p = data() + (l - len);
+ const char *p = data() + (l - len);
return QCString(p);
}
}
@@ -247,7 +247,7 @@ QCString QCString::mid(uint index, uint len) const
return result;
}
else {
- char *p = data() + index;
+ const char *p = data() + index;
QCString result(len + 1);
strncpy(result.data(), p, len);
*(result.data() + len) = '\0';
diff --git a/WebCore/kwq/KWQMemArray.h b/WebCore/kwq/KWQMemArray.h
index 88fa79b..94aec5a 100644
--- a/WebCore/kwq/KWQMemArray.h
+++ b/WebCore/kwq/KWQMemArray.h
@@ -35,21 +35,24 @@
template <class T> class QMemArray {
public:
- QMemArray() : impl(sizeof(T)) {}
- QMemArray(int i) : impl(sizeof(T),i) {}
+ QMemArray() : impl(sizeof(T)) { }
+ QMemArray(int i) : impl(sizeof(T), i) { }
- bool isEmpty() {return impl.size() == 0; }
- T &at(uint u) const {return *(T *)impl.at(u); }
- T *data() const { return (T *)impl.data(); }
+ bool isEmpty() { return impl.size() == 0; }
+ T &at(uint u) { return *(T *)impl.at(u); }
+ const T &at(uint u) const { return *(T *)impl.at(u); }
+ T *data() { return (T *)impl.data(); }
+ const T *data() const { return (T *)impl.data(); }
uint size() const { return impl.size(); }
- uint count() const { return size(); }
+ uint count() const { return impl.size(); }
bool resize(uint size) { return impl.resize(size); }
QMemArray<T>& duplicate(const T *data, int size) { impl.duplicate(data, size); return *this; }
void detach() { duplicate(data(), size()); }
bool fill(const T &item, int size=-1) { return impl.fill(&item, size); }
QMemArray<T>& assign(const QMemArray<T> &a) { return *this = a; }
- T &operator[](int i) const { return at(i); }
+ T &operator[](int i) { return *(T *)impl.at(i); }
+ const T &operator[](int i) const { return *(T *)impl.at(i); }
bool operator==(const QMemArray<T> &a) const { return impl == a.impl; }
bool operator!=(const QMemArray<T> &a) const { return !(*this == a); }
operator const T*() const { return data(); }
diff --git a/WebCore/kwq/KWQRegion.mm b/WebCore/kwq/KWQRegion.mm
index a0403ac..433bbf5 100644
--- a/WebCore/kwq/KWQRegion.mm
+++ b/WebCore/kwq/KWQRegion.mm
@@ -54,7 +54,10 @@ QRegion::QRegion(int x, int y, int w, int h, RegionType t)
QRegion::QRegion(const QPointArray &arr)
: path([[NSBezierPath alloc] init])
{
- _logNotYetImplemented();
+ [path moveToPoint:NSMakePoint(arr[0].x(), arr[0].y())];
+ for (uint i = 1; i < arr.count(); ++i) {
+ [path lineToPoint:NSMakePoint(arr[i].x(), arr[i].y())];
+ }
}
QRegion::QRegion(const QRegion &other)
diff --git a/WebCore/kwq/qt/qarray.h b/WebCore/kwq/qt/qarray.h
index 88fa79b..94aec5a 100644
--- a/WebCore/kwq/qt/qarray.h
+++ b/WebCore/kwq/qt/qarray.h
@@ -35,21 +35,24 @@
template <class T> class QMemArray {
public:
- QMemArray() : impl(sizeof(T)) {}
- QMemArray(int i) : impl(sizeof(T),i) {}
+ QMemArray() : impl(sizeof(T)) { }
+ QMemArray(int i) : impl(sizeof(T), i) { }
- bool isEmpty() {return impl.size() == 0; }
- T &at(uint u) const {return *(T *)impl.at(u); }
- T *data() const { return (T *)impl.data(); }
+ bool isEmpty() { return impl.size() == 0; }
+ T &at(uint u) { return *(T *)impl.at(u); }
+ const T &at(uint u) const { return *(T *)impl.at(u); }
+ T *data() { return (T *)impl.data(); }
+ const T *data() const { return (T *)impl.data(); }
uint size() const { return impl.size(); }
- uint count() const { return size(); }
+ uint count() const { return impl.size(); }
bool resize(uint size) { return impl.resize(size); }
QMemArray<T>& duplicate(const T *data, int size) { impl.duplicate(data, size); return *this; }
void detach() { duplicate(data(), size()); }
bool fill(const T &item, int size=-1) { return impl.fill(&item, size); }
QMemArray<T>& assign(const QMemArray<T> &a) { return *this = a; }
- T &operator[](int i) const { return at(i); }
+ T &operator[](int i) { return *(T *)impl.at(i); }
+ const T &operator[](int i) const { return *(T *)impl.at(i); }
bool operator==(const QMemArray<T> &a) const { return impl == a.impl; }
bool operator!=(const QMemArray<T> &a) const { return !(*this == a); }
operator const T*() const { return data(); }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list