[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:53:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 89dd5754f29433686d8304fe4b43c538456e0469
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 19 00:08:15 2001 +0000
Restructing of headers in prepartion for implementation. Added new WK*
headers to PB project description.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@518 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f7416dd..ca51c72 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,8 +1,20 @@
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * ChangeLog:
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+<<<<<<< ChangeLog
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+=======
2001-12-18 Maciej Stachowiak <mjs at apple.com>
* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
clobbered.
+>>>>>>> 1.7
2001-12-13 Maciej Stachowiak <mjs at apple.com>
Changes for international character set support. Still needs work,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f7416dd..ca51c72 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,8 +1,20 @@
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * ChangeLog:
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+<<<<<<< ChangeLog
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+=======
2001-12-18 Maciej Stachowiak <mjs at apple.com>
* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
clobbered.
+>>>>>>> 1.7
2001-12-13 Maciej Stachowiak <mjs at apple.com>
Changes for international character set support. Still needs work,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f7416dd..ca51c72 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,8 +1,20 @@
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * ChangeLog:
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+<<<<<<< ChangeLog
+2001-12-18 Richard Williamson <rjw at apple.com>
+
+ * src/kdelibs/khtml/dom/html_element.cpp:
+
+=======
2001-12-18 Maciej Stachowiak <mjs at apple.com>
* src/kwq/Makefile.in: Re-apply my changes, which accidentally got
clobbered.
+>>>>>>> 1.7
2001-12-13 Maciej Stachowiak <mjs at apple.com>
Changes for international character set support. Still needs work,
diff --git a/WebCore/khtml/dom/html_element.cpp b/WebCore/khtml/dom/html_element.cpp
index f5590ad..1f8adcf 100644
--- a/WebCore/khtml/dom/html_element.cpp
+++ b/WebCore/khtml/dom/html_element.cpp
@@ -1,4 +1,4 @@
-/**
+ /**
* This file is part of the DOM implementation for KDE.
*
* (C) 1999 Lars Knoll (knoll at kde.org)
diff --git a/WebCore/src/kdelibs/khtml/dom/html_element.cpp b/WebCore/src/kdelibs/khtml/dom/html_element.cpp
index f5590ad..1f8adcf 100644
--- a/WebCore/src/kdelibs/khtml/dom/html_element.cpp
+++ b/WebCore/src/kdelibs/khtml/dom/html_element.cpp
@@ -1,4 +1,4 @@
-/**
+ /**
* This file is part of the DOM implementation for KDE.
*
* (C) 1999 Lars Knoll (knoll at kde.org)
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7c15f0f..39b1bf7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,9 +1,24 @@
-2001-12-18 Kenneth Kocienda <kocienda at apple.com>
+2001-12-18 Richard Williamson <rjw at apple.com>
- Updated based on comments from John and Richard
-
- * Documentation/WebKit-White-Paper/WebKit-White-Paper.html:
- * Documentation/WebKit-White-Paper/images/webkit-cache-loader.jpg:
+ Restructing of headers in prepartion for implementation. Added new WK*
+ headers to PB project description.
+
+ * ChangeLog:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/NSWebPageDataSource.h:
+ * WebView.subproj/NSWebPageDataSource.mm:
+ * WebView.subproj/NSWebPageDataSourcePrivate.h:
+ * WebView.subproj/NSWebPageView.h:
+ * WebView.subproj/NSWebPageView.mm:
+ * WebView.subproj/NSWebPageViewPrivate.h:
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebController.mm:
+ * WebView.subproj/WKWebDataSource.h:
+ * WebView.subproj/WKWebDataSource.mm: (+[WKWebDataSource initialize]):
+ * WebView.subproj/WKWebDataSourcePrivate.h:
+ * WebView.subproj/WKWebView.h:
+ * WebView.subproj/WKWebView.mm:
+ * WebView.subproj/WKWebViewPrivate.h:
2001-12-18 Kenneth Kocienda <kocienda at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7c15f0f..39b1bf7 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,9 +1,24 @@
-2001-12-18 Kenneth Kocienda <kocienda at apple.com>
+2001-12-18 Richard Williamson <rjw at apple.com>
- Updated based on comments from John and Richard
-
- * Documentation/WebKit-White-Paper/WebKit-White-Paper.html:
- * Documentation/WebKit-White-Paper/images/webkit-cache-loader.jpg:
+ Restructing of headers in prepartion for implementation. Added new WK*
+ headers to PB project description.
+
+ * ChangeLog:
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/NSWebPageDataSource.h:
+ * WebView.subproj/NSWebPageDataSource.mm:
+ * WebView.subproj/NSWebPageDataSourcePrivate.h:
+ * WebView.subproj/NSWebPageView.h:
+ * WebView.subproj/NSWebPageView.mm:
+ * WebView.subproj/NSWebPageViewPrivate.h:
+ * WebView.subproj/WKWebController.h:
+ * WebView.subproj/WKWebController.mm:
+ * WebView.subproj/WKWebDataSource.h:
+ * WebView.subproj/WKWebDataSource.mm: (+[WKWebDataSource initialize]):
+ * WebView.subproj/WKWebDataSourcePrivate.h:
+ * WebView.subproj/WKWebView.h:
+ * WebView.subproj/WKWebView.mm:
+ * WebView.subproj/WKWebViewPrivate.h:
2001-12-18 Kenneth Kocienda <kocienda at apple.com>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0a60a58..30b8778 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -176,15 +176,20 @@
25BECC9A017E0A0D0ECA149E,
25BECC9B017E0A0D0ECA149E,
25BECC9D017E0A0D0ECA149E,
- 9C7CABC00190A3E10ECA16EA,
- 9C7CABC10190A3E10ECA16EA,
- 9C93A48601920D0C0ECA16EA,
- 9C93A48A01920D3D0ECA16EA,
251E877A01A1EE570ECA149E,
25A5593301A5996D0ECA149E,
25A8176F01B5B9180ECA149E,
25A8177301B698760ECA149E,
25A8177701B6A5240ECA149E,
+ 9C04852501CFF9CE0ECA16EA,
+ 9C04852601CFF9CE0ECA16EA,
+ 9C04852701CFF9CE0ECA16EA,
+ 9C04852801CFF9CE0ECA16EA,
+ 9C04852901CFF9CE0ECA16EA,
+ 9C04853001CFFD060ECA16EA,
+ 9C04853101CFFD060ECA16EA,
+ 9C04853201CFFD060ECA16EA,
+ 9C04853301CFFD060ECA16EA,
);
isa = PBXHeadersBuildPhase;
name = Headers;
@@ -206,13 +211,13 @@
2568C72A017490CF0ECA149E,
25BECC9E017E0A0D0ECA149E,
25BECC9F017E0A0D0ECA149E,
- 9C93A48701920D0C0ECA16EA,
- 9C93A48B01920D3D0ECA16EA,
251E877B01A1EE570ECA149E,
25A5593401A5996D0ECA149E,
25A8177001B5B9180ECA149E,
25A8177401B698760ECA149E,
25A8177801B6A5240ECA149E,
+ 9C04852A01CFF9CE0ECA16EA,
+ 9C04852B01CFF9CE0ECA16EA,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -371,6 +376,10 @@
2568C71F017490290ECA149E,
251E877801A1EE570ECA149E,
251E877901A1EE570ECA149E,
+ 9C04852C01CFFD060ECA16EA,
+ 9C04852D01CFFD060ECA16EA,
+ 9C04852E01CFFD060ECA16EA,
+ 9C04852F01CFFD060ECA16EA,
);
isa = PBXGroup;
name = Cache;
@@ -757,33 +766,50 @@
//9C2
//9C3
//9C4
- 9C7CABBB0190A37C0ECA16EA = {
- children = (
- 9C7CABBC0190A3E10ECA16EA,
- 9C7CABBE0190A3E10ECA16EA,
- 9C93A48401920D0C0ECA16EA,
- 9C93A48501920D0C0ECA16EA,
- 9C93A48801920D3D0ECA16EA,
- 9C93A48901920D3D0ECA16EA,
- );
- isa = PBXGroup;
- name = WebView;
- refType = 4;
+ 9C04851E01CFF9CE0ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebController.h;
+ path = WebView.subproj/WKWebController.h;
+ refType = 2;
+ };
+ 9C04851F01CFF9CE0ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebDataSource.h;
+ path = WebView.subproj/WKWebDataSource.h;
+ refType = 2;
+ };
+ 9C04852001CFF9CE0ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebDataSource.mm;
+ path = WebView.subproj/WKWebDataSource.mm;
+ refType = 2;
+ };
+ 9C04852101CFF9CE0ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebDataSourcePrivate.h;
+ path = WebView.subproj/WKWebDataSourcePrivate.h;
+ refType = 2;
+ };
+ 9C04852201CFF9CE0ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebView.h;
+ path = WebView.subproj/WKWebView.h;
+ refType = 2;
};
- 9C7CABBC0190A3E10ECA16EA = {
+ 9C04852301CFF9CE0ECA16EA = {
isa = PBXFileReference;
- name = NSWebPageDataSource.h;
- path = WebView.subproj/NSWebPageDataSource.h;
+ name = WKWebController.mm;
+ path = WebView.subproj/WKWebController.mm;
refType = 2;
};
- 9C7CABBE0190A3E10ECA16EA = {
+ 9C04852401CFF9CE0ECA16EA = {
isa = PBXFileReference;
- name = NSWebPageView.h;
- path = WebView.subproj/NSWebPageView.h;
+ name = WKWebViewPrivate.h;
+ path = WebView.subproj/WKWebViewPrivate.h;
refType = 2;
};
- 9C7CABC00190A3E10ECA16EA = {
- fileRef = 9C7CABBC0190A3E10ECA16EA;
+ 9C04852501CFF9CE0ECA16EA = {
+ fileRef = 9C04851E01CFF9CE0ECA16EA;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -791,8 +817,8 @@
);
};
};
- 9C7CABC10190A3E10ECA16EA = {
- fileRef = 9C7CABBE0190A3E10ECA16EA;
+ 9C04852601CFF9CE0ECA16EA = {
+ fileRef = 9C04851F01CFF9CE0ECA16EA;
isa = PBXBuildFile;
settings = {
ATTRIBUTES = (
@@ -800,54 +826,119 @@
);
};
};
- 9C93A48401920D0C0ECA16EA = {
- isa = PBXFileReference;
- name = NSWebPageView.mm;
- path = WebView.subproj/NSWebPageView.mm;
- refType = 2;
+ 9C04852701CFF9CE0ECA16EA = {
+ fileRef = 9C04852101CFF9CE0ECA16EA;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
};
- 9C93A48501920D0C0ECA16EA = {
- isa = PBXFileReference;
- name = NSWebPageDataSourcePrivate.h;
- path = WebView.subproj/NSWebPageDataSourcePrivate.h;
- refType = 2;
+ 9C04852801CFF9CE0ECA16EA = {
+ fileRef = 9C04852201CFF9CE0ECA16EA;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 9C04852901CFF9CE0ECA16EA = {
+ fileRef = 9C04852401CFF9CE0ECA16EA;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
};
- 9C93A48601920D0C0ECA16EA = {
- fileRef = 9C93A48501920D0C0ECA16EA;
+ 9C04852A01CFF9CE0ECA16EA = {
+ fileRef = 9C04852001CFF9CE0ECA16EA;
isa = PBXBuildFile;
settings = {
};
};
- 9C93A48701920D0C0ECA16EA = {
- fileRef = 9C93A48401920D0C0ECA16EA;
+ 9C04852B01CFF9CE0ECA16EA = {
+ fileRef = 9C04852301CFF9CE0ECA16EA;
isa = PBXBuildFile;
settings = {
};
};
- 9C93A48801920D3D0ECA16EA = {
+ 9C04852C01CFFD060ECA16EA = {
isa = PBXFileReference;
- name = NSWebPageDataSource.mm;
- path = WebView.subproj/NSWebPageDataSource.mm;
+ name = WKLoadChunk.h;
+ path = Cache.subproj/WKLoadChunk.h;
refType = 2;
};
- 9C93A48901920D3D0ECA16EA = {
+ 9C04852D01CFFD060ECA16EA = {
isa = PBXFileReference;
- name = NSWebPageViewPrivate.h;
- path = WebView.subproj/NSWebPageViewPrivate.h;
+ name = WKWebCache.h;
+ path = Cache.subproj/WKWebCache.h;
refType = 2;
};
- 9C93A48A01920D3D0ECA16EA = {
- fileRef = 9C93A48901920D3D0ECA16EA;
+ 9C04852E01CFFD060ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebCacheClient.h;
+ path = Cache.subproj/WKWebCacheClient.h;
+ refType = 2;
+ };
+ 9C04852F01CFFD060ECA16EA = {
+ isa = PBXFileReference;
+ name = WKWebContentType.h;
+ path = Cache.subproj/WKWebContentType.h;
+ refType = 2;
+ };
+ 9C04853001CFFD060ECA16EA = {
+ fileRef = 9C04852C01CFFD060ECA16EA;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 9C04853101CFFD060ECA16EA = {
+ fileRef = 9C04852D01CFFD060ECA16EA;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Public,
+ );
+ };
+ };
+ 9C04853201CFFD060ECA16EA = {
+ fileRef = 9C04852E01CFFD060ECA16EA;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
- 9C93A48B01920D3D0ECA16EA = {
- fileRef = 9C93A48801920D3D0ECA16EA;
+ 9C04853301CFFD060ECA16EA = {
+ fileRef = 9C04852F01CFFD060ECA16EA;
isa = PBXBuildFile;
settings = {
+ ATTRIBUTES = (
+ Public,
+ );
};
};
+ 9C7CABBB0190A37C0ECA16EA = {
+ children = (
+ 9C04851E01CFF9CE0ECA16EA,
+ 9C04851F01CFF9CE0ECA16EA,
+ 9C04852001CFF9CE0ECA16EA,
+ 9C04852101CFF9CE0ECA16EA,
+ 9C04852201CFF9CE0ECA16EA,
+ 9C04852301CFF9CE0ECA16EA,
+ 9C04852401CFF9CE0ECA16EA,
+ );
+ isa = PBXGroup;
+ name = WebView;
+ refType = 4;
+ };
};
rootObject = 0867D690FE84028FC02AAC07;
}
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 3201f39..a5249b0 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -6,7 +6,6 @@
*/
#import <Cocoa/Cocoa.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -101,19 +100,6 @@
*/
-/*
- =============================================================================
-
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
- description.
-
- [Don and I both agree that all these little protocols are useful to cleanly
- describe snippets of behavior, but do we explicity reference them anywhere,
- or do we just use the umbrella protocol?]
-*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
- at end
@@ -124,6 +110,10 @@
scheme used by Foundation, although Foundation's concrete classes
typically aren't public.
*/
+#ifndef NEW_WEBKIT_API
+ at interface WKDefaultWebController : NSObject
+ at end
+#else
@interface WKDefaultWebController : NSObject <WKWebController>
- initWithView: (WKWebView *) dataSource: (WKWebDataSource *)dataSource;
@@ -145,6 +135,24 @@
@end
+
+/*
+ =============================================================================
+
+ WKWebController implements all the behavior that ties together WKWebView
+ and WKWebDataSource. See each inherited protocol for a more complete
+ description.
+
+ [Don and I both agree that all these little protocols are useful to cleanly
+ describe snippets of behavior, but do we explicity reference them anywhere,
+ or do we just use the umbrella protocol?]
+*/
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at end
+
+
+
+
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 85e7dcf..085fbc8 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -67,14 +67,15 @@
============================================================================= */
-#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject <WKWebDataSource>
+ at interface WKWebDataSource : NSObject
{
@private
id _dataSourcePrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
- initWithURL: (NSURL *)inputURL;
@@ -194,7 +195,8 @@
// Returns nil or the page title.
- (NSString *)pageTitle;
+#endif
+
@end
-#endif
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageDataSource.mm
copy to WebKit/WebView.subproj/IFWebDataSource.mm
index d322954..419bef8 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -1,9 +1,10 @@
-/* NSWebPageDataSource.h
+/*
+ WKWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/NSWebPageDataSource.h>
+#import <WebKit/WKWebDataSource.h>
- at implementation NSWebPageDataSource
+ at implementation WKWebDataSource
+ (void)initialize {
diff --git a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
copy to WebKit/WebView.subproj/IFWebDataSourcePrivate.h
index 6fb209e..380846a 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageDataSourcePrivate.h
+/* WKWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
index ddbb4dc..a4f596b 100644
--- a/WebKit/WebView.subproj/IFWebView.h
+++ b/WebKit/WebView.subproj/IFWebView.h
@@ -9,7 +9,6 @@
#import <WebKit/WKWebDataSource.h>
#import <WebKit/WKWebController.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -87,6 +86,8 @@
id _viewPrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
- initWithFrame: (NSRect)frame;
// Convenience method. initWithFrame:url: will create a controller and data source.
@@ -149,6 +150,8 @@
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText;
+#endif
+
@end
@@ -170,5 +173,4 @@
subclassing of WKWebView
*/
-#endif
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
new file mode 100644
index 0000000..3cf71cb
--- /dev/null
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -0,0 +1,8 @@
+/* WKWebView.mm
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+#import <WebKit/WKWebView.h>
+
+ at implementation WKWebView
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/NSWebPageViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageViewPrivate.h
copy to WebKit/WebView.subproj/IFWebViewPrivate.h
index a508537..d39520c 100644
--- a/WebKit/WebView.subproj/NSWebPageViewPrivate.h
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageViewPrivate.h
+/* WKWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.h b/WebKit/WebView.subproj/NSWebPageDataSource.h
deleted file mode 100644
index 3993e16..0000000
--- a/WebKit/WebView.subproj/NSWebPageDataSource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- WKWebPageDataSource.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
- at interface NSWebPageDataSource : NSObject
-{
- at private
- id _dataSourcePrivate;
-}
-
- at end
-
diff --git a/WebKit/WebView.subproj/NSWebPageView.h b/WebKit/WebView.subproj/NSWebPageView.h
deleted file mode 100644
index 3ab3360..0000000
--- a/WebKit/WebView.subproj/NSWebPageView.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- WKWebPageView.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/NSWebPageDataSource.h>
-
- at interface NSWebPageView : NSView
-{
- at private
- id _viewPrivate;
-}
- at end
-
diff --git a/WebKit/WebView.subproj/NSWebPageView.mm b/WebKit/WebView.subproj/NSWebPageView.mm
deleted file mode 100644
index 2feb9bb..0000000
--- a/WebKit/WebView.subproj/NSWebPageView.mm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* NSWebPageView.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import <WebKit/NSWebPageView.h>
-
- at implementation NSWebPageView
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebController.h b/WebKit/WebView.subproj/WKWebController.h
index 3201f39..a5249b0 100644
--- a/WebKit/WebView.subproj/WKWebController.h
+++ b/WebKit/WebView.subproj/WKWebController.h
@@ -6,7 +6,6 @@
*/
#import <Cocoa/Cocoa.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -101,19 +100,6 @@
*/
-/*
- =============================================================================
-
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
- description.
-
- [Don and I both agree that all these little protocols are useful to cleanly
- describe snippets of behavior, but do we explicity reference them anywhere,
- or do we just use the umbrella protocol?]
-*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
- at end
@@ -124,6 +110,10 @@
scheme used by Foundation, although Foundation's concrete classes
typically aren't public.
*/
+#ifndef NEW_WEBKIT_API
+ at interface WKDefaultWebController : NSObject
+ at end
+#else
@interface WKDefaultWebController : NSObject <WKWebController>
- initWithView: (WKWebView *) dataSource: (WKWebDataSource *)dataSource;
@@ -145,6 +135,24 @@
@end
+
+/*
+ =============================================================================
+
+ WKWebController implements all the behavior that ties together WKWebView
+ and WKWebDataSource. See each inherited protocol for a more complete
+ description.
+
+ [Don and I both agree that all these little protocols are useful to cleanly
+ describe snippets of behavior, but do we explicity reference them anywhere,
+ or do we just use the umbrella protocol?]
+*/
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at end
+
+
+
+
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WKWebController.mm b/WebKit/WebView.subproj/WKWebController.mm
new file mode 100644
index 0000000..b786a9a
--- /dev/null
+++ b/WebKit/WebView.subproj/WKWebController.mm
@@ -0,0 +1,9 @@
+/*
+ WKWebController.mm
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+#import <WebKit/WKWebController.h>
+
+ at implementation WKDefaultWebController
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WKWebDataSource.h b/WebKit/WebView.subproj/WKWebDataSource.h
index 85e7dcf..085fbc8 100644
--- a/WebKit/WebView.subproj/WKWebDataSource.h
+++ b/WebKit/WebView.subproj/WKWebDataSource.h
@@ -67,14 +67,15 @@
============================================================================= */
-#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject <WKWebDataSource>
+ at interface WKWebDataSource : NSObject
{
@private
id _dataSourcePrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
- initWithURL: (NSURL *)inputURL;
@@ -194,7 +195,8 @@
// Returns nil or the page title.
- (NSString *)pageTitle;
+#endif
+
@end
-#endif
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/WKWebDataSource.mm
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageDataSource.mm
copy to WebKit/WebView.subproj/WKWebDataSource.mm
index d322954..419bef8 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/WKWebDataSource.mm
@@ -1,9 +1,10 @@
-/* NSWebPageDataSource.h
+/*
+ WKWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/NSWebPageDataSource.h>
+#import <WebKit/WKWebDataSource.h>
- at implementation NSWebPageDataSource
+ at implementation WKWebDataSource
+ (void)initialize {
diff --git a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h b/WebKit/WebView.subproj/WKWebDataSourcePrivate.h
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
copy to WebKit/WebView.subproj/WKWebDataSourcePrivate.h
index 6fb209e..380846a 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WKWebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageDataSourcePrivate.h
+/* WKWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/WKWebView.h b/WebKit/WebView.subproj/WKWebView.h
index ddbb4dc..a4f596b 100644
--- a/WebKit/WebView.subproj/WKWebView.h
+++ b/WebKit/WebView.subproj/WKWebView.h
@@ -9,7 +9,6 @@
#import <WebKit/WKWebDataSource.h>
#import <WebKit/WKWebController.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -87,6 +86,8 @@
id _viewPrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
- initWithFrame: (NSRect)frame;
// Convenience method. initWithFrame:url: will create a controller and data source.
@@ -149,6 +150,8 @@
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText;
+#endif
+
@end
@@ -170,5 +173,4 @@
subclassing of WKWebView
*/
-#endif
diff --git a/WebKit/WebView.subproj/WKWebView.mm b/WebKit/WebView.subproj/WKWebView.mm
new file mode 100644
index 0000000..3cf71cb
--- /dev/null
+++ b/WebKit/WebView.subproj/WKWebView.mm
@@ -0,0 +1,8 @@
+/* WKWebView.mm
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+#import <WebKit/WKWebView.h>
+
+ at implementation WKWebView
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/NSWebPageViewPrivate.h b/WebKit/WebView.subproj/WKWebViewPrivate.h
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageViewPrivate.h
copy to WebKit/WebView.subproj/WKWebViewPrivate.h
index a508537..d39520c 100644
--- a/WebKit/WebView.subproj/NSWebPageViewPrivate.h
+++ b/WebKit/WebView.subproj/WKWebViewPrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageViewPrivate.h
+/* WKWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 3201f39..a5249b0 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -6,7 +6,6 @@
*/
#import <Cocoa/Cocoa.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -101,19 +100,6 @@
*/
-/*
- =============================================================================
-
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
- description.
-
- [Don and I both agree that all these little protocols are useful to cleanly
- describe snippets of behavior, but do we explicity reference them anywhere,
- or do we just use the umbrella protocol?]
-*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
- at end
@@ -124,6 +110,10 @@
scheme used by Foundation, although Foundation's concrete classes
typically aren't public.
*/
+#ifndef NEW_WEBKIT_API
+ at interface WKDefaultWebController : NSObject
+ at end
+#else
@interface WKDefaultWebController : NSObject <WKWebController>
- initWithView: (WKWebView *) dataSource: (WKWebDataSource *)dataSource;
@@ -145,6 +135,24 @@
@end
+
+/*
+ =============================================================================
+
+ WKWebController implements all the behavior that ties together WKWebView
+ and WKWebDataSource. See each inherited protocol for a more complete
+ description.
+
+ [Don and I both agree that all these little protocols are useful to cleanly
+ describe snippets of behavior, but do we explicity reference them anywhere,
+ or do we just use the umbrella protocol?]
+*/
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at end
+
+
+
+
/*
=============================================================================
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 85e7dcf..085fbc8 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -67,14 +67,15 @@
============================================================================= */
-#ifdef READY_FOR_PRIMETIME
- at interface WKWebDataSource : NSObject <WKWebDataSource>
+ at interface WKWebDataSource : NSObject
{
@private
id _dataSourcePrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
- initWithURL: (NSURL *)inputURL;
@@ -194,7 +195,8 @@
// Returns nil or the page title.
- (NSString *)pageTitle;
+#endif
+
@end
-#endif
diff --git a/WebKit/WebView.subproj/NSWebPageDataSource.mm b/WebKit/WebView.subproj/WebDataSource.m
similarity index 90%
rename from WebKit/WebView.subproj/NSWebPageDataSource.mm
rename to WebKit/WebView.subproj/WebDataSource.m
index d322954..419bef8 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSource.mm
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -1,9 +1,10 @@
-/* NSWebPageDataSource.h
+/*
+ WKWebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/NSWebPageDataSource.h>
+#import <WebKit/WKWebDataSource.h>
- at implementation NSWebPageDataSource
+ at implementation WKWebDataSource
+ (void)initialize {
diff --git a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
similarity index 90%
rename from WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
rename to WebKit/WebView.subproj/WebDataSourcePrivate.h
index 6fb209e..380846a 100644
--- a/WebKit/WebView.subproj/NSWebPageDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageDataSourcePrivate.h
+/* WKWebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index ddbb4dc..a4f596b 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -9,7 +9,6 @@
#import <WebKit/WKWebDataSource.h>
#import <WebKit/WKWebController.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -87,6 +86,8 @@
id _viewPrivate;
}
+#ifdef READY_FOR_PRIMETIME
+
- initWithFrame: (NSRect)frame;
// Convenience method. initWithFrame:url: will create a controller and data source.
@@ -149,6 +150,8 @@
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText;
+#endif
+
@end
@@ -170,5 +173,4 @@
subclassing of WKWebView
*/
-#endif
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
new file mode 100644
index 0000000..3cf71cb
--- /dev/null
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -0,0 +1,8 @@
+/* WKWebView.mm
+ Copyright 2001, Apple, Inc. All rights reserved.
+*/
+#import <WebKit/WKWebView.h>
+
+ at implementation WKWebView
+
+ at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/NSWebPageViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
similarity index 90%
copy from WebKit/WebView.subproj/NSWebPageViewPrivate.h
copy to WebKit/WebView.subproj/WebFrameViewInternal.h
index a508537..d39520c 100644
--- a/WebKit/WebView.subproj/NSWebPageViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -1,4 +1,4 @@
-/* NSWebPageViewPrivate.h
+/* WKWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/NSWebPageViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
similarity index 90%
rename from WebKit/WebView.subproj/NSWebPageViewPrivate.h
rename to WebKit/WebView.subproj/WebFrameViewPrivate.h
index a508537..d39520c 100644
--- a/WebKit/WebView.subproj/NSWebPageViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -1,4 +1,4 @@
-/* NSWebPageViewPrivate.h
+/* WKWebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 3201f39..a5249b0 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -6,7 +6,6 @@
*/
#import <Cocoa/Cocoa.h>
-#ifdef READY_FOR_PRIMETIME
/*
=============================================================================
@@ -101,19 +100,6 @@
*/
-/*
- =============================================================================
-
- WKWebController implements all the behavior that ties together WKWebView
- and WKWebDataSource. See each inherited protocol for a more complete
- description.
-
- [Don and I both agree that all these little protocols are useful to cleanly
- describe snippets of behavior, but do we explicity reference them anywhere,
- or do we just use the umbrella protocol?]
-*/
- at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
- at end
@@ -124,6 +110,10 @@
scheme used by Foundation, although Foundation's concrete classes
typically aren't public.
*/
+#ifndef NEW_WEBKIT_API
+ at interface WKDefaultWebController : NSObject
+ at end
+#else
@interface WKDefaultWebController : NSObject <WKWebController>
- initWithView: (WKWebView *) dataSource: (WKWebDataSource *)dataSource;
@@ -145,6 +135,24 @@
@end
+
+/*
+ =============================================================================
+
+ WKWebController implements all the behavior that ties together WKWebView
+ and WKWebDataSource. See each inherited protocol for a more complete
+ description.
+
+ [Don and I both agree that all these little protocols are useful to cleanly
+ describe snippets of behavior, but do we explicity reference them anywhere,
+ or do we just use the umbrella protocol?]
+*/
+ at protocol WKWebController <WKLoadHandler, WKScriptContextHandler, WKAuthenticationHandler, WKLocationChangeHandler>
+ at end
+
+
+
+
/*
=============================================================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list