[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:44:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3574145b32d2a0660ff56b5fc09f522cc36e4cae
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 5 16:14:05 2001 +0000
Additions to get khtml/rendering/render_frames.cpp to compile
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@102 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index d2480fb..a9dd820 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
+ DashLine,
};
enum BrushStyle {
@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
+ enum RasterOp { // raster op mode
+ CopyROP,
+ OrROP,
+ XorROP,
+ };
+
static const QColor &black;
+ static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
diff --git a/WebCore/kwq/KWQPainter.h b/WebCore/kwq/KWQPainter.h
index e01e9be..5ee90a7 100644
--- a/WebCore/kwq/KWQPainter.h
+++ b/WebCore/kwq/KWQPainter.h
@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
+#include "qpoint.h"
+#include "qfontmetrics.h"
class QFont;
-class QFontMetrics;
class QPixmap;
class QWMatrix {
@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
+ void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
+ void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
- sy = 0);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
-
+ RasterOp rasterOp() const;
+ void setRasterOp(RasterOp);
};
#endif
diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index e10099e..852a604 100644
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
+ bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index d2480fb..a9dd820 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
+ DashLine,
};
enum BrushStyle {
@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
+ enum RasterOp { // raster op mode
+ CopyROP,
+ OrROP,
+ XorROP,
+ };
+
static const QColor &black;
+ static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
diff --git a/WebCore/kwq/qt/qobjectdefs.h b/WebCore/kwq/qt/qobjectdefs.h
index 4ce32ec..08eb573 100644
--- a/WebCore/kwq/qt/qobjectdefs.h
+++ b/WebCore/kwq/qt/qobjectdefs.h
@@ -52,4 +52,6 @@ class QMovie;
class QTimer;
class QImage;
+typedef int QCOORD;
+
#endif
diff --git a/WebCore/kwq/qt/qpainter.h b/WebCore/kwq/qt/qpainter.h
index e01e9be..5ee90a7 100644
--- a/WebCore/kwq/qt/qpainter.h
+++ b/WebCore/kwq/qt/qpainter.h
@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
+#include "qpoint.h"
+#include "qfontmetrics.h"
class QFont;
-class QFontMetrics;
class QPixmap;
class QWMatrix {
@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
+ void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
+ void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
- sy = 0);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
-
+ RasterOp rasterOp() const;
+ void setRasterOp(RasterOp);
};
#endif
diff --git a/WebCore/kwq/qt/qpoint.h b/WebCore/kwq/qt/qpoint.h
index e10099e..852a604 100644
--- a/WebCore/kwq/qt/qpoint.h
+++ b/WebCore/kwq/qt/qpoint.h
@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
+ bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index d2480fb..a9dd820 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -50,6 +50,7 @@ public:
NoPen,
SolidLine,
DotLine,
+ DashLine,
};
enum BrushStyle {
@@ -82,7 +83,14 @@ public:
Key_Down = 0x1015,
};
+ enum RasterOp { // raster op mode
+ CopyROP,
+ OrROP,
+ XorROP,
+ };
+
static const QColor &black;
+ static const QColor &white;
static const QColor &darkGray;
static const QCursor &sizeAllCursor;
diff --git a/WebCore/src/kwq/qt/qobjectdefs.h b/WebCore/src/kwq/qt/qobjectdefs.h
index 4ce32ec..08eb573 100644
--- a/WebCore/src/kwq/qt/qobjectdefs.h
+++ b/WebCore/src/kwq/qt/qobjectdefs.h
@@ -52,4 +52,6 @@ class QMovie;
class QTimer;
class QImage;
+typedef int QCOORD;
+
#endif
diff --git a/WebCore/src/kwq/qt/qpainter.h b/WebCore/src/kwq/qt/qpainter.h
index e01e9be..5ee90a7 100644
--- a/WebCore/src/kwq/qt/qpainter.h
+++ b/WebCore/src/kwq/qt/qpainter.h
@@ -32,9 +32,10 @@
#include "qbrush.h"
#include "qpen.h"
#include "qregion.h"
+#include "qpoint.h"
+#include "qfontmetrics.h"
class QFont;
-class QFontMetrics;
class QPixmap;
class QWMatrix {
@@ -51,6 +52,7 @@ public:
QFontMetrics fontMetrics() const;
const QPen &pen() const;
void setPen(const QPen &);
+ void setPen(PenStyle);
void setBrush(const QBrush &);
void setBrush(BrushStyle);
@@ -58,18 +60,20 @@ public:
void drawRect(int, int, int, int);
void fillRect(int, int, int, int, const QBrush &);
+ void drawLine(int, int, int, int);
void drawEllipse(int, int, int, int);
void drawArc(int, int, int, int, int, int);
+ void drawPolygon(const QPointArray &, bool winding=FALSE, int index=0, int npoints=-1);
void drawPixmap(const QPoint &, const QPixmap &);
void drawPixmap(const QPoint &, const QPixmap &, const QRect &);
- void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int
- sy = 0);
+ void drawTiledPixmap(int, int, int, int, const QPixmap &, int sx = 0, int sy = 0);
void drawText(int, int, int, int, AlignmentFlags, const QString &);
void setClipping(bool);
void setClipRegion(const QRegion &);
const QRegion &clipRegion() const;
bool hasClipping() const;
-
+ RasterOp rasterOp() const;
+ void setRasterOp(RasterOp);
};
#endif
diff --git a/WebCore/src/kwq/qt/qpoint.h b/WebCore/src/kwq/qt/qpoint.h
index e10099e..852a604 100644
--- a/WebCore/src/kwq/qt/qpoint.h
+++ b/WebCore/src/kwq/qt/qpoint.h
@@ -48,6 +48,7 @@ class QPointArray {
public:
QPointArray(int);
void setPoint(uint, int, int);
+ bool setPoints(int nPoints, int firstx, int firsty, ... );
};
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list