[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:57:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b68fef78f162058045b63ba9c8a585d0b74d2cef
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 18 19:16:01 2002 +0000
Changed to use non direct _rectForString() function. Avoids
unnecessary NSString allocation.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d7d37fc..a7cd9de 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-18 Richard Williamson <rjw at apple.com>
+
+ Changed to use non direct _rectForString() function. Avoids
+ unnecessary NSString allocation.
+
+ * src/kwq/KWQFontMetrics.mm: (QFontMetrics::boundingRect):
+
2002-03-18 Darin Adler <darin at apple.com>
* src/kwq/KWQFontMetrics.mm: (QFontMetricsPrivate::getInfo),
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d7d37fc..a7cd9de 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-18 Richard Williamson <rjw at apple.com>
+
+ Changed to use non direct _rectForString() function. Avoids
+ unnecessary NSString allocation.
+
+ * src/kwq/KWQFontMetrics.mm: (QFontMetrics::boundingRect):
+
2002-03-18 Darin Adler <darin at apple.com>
* src/kwq/KWQFontMetrics.mm: (QFontMetricsPrivate::getInfo),
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d7d37fc..a7cd9de 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-18 Richard Williamson <rjw at apple.com>
+
+ Changed to use non direct _rectForString() function. Avoids
+ unnecessary NSString allocation.
+
+ * src/kwq/KWQFontMetrics.mm: (QFontMetrics::boundingRect):
+
2002-03-18 Darin Adler <darin at apple.com>
* src/kwq/KWQFontMetrics.mm: (QFontMetricsPrivate::getInfo),
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index bf4f97f..d12e385 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -820,8 +820,7 @@ QRect QFontMetrics::boundingRect(const QString &qstring, int len) const
QRect QFontMetrics::boundingRect(QChar qc) const
{
unichar c = qc.unicode();
- NSString *string = [NSString stringWithCharacters: &c length: 1];
- NSRect rect = [data->getInfo() rectForString: string];
+ NSRect rect = _rectForString(data->getInfo(), &c, 1);
return QRect(ROUND_TO_INT(rect.origin.x),
ROUND_TO_INT(rect.origin.y),
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index bf4f97f..d12e385 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -820,8 +820,7 @@ QRect QFontMetrics::boundingRect(const QString &qstring, int len) const
QRect QFontMetrics::boundingRect(QChar qc) const
{
unichar c = qc.unicode();
- NSString *string = [NSString stringWithCharacters: &c length: 1];
- NSRect rect = [data->getInfo() rectForString: string];
+ NSRect rect = _rectForString(data->getInfo(), &c, 1);
return QRect(ROUND_TO_INT(rect.origin.x),
ROUND_TO_INT(rect.origin.y),
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list