[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:05:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 070d079924f25a47bc5fd86647f2f7f69efed81c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Apr 16 15:18:50 2002 +0000
2002-04-16 Kenneth Kocienda <kocienda at apple.com>
Moved IFError class from WebKit to WebFoundation.
Labyrinth:
Updated test and tool code to track this change.
* Tests/WebFoundationC/ifurlhandlec-test.c: (ResourceDidFailLoadingCallBack):
* Tools/wftool/WFTool.m: (-[WFTool
IFURLHandle:resourceDidFailLoadingWithResult:]):
WebBrowser:
Updated includes due to this change.
* BrowserDocument.m:
* FrameProgressEntry.m:
* LoadProgressEntry.m:
* LocationChangeHandler.m:
* WebBrowser.pbproj/project.pbxproj:
WebCore:
Updated URL handle client interface to pass an IFError in
an error callback rather than a plain int. These files were
modified due to this change.
* src/kwq/KWQKHTMLPart.mm: (WCSetIFWebDataSourceMakeFunc):
* src/kwq/KWQKloader.mm: (-[URLLoadClient
IFURLHandle:resourceDidFailLoadingWithResult:]):
Removed now unneeded file and function pointer symbol entry
since WebCore code never needs to create an IFError now that
those objects are created at a lower level (in WebFoundation).
* src/kwq/WCError.h: Removed.
* src/libwebcore.exp:
WebFoundation:
Updated URL handle client interface to pass an IFError in
an error callback rather than a plain int. These files were
modified due to this change.
I added some additional API to the C glue to make IFError objects
accessible from C code.
* CacheLoader.subproj/IFURLHandle.m: (-[IFURLHandleInstanceVariables dealloc]),
(-[IFURLHandleSynchronousClient IFURLHandle:resourceDidFailLoadingWithResult:]),
(-[IFURLHandle notifyClientsDidFailLoading]):
* CacheLoader.subproj/IFURLHandleC.h:
* CacheLoader.subproj/IFURLHandleC.m: (IFErrorGetErrorCode),
(IFErrorGetErrorDescription), (IFErrorGetFailingURL):
* CacheLoader.subproj/IFURLHandleCallBackClient.m: (-[IFURLHandleCallBackClient
IFURLHandle:resourceDidFailLoadingWithResult:]):
* CacheLoader.subproj/IFURLHandleClient.h:
* Misc.subproj/IFError.h:
* Misc.subproj/IFError.m: (+[IFError initialize]), (+[IFError errorWithCode:]),
(+[IFError errorWithCode:failingURL:]), (-[IFError initWithErrorCode:]),
(-[IFError errorDescription]), (-[IFError description]):
* Misc.subproj/WebFoundation.h:
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Moved IFError class from WebKit to WebFoundation.
Updated includes due to this change.
Updated URL handle client interface to pass an IFError in
an error callback rather than a plain int. The URL client was
modified due to this change.
* Misc.subproj/IFError.h: Removed.
* Misc.subproj/IFError.m: Removed.
* Plugins.subproj/IFPluginView.mm:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/IFBaseWebControllerPrivate.mm:
* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
IFURLHandle:resourceDidFailLoadingWithResult:]):
* WebView.subproj/IFWebFramePrivate.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1026 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d91446f..e486148 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,21 @@
+2002-04-16 Kenneth Kocienda <kocienda at apple.com>
+
+ Moved IFError class from WebKit to WebFoundation.
+ Updated URL handle client interface to pass an IFError in
+ an error callback rather than a plain int. These files were
+ modified due to this change.
+
+ * src/kwq/KWQKHTMLPart.mm: (WCSetIFWebDataSourceMakeFunc):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+
+ Removed now unneeded file and function pointer symbol entry
+ since WebCore code never needs to create an IFError now that
+ those objects are created at a lower level (in WebFoundation).
+
+ * src/kwq/WCError.h: Removed.
+ * src/libwebcore.exp:
+
2002-04-15 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d91446f..e486148 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,21 @@
+2002-04-16 Kenneth Kocienda <kocienda at apple.com>
+
+ Moved IFError class from WebKit to WebFoundation.
+ Updated URL handle client interface to pass an IFError in
+ an error callback rather than a plain int. These files were
+ modified due to this change.
+
+ * src/kwq/KWQKHTMLPart.mm: (WCSetIFWebDataSourceMakeFunc):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+
+ Removed now unneeded file and function pointer symbol entry
+ since WebCore code never needs to create an IFError now that
+ those objects are created at a lower level (in WebFoundation).
+
+ * src/kwq/WCError.h: Removed.
+ * src/libwebcore.exp:
+
2002-04-15 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d91446f..e486148 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2002-04-16 Kenneth Kocienda <kocienda at apple.com>
+
+ Moved IFError class from WebKit to WebFoundation.
+ Updated URL handle client interface to pass an IFError in
+ an error callback rather than a plain int. These files were
+ modified due to this change.
+
+ * src/kwq/KWQKHTMLPart.mm: (WCSetIFWebDataSourceMakeFunc):
+ * src/kwq/KWQKloader.mm: (-[URLLoadClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+
+ Removed now unneeded file and function pointer symbol entry
+ since WebCore code never needs to create an IFError now that
+ those objects are created at a lower level (in WebFoundation).
+
+ * src/kwq/WCError.h: Removed.
+ * src/libwebcore.exp:
+
2002-04-15 Darin Adler <darin at apple.com>
* src/kdelibs/khtml/rendering/render_text.cpp: (TextSlave::printDecoration):
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 2d6fae2..aaed449 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -87,26 +87,17 @@
#import <KWQView.h>
-#include <WCError.h>
#include <WCWebDataSource.h>
#include <loader.h>
#include <external.h>
-
-
WCIFWebDataSourceMakeFunc WCIFWebDataSourceMake;
void WCSetIFWebDataSourceMakeFunc(WCIFWebDataSourceMakeFunc func)
{
WCIFWebDataSourceMake = func;
}
-WCIFErrorMakeFunc WCIFErrorMake;
-void WCSetIFErrorMakeFunc(WCIFErrorMakeFunc func)
-{
- WCIFErrorMake = func;
-}
-
static bool cache_init = false;
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 2d6fae2..aaed449 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -87,26 +87,17 @@
#import <KWQView.h>
-#include <WCError.h>
#include <WCWebDataSource.h>
#include <loader.h>
#include <external.h>
-
-
WCIFWebDataSourceMakeFunc WCIFWebDataSourceMake;
void WCSetIFWebDataSourceMakeFunc(WCIFWebDataSourceMakeFunc func)
{
WCIFWebDataSourceMake = func;
}
-WCIFErrorMakeFunc WCIFErrorMake;
-void WCSetIFErrorMakeFunc(WCIFErrorMakeFunc func)
-{
- WCIFErrorMake = func;
-}
-
static bool cache_init = false;
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 5218561..99e780d 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -31,8 +31,8 @@
#include "loader.h"
#ifdef APPLE_CHANGES
#include <kwqdebug.h>
+#import <WebFoundation/WebFoundation.h>
#include <WCLoadProgress.h>
-#include <WCError.h>
#include <external.h>
#endif /* APPLE_CHANGES */
@@ -1101,18 +1101,17 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData;
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
- IFError *error = WCIFErrorMake(result);
id <IFLoadHandler> controller = [m_dataSource controller];
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1121,7 +1120,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
- [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
delete job;
}
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 5218561..99e780d 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -31,8 +31,8 @@
#include "loader.h"
#ifdef APPLE_CHANGES
#include <kwqdebug.h>
+#import <WebFoundation/WebFoundation.h>
#include <WCLoadProgress.h>
-#include <WCError.h>
#include <external.h>
#endif /* APPLE_CHANGES */
@@ -1101,18 +1101,17 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData;
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
- IFError *error = WCIFErrorMake(result);
id <IFLoadHandler> controller = [m_dataSource controller];
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1121,7 +1120,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
- [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
delete job;
}
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 5218561..99e780d 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -31,8 +31,8 @@
#include "loader.h"
#ifdef APPLE_CHANGES
#include <kwqdebug.h>
+#import <WebFoundation/WebFoundation.h>
#include <WCLoadProgress.h>
-#include <WCError.h>
#include <external.h>
#endif /* APPLE_CHANGES */
@@ -1101,18 +1101,17 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData;
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
- IFError *error = WCIFErrorMake(result);
id <IFLoadHandler> controller = [m_dataSource controller];
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1121,7 +1120,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
- [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
delete job;
}
diff --git a/WebCore/kwq/WCError.h b/WebCore/kwq/WCError.h
deleted file mode 100644
index 3d56d38..0000000
--- a/WebCore/kwq/WCError.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __WCERROR__
-#define __WCERROR__
-
-#import <Foundation/Foundation.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef id (*WCIFErrorMakeFunc)(int);
-void WCSetIFErrorMakeFunc(WCIFErrorMakeFunc func);
-
-extern WCIFErrorMakeFunc WCIFErrorMake;
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif /* __WCERROR__ */
diff --git a/WebCore/libwebcore.exp b/WebCore/libwebcore.exp
index 7169aa2..606f001 100644
--- a/WebCore/libwebcore.exp
+++ b/WebCore/libwebcore.exp
@@ -1,4 +1,3 @@
-_WCSetIFErrorMakeFunc
_WCSetIFLoadProgressMakeFunc__FPFv_P11objc_object
_WCSetIFPluginMakeFunc__FPFG7_NSRectP8WCPluginP8NSStringn1P12NSDictionaryUs_PB2
_WCSetIFWebDataSourceMakeFunc__FPFPv_P11objc_object
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 2d6fae2..aaed449 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -87,26 +87,17 @@
#import <KWQView.h>
-#include <WCError.h>
#include <WCWebDataSource.h>
#include <loader.h>
#include <external.h>
-
-
WCIFWebDataSourceMakeFunc WCIFWebDataSourceMake;
void WCSetIFWebDataSourceMakeFunc(WCIFWebDataSourceMakeFunc func)
{
WCIFWebDataSourceMake = func;
}
-WCIFErrorMakeFunc WCIFErrorMake;
-void WCSetIFErrorMakeFunc(WCIFErrorMakeFunc func)
-{
- WCIFErrorMake = func;
-}
-
static bool cache_init = false;
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 5218561..99e780d 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -31,8 +31,8 @@
#include "loader.h"
#ifdef APPLE_CHANGES
#include <kwqdebug.h>
+#import <WebFoundation/WebFoundation.h>
#include <WCLoadProgress.h>
-#include <WCError.h>
#include <external.h>
#endif /* APPLE_CHANGES */
@@ -1101,18 +1101,17 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
[controller _receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
void *userData;
userData = [[sender attributeForKey:IFURLHandleUserData] pointerValue];
KIO::TransferJob *job = static_cast<KIO::TransferJob *>(userData);
- KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %d, URL = %s\n", m_dataSource, result, job->url().url().latin1());
+ KWQDEBUGLEVEL (KWQ_LOG_LOADING, "dataSource = %p, result = %s, URL = %s\n", m_dataSource, [[result errorDescription] lossyCString], job->url().url().latin1());
[m_dataSource _removeURLHandle: job->handle()];
- IFError *error = WCIFErrorMake(result);
id <IFLoadHandler> controller = [m_dataSource controller];
IFLoadProgress *loadProgress = WCIFLoadProgressMake();
@@ -1121,7 +1120,7 @@ void DocLoader::removeCachedObject( CachedObject* o ) const
m_loader->slotFinished(job);
- [controller _receivedError: error forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
+ [controller _receivedError: result forResource: QSTRING_TO_NSSTRING(job->url().url()) partialProgress: loadProgress fromDataSource: m_dataSource];
delete job;
}
diff --git a/WebCore/src/kwq/WCError.h b/WebCore/src/kwq/WCError.h
deleted file mode 100644
index 3d56d38..0000000
--- a/WebCore/src/kwq/WCError.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __WCERROR__
-#define __WCERROR__
-
-#import <Foundation/Foundation.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef id (*WCIFErrorMakeFunc)(int);
-void WCSetIFErrorMakeFunc(WCIFErrorMakeFunc func);
-
-extern WCIFErrorMakeFunc WCIFErrorMake;
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif /* __WCERROR__ */
diff --git a/WebCore/src/libwebcore.exp b/WebCore/src/libwebcore.exp
index 7169aa2..606f001 100644
--- a/WebCore/src/libwebcore.exp
+++ b/WebCore/src/libwebcore.exp
@@ -1,4 +1,3 @@
-_WCSetIFErrorMakeFunc
_WCSetIFLoadProgressMakeFunc__FPFv_P11objc_object
_WCSetIFPluginMakeFunc__FPFG7_NSRectP8WCPluginP8NSStringn1P12NSDictionaryUs_PB2
_WCSetIFWebDataSourceMakeFunc__FPFPv_P11objc_object
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ec98314..a0281ff 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-04-16 Kenneth Kocienda <kocienda at apple.com>
+
+ Moved IFError class from WebKit to WebFoundation.
+ Updated includes due to this change.
+ Updated URL handle client interface to pass an IFError in
+ an error callback rather than a plain int. The URL client was
+ modified due to this change.
+
+ * Misc.subproj/IFError.h: Removed.
+ * Misc.subproj/IFError.m: Removed.
+ * Plugins.subproj/IFPluginView.mm:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFWebFramePrivate.mm:
+
2002-04-15 Darin Adler <darin at apple.com>
* WebView.subproj/IFPreferences.h:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ec98314..a0281ff 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-04-16 Kenneth Kocienda <kocienda at apple.com>
+
+ Moved IFError class from WebKit to WebFoundation.
+ Updated includes due to this change.
+ Updated URL handle client interface to pass an IFError in
+ an error callback rather than a plain int. The URL client was
+ modified due to this change.
+
+ * Misc.subproj/IFError.h: Removed.
+ * Misc.subproj/IFError.m: Removed.
+ * Plugins.subproj/IFPluginView.mm:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/IFBaseWebControllerPrivate.mm:
+ * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+ IFURLHandle:resourceDidFailLoadingWithResult:]):
+ * WebView.subproj/IFWebFramePrivate.mm:
+
2002-04-15 Darin Adler <darin at apple.com>
* WebView.subproj/IFPreferences.h:
diff --git a/WebKit/Misc.subproj/IFError.h b/WebKit/Misc.subproj/IFError.h
deleted file mode 100644
index fe62751..0000000
--- a/WebKit/Misc.subproj/IFError.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- IFError.h
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Foundation/Foundation.h>
-
-
-// WebFoundation error codes < 10000
-// WebKit error codes >= 10000
-
-typedef enum {
- IFNonHTMLContentNotSupportedError = 10000,
- IFFileDownloadNotSupportedError = 10001
-} IFErrorCode;
-
- at interface IFError : NSObject
-{
- int errorCode;
- NSURL *_failingURL;
-}
-
-- initWithErrorCode: (int)c;
-- initWithErrorCode: (int)c failingURL: (NSURL *)url;
-- (int)errorCode;
-- (NSString *)errorDescription;
-- (NSURL *)failingURL;
-
- at end
diff --git a/WebKit/Misc.subproj/IFError.m b/WebKit/Misc.subproj/IFError.m
deleted file mode 100644
index 615b202..0000000
--- a/WebKit/Misc.subproj/IFError.m
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- IFError.m
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <IFError.h>
-
-#include <WCError.h>
-#include <WebFoundation/IFURLCacheLoaderConstants.h>
-
-
- at implementation IFError
-
-static NSDictionary *descriptions = nil;
-
-static id IFErrorMake(int code)
-{
- return [[[IFError alloc] initWithErrorCode: (int)code] autorelease];
-}
-
-+(void) initialize
-{
- NSDictionary *dict;
-
- // +initialize is not thread-safe
- if (descriptions != nil) {
- return;
- }
-
- // Specifying all strings explicitly here, including table name, allows genstrings to work its magic
- dict = [NSDictionary dictionaryWithObjectsAndKeys:
- NSLocalizedStringFromTable (@"cancelled", @"IFError", @"IFURLHandleResultCancelled description"),
- [NSNumber numberWithInt: IFURLHandleResultCancelled],
- NSLocalizedStringFromTable (@"bad URL", @"IFError", @"IFURLHandleResultBadURLError description"),
- [NSNumber numberWithInt: IFURLHandleResultBadURLError],
- NSLocalizedStringFromTable (@"error requesting create", @"IFError", @"IFURLHandleResultRequestCreateError description"),
- [NSNumber numberWithInt: IFURLHandleResultRequestCreateError],
- NSLocalizedStringFromTable (@"error reading stream", @"IFError", @"IFURLHandleResultReadStreamError description"),
- [NSNumber numberWithInt: IFURLHandleResultReadStreamError],
- NSLocalizedStringFromTable (@"error creating read stream", @"IFError", @"IFURLHandleResultReadStreamCreateError description"),
- [NSNumber numberWithInt: IFURLHandleResultReadStreamCreateError],
- NSLocalizedStringFromTable (@"error setting client for read stream", @"IFError", @"IFURLHandleResultReadStreamSetClientError description"),
- [NSNumber numberWithInt: IFURLHandleResultReadStreamSetClientError],
- NSLocalizedStringFromTable (@"error opening read stream", @"IFError", @"IFURLHandleResultReadStreamOpenError description"),
- [NSNumber numberWithInt: IFURLHandleResultReadStreamOpenError],
- NSLocalizedStringFromTable (@"time out", @"IFError", @"IFURLHandleResultTimedOut description"),
- [NSNumber numberWithInt: IFURLHandleResultTimedOut],
- NSLocalizedStringFromTable (@"unsupported URL handle", @"IFError", @"IFURLHandleResultUnsupportedURLHandleError description"),
- [NSNumber numberWithInt: IFURLHandleResultUnsupportedURLHandleError],
- NSLocalizedStringFromTable (@"can't connect to host", @"IFError", @"IFURLHandleResultCantConnectToHostError description"),
- [NSNumber numberWithInt: IFURLHandleResultCantConnectToHostError],
- NSLocalizedStringFromTable (@"lost network connection", @"IFError", @"IFURLHandleResultNetworkConnectionLostError description"),
- [NSNumber numberWithInt: IFURLHandleResultNetworkConnectionLostError],
- NSLocalizedStringFromTable (@"DNS lookup error", @"IFError", @"IFURLHandleResultDNSLookupError description"),
- [NSNumber numberWithInt: IFURLHandleResultDNSLookupError],
- NSLocalizedStringFromTable (@"HTTP redirection loop error", @"IFError", @"IFURLHandleResultHTTPRedirectionLoopError description"),
- [NSNumber numberWithInt: IFURLHandleResultHTTPRedirectionLoopError],
- NSLocalizedStringFromTable (@"resource unavailable", @"IFError", @"IFURLHandleResultResourceUnavailableError description"),
- [NSNumber numberWithInt: IFURLHandleResultResourceUnavailableError],
- NSLocalizedStringFromTable (@"can't load from network", @"IFError", @"IFURLHandleResultCantLoadFromNetworkError description"),
- [NSNumber numberWithInt: IFURLHandleResultCantLoadFromNetworkError],
-
- NSLocalizedStringFromTable (@"bad request", @"IFError", @"IFURLHandleResultBadRequest description"),
- [NSNumber numberWithInt: IFURLHandleResultBadRequest],
- NSLocalizedStringFromTable (@"unauthorized", @"IFError", @"IFURLHandleResultUnauthorized description"),
- [NSNumber numberWithInt: IFURLHandleResultUnauthorized],
- NSLocalizedStringFromTable (@"payment required", @"IFError", @"IFURLHandleResultPaymentRequired description"),
- [NSNumber numberWithInt: IFURLHandleResultPaymentRequired],
- NSLocalizedStringFromTable (@"forbidden", @"IFError", @"IFURLHandleResultForbidden description"),
- [NSNumber numberWithInt: IFURLHandleResultForbidden],
- NSLocalizedStringFromTable (@"not found", @"IFError", @"IFURLHandleResultNotFound description"),
- [NSNumber numberWithInt: IFURLHandleResultNotFound],
- NSLocalizedStringFromTable (@"not allowed", @"IFError", @"IFURLHandleResultMethodNotAllowed description"),
- [NSNumber numberWithInt: IFURLHandleResultMethodNotAllowed],
- NSLocalizedStringFromTable (@"not acceptable", @"IFError", @"IFURLHandleResultNotAcceptable description"),
- [NSNumber numberWithInt: IFURLHandleResultNotAcceptable],
- NSLocalizedStringFromTable (@"not found", @"IFError", @"IFURLHandleResultNotFound description"),
- [NSNumber numberWithInt: IFURLHandleResultNotFound],
- NSLocalizedStringFromTable (@"proxy authentication required", @"IFError", @"IFURLHandleResultProxyAuthenticationRequired description"),
- [NSNumber numberWithInt: IFURLHandleResultProxyAuthenticationRequired],
- NSLocalizedStringFromTable (@"request time out", @"IFError", @"IFURLHandleResultRequestTimeOut description"),
- [NSNumber numberWithInt: IFURLHandleResultRequestTimeOut],
- NSLocalizedStringFromTable (@"conflict", @"IFError", @"IFURLHandleResultConflict description"),
- [NSNumber numberWithInt: IFURLHandleResultConflict],
- NSLocalizedStringFromTable (@"gone", @"IFError", @"IFURLHandleResultGone description"),
- [NSNumber numberWithInt: IFURLHandleResultGone],
- NSLocalizedStringFromTable (@"length required", @"IFError", @"IFURLHandleResultLengthRequired description"),
- [NSNumber numberWithInt: IFURLHandleResultLengthRequired],
- NSLocalizedStringFromTable (@"request entity too large", @"IFError", @"IFURLHandleResultRequestEntityTooLarge description"),
- [NSNumber numberWithInt: IFURLHandleResultRequestEntityTooLarge],
- NSLocalizedStringFromTable (@"request URI too large", @"IFError", @"IFURLHandleResultRequestURITooLarge description"),
- [NSNumber numberWithInt: IFURLHandleResultRequestURITooLarge],
- NSLocalizedStringFromTable (@"unsupported media type", @"IFError", @"IFURLHandleResultUnsupportedMediaType description"),
- [NSNumber numberWithInt: IFURLHandleResultUnsupportedMediaType],
- NSLocalizedStringFromTable (@"request range not satisfiable", @"IFError", @"IFURLHandleResultRequestRangeNotSatisfiable description"),
- [NSNumber numberWithInt: IFURLHandleResultRequestRangeNotSatisfiable],
- NSLocalizedStringFromTable (@"expectation failed", @"IFError", @"IFURLHandleResultExpectationFailed description"),
- [NSNumber numberWithInt: IFURLHandleResultExpectationFailed],
-
- NSLocalizedStringFromTable (@"internal server error", @"IFError", @"IFURLHandleResultInternalServerError description"),
- [NSNumber numberWithInt: IFURLHandleResultInternalServerError],
- NSLocalizedStringFromTable (@"not implemented", @"IFError", @"IFURLHandleResultNotImplemented description"),
- [NSNumber numberWithInt: IFURLHandleResultNotImplemented],
- NSLocalizedStringFromTable (@"bad gateway", @"IFError", @"IFURLHandleResultBadGateway description"),
- [NSNumber numberWithInt: IFURLHandleResultBadGateway],
- NSLocalizedStringFromTable (@"service unavailable", @"IFError", @"IFURLHandleResultServiceUnavailable description"),
- [NSNumber numberWithInt: IFURLHandleResultServiceUnavailable],
- NSLocalizedStringFromTable (@"gateway time out", @"IFError", @"IFURLHandleResultGatewayTimeOut description"),
- [NSNumber numberWithInt: IFURLHandleResultGatewayTimeOut],
- NSLocalizedStringFromTable (@"HTTP version not supported", @"IFError", @"IFURLHandleResultHTTPVersionNotSupported description"),
- [NSNumber numberWithInt: IFURLHandleResultHTTPVersionNotSupported],
-
- NSLocalizedStringFromTable (@"non-HTML content not currently supported", @"IFError", @"IFNonHTMLContentNotSupportedError description"),
- [NSNumber numberWithInt: IFNonHTMLContentNotSupportedError],
- NSLocalizedStringFromTable (@"file download not currently supported", @"IFError", @"IFFileDownloadNotSupportedError description"),
- [NSNumber numberWithInt: IFFileDownloadNotSupportedError],
- nil];
-
- if (descriptions == nil) {
- descriptions = [dict retain];
- }
-}
-
-+(void) load
-{
- WCSetIFErrorMakeFunc(IFErrorMake);
-}
-
-- initWithErrorCode: (int)c
-{
- return [self initWithErrorCode: c failingURL: nil];
-}
-
-- initWithErrorCode: (int)c failingURL: (NSURL *)url;
-{
- [super init];
- errorCode = c;
- _failingURL = [url retain];
- return self;
-}
-
-- (void)dealloc
-{
- [_failingURL autorelease];
- [super dealloc];
-}
-
-- (int)errorCode
-{
- return errorCode;
-}
-
-- (NSString *)errorDescription
-{
- return [descriptions objectForKey: [NSNumber numberWithInt: errorCode]];
-}
-
-- (NSURL *)failingURL
-{
- return _failingURL;
-}
-
-- (NSString *)description
-{
- return [NSString stringWithFormat: @"url %@, code %d: %@", [_failingURL absoluteString], errorCode, [self errorDescription]];
-}
-
- at end
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index b265a1d..18781c4 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -14,7 +14,7 @@
#import <WebFoundation/IFURLHandle.h>
#import <IFPluginStream.h>
#import <IFWebDataSource.h>
-#import <IFError.h>
+#import <WebFoundation/IFError.h>
#import <WebKitDebug.h>
extern "C" {
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b265a1d..18781c4 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -14,7 +14,7 @@
#import <WebFoundation/IFURLHandle.h>
#import <IFPluginStream.h>
#import <IFWebDataSource.h>
-#import <IFError.h>
+#import <WebFoundation/IFError.h>
#import <WebKitDebug.h>
extern "C" {
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index ac02c33..cb7b179 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 38;
+ objectVersion = 36;
objects = {
014CEA440018CDF011CA2923 = {
buildRules = (
@@ -206,7 +206,6 @@
F5EBC45802134BC301CA1520,
9CF0E24B021361B10ECA16EA,
F5B92B840223191D01C1A525,
- F5DE3CB4023575AA01A80181,
F5D538EA02441F2601A80181,
F5F084BB024BDC8E01CA1520,
F5F084BF024BDCA701CA1520,
@@ -229,7 +228,6 @@
089C1668FE841158C02AAC07,
35F3577501986B740ACA1520,
35F357800198AAB80ACA1520,
- F515C2B90238249C01C1A525,
F5B67131023EDF8901C1A525,
25B2A7C5025D0A880ECA149E,
F5883BDF025E5C6A01000102,
@@ -258,7 +256,6 @@
F5143A380221DCCE01A80181,
F520FB1C0221DEFD01C1A525,
F5B92B850223191D01C1A525,
- F5DE3CB5023575AA01A80181,
F5D538ED02441FDD01A80181,
F5AEBB3E024A527601C1A526,
F5F084BC024BDC8E01CA1520,
@@ -394,9 +391,6 @@
25C29825016E29620ECA149E,
25A5593101A5996D0ECA149E,
25A5593201A5996D0ECA149E,
- F5DE3CB2023575AA01A80181,
- F5DE3CB3023575AA01A80181,
- F515C2B70238249C01C1A525,
F59EAE410253C8DE018635CA,
F59EAE3E0253C7EE018635CA,
);
@@ -1088,27 +1082,6 @@
settings = {
};
};
- F515C2B70238249C01C1A525 = {
- children = (
- F515C2B80238249C01C1A525,
- );
- isa = PBXVariantGroup;
- name = IFError.strings;
- path = "";
- refType = 4;
- };
- F515C2B80238249C01C1A525 = {
- isa = PBXFileReference;
- name = English;
- path = English.lproj/IFError.strings;
- refType = 4;
- };
- F515C2B90238249C01C1A525 = {
- fileRef = F515C2B70238249C01C1A525;
- isa = PBXBuildFile;
- settings = {
- };
- };
F520FB190221DEFD01C1A525 = {
isa = PBXFileReference;
path = IFWebHistory.h;
@@ -1423,33 +1396,6 @@
settings = {
};
};
- F5DE3CB2023575AA01A80181 = {
- isa = PBXFileReference;
- name = IFError.h;
- path = Misc.subproj/IFError.h;
- refType = 4;
- };
- F5DE3CB3023575AA01A80181 = {
- isa = PBXFileReference;
- name = IFError.m;
- path = Misc.subproj/IFError.m;
- refType = 4;
- };
- F5DE3CB4023575AA01A80181 = {
- fileRef = F5DE3CB2023575AA01A80181;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- F5DE3CB5023575AA01A80181 = {
- fileRef = F5DE3CB3023575AA01A80181;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5E638620265FC0D01000102 = {
isa = PBXFileReference;
name = plugin_document_template.html;
diff --git a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
index 2817649..d505422 100644
--- a/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFBaseWebControllerPrivate.mm
@@ -7,8 +7,8 @@
#import <WebKit/IFWebViewPrivate.h>
#import <WebKit/IFWebFramePrivate.h>
#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFError.h>
+#import <WebFoundation/IFError.h>
#include <KWQKHTMLPart.h>
#include <rendering/render_frames.h>
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 23c51b8..f7d88e2 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -5,7 +5,6 @@
*/
#include <pthread.h>
-#import <WebKit/IFError.h>
#import <WebKit/IFBaseWebControllerPrivate.h>
#import <WebKit/IFMainURLHandleClient.h>
#import <WebKit/IFMIMEDatabase.h>
@@ -13,6 +12,8 @@
#import <WebKit/IFContentHandler.h>
#import <WebKit/IFDownloadHandlerPrivate.h>
+#import <WebFoundation/IFError.h>
+
#include <khtmlview.h>
@implementation IFMainURLHandleClient
@@ -158,23 +159,21 @@
[loadProgress release];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
- [[dataSource controller] receivedError: error forDownloadHandler:downloadHandler
+ [[dataSource controller] receivedError: result forDownloadHandler:downloadHandler
partialProgress: loadProgress];
}else{
- [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString]
+ [[dataSource controller] _mainReceivedError: result forResource: [[sender url] absoluteString]
partialProgress: loadProgress fromDataSource: dataSource];
}
- [error release];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index 63c739b..b78a698 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -7,11 +7,12 @@
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebViewPrivate.h>
#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFError.h>
#import <WebKit/IFPreferencesPrivate.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFError.h>
+
// includes from kde
#include <khtmlview.h>
#include <rendering/render_frames.h>
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 63c739b..b78a698 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -7,11 +7,12 @@
#import <WebKit/IFWebDataSourcePrivate.h>
#import <WebKit/IFWebViewPrivate.h>
#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFError.h>
#import <WebKit/IFPreferencesPrivate.h>
#import <WebKit/WebKitDebug.h>
+#import <WebFoundation/IFError.h>
+
// includes from kde
#include <khtmlview.h>
#include <rendering/render_frames.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 23c51b8..f7d88e2 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -5,7 +5,6 @@
*/
#include <pthread.h>
-#import <WebKit/IFError.h>
#import <WebKit/IFBaseWebControllerPrivate.h>
#import <WebKit/IFMainURLHandleClient.h>
#import <WebKit/IFMIMEDatabase.h>
@@ -13,6 +12,8 @@
#import <WebKit/IFContentHandler.h>
#import <WebKit/IFDownloadHandlerPrivate.h>
+#import <WebFoundation/IFError.h>
+
#include <khtmlview.h>
@implementation IFMainURLHandleClient
@@ -158,23 +159,21 @@
[loadProgress release];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
- [[dataSource controller] receivedError: error forDownloadHandler:downloadHandler
+ [[dataSource controller] receivedError: result forDownloadHandler:downloadHandler
partialProgress: loadProgress];
}else{
- [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString]
+ [[dataSource controller] _mainReceivedError: result forResource: [[sender url] absoluteString]
partialProgress: loadProgress fromDataSource: dataSource];
}
- [error release];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 23c51b8..f7d88e2 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -5,7 +5,6 @@
*/
#include <pthread.h>
-#import <WebKit/IFError.h>
#import <WebKit/IFBaseWebControllerPrivate.h>
#import <WebKit/IFMainURLHandleClient.h>
#import <WebKit/IFMIMEDatabase.h>
@@ -13,6 +12,8 @@
#import <WebKit/IFContentHandler.h>
#import <WebKit/IFDownloadHandlerPrivate.h>
+#import <WebFoundation/IFError.h>
+
#include <khtmlview.h>
@implementation IFMainURLHandleClient
@@ -158,23 +159,21 @@
[loadProgress release];
}
-- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
+- (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(IFError *)result
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %d\n", [[[sender url] absoluteString] cString], result);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "url = %s, result = %s\n", [[[sender url] absoluteString] cString], [[result errorDescription] lossyCString]);
IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
loadProgress->totalToLoad = [sender contentLength];
loadProgress->bytesSoFar = [sender contentLengthReceived];
- IFError *error = [[IFError alloc] initWithErrorCode: result failingURL: [sender url]];
if(handlerType == IFMIMEHANDLERTYPE_APPLICATION){
- [[dataSource controller] receivedError: error forDownloadHandler:downloadHandler
+ [[dataSource controller] receivedError: result forDownloadHandler:downloadHandler
partialProgress: loadProgress];
}else{
- [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString]
+ [[dataSource controller] _mainReceivedError: result forResource: [[sender url] absoluteString]
partialProgress: loadProgress fromDataSource: dataSource];
}
- [error release];
}
- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list