[webkit-changes] cvs commit: WebCore/kwq KWQKURL.mm KWQString.mm
Tim
tomernic at opensource.apple.com
Thu Dec 8 15:13:28 PST 2005
tomernic 05/12/08 15:13:27
Modified: . Tag: Safari-2-0-branch ChangeLog
khtml/css Tag: Safari-2-0-branch cssstyleselector.cpp
khtml/rendering Tag: Safari-2-0-branch bidi.cpp
kwq Tag: Safari-2-0-branch KWQKURL.mm KWQString.mm
Log:
Merged fix from TOT to Safari-2-0-branch
Reviewed and landed by Maciej.
- some simple changes that amount to a < 1% speedup.
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::applyProperty):
* khtml/rendering/bidi.cpp:
(khtml::BidiIterator::direction):
* kwq/KWQKURL.mm:
(hasSlashDotOrDotDot):
* kwq/KWQString.mm:
(QString::~QString):
Revision Changes Path
No revision
No revision
1.1.2.97 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.1.2.96
retrieving revision 1.1.2.97
diff -u -r1.1.2.96 -r1.1.2.97
--- ChangeLog 8 Dec 2005 21:44:24 -0000 1.1.2.96
+++ ChangeLog 8 Dec 2005 23:13:15 -0000 1.1.2.97
@@ -1,3 +1,20 @@
+2005-12-08 Tim Omernick <timo at apple.com>
+
+ Merged fix from TOT to Safari-2-0-branch
+
+ Reviewed and landed by Maciej.
+
+ - some simple changes that amount to a < 1% speedup.
+
+ * khtml/css/cssstyleselector.cpp:
+ (khtml::CSSStyleSelector::applyProperty):
+ * khtml/rendering/bidi.cpp:
+ (khtml::BidiIterator::direction):
+ * kwq/KWQKURL.mm:
+ (hasSlashDotOrDotDot):
+ * kwq/KWQString.mm:
+ (QString::~QString):
+
2005-12-08 David Harrison <harrison at apple.com>
Reviewed by Geoff.
No revision
No revision
1.178.8.3 +5 -4 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.178.8.2
retrieving revision 1.178.8.3
diff -u -r1.178.8.2 -r1.178.8.3
--- cssstyleselector.cpp 18 Nov 2005 22:41:48 -0000 1.178.8.2
+++ cssstyleselector.cpp 8 Dec 2005 23:13:22 -0000 1.178.8.3
@@ -1757,9 +1757,10 @@
Length l;
bool apply = false;
- bool isInherit = (parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
- bool isInitial = (value->cssValueType() == CSSValue::CSS_INITIAL) ||
- (!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
+ unsigned short valueType = value->cssValueType();
+
+ bool isInherit = parentNode && valueType == CSSValue::CSS_INHERIT;
+ bool isInitial = valueType == CSSValue::CSS_INITIAL || (!parentNode && valueType == CSSValue::CSS_INHERIT);
// These properties are used to set the correct margins/padding on RTL lists.
if (id == CSS_PROP__KHTML_MARGIN_START)
@@ -3549,7 +3550,7 @@
style->setBoxOrdinalGroup((unsigned int)(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER)));
return;
case CSS_PROP__KHTML_MARQUEE:
- if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
+ if (valueType != CSSValue::CSS_INHERIT || !parentNode) return;
style->setMarqueeDirection(parentStyle->marqueeDirection());
style->setMarqueeIncrement(parentStyle->marqueeIncrement());
style->setMarqueeSpeed(parentStyle->marqueeSpeed());
No revision
No revision
1.125.8.9 +9 -1 WebCore/khtml/rendering/bidi.cpp
Index: bidi.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.125.8.8
retrieving revision 1.125.8.9
diff -u -r1.125.8.8 -r1.125.8.9
--- bidi.cpp 10 Oct 2005 07:15:15 -0000 1.125.8.8
+++ bidi.cpp 8 Dec 2005 23:13:24 -0000 1.125.8.9
@@ -351,7 +351,15 @@
return text->text()[pos];
}
-inline QChar::Direction BidiIterator::direction() const
+#ifndef ALWAYS_INLINE
+#if defined(__GNUC__) && (__GNUC__ > 3)
+#define ALWAYS_INLINE __attribute__ ((always_inline))
+#else
+#define ALWAYS_INLINE inline
+#endif
+#endif
+
+ALWAYS_INLINE QChar::Direction BidiIterator::direction() const
{
if (!obj)
return QChar::DirON;
No revision
No revision
1.89.8.2 +3 -3 WebCore/kwq/KWQKURL.mm
Index: KWQKURL.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKURL.mm,v
retrieving revision 1.89.8.1
retrieving revision 1.89.8.2
diff -u -r1.89.8.1 -r1.89.8.2
--- KWQKURL.mm 12 Jul 2005 22:28:17 -0000 1.89.8.1
+++ KWQKURL.mm 8 Dec 2005 23:13:26 -0000 1.89.8.2
@@ -1060,11 +1060,11 @@
static inline bool hasSlashDotOrDotDot(const char *str)
{
- const char *p = str;
+ const unsigned char *p = reinterpret_cast<const unsigned char *>(str);
if (!*p)
return false;
- char pc = *p;
- while (char c = *++p) {
+ unsigned char pc = *p;
+ while (unsigned char c = *++p) {
if (c == '.' && (pc == '/' || pc == '.'))
return true;
pc = c;
1.137.8.2 +2 -0 WebCore/kwq/KWQString.mm
Index: KWQString.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQString.mm,v
retrieving revision 1.137.8.1
retrieving revision 1.137.8.2
diff -u -r1.137.8.1 -r1.137.8.2
--- KWQString.mm 22 Jul 2005 03:09:54 -0000 1.137.8.1
+++ KWQString.mm 8 Dec 2005 23:13:26 -0000 1.137.8.2
@@ -857,7 +857,9 @@
if (needToFreeHandle)
freeHandle(dataHandle);
+#ifndef NDEBUG
dataHandle = 0;
+#endif
}
More information about the webkit-changes
mailing list