[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:52:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 069563c6b058df23f8f9da0af000ec4dab1a271b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 15 04:43:19 2001 +0000
Fixed color to parse #000 style color names.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index ceb4aff..add7090 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -941,7 +941,6 @@ void RenderSelect::layout( )
QSize s(m_widget->sizeHint());
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
- fprintf (stderr, "select box size w %d, h %d\n", s.width(), s.height());
}
/// uuh, ignore the following line..
diff --git a/WebCore/kwq/KWQColor.mm b/WebCore/kwq/KWQColor.mm
index db15a4b..6e252e2 100644
--- a/WebCore/kwq/KWQColor.mm
+++ b/WebCore/kwq/KWQColor.mm
@@ -151,6 +151,7 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
decoded = FALSE;
if ((string.length() == 7 && string[0] == '#') ||
+ (string.length() == 4 && string[0] == '#') ||
(string.length() == 6 && looksLikeSixLetterHexColorString(string))) {
int offset = 0;
int len;
@@ -178,13 +179,13 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
*b = (hex2int(p[4]) << 4) + hex2int(p[5]);
decoded = TRUE;
} else if (len == 3) {
- *r = (hex2int(p[0]) << 4) + hex2int(p[0]);
- *g = (hex2int(p[1]) << 4) + hex2int(p[1]);
- *b = (hex2int(p[2]) << 4) + hex2int(p[2]);
+ *r = hex2int(p[0]);
+ *g = hex2int(p[1]);
+ *b = hex2int(p[2]);
decoded = TRUE;
}
- }
-
+ }
+
return decoded;
}
@@ -218,7 +219,7 @@ void QColor::setNamedColor(const QString &name)
setRgb(r, g, b);
}
else {
- NSLog (@"WARNING %s:%d %s couldn't create color using name %s\n", __FILE__, __LINE__, __FUNCTION__, name.ascii());
+ KWQDEBUG1 ("couldn't create color using name %s\n", name.ascii());
setRgb(0, 0, 0);
}
}
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 0e13998..e7b75d4 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -31,7 +31,6 @@
bool QObject::connect(const QObject *src, const char *signal, const QObject *dest,
const char *slot)
{
- NSLog (@"QObject::connect() signal %s, slot %s\n", signal, slot);
return FALSE;
}
@@ -39,20 +38,17 @@ bool QObject::connect(const QObject *src, const char *signal, const QObject *des
bool QObject::disconnect( const QObject *, const char *, const QObject *,
const char *)
{
- _logNeverImplemented();
return FALSE;
}
QObject::QObject(QObject *parent=0, const char *name=0)
{
- _logNotYetImplemented();
}
QObject::~QObject()
{
- _logNotYetImplemented();
}
@@ -60,14 +56,14 @@ QObject::~QObject()
const char *QObject::name() const
{
- _logNeverImplemented();
+ _logNotYetImplemented();
return "noname";
}
void QObject::setName(const char *)
{
- _logNeverImplemented();
+ _logNotYetImplemented();
}
QVariant QObject::property(const char *name) const
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 4b7725c..633e91a 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -161,7 +161,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
[subView removeFromSuperview];
- NSLog (@"Adding 0x%08x %@ at (%d,%d) w %d h %d\n", subView, [[subView class] className], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
+ KWQDEBUG6 ("Adding 0x%08x %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_form.cpp b/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
index ceb4aff..add7090 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
@@ -941,7 +941,6 @@ void RenderSelect::layout( )
QSize s(m_widget->sizeHint());
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
- fprintf (stderr, "select box size w %d, h %d\n", s.width(), s.height());
}
/// uuh, ignore the following line..
diff --git a/WebCore/src/kwq/KWQColor.mm b/WebCore/src/kwq/KWQColor.mm
index db15a4b..6e252e2 100644
--- a/WebCore/src/kwq/KWQColor.mm
+++ b/WebCore/src/kwq/KWQColor.mm
@@ -151,6 +151,7 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
decoded = FALSE;
if ((string.length() == 7 && string[0] == '#') ||
+ (string.length() == 4 && string[0] == '#') ||
(string.length() == 6 && looksLikeSixLetterHexColorString(string))) {
int offset = 0;
int len;
@@ -178,13 +179,13 @@ static bool decodeColorFromHexColorString(const QString &string, int *r, int *g,
*b = (hex2int(p[4]) << 4) + hex2int(p[5]);
decoded = TRUE;
} else if (len == 3) {
- *r = (hex2int(p[0]) << 4) + hex2int(p[0]);
- *g = (hex2int(p[1]) << 4) + hex2int(p[1]);
- *b = (hex2int(p[2]) << 4) + hex2int(p[2]);
+ *r = hex2int(p[0]);
+ *g = hex2int(p[1]);
+ *b = hex2int(p[2]);
decoded = TRUE;
}
- }
-
+ }
+
return decoded;
}
@@ -218,7 +219,7 @@ void QColor::setNamedColor(const QString &name)
setRgb(r, g, b);
}
else {
- NSLog (@"WARNING %s:%d %s couldn't create color using name %s\n", __FILE__, __LINE__, __FUNCTION__, name.ascii());
+ KWQDEBUG1 ("couldn't create color using name %s\n", name.ascii());
setRgb(0, 0, 0);
}
}
diff --git a/WebCore/src/kwq/KWQObject.mm b/WebCore/src/kwq/KWQObject.mm
index 0e13998..e7b75d4 100644
--- a/WebCore/src/kwq/KWQObject.mm
+++ b/WebCore/src/kwq/KWQObject.mm
@@ -31,7 +31,6 @@
bool QObject::connect(const QObject *src, const char *signal, const QObject *dest,
const char *slot)
{
- NSLog (@"QObject::connect() signal %s, slot %s\n", signal, slot);
return FALSE;
}
@@ -39,20 +38,17 @@ bool QObject::connect(const QObject *src, const char *signal, const QObject *des
bool QObject::disconnect( const QObject *, const char *, const QObject *,
const char *)
{
- _logNeverImplemented();
return FALSE;
}
QObject::QObject(QObject *parent=0, const char *name=0)
{
- _logNotYetImplemented();
}
QObject::~QObject()
{
- _logNotYetImplemented();
}
@@ -60,14 +56,14 @@ QObject::~QObject()
const char *QObject::name() const
{
- _logNeverImplemented();
+ _logNotYetImplemented();
return "noname";
}
void QObject::setName(const char *)
{
- _logNeverImplemented();
+ _logNotYetImplemented();
}
QVariant QObject::property(const char *name) const
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 4b7725c..633e91a 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -161,7 +161,7 @@ void QScrollView::addChild(QWidget* child, int x, int y)
[subView removeFromSuperview];
- NSLog (@"Adding 0x%08x %@ at (%d,%d) w %d h %d\n", subView, [[subView class] className], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
+ KWQDEBUG6 ("Adding 0x%08x %s at (%d,%d) w %d h %d\n", subView, [[[subView class] className] cString], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list