[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:02:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 86e063c7f55cffd55ee867e9ac3a28b294b9378e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Apr 4 19:41:45 2002 +0000
Redo clobbered fixes for problems that show up only when xNDEBUG is set
* src/kwq/KWQApplication.mm: (QApplication::sendEvent):
* src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
Remove or ifdef otherwise-unused variables.
* src/kwq/KWQFontMetrics.mm: (_rectForString):
Add missing semicolons.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@965 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 811834c..779bf1c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
2002-04-04 Darin Adler <darin at apple.com>
+ Redo clobbered fixes for problems that show up only when xNDEBUG is set
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ Add missing semicolons.
+
+2002-04-04 Darin Adler <darin at apple.com>
+
* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
(QString::convertToQCString): Remove some excessive logging that
was getting in the way of important log messages.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 811834c..779bf1c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
2002-04-04 Darin Adler <darin at apple.com>
+ Redo clobbered fixes for problems that show up only when xNDEBUG is set
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ Add missing semicolons.
+
+2002-04-04 Darin Adler <darin at apple.com>
+
* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
(QString::convertToQCString): Remove some excessive logging that
was getting in the way of important log messages.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 811834c..779bf1c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2002-04-04 Darin Adler <darin at apple.com>
+ Redo clobbered fixes for problems that show up only when xNDEBUG is set
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ Add missing semicolons.
+
+2002-04-04 Darin Adler <darin at apple.com>
+
* src/kwq/KWQString.mm: (QString::unicode), (QString::latin1),
(QString::convertToQCString): Remove some excessive logging that
was getting in the way of important log messages.
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 3a7607e..644c0ab 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -91,9 +91,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- QEvent::Type type = e->type();
-
- KWQDEBUG ("received %d\n", type);
+ KWQDEBUG ("received %d\n", e->type());
return FALSE;
}
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 1185b5d..d164fb7 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -577,7 +577,7 @@ static NSRect _rectForString (KWQLayoutInfo *self, const UniChar *internalBuffer
// If we can't use the cached map, then calculate a map for this string. Expensive.
if (needCharToGlyphLookup){
- KWQDEBUGLEVEL (KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] lossyCString], [font pointSize])
+ KWQDEBUGLEVEL(KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] lossyCString], [font pointSize]);
__IFInitATSGlyphVector(&self->_glyphVector, stringLength);
(void)ATSUConvertCharToGlyphs(self->_styleGroup, internalBuffer, 0, stringLength, 0, &self->_glyphVector);
glyphRecords = self->_glyphVector.firstRecord;
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 32b06aa..df45291 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1021,12 +1021,9 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- void *userData;
-
- userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
-
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(
+ [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 32b06aa..df45291 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1021,12 +1021,9 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- void *userData;
-
- userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
-
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(
+ [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 32b06aa..df45291 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1021,12 +1021,9 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- void *userData;
-
- userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
-
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(
+ [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index 3a7607e..644c0ab 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -91,9 +91,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- QEvent::Type type = e->type();
-
- KWQDEBUG ("received %d\n", type);
+ KWQDEBUG ("received %d\n", e->type());
return FALSE;
}
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index 1185b5d..d164fb7 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -577,7 +577,7 @@ static NSRect _rectForString (KWQLayoutInfo *self, const UniChar *internalBuffer
// If we can't use the cached map, then calculate a map for this string. Expensive.
if (needCharToGlyphLookup){
- KWQDEBUGLEVEL (KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] lossyCString], [font pointSize])
+ KWQDEBUGLEVEL(KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] lossyCString], [font pointSize]);
__IFInitATSGlyphVector(&self->_glyphVector, stringLength);
(void)ATSUConvertCharToGlyphs(self->_styleGroup, internalBuffer, 0, stringLength, 0, &self->_glyphVector);
glyphRecords = self->_glyphVector.firstRecord;
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 32b06aa..df45291 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1021,12 +1021,9 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)sender
{
- void *userData;
-
- userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
-
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
- static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
+ KWQDEBUGLEVEL(KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(
+ [[sender attributeForKey:IFURLHandleUserData] pointerValue])->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list