[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:51:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit adc5376a00d91b0d49366c4d10cc281b8b128cb6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 8 20:15:19 2001 +0000
Fixes to do page sizing. And other fixes to get forms to render almost correctly.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@424 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index baa02d2..4629c6c 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -918,17 +918,29 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
-(void)cacheDataAvailable:(NSNotification *)notification
{
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheDataAvailable: Received invalid notication, %@", notificationName);
+ }
+ else {
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ }
}
-(void)cacheFinished:(NSNotification *)notification
{
- // FIXME: need an implementation for this
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotFinished(job);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheFinished: Received invalid notication, %@", notificationName);
+ }
+ else {
+ // FIXME: need an implementation for this
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotFinished(job);
+ }
}
@end
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index baa02d2..4629c6c 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -918,17 +918,29 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
-(void)cacheDataAvailable:(NSNotification *)notification
{
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheDataAvailable: Received invalid notication, %@", notificationName);
+ }
+ else {
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ }
}
-(void)cacheFinished:(NSNotification *)notification
{
- // FIXME: need an implementation for this
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotFinished(job);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheFinished: Received invalid notication, %@", notificationName);
+ }
+ else {
+ // FIXME: need an implementation for this
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotFinished(job);
+ }
}
@end
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index baa02d2..4629c6c 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -918,17 +918,29 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
-(void)cacheDataAvailable:(NSNotification *)notification
{
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheDataAvailable: Received invalid notication, %@", notificationName);
+ }
+ else {
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ }
}
-(void)cacheFinished:(NSNotification *)notification
{
- // FIXME: need an implementation for this
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotFinished(job);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheFinished: Received invalid notication, %@", notificationName);
+ }
+ else {
+ // FIXME: need an implementation for this
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotFinished(job);
+ }
}
@end
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 5653d13..9e7f1e6 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -162,13 +162,13 @@ void QScrollView::removeChild(QWidget* child)
void QScrollView::resizeContents(int w, int h)
{
- //_logNeverImplemented();
+ resize (w, h);
}
void QScrollView::updateContents(int x, int y, int w, int h)
{
- //_logNeverImplemented();
+ _logNotYetImplemented();
}
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index c7e8fb6..7c22d74 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -1552,6 +1552,9 @@ QConstString::QConstString(QChar *qcs, uint len)
// guarantee backing store is not copied even though string is mutable
s = CFStringCreateMutableWithExternalCharactersNoCopy(
kCFAllocatorDefault, &qcs->c, len, len, kCFAllocatorNull);
+// When is the memory freed? Can we safely use the bytes???
+// s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+// CFStringAppendCharacters (s, &qcs->c, len);
} else {
s = NULL;
}
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index b335fd1..371b0c3 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -49,6 +49,7 @@ QScrollBar *QTableView::verticalScrollBar() const
{
// Nothing needed.
_logNeverImplemented();
+ return 0L;
}
@@ -56,6 +57,7 @@ QScrollBar *QTableView::horizontalScrollBar() const
{
// Nothing needed.
_logNeverImplemented();
+ return 0L;
}
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 24a0103..ef30307 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -58,7 +58,8 @@ public:
QWidgetPrivate(QWidget *widget) : pos(0,0), rect(0,0,0,0), pal()
{
view = [[KWQView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: widget];
- style = 0L;
+ // FIXME! We really don't care about widget styles.
+ style = new QStyle();
font = 0L;
cursor = 0L;
}
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index baa02d2..4629c6c 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -918,17 +918,29 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
-(void)cacheDataAvailable:(NSNotification *)notification
{
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheDataAvailable: Received invalid notication, %@", notificationName);
+ }
+ else {
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotData(job, (const char *)[data cacheData], [data cacheDataSize]);
+ }
}
-(void)cacheFinished:(NSNotification *)notification
{
- // FIXME: need an implementation for this
- id <WCURICacheData> data = [notification object];
- KIO::Job *job = static_cast<KIO::Job *>([data userData]);
- m_loader->slotFinished(job);
+ NSString *notificationName = [notification name];
+ if ([notificationName rangeOfString: @"uri"].location != 0){
+ NSLog (@"cacheFinished: Received invalid notication, %@", notificationName);
+ }
+ else {
+ // FIXME: need an implementation for this
+ id <WCURICacheData> data = [notification object];
+ KIO::Job *job = static_cast<KIO::Job *>([data userData]);
+ m_loader->slotFinished(job);
+ }
}
@end
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 5653d13..9e7f1e6 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -162,13 +162,13 @@ void QScrollView::removeChild(QWidget* child)
void QScrollView::resizeContents(int w, int h)
{
- //_logNeverImplemented();
+ resize (w, h);
}
void QScrollView::updateContents(int x, int y, int w, int h)
{
- //_logNeverImplemented();
+ _logNotYetImplemented();
}
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index c7e8fb6..7c22d74 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -1552,6 +1552,9 @@ QConstString::QConstString(QChar *qcs, uint len)
// guarantee backing store is not copied even though string is mutable
s = CFStringCreateMutableWithExternalCharactersNoCopy(
kCFAllocatorDefault, &qcs->c, len, len, kCFAllocatorNull);
+// When is the memory freed? Can we safely use the bytes???
+// s = CFStringCreateMutable(kCFAllocatorDefault, 0);
+// CFStringAppendCharacters (s, &qcs->c, len);
} else {
s = NULL;
}
diff --git a/WebCore/src/kwq/KWQStyle.h b/WebCore/src/kwq/KWQStyle.h
index 9eb6329..ada01c5 100644
--- a/WebCore/src/kwq/KWQStyle.h
+++ b/WebCore/src/kwq/KWQStyle.h
@@ -51,8 +51,8 @@ public:
// member functions --------------------------------------------------------
GUIStyle guiStyle() const;
- virtual QSize indicatorSize() const = 0;
- virtual QSize exclusiveIndicatorSize() const = 0;
+ virtual QSize indicatorSize() { return QSize(0,0); };
+ virtual QSize exclusiveIndicatorSize() { return QSize(0,0); };
// operators ---------------------------------------------------------------
@@ -63,7 +63,7 @@ private:
// note that these are "standard" (no pendantic stuff needed)
QStyle(const QStyle &);
QStyle &operator=(const QStyle &);
-
+
}; // class QStyle =============================================================
#endif
diff --git a/WebCore/src/kwq/KWQTextEdit.mm b/WebCore/src/kwq/KWQTextEdit.mm
index b335fd1..371b0c3 100644
--- a/WebCore/src/kwq/KWQTextEdit.mm
+++ b/WebCore/src/kwq/KWQTextEdit.mm
@@ -49,6 +49,7 @@ QScrollBar *QTableView::verticalScrollBar() const
{
// Nothing needed.
_logNeverImplemented();
+ return 0L;
}
@@ -56,6 +57,7 @@ QScrollBar *QTableView::horizontalScrollBar() const
{
// Nothing needed.
_logNeverImplemented();
+ return 0L;
}
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index 24a0103..ef30307 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -58,7 +58,8 @@ public:
QWidgetPrivate(QWidget *widget) : pos(0,0), rect(0,0,0,0), pal()
{
view = [[KWQView alloc] initWithFrame: NSMakeRect (0,0,0,0) widget: widget];
- style = 0L;
+ // FIXME! We really don't care about widget styles.
+ style = new QStyle();
font = 0L;
cursor = 0L;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list