[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 06:52:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b4c977fffdec3d0d759e779a0fd3f4b0eb62709f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 22 22:18:34 2002 +0000
Added stubs from common WebResourceHandleDelegate base
class.
* Plugins.subproj/WebBaseNetscapePluginStream.h:
* Plugins.subproj/WebNetscapePluginStream.h:
* WebCoreSupport.subproj/WebSubresourceClient.h:
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebBaseResourceHandleDelegate.h: Added.
* WebView.subproj/WebBaseResourceHandleDelegate.m: Added.
* WebView.subproj/WebMainResourceClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a7c4ce5..076fa5f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-22 Richard Williamson <rjw at apple.com>
+
+ Added stubs from common WebResourceHandleDelegate base
+ class.
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h: Added.
+ * WebView.subproj/WebBaseResourceHandleDelegate.m: Added.
+ * WebView.subproj/WebMainResourceClient.h:
+
2002-10-22 Darin Adler <darin at apple.com>
Make the panel position itself above the main window.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a7c4ce5..076fa5f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-22 Richard Williamson <rjw at apple.com>
+
+ Added stubs from common WebResourceHandleDelegate base
+ class.
+
+ * Plugins.subproj/WebBaseNetscapePluginStream.h:
+ * Plugins.subproj/WebNetscapePluginStream.h:
+ * WebCoreSupport.subproj/WebSubresourceClient.h:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebBaseResourceHandleDelegate.h: Added.
+ * WebView.subproj/WebBaseResourceHandleDelegate.m: Added.
+ * WebView.subproj/WebMainResourceClient.h:
+
2002-10-22 Darin Adler <darin at apple.com>
Make the panel position itself above the main window.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
index 6ebcdcc..4076778 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.h
@@ -5,11 +5,12 @@
#import <Foundation/Foundation.h>
+#import <WebKit/WebBaseResourceHandleDelegate.h>
#import <WebKit/npapi.h>
@class WebResourceResponse;
- at interface WebBaseNetscapePluginStream : NSObject
+ at interface WebBaseNetscapePluginStream : WebBaseResourceHandleDelegate
{
NSURL *URL;
NPP instance;
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.h b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
index d530742..c8acd67 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.h
@@ -11,9 +11,9 @@
@class WebNetscapePluginEmbeddedView;
@class WebResourceHandle;
@class WebResourceRequest;
- at protocol WebResourceHandleDelegate;
- at interface WebNetscapePluginStream : WebBaseNetscapePluginStream <WebResourceHandleDelegate>
+
+ at interface WebNetscapePluginStream : WebBaseNetscapePluginStream
{
WebNetscapePluginEmbeddedView *view;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
index 355183e..09ff7be 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
@@ -1,19 +1,18 @@
-//
-// WebSubresourceClient.h
-// WebKit
-//
-// Created by Darin Adler on Sat Jun 15 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ WebSubresourceClient.h
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+#import <Foundation/Foundation.h>
-#import <WebFoundation/WebResourceHandleDelegate.h>
+#import <WebKit/WebBaseResourceHandleDelegate.h>
@class WebDataSource;
@class WebResourceResponse;
+
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
- at interface WebSubresourceClient : NSObject <WebResourceHandleDelegate, WebCoreResourceHandle>
+ at interface WebSubresourceClient : WebBaseResourceHandleDelegate <WebCoreResourceHandle>
{
id <WebCoreResourceLoader> loader;
WebDataSource *dataSource;
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
index 355183e..09ff7be 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
@@ -1,19 +1,18 @@
-//
-// WebSubresourceClient.h
-// WebKit
-//
-// Created by Darin Adler on Sat Jun 15 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ WebSubresourceClient.h
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+#import <Foundation/Foundation.h>
-#import <WebFoundation/WebResourceHandleDelegate.h>
+#import <WebKit/WebBaseResourceHandleDelegate.h>
@class WebDataSource;
@class WebResourceResponse;
+
@protocol WebCoreResourceHandle;
@protocol WebCoreResourceLoader;
- at interface WebSubresourceClient : NSObject <WebResourceHandleDelegate, WebCoreResourceHandle>
+ at interface WebSubresourceClient : WebBaseResourceHandleDelegate <WebCoreResourceHandle>
{
id <WebCoreResourceLoader> loader;
WebDataSource *dataSource;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 24ef589..e2cde5e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -290,6 +290,7 @@
848DFF870365FE6A00CA2ACA,
848DFF880365FE6A00CA2ACA,
848DFF890365FE6A00CA2ACA,
+ 51F6866E0366057300CA2D3A,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -391,6 +392,7 @@
9345D4ED0365C5B2008635CE,
9345DDB10365FB27008635CE,
9345DDB50365FFD0008635CE,
+ 51F6866F0366057300CA2D3A,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1275,6 +1277,32 @@
settings = {
};
};
+ 51F6866C0366057300CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebBaseResourceHandleDelegate.h;
+ path = WebView.subproj/WebBaseResourceHandleDelegate.h;
+ refType = 2;
+ };
+ 51F6866D0366057300CA2D3A = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ name = WebBaseResourceHandleDelegate.m;
+ path = WebView.subproj/WebBaseResourceHandleDelegate.m;
+ refType = 2;
+ };
+ 51F6866E0366057300CA2D3A = {
+ fileRef = 51F6866C0366057300CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 51F6866F0366057300CA2D3A = {
+ fileRef = 51F6866D0366057300CA2D3A;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//510
//511
//512
@@ -1793,6 +1821,8 @@
933D659903413FF2008635CE,
933D659A03413FF2008635CE,
513D422E034CF55A00CA2ACD,
+ 51F6866C0366057300CA2D3A,
+ 51F6866D0366057300CA2D3A,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
new file mode 100644
index 0000000..c009ca2
--- /dev/null
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -0,0 +1,15 @@
+/*
+ WebBaseResourceHandleDelegate.h
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+ at protocol WebResourceHandleDelegate;
+
+ at interface WebBaseResourceHandleDelegate : NSObject <WebResourceHandleDelegate>
+{
+
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
new file mode 100644
index 0000000..449ca02
--- /dev/null
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -0,0 +1,11 @@
+/*
+ WebBaseResourceHandleDelegate.m
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+
+#import "WebBaseResourceHandleDelegate.h"
+
+
+ at implementation WebBaseResourceHandleDelegate
+
+ at end
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
new file mode 100644
index 0000000..c009ca2
--- /dev/null
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -0,0 +1,15 @@
+/*
+ WebBaseResourceHandleDelegate.h
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+
+#import <Foundation/Foundation.h>
+
+ at protocol WebResourceHandleDelegate;
+
+ at interface WebBaseResourceHandleDelegate : NSObject <WebResourceHandleDelegate>
+{
+
+}
+
+ at end
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
new file mode 100644
index 0000000..449ca02
--- /dev/null
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -0,0 +1,11 @@
+/*
+ WebBaseResourceHandleDelegate.m
+ Copyright (c) 2002, Apple Computer, Inc. All rights reserved.
+*/
+
+#import "WebBaseResourceHandleDelegate.h"
+
+
+ at implementation WebBaseResourceHandleDelegate
+
+ at end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 18857df..39c1f7c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -8,6 +8,7 @@
#import <Foundation/Foundation.h>
+#import <WebKit/WebBaseResourceHandleDelegate.h>
#import <WebKit/WebControllerPolicyDelegate.h>
@class WebDownloadHandler;
@@ -19,7 +20,7 @@
@protocol WebResourceHandleDelegate;
@protocol WebResourceLoadDelegate;
- at interface WebMainResourceClient : NSObject <WebResourceHandleDelegate>
+ at interface WebMainResourceClient : WebBaseResourceHandleDelegate
{
NSURL *currentURL;
WebDataSource *dataSource;
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 18857df..39c1f7c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -8,6 +8,7 @@
#import <Foundation/Foundation.h>
+#import <WebKit/WebBaseResourceHandleDelegate.h>
#import <WebKit/WebControllerPolicyDelegate.h>
@class WebDownloadHandler;
@@ -19,7 +20,7 @@
@protocol WebResourceHandleDelegate;
@protocol WebResourceLoadDelegate;
- at interface WebMainResourceClient : NSObject <WebResourceHandleDelegate>
+ at interface WebMainResourceClient : WebBaseResourceHandleDelegate
{
NSURL *currentURL;
WebDataSource *dataSource;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list