[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:06:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6a60d26cdfe5243be03e4c399886b3d33ee66d1e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 16 22:30:07 2002 +0000
* src/kwq/kio/jobclasses.h:
* src/kwq/KWQKjobclasses.mm: (TransferJob::setError): New.
* src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
(-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
Set an error code so that the load will abort intead of continuing.
* src/kwq/KWQKHTMLPart.mm: Removed some unused code.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e486148..8b1dff1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-04-16 Darin Adler <darin at apple.com>
+
+ * src/kwq/kio/jobclasses.h:
+ * src/kwq/KWQKjobclasses.mm: (TransferJob::setError): New.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Set an error code so that the load will abort intead of continuing.
+
+ * src/kwq/KWQKHTMLPart.mm: Removed some unused code.
+
2002-04-16 Kenneth Kocienda <kocienda at apple.com>
Moved IFError class from WebKit to WebFoundation.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e486148..8b1dff1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-04-16 Darin Adler <darin at apple.com>
+
+ * src/kwq/kio/jobclasses.h:
+ * src/kwq/KWQKjobclasses.mm: (TransferJob::setError): New.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Set an error code so that the load will abort intead of continuing.
+
+ * src/kwq/KWQKHTMLPart.mm: Removed some unused code.
+
2002-04-16 Kenneth Kocienda <kocienda at apple.com>
Moved IFError class from WebKit to WebFoundation.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e486148..8b1dff1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-04-16 Darin Adler <darin at apple.com>
+
+ * src/kwq/kio/jobclasses.h:
+ * src/kwq/KWQKjobclasses.mm: (TransferJob::setError): New.
+
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient IFURLHandleResourceDidCancelLoading:]),
+ (-[URLLoadClient IFURLHandle:resourceDidFailLoadingWithResult:]):
+ Set an error code so that the load will abort intead of continuing.
+
+ * src/kwq/KWQKHTMLPart.mm: Removed some unused code.
+
2002-04-16 Kenneth Kocienda <kocienda at apple.com>
Moved IFError class from WebKit to WebFoundation.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index aaed449..f5d535b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -394,11 +394,6 @@ KJavaAppletContext *KHTMLPart::createJavaContext()
return 0L;
}
-void KHTMLPart::setPluginsEnabled( bool enable )
-{
- _logNotYetImplemented();
-}
-
bool KHTMLPart::pluginsEnabled() const
{
return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index aaed449..f5d535b 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -394,11 +394,6 @@ KJavaAppletContext *KHTMLPart::createJavaContext()
return 0L;
}
-void KHTMLPart::setPluginsEnabled( bool enable )
-{
- _logNotYetImplemented();
-}
-
bool KHTMLPart::pluginsEnabled() const
{
return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 7fd0e1c..99af382 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -161,6 +161,7 @@ public:
// member functions --------------------------------------------------------
int error();
+ void setError(int);
bool isErrorPage() const;
QString queryMetaData(const QString &key);
void addMetaData(const QString &key, const QString &value);
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index aa06be3..4499279 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -68,7 +68,7 @@ QString Job::errorString()
}
-void Job::kill(bool quietly=TRUE)
+void Job::kill(bool quietly)
{
_logNotYetImplemented();
}
@@ -153,6 +153,11 @@ int TransferJob::error()
return _status;
}
+void TransferJob::setError(int e)
+{
+ _status = e;
+}
+
QString TransferJob::queryMetaData(const QString &key)
{
NSString *_key;
@@ -175,7 +180,7 @@ void TransferJob::addMetaData(const QString &key, const QString &value)
[d->metaData setObject:_value forKey:_key];
}
-void TransferJob::kill(bool quietly=TRUE)
+void TransferJob::kill(bool quietly)
{
[d->handle cancelLoadInBackground];
}
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 99e780d..25e6fbe 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1040,6 +1040,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ job->setError(1);
m_loader->slotFinished(job);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1118,6 +1119,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
+ job->setError(1);
m_loader->slotFinished(job);
[controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 99e780d..25e6fbe 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1040,6 +1040,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ job->setError(1);
m_loader->slotFinished(job);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1118,6 +1119,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
+ job->setError(1);
m_loader->slotFinished(job);
[controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 99e780d..25e6fbe 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1040,6 +1040,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ job->setError(1);
m_loader->slotFinished(job);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1118,6 +1119,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
+ job->setError(1);
m_loader->slotFinished(job);
[controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 7fd0e1c..99af382 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -161,6 +161,7 @@ public:
// member functions --------------------------------------------------------
int error();
+ void setError(int);
bool isErrorPage() const;
QString queryMetaData(const QString &key);
void addMetaData(const QString &key, const QString &value);
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index aaed449..f5d535b 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -394,11 +394,6 @@ KJavaAppletContext *KHTMLPart::createJavaContext()
return 0L;
}
-void KHTMLPart::setPluginsEnabled( bool enable )
-{
- _logNotYetImplemented();
-}
-
bool KHTMLPart::pluginsEnabled() const
{
return [[[NSUserDefaults standardUserDefaults] objectForKey:@"WebKitPluginsEnabled"] boolValue];
diff --git a/WebCore/src/kwq/KWQKjobclasses.mm b/WebCore/src/kwq/KWQKjobclasses.mm
index aa06be3..4499279 100644
--- a/WebCore/src/kwq/KWQKjobclasses.mm
+++ b/WebCore/src/kwq/KWQKjobclasses.mm
@@ -68,7 +68,7 @@ QString Job::errorString()
}
-void Job::kill(bool quietly=TRUE)
+void Job::kill(bool quietly)
{
_logNotYetImplemented();
}
@@ -153,6 +153,11 @@ int TransferJob::error()
return _status;
}
+void TransferJob::setError(int e)
+{
+ _status = e;
+}
+
QString TransferJob::queryMetaData(const QString &key)
{
NSString *_key;
@@ -175,7 +180,7 @@ void TransferJob::addMetaData(const QString &key, const QString &value)
[d->metaData setObject:_value forKey:_key];
}
-void TransferJob::kill(bool quietly=TRUE)
+void TransferJob::kill(bool quietly)
{
[d->handle cancelLoadInBackground];
}
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 99e780d..25e6fbe 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -1040,6 +1040,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p for URL %s\n", m_dataSource, urlString.latin1());
+ job->setError(1);
m_loader->slotFinished(job);
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1118,6 +1119,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
+ job->setError(1);
m_loader->slotFinished(job);
[controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
diff --git a/WebCore/src/kwq/kio/jobclasses.h b/WebCore/src/kwq/kio/jobclasses.h
index 7fd0e1c..99af382 100644
--- a/WebCore/src/kwq/kio/jobclasses.h
+++ b/WebCore/src/kwq/kio/jobclasses.h
@@ -161,6 +161,7 @@ public:
// member functions --------------------------------------------------------
int error();
+ void setError(int);
bool isErrorPage() const;
QString queryMetaData(const QString &key);
void addMetaData(const QString &key, const QString &value);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list