[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:01:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3cac2fa28130b6e08007dd63a0700d5ff4deea18
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 3 19:41:30 2002 +0000
Fix problems that show up only when xNDEBUG is set.
* src/kwq/KWQApplication.mm: (QApplication::sendEvent):
* src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
* src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
Remove or ifdef otherwise-unused variables.
* src/kwq/KWQFontMetrics.mm: (_rectForString):
* src/kwq/KWQPainter.mm: (QPainter::setRasterOp), (QPainter::translate),
(QPainter::scale):
Add missing semicolons.
* src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin):
Fix an ifdef.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@955 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 23d2413..7882397 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,22 @@
2002-04-03 Darin Adler <darin at apple.com>
+ Fix problems that show up only when xNDEBUG is set.
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQPainter.mm: (QPainter::setRasterOp), (QPainter::translate),
+ (QPainter::scale):
+ Add missing semicolons.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin):
+ Fix an ifdef.
+
+2002-04-03 Darin Adler <darin at apple.com>
+
* src/Makefile.am: Use nmedit and strip to remove the symbols
we don't want to export.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 23d2413..7882397 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,22 @@
2002-04-03 Darin Adler <darin at apple.com>
+ Fix problems that show up only when xNDEBUG is set.
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQPainter.mm: (QPainter::setRasterOp), (QPainter::translate),
+ (QPainter::scale):
+ Add missing semicolons.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin):
+ Fix an ifdef.
+
+2002-04-03 Darin Adler <darin at apple.com>
+
* src/Makefile.am: Use nmedit and strip to remove the symbols
we don't want to export.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 23d2413..7882397 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,22 @@
2002-04-03 Darin Adler <darin at apple.com>
+ Fix problems that show up only when xNDEBUG is set.
+
+ * src/kwq/KWQApplication.mm: (QApplication::sendEvent):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidBeginLoading:]):
+ * src/kwq/KWQView.mm: (-[KWQHTMLView layout]), (-[KWQHTMLView drawRect:]):
+ Remove or ifdef otherwise-unused variables.
+
+ * src/kwq/KWQFontMetrics.mm: (_rectForString):
+ * src/kwq/KWQPainter.mm: (QPainter::setRasterOp), (QPainter::translate),
+ (QPainter::scale):
+ Add missing semicolons.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::begin):
+ Fix an ifdef.
+
+2002-04-03 Darin Adler <darin at apple.com>
+
* src/Makefile.am: Use nmedit and strip to remove the symbols
we don't want to export.
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index c9458de..db39772 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -91,10 +91,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- QEvent::Type type = e->type();
-
- KWQDEBUG1 ("received %d\n", type);
-
+ KWQDEBUG1 ("received %d\n", e->type());
return FALSE;
}
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 44a59a7..b60f095 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){
- KWQDEBUGLEVEL3 (KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] cString], [font pointSize])
+ KWQDEBUGLEVEL3(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);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 3c5aefc..e918ae7 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -524,7 +524,9 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setParsing(true);
+#ifdef _KWQ_TIMING
d->totalWriteTime = 0;
+#endif
}
void KHTMLPart::write( const char *str, int len )
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 3c5aefc..e918ae7 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -524,7 +524,9 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setParsing(true);
+#ifdef _KWQ_TIMING
d->totalWriteTime = 0;
+#endif
}
void KHTMLPart::write( const char *str, int len )
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 3ed8ee0..69485d6 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1025,8 +1025,8 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
- KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 3ed8ee0..69485d6 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1025,8 +1025,8 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
- KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 3ed8ee0..69485d6 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1025,8 +1025,8 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
- KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 2aee325..edaba64 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -687,19 +687,19 @@ void QPainter::setRasterOp(RasterOp op)
else
data->compositingOperation = NSCompositeCopy;
#else
- _logNotYetImplemented()
+ _logNotYetImplemented();
#endif
}
void QPainter::translate(double dx, double dy)
{
- _logNotYetImplemented()
+ _logNotYetImplemented();
}
void QPainter::scale(double dx, double dy)
{
- _logNotYetImplemented()
+ _logNotYetImplemented();
}
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index c6315f7..c10c866 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -173,7 +173,9 @@
if (((KHTMLView *)widget)->part()->xmlDocImpl() &&
((KHTMLView *)widget)->part()->xmlDocImpl()->renderer()){
if (needsLayout){
+#ifndef xNDEBUG
double start = CFAbsoluteTimeGetCurrent();
+#endif
((KHTMLView *)widget)->layout();
KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
needsLayout = NO;
@@ -198,7 +200,9 @@
[self lockFocus];
+#ifndef xNDEBUG
double start = CFAbsoluteTimeGetCurrent();
+#endif
((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
(int)rect.origin.y,
(int)rect.size.width,
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index c9458de..db39772 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -91,10 +91,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- QEvent::Type type = e->type();
-
- KWQDEBUG1 ("received %d\n", type);
-
+ KWQDEBUG1 ("received %d\n", e->type());
return FALSE;
}
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index 44a59a7..b60f095 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){
- KWQDEBUGLEVEL3 (KWQ_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", internalBuffer[i], [[font displayName] cString], [font pointSize])
+ KWQDEBUGLEVEL3(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);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 3c5aefc..e918ae7 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -524,7 +524,9 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setParsing(true);
+#ifdef _KWQ_TIMING
d->totalWriteTime = 0;
+#endif
}
void KHTMLPart::write( const char *str, int len )
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 3ed8ee0..69485d6 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1025,8 +1025,8 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
- KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, job->url().url().latin1());
+ KWQDEBUGLEVEL2 (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource,
+ static_cast<KIO::TransferJob *>(userData)->url().url().latin1());
}
- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
diff --git a/WebCore/src/kwq/KWQPainter.mm b/WebCore/src/kwq/KWQPainter.mm
index 2aee325..edaba64 100644
--- a/WebCore/src/kwq/KWQPainter.mm
+++ b/WebCore/src/kwq/KWQPainter.mm
@@ -687,19 +687,19 @@ void QPainter::setRasterOp(RasterOp op)
else
data->compositingOperation = NSCompositeCopy;
#else
- _logNotYetImplemented()
+ _logNotYetImplemented();
#endif
}
void QPainter::translate(double dx, double dy)
{
- _logNotYetImplemented()
+ _logNotYetImplemented();
}
void QPainter::scale(double dx, double dy)
{
- _logNotYetImplemented()
+ _logNotYetImplemented();
}
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index c6315f7..c10c866 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -173,7 +173,9 @@
if (((KHTMLView *)widget)->part()->xmlDocImpl() &&
((KHTMLView *)widget)->part()->xmlDocImpl()->renderer()){
if (needsLayout){
+#ifndef xNDEBUG
double start = CFAbsoluteTimeGetCurrent();
+#endif
((KHTMLView *)widget)->layout();
KWQDEBUGLEVEL1 (KWQ_LOG_TIMING, "layout time %e\n", CFAbsoluteTimeGetCurrent() - start);
needsLayout = NO;
@@ -198,7 +200,9 @@
[self lockFocus];
+#ifndef xNDEBUG
double start = CFAbsoluteTimeGetCurrent();
+#endif
((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
(int)rect.origin.y,
(int)rect.size.width,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list