[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:24:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f7e15ec7c4cf85686da95a806afca87a45b7e700
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 16 16:17:05 2002 +0000
top level:
* many files: Renamed IF* -> Web*.
Tools:
* various files: Renamed IF* -> Web*.
WebFoundation:
* almost every file: Renamed IF* -> Web*.
WebCore:
* almost every file: Renamed IF* -> Web*.
WebKit:
* almost every file: Renamed IF* -> Web*.
WebBrowser:
* almost every file: Renamed IF* -> Web*.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2ab03a3..d06b77c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-07-16 Darin Adler <darin at apple.com>
+
+ * almost every file: Renamed IF* -> Web*.
+
2002-07-15 Darin Adler <darin at apple.com>
A teeny weeny bit of refactoring.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2ab03a3..d06b77c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,7 @@
+2002-07-16 Darin Adler <darin at apple.com>
+
+ * almost every file: Renamed IF* -> Web*.
+
2002-07-15 Darin Adler <darin at apple.com>
A teeny weeny bit of refactoring.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2ab03a3..d06b77c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,7 @@
+2002-07-16 Darin Adler <darin at apple.com>
+
+ * almost every file: Renamed IF* -> Web*.
+
2002-07-15 Darin Adler <darin at apple.com>
A teeny weeny bit of refactoring.
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index f6fcef8..3f7674a 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -1,7 +1,7 @@
.objc_class_name_WebCoreBridge
.objc_class_name_WebCoreCache
.objc_class_name_WebCoreCookieAdapter
-.objc_class_name_WebCoreFrame
+.objc_class_name_WebCoreFrameBridge
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreTextRendererFactory
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 0470cc5..a705be2 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -3772,8 +3772,8 @@
};
F52CA70F02DFACBD018635CA = {
isa = PBXFileReference;
- name = WebCoreFrame.mm;
- path = kwq/WebCoreFrame.mm;
+ name = WebCoreFrameBridge.mm;
+ path = kwq/WebCoreFrameBridge.mm;
refType = 4;
};
F52CA71002DFACBD018635CA = {
@@ -4132,8 +4132,8 @@
};
F58784F802DE375901EA4122 = {
isa = PBXFileReference;
- name = KWQKHTMLPart.mm;
- path = kwq/KWQKHTMLPart.mm;
+ name = KWQKHTMLPartImpl.mm;
+ path = kwq/KWQKHTMLPartImpl.mm;
refType = 4;
};
F58784F902DE375901EA4122 = {
@@ -4192,8 +4192,8 @@
};
F587850302DE375901EA4122 = {
isa = PBXFileReference;
- name = KWQKloader.mm;
- path = kwq/KWQKloader.mm;
+ name = KWQLoaderImpl.mm;
+ path = kwq/KWQLoaderImpl.mm;
refType = 4;
};
F587850402DE375901EA4122 = {
@@ -4606,8 +4606,8 @@
};
F587854B02DE375901EA4122 = {
isa = PBXFileReference;
- name = WebCoreFrame.h;
- path = kwq/WebCoreFrame.h;
+ name = WebCoreFrameBridge.h;
+ path = kwq/WebCoreFrameBridge.h;
refType = 4;
};
F587854C02DE375901EA4122 = {
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index a7eb376..7a8b372 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -33,7 +33,7 @@
#import <khtmlview.h>
#import <WebCoreBridge.h>
-#import <WebCoreFrame.h>
+#import <WebCoreFrameBridge.h>
#import <WebCoreViewFactory.h>
#import <kwqdebug.h>
@@ -68,7 +68,7 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreFrame *frame;
+ WebCoreFrameBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
@@ -381,7 +381,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
{
KURL clickedURL(part->completeURL( url));
KURL refLess(clickedURL);
- WebCoreFrame *frame;
+ WebCoreFrameBridge *frame;
if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
@@ -428,7 +428,7 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
NSString *name = frameName.getNSString();
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "name %s\n", DEBUG_OBJECT(name));
- WebCoreFrame *wcFrame = [bridge childFrameNamed:name];
+ WebCoreFrameBridge *wcFrame = [bridge childFrameNamed:name];
if (wcFrame) {
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "found %s\n", DEBUG_OBJECT(name));
frame->setWidget([[wcFrame bridge] part]->impl->getView());
@@ -600,7 +600,7 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
QPtrList<KParts::ReadOnlyPart> parts;
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
- WebCoreFrame *childFrame;
+ WebCoreFrameBridge *childFrame;
while ((childFrame = [e nextObject])) {
KHTMLPart *childPart = [[childFrame committedBridge] part];
if (childPart)
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index a7eb376..7a8b372 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -33,7 +33,7 @@
#import <khtmlview.h>
#import <WebCoreBridge.h>
-#import <WebCoreFrame.h>
+#import <WebCoreFrameBridge.h>
#import <WebCoreViewFactory.h>
#import <kwqdebug.h>
@@ -68,7 +68,7 @@ KWQKHTMLPartImpl::~KWQKHTMLPartImpl()
bool KWQKHTMLPartImpl::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs )
{
- WebCoreFrame *frame;
+ WebCoreFrameBridge *frame;
if (!urlArgs.frameName.isEmpty()) {
frame = [bridge frameNamed:urlArgs.frameName.getNSString()];
@@ -381,7 +381,7 @@ void KWQKHTMLPartImpl::urlSelected( const QString &url, int button, int state, c
{
KURL clickedURL(part->completeURL( url));
KURL refLess(clickedURL);
- WebCoreFrame *frame;
+ WebCoreFrameBridge *frame;
if ( url.find( QString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
@@ -428,7 +428,7 @@ bool KWQKHTMLPartImpl::requestFrame( khtml::RenderPart *frame, const QString &ur
NSString *name = frameName.getNSString();
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "name %s\n", DEBUG_OBJECT(name));
- WebCoreFrame *wcFrame = [bridge childFrameNamed:name];
+ WebCoreFrameBridge *wcFrame = [bridge childFrameNamed:name];
if (wcFrame) {
KWQDEBUGLEVEL(KWQ_LOG_FRAMES, "found %s\n", DEBUG_OBJECT(name));
frame->setWidget([[wcFrame bridge] part]->impl->getView());
@@ -600,7 +600,7 @@ QPtrList<KParts::ReadOnlyPart> KWQKHTMLPartImpl::frames() const
{
QPtrList<KParts::ReadOnlyPart> parts;
NSEnumerator *e = [[bridge childFrames] objectEnumerator];
- WebCoreFrame *childFrame;
+ WebCoreFrameBridge *childFrame;
while ((childFrame = [e nextObject])) {
KHTMLPart *childPart = [[childFrame committedBridge] part];
if (childPart)
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 4b604ba..7c5d11a 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -25,7 +25,7 @@
#import <kjavaappletwidget.h>
#import <WebCoreViewFactory.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSURLExtras.h>
KJavaAppletWidget::KJavaAppletWidget(KJavaAppletContext *, QWidget *)
: m_applet(*this)
@@ -43,7 +43,7 @@ KJavaAppletWidget::~KJavaAppletWidget()
void KJavaAppletWidget::setBaseURL(const QString &baseURL)
{
[m_baseURL release];
- m_baseURL = [[NSURL _IF_URLWithString:baseURL.getNSString()] retain];
+ m_baseURL = [[NSURL _web_URLWithString:baseURL.getNSString()] retain];
}
void KJavaAppletWidget::setParameter(const QString &name, const QString &value)
diff --git a/WebCore/kwq/KWQKJobClasses.h b/WebCore/kwq/KWQKJobClasses.h
index 087db7f..2139d4f 100644
--- a/WebCore/kwq/KWQKJobClasses.h
+++ b/WebCore/kwq/KWQKJobClasses.h
@@ -31,9 +31,9 @@
#include <qstring.h>
#ifdef __OBJC__
- at class IFURLHandle;
+ at class WebResourceHandle;
#else
-class IFURLHandle;
+class WebResourceHandle;
#endif
namespace KIO {
@@ -60,8 +60,8 @@ public:
void addMetaData(const QString &key, const QString &value);
void kill();
- void setHandle(IFURLHandle *);
- IFURLHandle *handle() const;
+ void setHandle(WebResourceHandle *);
+ WebResourceHandle *handle() const;
NSURL *url() const;
diff --git a/WebCore/kwq/KWQKJobClasses.mm b/WebCore/kwq/KWQKJobClasses.mm
index f8c19d2..7e1c348 100644
--- a/WebCore/kwq/KWQKJobClasses.mm
+++ b/WebCore/kwq/KWQKJobClasses.mm
@@ -30,8 +30,8 @@
#import <Foundation/Foundation.h>
-#import <WebFoundation/IFURLHandle.h>
-#import <WebFoundation/IFURLHandleClient.h>
+#import <WebFoundation/WebResourceHandle.h>
+#import <WebFoundation/WebResourceClient.h>
namespace KIO {
@@ -56,7 +56,7 @@ public:
int status;
NSMutableDictionary *metaData;
NSURL *url;
- IFURLHandle *handle;
+ WebResourceHandle *handle;
};
TransferJob::TransferJob(const KURL &url, bool reload, bool showProgressInfo)
@@ -113,14 +113,14 @@ void TransferJob::kill()
[d->handle cancelLoadInBackground];
}
-void TransferJob::setHandle(IFURLHandle *handle)
+void TransferJob::setHandle(WebResourceHandle *handle)
{
[handle retain];
[d->handle release];
d->handle = handle;
}
-IFURLHandle *TransferJob::handle() const
+WebResourceHandle *TransferJob::handle() const
{
return d->handle;
}
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
deleted file mode 100644
index 19341a9..0000000
--- a/WebCore/kwq/KWQKloader.mm
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2001, 2002 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.
- */
-
-#import <KWQLoaderImpl.h>
-
-#import <jobclasses.h>
-#import <loader.h>
-
-#import <KWQKHTMLPartImpl.h>
-
-#import <WebCoreBridge.h>
-#import <WebCoreResourceLoader.h>
-
-#import <kwqdebug.h>
-
-using khtml::CachedObject;
-using khtml::DocLoader;
-using khtml::Loader;
-using khtml::Request;
-using KIO::TransferJob;
-
- at interface WebCoreResourceLoader : NSObject <WebCoreResourceLoader>
-{
- Loader *loader;
- TransferJob *job;
-}
-
--(id)initWithLoader:(Loader *)loader job:(TransferJob *)job;
-
- at end
-
- at implementation WebCoreResourceLoader
-
--(id)initWithLoader:(Loader *)l job:(TransferJob *)j;
-{
- [super init];
-
- loader = l;
- job = j;
-
- return self;
-}
-
-- (void)dealloc
-{
- delete job;
- [super dealloc];
-}
-
-- (void)addData:(NSData *)data
-{
- loader->slotData(job, (const char *)[data bytes], [data length]);
-}
-
-- (void)cancel
-{
- job->setError(1);
- [self finish];
-}
-
-- (void)finish
-{
- loader->slotFinished(job);
- job->setHandle(0);
-}
-
- at end
-
-void KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
-{
- KWQDEBUGLEVEL(KWQ_LOG_LOADING, "Serving request for base %s, url %s",
- request->m_docLoader->part()->baseURL().url().latin1(),
- request->object->url().string().latin1());
-
- WebCoreResourceLoader *resourceLoader = [[WebCoreResourceLoader alloc] initWithLoader:loader job:job];
-
- WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->impl->getBridge();
- job->setHandle([bridge startLoadingResource:resourceLoader withURL:job->url()]);
-
- [resourceLoader release];
-}
-
-void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
-{
- // Return from the function for objects that we didn't load from the cache.
- if (!cachedObject)
- return;
- switch (cachedObject->status()) {
- case CachedObject::Persistent:
- case CachedObject::Cached:
- case CachedObject::Uncacheable:
- break;
- case CachedObject::NotCached:
- case CachedObject::Unknown:
- case CachedObject::New:
- case CachedObject::Pending:
- return;
- }
-
- // Notify the caller that we "loaded".
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->impl->getBridge();
- NSURL *nsURL = [[NSURL alloc] initWithString:cachedObject->url().string().getNSString()];
- // FIXME: cachedObject-size() is not the correct size, see Radar 2965269
- [bridge objectLoadedFromCache:nsURL size:cachedObject->size()];
- [nsURL release];
-}
\ No newline at end of file
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 087a3d4..6421ba8 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -32,7 +32,7 @@
/*
This class implementation does NOT actually emulate the Qt QScrollView.
It does provide an implementation that khtml will use to interact with
- WebKit's IFWebView documentView and our NSScrollView subclass.
+ WebKit's WebView documentView and our NSScrollView subclass.
QScrollView's view is a NSScrollView (or subclass of NSScrollView) in most
cases (except for provisional widgets). That scrollview is a subview of an
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index f58a834..5817a24 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -328,7 +328,7 @@ void QWidget::internalSetGeometry(int x, int y, int w, int h)
// A QScrollView is a widget only used to represent a frame. If
// this widget's view is a WebCoreFrameView the we resize it's containing
- // view, an IFWebView. The scrollview contained by the IFWebView
+ // view, an WebView. The scrollview contained by the WebView
// will be autosized.
if ([view conformsToProtocol:@protocol(WebCoreFrameView)]) {
view = [view superview];
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index a92159a..2f1b2a9 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -44,10 +44,10 @@ typedef khtml::RenderPart KHTMLRenderPart;
#endif
- at class IFError;
- at class IFURLHandle;
+ at class WebError;
+ at class WebResourceHandle;
- at class WebCoreFrame;
+ at class WebCoreFrameBridge;
@protocol WebCoreDOMTreeCopier;
@protocol WebCoreRenderTreeCopier;
@@ -114,13 +114,13 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (WebCoreBridge *)parent;
-- (WebCoreFrame *)frame;
-- (NSArray *)childFrames; // WebCoreFrame objects
-- (WebCoreFrame *)childFrameNamed:(NSString *)name;
-- (WebCoreFrame *)descendantFrameNamed:(NSString *)name;
+- (WebCoreFrameBridge *)frame;
+- (NSArray *)childFrames; // WebCoreFrameBridge objects
+- (WebCoreFrameBridge *)childFrameNamed:(NSString *)name;
+- (WebCoreFrameBridge *)descendantFrameNamed:(NSString *)name;
-- (WebCoreFrame *)mainFrame;
-- (WebCoreFrame *)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
+- (WebCoreFrameBridge *)mainFrame;
+- (WebCoreFrameBridge *)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
- (void)setTitle:(NSString *)title;
- (void)setStatusText:(NSString *)status;
@@ -139,7 +139,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (NSWindow *)window;
- (void)setWindowFrame:(NSRect)frame;
-- (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL;
+- (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)loader withURL:(NSURL *)URL;
- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index cb624db..dbff65a 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -25,7 +25,7 @@
#import <WebCoreBridge.h>
-#import <WebCoreFrame.h>
+#import <WebCoreFrameBridge.h>
#import <KWQKHTMLPartImpl.h>
#import <khtmlview.h>
diff --git a/WebCore/kwq/WebCoreFrame.h b/WebCore/kwq/WebCoreFrame.h
deleted file mode 100644
index cff1fd1..0000000
--- a/WebCore/kwq/WebCoreFrame.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2002 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.
- */
-
-#import <WebCore/WebCoreBridge.h>
-
-// The main difference between a WebCoreFrame and a WebCoreBridge
-// is that there's no guarantee a WebCoreFrame will have any HTML in
-// it, thus no guarantee that it will have a KHTMLPart.
-
-// The WebCoreFrame interface contains methods for use by the non-WebCore side of the bridge.
-
- at interface WebCoreFrame : NSObject
-{
- KHTMLRenderPart *renderPart;
-}
-
-- (void)setRenderPart:(KHTMLRenderPart *)renderPart;
-- (KHTMLRenderPart *)renderPart;
-
- at end
-
-// The WebCoreFrame protocol contains methods for use by the WebCore side of the bridge.
-
- at protocol WebCoreFrame
-
-- (void)loadURL:(NSURL *)URL;
-- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
-
-- (WebCoreBridge *)bridge; // returns provisional bridge if present (avoid calling this for that reason)
-- (WebCoreBridge *)committedBridge; // always returns committed bridge, not provisional (avoid calling this for that reason)
-
- at end
-
-// This interface definition allows those who hold a WebCoreFrame * to call all the methods
-// in the WebCoreBridge protocol without requiring the base implementation to supply the methods.
-// This idiom is appropriate because WebCoreFrame is an abstract class.
-
- at interface WebCoreFrame (SubclassResponsibility) <WebCoreFrame>
- at end
diff --git a/WebCore/kwq/WebCoreFrame.mm b/WebCore/kwq/WebCoreFrame.mm
deleted file mode 100644
index b51a74a..0000000
--- a/WebCore/kwq/WebCoreFrame.mm
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// WebCoreFrame.m
-// WebCore
-//
-// Created by Darin Adler on Fri Jul 12 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "WebCoreFrame.h"
-
-#import <render_frames.h>
-
- at implementation WebCoreFrame
-
-- (void)dealloc
-{
- if (renderPart) {
- renderPart->deref();
- }
- [super dealloc];
-}
-
-- (void)setRenderPart:(KHTMLRenderPart *)newPart;
-{
- newPart->ref();
- if (renderPart) {
- renderPart->deref();
- }
- renderPart = newPart;
-}
-
-- (KHTMLRenderPart *)renderPart
-{
- return renderPart;
-}
-
- at end
diff --git a/WebCore/kwq/WebCoreFrameBridge.h b/WebCore/kwq/WebCoreFrameBridge.h
index cff1fd1..807acd9 100644
--- a/WebCore/kwq/WebCoreFrameBridge.h
+++ b/WebCore/kwq/WebCoreFrameBridge.h
@@ -25,13 +25,13 @@
#import <WebCore/WebCoreBridge.h>
-// The main difference between a WebCoreFrame and a WebCoreBridge
-// is that there's no guarantee a WebCoreFrame will have any HTML in
+// The main difference between a WebCoreFrameBridge and a WebCoreBridge
+// is that there's no guarantee a WebCoreFrameBridge will have any HTML in
// it, thus no guarantee that it will have a KHTMLPart.
-// The WebCoreFrame interface contains methods for use by the non-WebCore side of the bridge.
+// The WebCoreFrameBridge interface contains methods for use by the non-WebCore side of the bridge.
- at interface WebCoreFrame : NSObject
+ at interface WebCoreFrameBridge : NSObject
{
KHTMLRenderPart *renderPart;
}
@@ -41,9 +41,9 @@
@end
-// The WebCoreFrame protocol contains methods for use by the WebCore side of the bridge.
+// The WebCoreFrameBridge protocol contains methods for use by the WebCore side of the bridge.
- at protocol WebCoreFrame
+ at protocol WebCoreFrameBridge
- (void)loadURL:(NSURL *)URL;
- (void)postWithURL:(NSURL *)URL data:(NSData *)data;
@@ -53,9 +53,9 @@
@end
-// This interface definition allows those who hold a WebCoreFrame * to call all the methods
+// This interface definition allows those who hold a WebCoreFrameBridge * to call all the methods
// in the WebCoreBridge protocol without requiring the base implementation to supply the methods.
-// This idiom is appropriate because WebCoreFrame is an abstract class.
+// This idiom is appropriate because WebCoreFrameBridge is an abstract class.
- at interface WebCoreFrame (SubclassResponsibility) <WebCoreFrame>
+ at interface WebCoreFrameBridge (SubclassResponsibility) <WebCoreFrameBridge>
@end
diff --git a/WebCore/kwq/WebCoreFrameBridge.mm b/WebCore/kwq/WebCoreFrameBridge.mm
index b51a74a..f671393 100644
--- a/WebCore/kwq/WebCoreFrameBridge.mm
+++ b/WebCore/kwq/WebCoreFrameBridge.mm
@@ -1,16 +1,16 @@
//
-// WebCoreFrame.m
+// WebCoreFrameBridge.m
// WebCore
//
// Created by Darin Adler on Fri Jul 12 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "WebCoreFrame.h"
+#import "WebCoreFrameBridge.h"
#import <render_frames.h>
- at implementation WebCoreFrame
+ at implementation WebCoreFrameBridge
- (void)dealloc
{
diff --git a/WebCore/kwq/kio/jobclasses.h b/WebCore/kwq/kio/jobclasses.h
index 087db7f..2139d4f 100644
--- a/WebCore/kwq/kio/jobclasses.h
+++ b/WebCore/kwq/kio/jobclasses.h
@@ -31,9 +31,9 @@
#include <qstring.h>
#ifdef __OBJC__
- at class IFURLHandle;
+ at class WebResourceHandle;
#else
-class IFURLHandle;
+class WebResourceHandle;
#endif
namespace KIO {
@@ -60,8 +60,8 @@ public:
void addMetaData(const QString &key, const QString &value);
void kill();
- void setHandle(IFURLHandle *);
- IFURLHandle *handle() const;
+ void setHandle(WebResourceHandle *);
+ WebResourceHandle *handle() const;
NSURL *url() const;
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.h b/WebKit/Bookmarks.subproj/IFBookmark.h
deleted file mode 100644
index 7388711..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmark.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// IFBookmark.h
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
- at class IFBookmarkGroup;
-
-typedef enum {
- IFBookmarkTypeLeaf,
- IFBookmarkTypeList,
- IFBookmarkTypeSeparator,
-} IFBookmarkType;
-
- at interface IFBookmark : NSObject <NSCopying> {
- IFBookmark *_parent;
- IFBookmarkGroup *_group;
- NSString *_identifier;
-}
-
-+ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
-+ (IFBookmark *)bookmarkOfType:(IFBookmarkType)type;
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
-- (NSDictionary *)dictionaryRepresentation;
-
-- (NSString *)title;
-- (void)setTitle:(NSString *)title;
-
-- (NSImage *)image;
-- (void)setImage:(NSImage *)image;
-
-// The type of bookmark
-- (IFBookmarkType)bookmarkType;
-
-// String intended to represent URL for leaf bookmarks. May not be a valid URL string.
-// This is nil if bookmarkType is not IFBookmarkTypeLeaf.
-- (NSString *)URLString;
-
-// Sets the string intended to represent URL for leaf bookmarks. URLString need not be
-// a valid URL string. Does nothing if bookmarkType is not IFBookmarkTypeLeaf.
-- (void)setURLString:(NSString *)URLString;
-
-// Array of child IFBookmarks. Returns nil if bookmarkType is not IFBookmarkTypeList.
-- (NSArray *)children;
-
-// Number of children. Returns 0 if bookmarkType is not IFBookmarkTypeList.
-- (unsigned)numberOfChildren;
-
-// Insert a bookmark into the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index;
-
-// Remove a bookmark from the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
-- (void)removeChild:(IFBookmark *)bookmark;
-
-// The parent of this bookmark, or nil if this is the top bookmark in a group
-- (IFBookmark *)parent;
-
-// The group that this bookmark belongs to.
-- (IFBookmarkGroup *)group;
-
-// An NSString that can be used to uniquely identify this bookmark; use with +[IFBookmarkGroup bookmarkForIdentifier];
-- (NSString *)identifier;
-
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.m b/WebKit/Bookmarks.subproj/IFBookmark.m
deleted file mode 100644
index b19d39c..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmark.m
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// IFBookmark.m
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmark.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkSeparator.h>
-#import <WebKit/WebKitDebug.h>
-
-// to get NSRequestConcreteImplementation
-#import <Foundation/NSPrivateDecls.h>
-
- at implementation IFBookmark
-
-static unsigned _highestUsedID = 0;
-
-+ (NSString *)_generateUniqueIdentifier
-{
- return [[NSNumber numberWithInt:++_highestUsedID] stringValue];
-}
-
-- (id)init
-{
- [super init];
- _identifier = [[IFBookmark _generateUniqueIdentifier] retain];
- return self;
-}
-
-- (void)dealloc
-{
- WEBKIT_ASSERT (_group == nil);
-
- [_identifier release];
- [super dealloc];
-}
-
-- (NSString *)identifier
-{
- WEBKIT_ASSERT(_identifier != nil);
- return [[_identifier retain] autorelease];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
-- (NSString *)title
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
-- (void)setTitle:(NSString *)title
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
-- (NSImage *)image
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
-- (void)setImage:(NSImage *)image
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
-- (IFBookmarkType)bookmarkType
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return IFBookmarkTypeLeaf;
-}
-
-- (NSString *)URLString
-{
- return nil;
-}
-
-- (void)setURLString:(NSString *)URLString
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
-- (NSArray *)children
-{
- return nil;
-}
-
-- (unsigned)numberOfChildren
-{
- return 0;
-}
-
-- (unsigned)_numberOfDescendants
-{
- return 0;
-}
-
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
-- (void)removeChild:(IFBookmark *)bookmark
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
-}
-
-- (IFBookmark *)parent
-{
- return _parent;
-}
-
-- (void)_setParent:(IFBookmark *)parent
-{
- // Don't retain parent, to avoid circular ownership that prevents dealloc'ing
- // when a parent with children is removed from a group and has no other references.
- _parent = parent;
-}
-
-- (IFBookmarkGroup *)group
-{
- return _group;
-}
-
-- (void)_setGroup:(IFBookmarkGroup *)group
-{
- if (group == _group) {
- return;
- }
-
- [_group _removedBookmark:self];
- [_group release];
-
- _group = [group retain];
- [group _addedBookmark:self];
-}
-
-+ (IFBookmark *)bookmarkOfType:(IFBookmarkType)type
-{
- if (type == IFBookmarkTypeList) {
- return [[[IFBookmarkList alloc] init] autorelease];
- } else if (type == IFBookmarkTypeLeaf) {
- return [[[IFBookmarkLeaf alloc] init] autorelease];
- } else if (type == IFBookmarkTypeSeparator) {
- return [[[IFBookmarkSeparator alloc] init] autorelease];
- }
-
- return nil;
-}
-
-
-+ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
-{
- NSString *typeString;
-
- Class class = nil;
-
- typeString = [dict objectForKey:IFBookmarkTypeKey];
- if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
- class = [IFBookmarkList class];
- } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
- class = [IFBookmarkLeaf class];
- } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
- class = [IFBookmarkSeparator class];
- }
-
- if (class) {
- return [[[class alloc] initFromDictionaryRepresentation:dict
- withGroup:group] autorelease];
- }
-
- return nil;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
- NSRequestConcreteImplementation(self, _cmd, [self class]);
- return nil;
-}
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.h b/WebKit/Bookmarks.subproj/IFBookmarkGroup.h
deleted file mode 100644
index 2a02463..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.h
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// IFBookmarkGroup.h
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-#import <WebKit/IFBookmark.h>
-
-// notification sent when bookmarks are added/removed from group, or when bookmarks in group are modified
-#define IFBookmarkGroupChangedNotification @"IFBookmarkGroupChangedNotification"
-
-// keys for userInfo for IFBookmarkGroupChangedNotification. These are always present.
-
-// The lowest common ancestor of all the IFBookmark objects that changed.
-#define IFModifiedBookmarkKey @"IFModifiedBookmarkKey"
-
-// An NSNumber object representing a boolean that distinguishes changes
-// to the bookmark itself from changes to its children.
-#define IFBookmarkChildrenChangedKey @"IFBookmarkChildrenChangedKey"
-
- at interface IFBookmarkGroup : NSObject
-{
- NSString *_file;
- IFBookmark *_topBookmark;
- NSMutableDictionary *_bookmarksByID;
- BOOL _loading;
-}
-
-+ (IFBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file;
-- (id)initWithFile: (NSString *)file;
-
-// examining contents
-- (IFBookmark *)topBookmark;
-- (IFBookmark *)bookmarkForIdentifier:(NSString *)identifier;
-
-// modifying contents
-- (void)removeBookmark:(IFBookmark *)bookmark;
-
-- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType;
-- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType;
-
-// storing contents on disk
-
-// The file path used for storing this IFBookmarkGroup, specified in -[IFBookmarkGroup initWithFile:] or +[IFBookmarkGroup bookmarkGroupWithFile:]
-- (NSString *)file;
-
-// Load bookmark group from file. This happens automatically at init time, and need not normally be called.
-- (BOOL)loadBookmarkGroup;
-
-// Save bookmark group to file. It is the client's responsibility to call this at appropriate times.
-- (BOOL)saveBookmarkGroup;
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
deleted file mode 100644
index d77e012..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
+++ /dev/null
@@ -1,275 +0,0 @@
-//
-// IFBookmarkGroup.m
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkSeparator.h>
-#import <WebKit/WebKitDebug.h>
-
- at interface IFBookmarkGroup (IFForwardDeclarations)
-- (void)_setTopBookmark:(IFBookmark *)newTopBookmark;
- at end
-
- at implementation IFBookmarkGroup
-
-+ (IFBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file
-{
- return [[[IFBookmarkGroup alloc] initWithFile:file] autorelease];
-}
-
-- (id)initWithFile: (NSString *)file
-{
- if (![super init]) {
- return nil;
- }
-
- _bookmarksByID = [[NSMutableDictionary dictionary] retain];
-
- _file = [file retain];
- [self _setTopBookmark:nil];
-
- // read history from disk
- [self loadBookmarkGroup];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_topBookmark release];
- [_file release];
- [_bookmarksByID release];
- [super dealloc];
-}
-
-- (IFBookmark *)topBookmark
-{
- return _topBookmark;
-}
-
-- (void)_sendChangeNotificationForBookmark:(IFBookmark *)bookmark
- childrenChanged:(BOOL)flag
-{
- NSDictionary *userInfo;
-
- WEBKIT_ASSERT (bookmark != nil);
-
- if (_loading) {
- return;
- }
-
- userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
- bookmark, IFModifiedBookmarkKey,
- [NSNumber numberWithBool:flag], IFBookmarkChildrenChangedKey,
- nil];
-
- [[NSNotificationCenter defaultCenter]
- postNotificationName:IFBookmarkGroupChangedNotification
- object:self
- userInfo:userInfo];
-}
-
-- (void)_setTopBookmark:(IFBookmark *)newTopBookmark
-{
- WEBKIT_ASSERT_VALID_ARG (newTopBookmark, newTopBookmark == nil ||
- [newTopBookmark bookmarkType] == IFBookmarkTypeList);
-
- [_topBookmark _setGroup:nil];
- [_topBookmark autorelease];
-
- if (newTopBookmark) {
- _topBookmark = [newTopBookmark retain];
- } else {
- _topBookmark = [[IFBookmarkList alloc] initWithTitle:nil image:nil group:self];
- }
-
- [self _sendChangeNotificationForBookmark:_topBookmark childrenChanged:YES];
-}
-
-- (void)_bookmarkDidChange:(IFBookmark *)bookmark
-{
- [self _sendChangeNotificationForBookmark:bookmark childrenChanged:NO];
-}
-
-- (void)_bookmarkChildrenDidChange:(IFBookmark *)bookmark
-{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark bookmarkType] == IFBookmarkTypeList);
-
- [self _sendChangeNotificationForBookmark:bookmark childrenChanged:YES];
-}
-
-- (void)_removedBookmark:(IFBookmark *)bookmark
-{
- WEBKIT_ASSERT ([_bookmarksByID objectForKey:[bookmark identifier]] == bookmark);
- [_bookmarksByID removeObjectForKey:[bookmark identifier]];
-}
-
-- (void)_addedBookmark:(IFBookmark *)bookmark
-{
- WEBKIT_ASSERT ([_bookmarksByID objectForKey:[bookmark identifier]] == nil);
- [_bookmarksByID setObject:bookmark forKey:[bookmark identifier]];
-}
-
-- (IFBookmark *)bookmarkForIdentifier:(NSString *)identifier
-{
- return [_bookmarksByID objectForKey:identifier];
-}
-
-- (void)removeBookmark:(IFBookmark *)bookmark
-{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark group] == self);
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] != nil || bookmark == _topBookmark);
-
- if (bookmark == _topBookmark) {
- [self _setTopBookmark:nil];
- } else {
- [[bookmark parent] removeChild:bookmark];
- [bookmark _setGroup:nil];
- }
-}
-
-- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType
-{
- return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
- ofBookmark:parent
- withTitle:newTitle
- image:newImage
- URLString:newURLString
- type:bookmarkType];
-}
-
-- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType
-{
- IFBookmark *bookmark;
-
- WEBKIT_ASSERT_VALID_ARG (parent, [parent group] == self);
- WEBKIT_ASSERT_VALID_ARG (parent, [parent bookmarkType] == IFBookmarkTypeList);
- WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == IFBookmarkTypeLeaf || (newURLString == nil));
-
- if (bookmarkType == IFBookmarkTypeLeaf) {
- bookmark = [[[IFBookmarkLeaf alloc] initWithURLString:newURLString
- title:newTitle
- image:newImage
- group:self] autorelease];
- } else if (bookmarkType == IFBookmarkTypeSeparator) {
- bookmark = [[[IFBookmarkSeparator alloc] initWithGroup:self] autorelease];
- } else {
- WEBKIT_ASSERT (bookmarkType == IFBookmarkTypeList);
- bookmark = [[[IFBookmarkList alloc] initWithTitle:newTitle
- image:newImage
- group:self] autorelease];
- }
-
- [parent insertChild:bookmark atIndex:index];
- return bookmark;
-}
-
-- (NSString *)file
-{
- return _file;
-}
-
-- (BOOL)_loadBookmarkGroupGuts
-{
- NSString *path;
- NSDictionary *dictionary;
- IFBookmarkList *newTopBookmark;
-
- path = [self file];
- if (path == nil) {
- WEBKITDEBUG("couldn't load bookmarks; couldn't find or create directory to store it in\n");
- return NO;
- }
-
- dictionary = [NSDictionary dictionaryWithContentsOfFile: path];
- if (dictionary == nil) {
- if (![[NSFileManager defaultManager] fileExistsAtPath: path]) {
- WEBKITDEBUG("no bookmarks file found at %s\n",
- DEBUG_OBJECT(path));
- } else {
- WEBKITDEBUG("attempt to read bookmarks from %s failed; perhaps contents are corrupted\n",
- DEBUG_OBJECT(path));
- }
- return NO;
- }
-
- _loading = YES;
- newTopBookmark = [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
- [self _setTopBookmark:newTopBookmark];
- _loading = NO;
-
- return YES;
-}
-
-- (BOOL)loadBookmarkGroup
-{
- double start, duration;
- BOOL result;
-
- start = CFAbsoluteTimeGetCurrent();
- result = [self _loadBookmarkGroupGuts];
-
- if (result == YES) {
- duration = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "loading %d bookmarks from %s took %f seconds\n",
- [[self topBookmark] _numberOfDescendants], DEBUG_OBJECT([self file]), duration);
- }
-
- return result;
-}
-
-- (BOOL)_saveBookmarkGroupGuts
-{
- NSString *path;
- NSDictionary *dictionary;
-
- path = [self file];
- if (path == nil) {
- WEBKITDEBUG("couldn't save bookmarks; couldn't find or create directory to store it in\n");
- return NO;
- }
-
- dictionary = [[self topBookmark] dictionaryRepresentation];
- if (![dictionary writeToFile:path atomically:YES]) {
- WEBKITDEBUG("attempt to save %s to %s failed\n", DEBUG_OBJECT(dictionary), DEBUG_OBJECT(path));
- return NO;
- }
-
- return YES;
-}
-
-- (BOOL)saveBookmarkGroup
-{
- double start, duration;
- BOOL result;
-
- start = CFAbsoluteTimeGetCurrent();
- result = [self _saveBookmarkGroupGuts];
-
- if (result == YES) {
- duration = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "saving %d bookmarks to %s took %f seconds\n",
- [[self topBookmark] _numberOfDescendants], DEBUG_OBJECT([self file]), duration);
- }
-
- return result;
-}
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup_Private.h b/WebKit/Bookmarks.subproj/IFBookmarkGroup_Private.h
deleted file mode 100644
index a437fd1..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup_Private.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * IFBookmarkGroup_Private.h
- * WebKit
- *
- * Created by John Sullivan on Thu May 2 2002.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#import <WebKit/IFBookmarkGroup.h>
-
- at interface IFBookmarkGroup(IFPrivate)
-
-- (void)_bookmarkDidChange:(IFBookmark *)bookmark;
-- (void)_bookmarkChildrenDidChange:(IFBookmark *)bookmark;
-
-- (void)_removedBookmark:(IFBookmark *)bookmark;
-- (void)_addedBookmark:(IFBookmark *)bookmark;
-
- at end
-
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.h b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.h
deleted file mode 100644
index 26d2ede..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// IFBookmarkLeaf.h
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmark.h>
-
- at class IFURIEntry;
-
- at interface IFBookmarkLeaf : IFBookmark {
- IFURIEntry *_entry;
- NSString *_URLString;
-}
-
-- (id)initWithURLString:(NSString *)URLString
- title:(NSString *)title
- image:(NSImage *)image
- group:(IFBookmarkGroup *)group;
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
deleted file mode 100644
index 9a07548..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// IFBookmarkLeaf.m
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFURIEntry.h>
-#import <WebKit/WebKitDebug.h>
-
-#define URIDictionaryKey @"URIDictionary"
-#define URLStringKey @"URLString"
-
- at implementation IFBookmarkLeaf
-
-- (id)init
-{
- [super init];
- _entry = [[IFURIEntry alloc] init];
- return self;
-}
-
-- (id)initWithURLString:(NSString *)URLString
- title:(NSString *)title
- image:(NSImage *)image
- group:(IFBookmarkGroup *)group;
-{
- WEBKIT_ASSERT_VALID_ARG (group, group != nil);
-
- [self init];
-
- // Since our URLString may not be valid for creating an NSURL object,
- // just hang onto the string separately and don't bother creating
- // an NSURL object for the IFURIEntry.
- [self setTitle:title];
- [self setImage:image];
- _URLString = [URLString retain];
- [self _setGroup:group];
-
- return self;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
-{
- WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
-
- [super init];
-
- [self _setGroup:group];
-
- _entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation:
- [dict objectForKey:URIDictionaryKey]] retain];
- _URLString = [[dict objectForKey:URLStringKey] retain];
-
- return self;
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
- NSMutableDictionary *dict;
-
- dict = [NSMutableDictionary dictionaryWithCapacity:3];
-
- [dict setObject:IFBookmarkTypeLeafValue forKey:IFBookmarkTypeKey];
- [dict setObject:[_entry dictionaryRepresentation] forKey:URIDictionaryKey];
- if (_URLString != nil) {
- [dict setObject:_URLString forKey:URLStringKey];
- }
-
- return dict;
-}
-
-- (void)dealloc
-{
- [_entry release];
- [_URLString release];
- [super dealloc];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [[IFBookmarkLeaf allocWithZone:zone] initWithURLString:_URLString
- title:[self title]
- image:[self image]
- group:[self group]];
-}
-
-- (NSString *)title
-{
- return [_entry title];
-}
-
-- (void)setTitle:(NSString *)title
-{
- if ([title isEqualToString:[self title]]) {
- return;
- }
-
- WEBKIT_ASSERT (_entry != nil);
- [_entry setTitle:title];
-
- [[self group] _bookmarkDidChange:self];
-}
-
-- (NSImage *)image
-{
- return [_entry image];
-}
-
-- (void)setImage:(NSImage *)image
-{
- [_entry setImage:image];
-
- [[self group] _bookmarkDidChange:self];
-}
-
-- (IFBookmarkType)bookmarkType
-{
- return IFBookmarkTypeLeaf;
-}
-
-- (NSString *)URLString
-{
- return _URLString;
-}
-
-- (void)setURLString:(NSString *)URLString
-{
- WEBKIT_ASSERT_VALID_ARG (URLString, URLString != nil);
- if ([URLString isEqualToString:_URLString]) {
- return;
- }
-
- [_URLString release];
- _URLString = [URLString copy];
-
- [[self group] _bookmarkDidChange:self];
-}
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.h b/WebKit/Bookmarks.subproj/IFBookmarkList.h
deleted file mode 100644
index 6aabd3c..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// IFBookmarkList.h
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmark.h>
-
- at interface IFBookmarkList : IFBookmark {
- NSString *_title;
- NSImage *_image;
- NSMutableArray *_list;
-}
-
-- (id)initWithTitle:(NSString *)title image:(NSImage *)image group:(IFBookmarkGroup *)group;
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.m b/WebKit/Bookmarks.subproj/IFBookmarkList.m
deleted file mode 100644
index 3b2428c..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.m
+++ /dev/null
@@ -1,248 +0,0 @@
-//
-// IFBookmarkList.m
-// WebKit
-//
-// Created by John Sullivan on Tue Apr 30 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkSeparator.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/WebKitDebug.h>
-
-#define TitleKey @"Title"
-#define ChildrenKey @"Children"
-
- at implementation IFBookmarkList
-
-- (id)initWithTitle:(NSString *)title
- image:(NSImage *)image
- group:(IFBookmarkGroup *)group
-{
- WEBKIT_ASSERT_VALID_ARG (group, group != nil);
-
- [super init];
-
- _title = [title copy];
- _image = [image retain];
- _list = [[NSMutableArray alloc] init];
- [self _setGroup:group];
-
- return self;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
-{
- NSArray *storedChildren;
- IFBookmark *child;
- unsigned index, count;
-
- WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
-
- [super init];
-
- [self _setGroup:group];
-
- // FIXME: doesn't restore images
- _title = [[dict objectForKey:TitleKey] retain];
- _list = [[NSMutableArray alloc] init];
-
- storedChildren = [dict objectForKey:ChildrenKey];
- if (storedChildren != nil) {
- count = [storedChildren count];
- for (index = 0; index < count; ++index) {
- child = [IFBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
- withGroup:group];
-
- if (child != nil) {
- [self insertChild:child atIndex:index];
- }
- }
- }
-
- return self;
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
- NSMutableDictionary *dict;
- NSMutableArray *childrenAsDictionaries;
- unsigned index, childCount;
-
- dict = [NSMutableDictionary dictionaryWithCapacity: 3];
-
- // FIXME: doesn't save images
- if (_title != nil) {
- [dict setObject:_title forKey:TitleKey];
- }
-
- [dict setObject:IFBookmarkTypeListValue forKey:IFBookmarkTypeKey];
-
- childCount = [self numberOfChildren];
- if (childCount > 0) {
- childrenAsDictionaries = [NSMutableArray arrayWithCapacity:childCount];
-
- for (index = 0; index < childCount; ++index) {
- IFBookmark *child;
-
- child = [_list objectAtIndex:index];
- [childrenAsDictionaries addObject:[child dictionaryRepresentation]];
- }
-
- [dict setObject:childrenAsDictionaries forKey:ChildrenKey];
- }
-
- return dict;
-}
-
-- (void)dealloc
-{
- [_title release];
- [_image release];
- [_list release];
- [super dealloc];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- IFBookmarkList *copy;
- unsigned index, count;
-
- copy = [[IFBookmarkList alloc] initWithTitle:[self title]
- image:[self image]
- group:[self group]];
-
- count = [self numberOfChildren];
- for (index = 0; index < count; ++index) {
- IFBookmark *childCopy;
-
- childCopy = [[[_list objectAtIndex:index] copyWithZone:zone] autorelease];
- [copy insertChild:childCopy atIndex:index];
- }
-
- return copy;
-}
-
-- (NSString *)title
-{
- return _title;
-}
-
-- (void)setTitle:(NSString *)title
-{
- if ([title isEqualToString:_title]) {
- return;
- }
-
- [_title release];
- _title = [title copy];
-
- [[self group] _bookmarkDidChange:self];
-}
-
-- (NSImage *)image
-{
- static NSImage *defaultImage = nil;
- static BOOL loadedDefaultImage = NO;
-
- if (_image != nil) {
- return _image;
- }
-
- // Attempt to load default image only once, to avoid performance penalty of repeatedly
- // trying and failing to find it.
- if (!loadedDefaultImage) {
- NSString *pathForDefaultImage =
- [[NSBundle bundleForClass:[self class]] pathForResource:@"bookmark_folder" ofType:@"tiff"];
- if (pathForDefaultImage != nil) {
- defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
- }
- loadedDefaultImage = YES;
- }
-
- return defaultImage;
-}
-
-- (void)setImage:(NSImage *)image
-{
- if ([image isEqual:_image]) {
- return;
- }
-
- [image retain];
- [_image release];
- _image = image;
-
- [[self group] _bookmarkDidChange:self];
-}
-
-- (IFBookmarkType)bookmarkType
-{
- return IFBookmarkTypeList;
-}
-
-- (NSArray *)children
-{
- return [NSArray arrayWithArray:_list];
-}
-
-- (unsigned)numberOfChildren
-{
- return [_list count];
-}
-
-- (unsigned)_numberOfDescendants
-{
- unsigned result;
- unsigned index, count;
- IFBookmark *child;
-
- count = [self numberOfChildren];
- result = count;
-
- for (index = 0; index < count; ++index) {
- child = [_list objectAtIndex:index];
- result += [child _numberOfDescendants];
- }
-
- return result;
-}
-
-- (void)removeChild:(IFBookmark *)bookmark
-{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
- WEBKIT_ASSERT_VALID_ARG (bookmark, [_list containsObject:bookmark]);
-
- [_list removeObject:bookmark];
- [bookmark _setParent:nil];
-
- [[self group] _bookmarkChildrenDidChange:self];
-}
-
-
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
-{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == nil);
- WEBKIT_ASSERT_VALID_ARG (bookmark, ![_list containsObject:bookmark]);
-
- [_list insertObject:bookmark atIndex:index];
- [bookmark _setParent:self];
- [bookmark _setGroup:[self group]];
-
- [[self group] _bookmarkChildrenDidChange:self];
-}
-
-- (void)_setGroup:(IFBookmarkGroup *)group
-{
- if (group == [self group]) {
- return;
- }
-
- [super _setGroup:group];
- [_list makeObjectsPerformSelector:@selector(_setGroup:) withObject:group];
-}
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.h b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.h
deleted file mode 100644
index 7786744..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// IFBookmarkSeparator.h
-// WebKit
-//
-// Created by John Sullivan on Mon May 20 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFBookmark.h>
-
-
- at interface IFBookmarkSeparator : IFBookmark {
-}
-
-- (id)initWithGroup:(IFBookmarkGroup *)group;
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
deleted file mode 100644
index e1f75f3..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// IFBookmarkSeparator.m
-// WebKit
-//
-// Created by John Sullivan on Mon May 20 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFBookmarkSeparator.h"
-
-#import "IFBookmark_Private.h"
-#import <WebKit/WebKitDebug.h>
-
-
- at implementation IFBookmarkSeparator
-
-- (id)initWithGroup:(IFBookmarkGroup *)group
-{
- WEBKIT_ASSERT_VALID_ARG (group, group != nil);
-
- [super init];
- [self _setGroup:group];
-
- return self;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
-{
- if (![[dict objectForKey:IFBookmarkTypeKey] isEqualToString:IFBookmarkTypeSeparatorValue]) {
- WEBKITDEBUG("Can't initialize Bookmark separator from non-separator type");
- return nil;
- }
-
- return [self initWithGroup:group];
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
- return [NSDictionary dictionaryWithObject:IFBookmarkTypeSeparatorValue forKey:IFBookmarkTypeKey];
-}
-
-- (IFBookmarkType)bookmarkType
-{
- return IFBookmarkTypeSeparator;
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [[IFBookmarkSeparator alloc] initWithGroup:[self group]];
-}
-
-- (NSString *)title
-{
- return nil;
-}
-
-- (NSImage *)image
-{
- return nil;
-}
-
- at end
diff --git a/WebKit/Bookmarks.subproj/IFBookmark_Private.h b/WebKit/Bookmarks.subproj/IFBookmark_Private.h
deleted file mode 100644
index 4d2c608..0000000
--- a/WebKit/Bookmarks.subproj/IFBookmark_Private.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * IFBookmark_Private.h
- * WebKit
- *
- * Created by John Sullivan on Tue Apr 30 2002.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#import <WebKit/IFBookmark.h>
-
-#define IFBookmarkTypeKey @"IFBookmarkType"
-#define IFBookmarkTypeLeafValue @"IFBookmarkTypeLeaf"
-#define IFBookmarkTypeListValue @"IFBookmarkTypeList"
-#define IFBookmarkTypeSeparatorValue @"IFBookmarkTypeSeparator"
-
- at interface IFBookmark(IFPrivate)
-
-- (void)_setParent:(IFBookmark *)parent;
-- (void)_setGroup:(IFBookmarkGroup *)group;
-
-- (unsigned)_numberOfDescendants;
-
- at end
-
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index 7388711..3c73eb6 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -1,5 +1,5 @@
//
-// IFBookmark.h
+// WebBookmark.h
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
@@ -8,24 +8,24 @@
#import <Cocoa/Cocoa.h>
- at class IFBookmarkGroup;
+ at class WebBookmarkGroup;
typedef enum {
- IFBookmarkTypeLeaf,
- IFBookmarkTypeList,
- IFBookmarkTypeSeparator,
-} IFBookmarkType;
-
- at interface IFBookmark : NSObject <NSCopying> {
- IFBookmark *_parent;
- IFBookmarkGroup *_group;
+ WebBookmarkTypeLeaf,
+ WebBookmarkTypeList,
+ WebBookmarkTypeSeparator,
+} WebBookmarkType;
+
+ at interface WebBookmark : NSObject <NSCopying> {
+ WebBookmark *_parent;
+ WebBookmarkGroup *_group;
NSString *_identifier;
}
-+ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
-+ (IFBookmark *)bookmarkOfType:(IFBookmarkType)type;
++ (WebBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group;
++ (WebBookmark *)bookmarkOfType:(WebBookmarkType)type;
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group;
- (NSDictionary *)dictionaryRepresentation;
- (NSString *)title;
@@ -35,35 +35,35 @@ typedef enum {
- (void)setImage:(NSImage *)image;
// The type of bookmark
-- (IFBookmarkType)bookmarkType;
+- (WebBookmarkType)bookmarkType;
// String intended to represent URL for leaf bookmarks. May not be a valid URL string.
-// This is nil if bookmarkType is not IFBookmarkTypeLeaf.
+// This is nil if bookmarkType is not WebBookmarkTypeLeaf.
- (NSString *)URLString;
// Sets the string intended to represent URL for leaf bookmarks. URLString need not be
-// a valid URL string. Does nothing if bookmarkType is not IFBookmarkTypeLeaf.
+// a valid URL string. Does nothing if bookmarkType is not WebBookmarkTypeLeaf.
- (void)setURLString:(NSString *)URLString;
-// Array of child IFBookmarks. Returns nil if bookmarkType is not IFBookmarkTypeList.
+// Array of child WebBookmarks. Returns nil if bookmarkType is not WebBookmarkTypeList.
- (NSArray *)children;
-// Number of children. Returns 0 if bookmarkType is not IFBookmarkTypeList.
+// Number of children. Returns 0 if bookmarkType is not WebBookmarkTypeList.
- (unsigned)numberOfChildren;
-// Insert a bookmark into the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index;
+// Insert a bookmark into the list. Does nothing if bookmarkType is not WebBookmarkTypeList.
+- (void)insertChild:(WebBookmark *)bookmark atIndex:(unsigned)index;
-// Remove a bookmark from the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
-- (void)removeChild:(IFBookmark *)bookmark;
+// Remove a bookmark from the list. Does nothing if bookmarkType is not WebBookmarkTypeList.
+- (void)removeChild:(WebBookmark *)bookmark;
// The parent of this bookmark, or nil if this is the top bookmark in a group
-- (IFBookmark *)parent;
+- (WebBookmark *)parent;
// The group that this bookmark belongs to.
-- (IFBookmarkGroup *)group;
+- (WebBookmarkGroup *)group;
-// An NSString that can be used to uniquely identify this bookmark; use with +[IFBookmarkGroup bookmarkForIdentifier];
+// An NSString that can be used to uniquely identify this bookmark; use with +[WebBookmarkGroup bookmarkForIdentifier];
- (NSString *)identifier;
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index b19d39c..507c892 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -1,24 +1,24 @@
//
-// IFBookmark.m
+// WebBookmark.m
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmark.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkSeparator.h>
+#import <WebKit/WebBookmark.h>
+#import <WebKit/WebBookmarkPrivate.h>
+#import <WebKit/WebBookmarkGroup.h>
+#import <WebKit/WebBookmarkGroupPrivate.h>
+#import <WebKit/WebBookmarkLeaf.h>
+#import <WebKit/WebBookmarkList.h>
+#import <WebKit/WebBookmarkSeparator.h>
#import <WebKit/WebKitDebug.h>
// to get NSRequestConcreteImplementation
#import <Foundation/NSPrivateDecls.h>
- at implementation IFBookmark
+ at implementation WebBookmark
static unsigned _highestUsedID = 0;
@@ -30,7 +30,7 @@ static unsigned _highestUsedID = 0;
- (id)init
{
[super init];
- _identifier = [[IFBookmark _generateUniqueIdentifier] retain];
+ _identifier = [[WebBookmark _generateUniqueIdentifier] retain];
return self;
}
@@ -76,10 +76,10 @@ static unsigned _highestUsedID = 0;
NSRequestConcreteImplementation(self, _cmd, [self class]);
}
-- (IFBookmarkType)bookmarkType
+- (WebBookmarkType)bookmarkType
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
- return IFBookmarkTypeLeaf;
+ return WebBookmarkTypeLeaf;
}
- (NSString *)URLString
@@ -107,34 +107,34 @@ static unsigned _highestUsedID = 0;
return 0;
}
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
+- (void)insertChild:(WebBookmark *)bookmark atIndex:(unsigned)index
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
}
-- (void)removeChild:(IFBookmark *)bookmark
+- (void)removeChild:(WebBookmark *)bookmark
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
}
-- (IFBookmark *)parent
+- (WebBookmark *)parent
{
return _parent;
}
-- (void)_setParent:(IFBookmark *)parent
+- (void)_setParent:(WebBookmark *)parent
{
// Don't retain parent, to avoid circular ownership that prevents dealloc'ing
// when a parent with children is removed from a group and has no other references.
_parent = parent;
}
-- (IFBookmarkGroup *)group
+- (WebBookmarkGroup *)group
{
return _group;
}
-- (void)_setGroup:(IFBookmarkGroup *)group
+- (void)_setGroup:(WebBookmarkGroup *)group
{
if (group == _group) {
return;
@@ -147,33 +147,33 @@ static unsigned _highestUsedID = 0;
[group _addedBookmark:self];
}
-+ (IFBookmark *)bookmarkOfType:(IFBookmarkType)type
++ (WebBookmark *)bookmarkOfType:(WebBookmarkType)type
{
- if (type == IFBookmarkTypeList) {
- return [[[IFBookmarkList alloc] init] autorelease];
- } else if (type == IFBookmarkTypeLeaf) {
- return [[[IFBookmarkLeaf alloc] init] autorelease];
- } else if (type == IFBookmarkTypeSeparator) {
- return [[[IFBookmarkSeparator alloc] init] autorelease];
+ if (type == WebBookmarkTypeList) {
+ return [[[WebBookmarkList alloc] init] autorelease];
+ } else if (type == WebBookmarkTypeLeaf) {
+ return [[[WebBookmarkLeaf alloc] init] autorelease];
+ } else if (type == WebBookmarkTypeSeparator) {
+ return [[[WebBookmarkSeparator alloc] init] autorelease];
}
return nil;
}
-+ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
++ (WebBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
NSString *typeString;
Class class = nil;
- typeString = [dict objectForKey:IFBookmarkTypeKey];
- if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
- class = [IFBookmarkList class];
- } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
- class = [IFBookmarkLeaf class];
- } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
- class = [IFBookmarkSeparator class];
+ typeString = [dict objectForKey:WebBookmarkTypeKey];
+ if ([typeString isEqualToString:WebBookmarkTypeListValue]) {
+ class = [WebBookmarkList class];
+ } else if ([typeString isEqualToString:WebBookmarkTypeLeafValue]) {
+ class = [WebBookmarkLeaf class];
+ } else if ([typeString isEqualToString:WebBookmarkTypeSeparatorValue]) {
+ class = [WebBookmarkSeparator class];
}
if (class) {
@@ -184,7 +184,7 @@ static unsigned _highestUsedID = 0;
return nil;
}
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
index 2a02463..fffe36a 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
@@ -1,5 +1,5 @@
//
-// IFBookmarkGroup.h
+// WebBookmarkGroup.h
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
@@ -7,53 +7,53 @@
//
#import <Cocoa/Cocoa.h>
-#import <WebKit/IFBookmark.h>
+#import <WebKit/WebBookmark.h>
// notification sent when bookmarks are added/removed from group, or when bookmarks in group are modified
-#define IFBookmarkGroupChangedNotification @"IFBookmarkGroupChangedNotification"
+#define WebBookmarkGroupChangedNotification @"WebBookmarkGroupChangedNotification"
-// keys for userInfo for IFBookmarkGroupChangedNotification. These are always present.
+// keys for userInfo for WebBookmarkGroupChangedNotification. These are always present.
-// The lowest common ancestor of all the IFBookmark objects that changed.
-#define IFModifiedBookmarkKey @"IFModifiedBookmarkKey"
+// The lowest common ancestor of all the WebBookmark objects that changed.
+#define WebModifiedBookmarkKey @"WebModifiedBookmarkKey"
// An NSNumber object representing a boolean that distinguishes changes
// to the bookmark itself from changes to its children.
-#define IFBookmarkChildrenChangedKey @"IFBookmarkChildrenChangedKey"
+#define WebBookmarkChildrenChangedKey @"WebBookmarkChildrenChangedKey"
- at interface IFBookmarkGroup : NSObject
+ at interface WebBookmarkGroup : NSObject
{
NSString *_file;
- IFBookmark *_topBookmark;
+ WebBookmark *_topBookmark;
NSMutableDictionary *_bookmarksByID;
BOOL _loading;
}
-+ (IFBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file;
++ (WebBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file;
- (id)initWithFile: (NSString *)file;
// examining contents
-- (IFBookmark *)topBookmark;
-- (IFBookmark *)bookmarkForIdentifier:(NSString *)identifier;
+- (WebBookmark *)topBookmark;
+- (WebBookmark *)bookmarkForIdentifier:(NSString *)identifier;
// modifying contents
-- (void)removeBookmark:(IFBookmark *)bookmark;
+- (void)removeBookmark:(WebBookmark *)bookmark;
-- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
+- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
image:(NSImage *)newImage
URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType;
-- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+ type:(WebBookmarkType)bookmarkType;
+- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
image:(NSImage *)newImage
URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType;
+ type:(WebBookmarkType)bookmarkType;
// storing contents on disk
-// The file path used for storing this IFBookmarkGroup, specified in -[IFBookmarkGroup initWithFile:] or +[IFBookmarkGroup bookmarkGroupWithFile:]
+// The file path used for storing this WebBookmarkGroup, specified in -[WebBookmarkGroup initWithFile:] or +[WebBookmarkGroup bookmarkGroupWithFile:]
- (NSString *)file;
// Load bookmark group from file. This happens automatically at init time, and need not normally be called.
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index d77e012..b915485 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -1,28 +1,28 @@
//
-// IFBookmarkGroup.m
+// WebBookmarkGroup.m
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkSeparator.h>
+#import <WebKit/WebBookmarkGroup.h>
+#import <WebKit/WebBookmarkGroupPrivate.h>
+#import <WebKit/WebBookmarkPrivate.h>
+#import <WebKit/WebBookmarkList.h>
+#import <WebKit/WebBookmarkLeaf.h>
+#import <WebKit/WebBookmarkSeparator.h>
#import <WebKit/WebKitDebug.h>
- at interface IFBookmarkGroup (IFForwardDeclarations)
-- (void)_setTopBookmark:(IFBookmark *)newTopBookmark;
+ at interface WebBookmarkGroup (WebForwardDeclarations)
+- (void)_setTopBookmark:(WebBookmark *)newTopBookmark;
@end
- at implementation IFBookmarkGroup
+ at implementation WebBookmarkGroup
-+ (IFBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file
++ (WebBookmarkGroup *)bookmarkGroupWithFile: (NSString *)file
{
- return [[[IFBookmarkGroup alloc] initWithFile:file] autorelease];
+ return [[[WebBookmarkGroup alloc] initWithFile:file] autorelease];
}
- (id)initWithFile: (NSString *)file
@@ -50,12 +50,12 @@
[super dealloc];
}
-- (IFBookmark *)topBookmark
+- (WebBookmark *)topBookmark
{
return _topBookmark;
}
-- (void)_sendChangeNotificationForBookmark:(IFBookmark *)bookmark
+- (void)_sendChangeNotificationForBookmark:(WebBookmark *)bookmark
childrenChanged:(BOOL)flag
{
NSDictionary *userInfo;
@@ -67,20 +67,20 @@
}
userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
- bookmark, IFModifiedBookmarkKey,
- [NSNumber numberWithBool:flag], IFBookmarkChildrenChangedKey,
+ bookmark, WebModifiedBookmarkKey,
+ [NSNumber numberWithBool:flag], WebBookmarkChildrenChangedKey,
nil];
[[NSNotificationCenter defaultCenter]
- postNotificationName:IFBookmarkGroupChangedNotification
+ postNotificationName:WebBookmarkGroupChangedNotification
object:self
userInfo:userInfo];
}
-- (void)_setTopBookmark:(IFBookmark *)newTopBookmark
+- (void)_setTopBookmark:(WebBookmark *)newTopBookmark
{
WEBKIT_ASSERT_VALID_ARG (newTopBookmark, newTopBookmark == nil ||
- [newTopBookmark bookmarkType] == IFBookmarkTypeList);
+ [newTopBookmark bookmarkType] == WebBookmarkTypeList);
[_topBookmark _setGroup:nil];
[_topBookmark autorelease];
@@ -88,42 +88,42 @@
if (newTopBookmark) {
_topBookmark = [newTopBookmark retain];
} else {
- _topBookmark = [[IFBookmarkList alloc] initWithTitle:nil image:nil group:self];
+ _topBookmark = [[WebBookmarkList alloc] initWithTitle:nil image:nil group:self];
}
[self _sendChangeNotificationForBookmark:_topBookmark childrenChanged:YES];
}
-- (void)_bookmarkDidChange:(IFBookmark *)bookmark
+- (void)_bookmarkDidChange:(WebBookmark *)bookmark
{
[self _sendChangeNotificationForBookmark:bookmark childrenChanged:NO];
}
-- (void)_bookmarkChildrenDidChange:(IFBookmark *)bookmark
+- (void)_bookmarkChildrenDidChange:(WebBookmark *)bookmark
{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark bookmarkType] == IFBookmarkTypeList);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark bookmarkType] == WebBookmarkTypeList);
[self _sendChangeNotificationForBookmark:bookmark childrenChanged:YES];
}
-- (void)_removedBookmark:(IFBookmark *)bookmark
+- (void)_removedBookmark:(WebBookmark *)bookmark
{
WEBKIT_ASSERT ([_bookmarksByID objectForKey:[bookmark identifier]] == bookmark);
[_bookmarksByID removeObjectForKey:[bookmark identifier]];
}
-- (void)_addedBookmark:(IFBookmark *)bookmark
+- (void)_addedBookmark:(WebBookmark *)bookmark
{
WEBKIT_ASSERT ([_bookmarksByID objectForKey:[bookmark identifier]] == nil);
[_bookmarksByID setObject:bookmark forKey:[bookmark identifier]];
}
-- (IFBookmark *)bookmarkForIdentifier:(NSString *)identifier
+- (WebBookmark *)bookmarkForIdentifier:(NSString *)identifier
{
return [_bookmarksByID objectForKey:identifier];
}
-- (void)removeBookmark:(IFBookmark *)bookmark
+- (void)removeBookmark:(WebBookmark *)bookmark
{
WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark group] == self);
WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] != nil || bookmark == _topBookmark);
@@ -136,11 +136,11 @@
}
}
-- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
image:(NSImage *)newImage
URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType
+ type:(WebBookmarkType)bookmarkType
{
return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
ofBookmark:parent
@@ -150,29 +150,29 @@
type:bookmarkType];
}
-- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
+- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
image:(NSImage *)newImage
URLString:(NSString *)newURLString
- type:(IFBookmarkType)bookmarkType
+ type:(WebBookmarkType)bookmarkType
{
- IFBookmark *bookmark;
+ WebBookmark *bookmark;
WEBKIT_ASSERT_VALID_ARG (parent, [parent group] == self);
- WEBKIT_ASSERT_VALID_ARG (parent, [parent bookmarkType] == IFBookmarkTypeList);
- WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == IFBookmarkTypeLeaf || (newURLString == nil));
+ WEBKIT_ASSERT_VALID_ARG (parent, [parent bookmarkType] == WebBookmarkTypeList);
+ WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == WebBookmarkTypeLeaf || (newURLString == nil));
- if (bookmarkType == IFBookmarkTypeLeaf) {
- bookmark = [[[IFBookmarkLeaf alloc] initWithURLString:newURLString
+ if (bookmarkType == WebBookmarkTypeLeaf) {
+ bookmark = [[[WebBookmarkLeaf alloc] initWithURLString:newURLString
title:newTitle
image:newImage
group:self] autorelease];
- } else if (bookmarkType == IFBookmarkTypeSeparator) {
- bookmark = [[[IFBookmarkSeparator alloc] initWithGroup:self] autorelease];
+ } else if (bookmarkType == WebBookmarkTypeSeparator) {
+ bookmark = [[[WebBookmarkSeparator alloc] initWithGroup:self] autorelease];
} else {
- WEBKIT_ASSERT (bookmarkType == IFBookmarkTypeList);
- bookmark = [[[IFBookmarkList alloc] initWithTitle:newTitle
+ WEBKIT_ASSERT (bookmarkType == WebBookmarkTypeList);
+ bookmark = [[[WebBookmarkList alloc] initWithTitle:newTitle
image:newImage
group:self] autorelease];
}
@@ -190,7 +190,7 @@
{
NSString *path;
NSDictionary *dictionary;
- IFBookmarkList *newTopBookmark;
+ WebBookmarkList *newTopBookmark;
path = [self file];
if (path == nil) {
@@ -211,7 +211,7 @@
}
_loading = YES;
- newTopBookmark = [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
+ newTopBookmark = [[[WebBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
[self _setTopBookmark:newTopBookmark];
_loading = NO;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
index a437fd1..2c9c6c2 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
@@ -1,5 +1,5 @@
/*
- * IFBookmarkGroup_Private.h
+ * WebBookmarkGroupPrivate.h
* WebKit
*
* Created by John Sullivan on Thu May 2 2002.
@@ -7,15 +7,15 @@
*
*/
-#import <WebKit/IFBookmarkGroup.h>
+#import <WebKit/WebBookmarkGroup.h>
- at interface IFBookmarkGroup(IFPrivate)
+ at interface WebBookmarkGroup(WebPrivate)
-- (void)_bookmarkDidChange:(IFBookmark *)bookmark;
-- (void)_bookmarkChildrenDidChange:(IFBookmark *)bookmark;
+- (void)_bookmarkDidChange:(WebBookmark *)bookmark;
+- (void)_bookmarkChildrenDidChange:(WebBookmark *)bookmark;
-- (void)_removedBookmark:(IFBookmark *)bookmark;
-- (void)_addedBookmark:(IFBookmark *)bookmark;
+- (void)_removedBookmark:(WebBookmark *)bookmark;
+- (void)_addedBookmark:(WebBookmark *)bookmark;
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
index 26d2ede..4b48605 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.h
@@ -1,23 +1,23 @@
//
-// IFBookmarkLeaf.h
+// WebBookmarkLeaf.h
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmark.h>
+#import <WebKit/WebBookmark.h>
- at class IFURIEntry;
+ at class WebHistoryItem;
- at interface IFBookmarkLeaf : IFBookmark {
- IFURIEntry *_entry;
+ at interface WebBookmarkLeaf : WebBookmark {
+ WebHistoryItem *_entry;
NSString *_URLString;
}
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
image:(NSImage *)image
- group:(IFBookmarkGroup *)group;
+ group:(WebBookmarkGroup *)group;
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index 9a07548..402cd94 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -1,34 +1,34 @@
//
-// IFBookmarkLeaf.m
+// WebBookmarkLeaf.m
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
-#import <WebKit/IFURIEntry.h>
+#import <WebKit/WebBookmarkLeaf.h>
+#import <WebKit/WebBookmarkPrivate.h>
+#import <WebKit/WebBookmarkGroup.h>
+#import <WebKit/WebBookmarkGroupPrivate.h>
+#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebKitDebug.h>
#define URIDictionaryKey @"URIDictionary"
#define URLStringKey @"URLString"
- at implementation IFBookmarkLeaf
+ at implementation WebBookmarkLeaf
- (id)init
{
[super init];
- _entry = [[IFURIEntry alloc] init];
+ _entry = [[WebHistoryItem alloc] init];
return self;
}
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
image:(NSImage *)image
- group:(IFBookmarkGroup *)group;
+ group:(WebBookmarkGroup *)group;
{
WEBKIT_ASSERT_VALID_ARG (group, group != nil);
@@ -36,7 +36,7 @@
// Since our URLString may not be valid for creating an NSURL object,
// just hang onto the string separately and don't bother creating
- // an NSURL object for the IFURIEntry.
+ // an NSURL object for the WebHistoryItem.
[self setTitle:title];
[self setImage:image];
_URLString = [URLString retain];
@@ -45,7 +45,7 @@
return self;
}
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -53,7 +53,7 @@
[self _setGroup:group];
- _entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation:
+ _entry = [[[WebHistoryItem alloc] initFromDictionaryRepresentation:
[dict objectForKey:URIDictionaryKey]] retain];
_URLString = [[dict objectForKey:URLStringKey] retain];
@@ -66,7 +66,7 @@
dict = [NSMutableDictionary dictionaryWithCapacity:3];
- [dict setObject:IFBookmarkTypeLeafValue forKey:IFBookmarkTypeKey];
+ [dict setObject:WebBookmarkTypeLeafValue forKey:WebBookmarkTypeKey];
[dict setObject:[_entry dictionaryRepresentation] forKey:URIDictionaryKey];
if (_URLString != nil) {
[dict setObject:_URLString forKey:URLStringKey];
@@ -84,7 +84,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- return [[IFBookmarkLeaf allocWithZone:zone] initWithURLString:_URLString
+ return [[WebBookmarkLeaf allocWithZone:zone] initWithURLString:_URLString
title:[self title]
image:[self image]
group:[self group]];
@@ -119,9 +119,9 @@
[[self group] _bookmarkDidChange:self];
}
-- (IFBookmarkType)bookmarkType
+- (WebBookmarkType)bookmarkType
{
- return IFBookmarkTypeLeaf;
+ return WebBookmarkTypeLeaf;
}
- (NSString *)URLString
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.h b/WebKit/Bookmarks.subproj/WebBookmarkList.h
index 6aabd3c..338c097 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.h
@@ -1,19 +1,19 @@
//
-// IFBookmarkList.h
+// WebBookmarkList.h
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmark.h>
+#import <WebKit/WebBookmark.h>
- at interface IFBookmarkList : IFBookmark {
+ at interface WebBookmarkList : WebBookmark {
NSString *_title;
NSImage *_image;
NSMutableArray *_list;
}
-- (id)initWithTitle:(NSString *)title image:(NSImage *)image group:(IFBookmarkGroup *)group;
+- (id)initWithTitle:(NSString *)title image:(NSImage *)image group:(WebBookmarkGroup *)group;
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index 3b2428c..0bc2c10 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -1,26 +1,26 @@
//
-// IFBookmarkList.m
+// WebBookmarkList.m
// WebKit
//
// Created by John Sullivan on Tue Apr 30 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmarkList.h>
-#import <WebKit/IFBookmarkLeaf.h>
-#import <WebKit/IFBookmarkSeparator.h>
-#import <WebKit/IFBookmark_Private.h>
-#import <WebKit/IFBookmarkGroup_Private.h>
+#import <WebKit/WebBookmarkList.h>
+#import <WebKit/WebBookmarkLeaf.h>
+#import <WebKit/WebBookmarkSeparator.h>
+#import <WebKit/WebBookmarkPrivate.h>
+#import <WebKit/WebBookmarkGroupPrivate.h>
#import <WebKit/WebKitDebug.h>
#define TitleKey @"Title"
#define ChildrenKey @"Children"
- at implementation IFBookmarkList
+ at implementation WebBookmarkList
- (id)initWithTitle:(NSString *)title
image:(NSImage *)image
- group:(IFBookmarkGroup *)group
+ group:(WebBookmarkGroup *)group
{
WEBKIT_ASSERT_VALID_ARG (group, group != nil);
@@ -34,10 +34,10 @@
return self;
}
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
NSArray *storedChildren;
- IFBookmark *child;
+ WebBookmark *child;
unsigned index, count;
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -54,7 +54,7 @@
if (storedChildren != nil) {
count = [storedChildren count];
for (index = 0; index < count; ++index) {
- child = [IFBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
+ child = [WebBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
withGroup:group];
if (child != nil) {
@@ -79,14 +79,14 @@
[dict setObject:_title forKey:TitleKey];
}
- [dict setObject:IFBookmarkTypeListValue forKey:IFBookmarkTypeKey];
+ [dict setObject:WebBookmarkTypeListValue forKey:WebBookmarkTypeKey];
childCount = [self numberOfChildren];
if (childCount > 0) {
childrenAsDictionaries = [NSMutableArray arrayWithCapacity:childCount];
for (index = 0; index < childCount; ++index) {
- IFBookmark *child;
+ WebBookmark *child;
child = [_list objectAtIndex:index];
[childrenAsDictionaries addObject:[child dictionaryRepresentation]];
@@ -108,16 +108,16 @@
- (id)copyWithZone:(NSZone *)zone
{
- IFBookmarkList *copy;
+ WebBookmarkList *copy;
unsigned index, count;
- copy = [[IFBookmarkList alloc] initWithTitle:[self title]
+ copy = [[WebBookmarkList alloc] initWithTitle:[self title]
image:[self image]
group:[self group]];
count = [self numberOfChildren];
for (index = 0; index < count; ++index) {
- IFBookmark *childCopy;
+ WebBookmark *childCopy;
childCopy = [[[_list objectAtIndex:index] copyWithZone:zone] autorelease];
[copy insertChild:childCopy atIndex:index];
@@ -179,9 +179,9 @@
[[self group] _bookmarkDidChange:self];
}
-- (IFBookmarkType)bookmarkType
+- (WebBookmarkType)bookmarkType
{
- return IFBookmarkTypeList;
+ return WebBookmarkTypeList;
}
- (NSArray *)children
@@ -198,7 +198,7 @@
{
unsigned result;
unsigned index, count;
- IFBookmark *child;
+ WebBookmark *child;
count = [self numberOfChildren];
result = count;
@@ -211,7 +211,7 @@
return result;
}
-- (void)removeChild:(IFBookmark *)bookmark
+- (void)removeChild:(WebBookmark *)bookmark
{
WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
WEBKIT_ASSERT_VALID_ARG (bookmark, [_list containsObject:bookmark]);
@@ -223,7 +223,7 @@
}
-- (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
+- (void)insertChild:(WebBookmark *)bookmark atIndex:(unsigned)index
{
WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == nil);
WEBKIT_ASSERT_VALID_ARG (bookmark, ![_list containsObject:bookmark]);
@@ -235,7 +235,7 @@
[[self group] _bookmarkChildrenDidChange:self];
}
-- (void)_setGroup:(IFBookmarkGroup *)group
+- (void)_setGroup:(WebBookmarkGroup *)group
{
if (group == [self group]) {
return;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
index 4d2c608..8956cf3 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
@@ -1,5 +1,5 @@
/*
- * IFBookmark_Private.h
+ * WebBookmarkPrivate.h
* WebKit
*
* Created by John Sullivan on Tue Apr 30 2002.
@@ -7,17 +7,17 @@
*
*/
-#import <WebKit/IFBookmark.h>
+#import <WebKit/WebBookmark.h>
-#define IFBookmarkTypeKey @"IFBookmarkType"
-#define IFBookmarkTypeLeafValue @"IFBookmarkTypeLeaf"
-#define IFBookmarkTypeListValue @"IFBookmarkTypeList"
-#define IFBookmarkTypeSeparatorValue @"IFBookmarkTypeSeparator"
+#define WebBookmarkTypeKey @"WebBookmarkType"
+#define WebBookmarkTypeLeafValue @"WebBookmarkTypeLeaf"
+#define WebBookmarkTypeListValue @"WebBookmarkTypeList"
+#define WebBookmarkTypeSeparatorValue @"WebBookmarkTypeSeparator"
- at interface IFBookmark(IFPrivate)
+ at interface WebBookmark(WebPrivate)
-- (void)_setParent:(IFBookmark *)parent;
-- (void)_setGroup:(IFBookmarkGroup *)group;
+- (void)_setParent:(WebBookmark *)parent;
+- (void)_setGroup:(WebBookmarkGroup *)group;
- (unsigned)_numberOfDescendants;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h
index 7786744..fadfa2e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h
@@ -1,17 +1,17 @@
//
-// IFBookmarkSeparator.h
+// WebBookmarkSeparator.h
// WebKit
//
// Created by John Sullivan on Mon May 20 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFBookmark.h>
+#import <WebKit/WebBookmark.h>
- at interface IFBookmarkSeparator : IFBookmark {
+ at interface WebBookmarkSeparator : WebBookmark {
}
-- (id)initWithGroup:(IFBookmarkGroup *)group;
+- (id)initWithGroup:(WebBookmarkGroup *)group;
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
index e1f75f3..59bbe30 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
@@ -1,20 +1,20 @@
//
-// IFBookmarkSeparator.m
+// WebBookmarkSeparator.m
// WebKit
//
// Created by John Sullivan on Mon May 20 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFBookmarkSeparator.h"
+#import "WebBookmarkSeparator.h"
-#import "IFBookmark_Private.h"
+#import "WebBookmarkPrivate.h"
#import <WebKit/WebKitDebug.h>
- at implementation IFBookmarkSeparator
+ at implementation WebBookmarkSeparator
-- (id)initWithGroup:(IFBookmarkGroup *)group
+- (id)initWithGroup:(WebBookmarkGroup *)group
{
WEBKIT_ASSERT_VALID_ARG (group, group != nil);
@@ -24,9 +24,9 @@
return self;
}
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
- if (![[dict objectForKey:IFBookmarkTypeKey] isEqualToString:IFBookmarkTypeSeparatorValue]) {
+ if (![[dict objectForKey:WebBookmarkTypeKey] isEqualToString:WebBookmarkTypeSeparatorValue]) {
WEBKITDEBUG("Can't initialize Bookmark separator from non-separator type");
return nil;
}
@@ -36,17 +36,17 @@
- (NSDictionary *)dictionaryRepresentation
{
- return [NSDictionary dictionaryWithObject:IFBookmarkTypeSeparatorValue forKey:IFBookmarkTypeKey];
+ return [NSDictionary dictionaryWithObject:WebBookmarkTypeSeparatorValue forKey:WebBookmarkTypeKey];
}
-- (IFBookmarkType)bookmarkType
+- (WebBookmarkType)bookmarkType
{
- return IFBookmarkTypeSeparator;
+ return WebBookmarkTypeSeparator;
}
- (id)copyWithZone:(NSZone *)zone
{
- return [[IFBookmarkSeparator alloc] initWithGroup:[self group]];
+ return [[WebBookmarkSeparator alloc] initWithGroup:[self group]];
}
- (NSString *)title
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 308e302..53d96e3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-16 Darin Adler <darin at apple.com>
+
+ * almost every file: Renamed IF* -> Web*.
+
2002-07-15 Richard Williamson (Home) <rjw at apple.com>
Removed dependence on window resize notification. We now
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 308e302..53d96e3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-07-16 Darin Adler <darin at apple.com>
+
+ * almost every file: Renamed IF* -> Web*.
+
2002-07-15 Richard Williamson (Home) <rjw at apple.com>
Removed dependence on window resize notification. We now
diff --git a/WebKit/English.lproj/IFError.strings b/WebKit/English.lproj/IFError.strings
deleted file mode 100644
index 5bf105d..0000000
Binary files a/WebKit/English.lproj/IFError.strings and /dev/null differ
diff --git a/WebKit/History.subproj/IFBackForwardList.h b/WebKit/History.subproj/IFBackForwardList.h
deleted file mode 100644
index 2b32010..0000000
--- a/WebKit/History.subproj/IFBackForwardList.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* IFBackForwardList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFURIList;
- at class IFURIEntry;
-
- at interface IFBackForwardList : NSObject {
- IFURIList *uriList;
- int index;
- NSLock *mutex;
- int state;
-}
-
--(id)init;
-
-// add to the list
--(void)addEntry:(IFURIEntry *)entry;
-
-// change position in the list
--(void)goBack;
--(void)goForward;
-
-// examine entries without changing position
--(IFURIEntry *)backEntry;
--(IFURIEntry *)currentEntry;
--(IFURIEntry *)forwardEntry;
-
-// examine entire list
--(NSArray *)backList;
--(NSArray *)forwardList;
-
-// check whether entries exist
--(BOOL)canGoBack;
--(BOOL)canGoForward;
-
- at end
\ No newline at end of file
diff --git a/WebKit/History.subproj/IFBackForwardList.m b/WebKit/History.subproj/IFBackForwardList.m
deleted file mode 100644
index c44ad40..0000000
--- a/WebKit/History.subproj/IFBackForwardList.m
+++ /dev/null
@@ -1,174 +0,0 @@
-//
-// IFBackForwardList.m
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
-//
-
-#import "IFBackForwardList.h"
-
-#import "IFURIEntry.h"
-#import "IFURIList.h"
-
- at implementation IFBackForwardList
-
--(id)init
-{
- if (self != [super init])
- {
- return nil;
- }
-
- uriList = [[IFURIList alloc] init];
- [uriList setAllowsDuplicates:YES];
- index = 0;
- mutex = [[NSLock alloc] init];
-
- return self;
-}
-
--(void)dealloc
-{
- [uriList release];
- [mutex release];
-
- [super dealloc];
-}
-
--(void)addEntry:(IFURIEntry *)entry
-{
- [mutex lock];
- if (index > 0) {
- [uriList removeEntriesToIndex:index];
- index = 0;
- }
- [uriList addEntry:entry];
- [mutex unlock];
-}
-
--(void)goBack
-{
- [mutex lock];
- index++;
- [mutex unlock];
-}
-
--(IFURIEntry *)backEntry
-{
- IFURIEntry *result;
- int count;
-
- [mutex lock];
- count = [uriList count];
- if (count > 1 && index < (count - 1)) {
- result = [uriList entryAtIndex:index+1];
- } else {
- result = nil;
- }
- [mutex unlock];
-
- return result;
-}
-
--(IFURIEntry *)currentEntry
-{
- IFURIEntry *result;
-
- [mutex lock];
- result = [uriList entryAtIndex:index];
- [mutex unlock];
-
- return result;
-}
-
--(IFURIEntry *)forwardEntry
-{
- IFURIEntry *result;
-
- [mutex lock];
- if (index > 0) {
- result = [uriList entryAtIndex:index-1];
- } else {
- result = nil;
- }
- [mutex unlock];
-
- return result;
-}
-
--(void)goForward
-{
- [mutex lock];
- index--;
- [mutex unlock];
-}
-
--(BOOL)canGoBack
-{
- BOOL result;
- int count;
-
- [mutex lock];
- count = [uriList count];
- result = (count > 1 && index < (count - 1));
- [mutex unlock];
-
- return result;
-}
-
--(BOOL)canGoForward
-{
- BOOL result;
-
- [mutex lock];
- result = (index > 0);
- [mutex unlock];
-
- return result;
-}
-
--(NSArray *)backList
-{
- // FIXME: implement this some day
- return nil;
-}
-
--(NSArray *)forwardList
-{
- // FIXME: implement this some day
- return nil;
-}
-
--(NSString *)description
-{
- NSMutableString *result;
- int i;
-
- [mutex lock];
-
- result = [NSMutableString stringWithCapacity:512];
-
- [result appendString:@"\n--------------------------------------------\n"];
- [result appendString:@"IFBackForwardList:\n"];
-
- for (i = 0; i < [uriList count]; i++) {
- if (i == index) {
- [result appendString:@" >>>"];
- }
- else {
- [result appendString:@" "];
- }
- [result appendFormat:@" %d) ", i];
- [result appendString:[[uriList entryAtIndex:i] description]];
- [result appendString:@"\n"];
- }
-
- [result appendString:@"\n--------------------------------------------\n"];
-
- [mutex unlock];
-
- return result;
-}
-
- at end
diff --git a/WebKit/History.subproj/IFURIEntry.h b/WebKit/History.subproj/IFURIEntry.h
deleted file mode 100644
index 8ebf93f..0000000
--- a/WebKit/History.subproj/IFURIEntry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// IFURIEntry.h
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
- at interface IFURIEntry : NSObject
-{
- NSURL *_url;
- NSString *_title;
- NSString *_displayTitle;
- NSImage *_image;
- NSCalendarDate *_lastVisitedDate;
-}
-
--(id)init;
--(id)initWithURL:(NSURL *)url title:(NSString *)title;
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image;
-
-- (NSDictionary *)dictionaryRepresentation;
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
-
--(NSURL *)url;
--(NSString *)title;
--(NSString *)displayTitle;
--(NSImage *)image;
--(NSCalendarDate *)lastVisitedDate;
-
--(void)setURL:(NSURL *)url;
--(void)setTitle:(NSString *)title;
--(void)setDisplayTitle:(NSString *)displayTitle;
--(void)setImage:(NSImage *)image;
--(void)setLastVisitedDate:(NSCalendarDate *)date;
-
--(unsigned)hash;
--(BOOL)isEqual:(id)anObject;
-
- at end
diff --git a/WebKit/History.subproj/IFURIEntry.m b/WebKit/History.subproj/IFURIEntry.m
deleted file mode 100644
index 2747aaa..0000000
--- a/WebKit/History.subproj/IFURIEntry.m
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// IFURIEntry.m
-// WebKit
-//
-// Created by Kenneth Kocienda on Thu Nov 29 2001.
-// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFURIEntry.h"
-#import "WebKitReallyPrivate.h"
-
-#import <WebFoundation/IFNSURLExtensions.h>
-
- at implementation IFURIEntry
-
--(id)init
-{
- return [self initWithURL:nil title:nil image:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title
-{
- return [self initWithURL:url title:title image:nil];
-}
-
--(id)initWithURL:(NSURL *)url title:(NSString *)title image:(NSImage *)image
-{
- if (self != [super init])
- {
- return nil;
- }
-
- _url = [url retain];
- _title = [title copy];
- _image = [image retain];
- _lastVisitedDate = [[NSCalendarDate alloc] init];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_url release];
- [_title release];
- [_displayTitle release];
- [_image release];
- [_lastVisitedDate release];
-
- [super dealloc];
-}
-
--(NSURL *)url
-{
- return _url;
-}
-
--(NSString *)title
-{
- return _title;
-}
-
--(NSString *)displayTitle;
-{
- return _displayTitle;
-}
-
--(NSImage *)image
-{
- static NSImage *defaultImage = nil;
- static BOOL loadedDefaultImage = NO;
-
- if (_image != nil) {
- return _image;
- }
-
- // Attempt to load default image only once, to avoid performance penalty of repeatedly
- // trying and failing to find it.
- if (!loadedDefaultImage) {
- NSString *pathForDefaultImage =
- [[NSBundle bundleForClass:[IFURIEntry class]] pathForResource:@"url_icon" ofType:@"tiff"];
- if (pathForDefaultImage != nil) {
- defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
- }
- loadedDefaultImage = YES;
- }
-
- return defaultImage;
-}
-
--(NSCalendarDate *)lastVisitedDate
-{
- return _lastVisitedDate;
-}
-
--(void)setURL:(NSURL *)url
-{
- if (url != _url) {
- [_url release];
- _url = [url retain];
- }
-}
-
--(void)setTitle:(NSString *)title
-{
- if (title != _title) {
- [_title release];
- _title = [title copy];
- }
-}
-
--(void)setDisplayTitle:(NSString *)displayTitle
-{
- if (displayTitle != _displayTitle) {
- [_displayTitle release];
- _displayTitle = [displayTitle copy];
- }
-}
-
--(void)setImage:(NSImage *)image
-{
- if (image != _image) {
- [_image release];
- _image = [image retain];
- }
-}
-
--(void)setLastVisitedDate:(NSCalendarDate *)date
-{
- if (date != _lastVisitedDate) {
- [_lastVisitedDate release];
- _lastVisitedDate = [date retain];
- }
-}
-
--(unsigned)hash
-{
- return [_url hash];
-}
-
--(BOOL)isEqual:(id)anObject
-{
- BOOL result;
-
- result = NO;
-
- if ([anObject isMemberOfClass:[IFURIEntry class]]) {
- result = [_url isEqual:[anObject url]];
- }
-
- return result;
-}
-
--(NSString *)description
-{
- return [NSString stringWithFormat:@"IFURIEntry %@", _url];
-}
-
-
-- (NSDictionary *)dictionaryRepresentation
-{
- NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity: 6];
-
- // FIXME: doesn't save/restore images yet
- if (_url != nil) {
- [dict setObject: [_url absoluteString] forKey: @"url"];
- }
- if (_title != nil) {
- [dict setObject: _title forKey: @"title"];
- }
- if (_displayTitle != nil) {
- [dict setObject: _displayTitle forKey: @"displayTitle"];
- }
- if (_lastVisitedDate != nil) {
- [dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
- forKey: @"lastVisitedDate"];
- }
-
- return dict;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
-{
- NSString *storedURLString;
-
- [super init];
-
- // FIXME: doesn't save/restore images yet
- storedURLString = [dict objectForKey: @"url"];
- if (storedURLString != nil) {
- _url = [[NSURL _IF_URLWithString:storedURLString] retain];
- }
- _title = [[dict objectForKey: @"title"] copy];
- _displayTitle = [[dict objectForKey: @"displayTitle"] copy];
- _lastVisitedDate = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
- [[dict objectForKey: @"lastVisitedDate"] doubleValue]];
-
- return self;
-}
-
- at end
diff --git a/WebKit/History.subproj/IFURIList.h b/WebKit/History.subproj/IFURIList.h
deleted file mode 100644
index 074b722..0000000
--- a/WebKit/History.subproj/IFURIList.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* IFURIList.h
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFURIEntry;
-
-typedef struct IFURIListNode IFURIListNode;
-
- at interface IFURIList : NSObject
-{
- IFURIListNode *_head;
- IFURIListNode *_tail;
- int _count;
- BOOL _allowsDuplicates;
- int _maximumSize;
-}
-
--(id)init;
-
--(BOOL)allowsDuplicates;
--(void)setAllowsDuplicates:(BOOL)allowsDuplicates;
-
--(int)count;
-
--(int)maximumSize;
--(void)setMaximumSize:(int)size;
-
--(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
--(void)addEntry:(IFURIEntry *)entry;
--(IFURIEntry *)removeURL:(NSURL *)url;
--(BOOL)removeEntry:(IFURIEntry *)entry;
-
--(IFURIEntry *)entryForURL:(NSURL *)url;
--(IFURIEntry *)entryAtIndex:(int)index;
--(IFURIEntry *)removeEntryAtIndex:(int)index;
--(void)removeEntriesToIndex:(int)index;
-
- at end
diff --git a/WebKit/History.subproj/IFURIList.m b/WebKit/History.subproj/IFURIList.m
deleted file mode 100644
index 600617e..0000000
--- a/WebKit/History.subproj/IFURIList.m
+++ /dev/null
@@ -1,334 +0,0 @@
-/* IFURIList.m
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import "IFURIList.h"
-#import "IFURIEntry.h"
-#import "WebKitDebug.h"
-
-struct IFURIListNode
-{
- unsigned hash;
- IFURIEntry *entry;
- IFURIListNode *prev;
- IFURIListNode *next;
-};
-
-static IFURIListNode *newURIListNode(IFURIEntry *entry)
-{
- IFURIListNode *node;
-
- [entry retain];
-
- node = malloc(sizeof(IFURIListNode));
- node->hash = [entry hash];
- node->entry = entry;
- node->prev = nil;
- node->next = nil;
-
- return node;
-}
-
-static void freeNode(IFURIListNode *node)
-{
- // it is important to autorelase here rather than using
- // a straight release since we often return an entry
- // as a result of an operation that causes a node
- // to be freed
- [node->entry autorelease];
- free(node);
-}
-
-
- at implementation IFURIList
-
--(id)init
-{
- if (self != [super init])
- {
- return nil;
- }
-
- _head = _tail = nil;
- _count = 0;
- _maximumSize = -1;
- _allowsDuplicates = NO;
-
- return self;
-}
-
--(void)dealloc
-{
- IFURIListNode *curNode;
- IFURIListNode *delNode;
-
- curNode = _head;
-
- while (curNode) {
- delNode = curNode;
- curNode = curNode->next;
- freeNode(delNode);
- }
-
- [super dealloc];
-}
-
--(BOOL)allowsDuplicates
-{
- return _allowsDuplicates;
-}
-
--(void)setAllowsDuplicates:(BOOL)allowsDuplicates
-{
- _allowsDuplicates = allowsDuplicates;
-}
-
--(int)count
-{
- return _count;
-}
-
--(int)maximumSize
-{
- return _maximumSize;
-}
-
--(void)setMaximumSize:(int)size
-{
- WEBKIT_ASSERT(size > 0 || size == -1);
- _maximumSize = size;
-}
-
-
-
--(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
-{
- IFURIEntry *result;
-
- result = [[IFURIEntry alloc] initWithURL:url title:title];
- [self addEntry:result];
-
- return result;
-}
-
--(void)addEntry:(IFURIEntry *)entry
-{
- IFURIListNode *node;
- unsigned hash;
-
- if (!_allowsDuplicates) {
- // search the list first and remove any entry with the same URL
- // having the same title does not count
- // use the hash codes of the urls to speed up the linear search
- hash = [entry hash];
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [entry isEqual:node->entry]) {
- _count--;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
- }
-
- // make new entry and put it at the head of the list
- node = newURIListNode(entry);
- node->next = _head;
- _head = node;
- _count++;
- if (_count == 1) {
- _tail = _head;
- }
-
- if (_maximumSize != -1 && _count > _maximumSize) {
- // drop off the tail
- node = _tail;
- _tail = _tail->prev;
- _tail->next = nil;
- freeNode(node);
- _count--;
- }
-}
-
--(IFURIEntry *)removeURL:(NSURL *)url
-{
- IFURIEntry *removedEntry;
- IFURIListNode *node;
- unsigned hash;
-
- removedEntry = nil;
- hash = [url hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
- _count--;
- removedEntry = node->entry;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
-
- return removedEntry;
-}
-
--(BOOL)removeEntry:(IFURIEntry *)entry
-{
- BOOL removed;
- IFURIListNode *node;
- unsigned hash;
-
- removed = NO;
- hash = [entry hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [entry isEqual:node->entry]) {
- _count--;
- removed = YES;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
- break;
- }
- }
-
- return removed;
-}
-
--(IFURIEntry *)entryForURL:(NSURL *)url
-{
- IFURIEntry *foundEntry;
- IFURIListNode *node;
- unsigned hash;
-
- foundEntry = nil;
- hash = [url hash];
-
- for (node = _head; node != nil; node = node->next) {
- if (hash == node->hash && [url isEqual:[node->entry url]]) {
- foundEntry = node->entry;
- break;
- }
- }
-
- return foundEntry;
-}
-
--(IFURIEntry *)entryAtIndex:(int)index
-{
- int i;
- IFURIListNode *node;
-
- WEBKIT_ASSERT(index >= 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- node = node->next;
- }
-
- return node->entry;
-}
-
--(IFURIEntry *)removeEntryAtIndex:(int)index
-{
- IFURIEntry *removedEntry;
- IFURIListNode *node;
- int i;
-
- WEBKIT_ASSERT(index > 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- node = node->next;
- }
-
- _count--;
- removedEntry = node->entry;
- if (node == _head) {
- _head = node->next;
- if (_head) {
- _head->prev = nil;
- }
- }
- else if (node == _tail) {
- _tail = node->prev;
- if (_tail) {
- _tail->next = nil;
- }
- }
- else {
- node->prev->next = node->next;
- node->next->prev = node->prev;
- }
- freeNode(node);
-
- return removedEntry;
-}
-
--(void)removeEntriesToIndex:(int)index
-{
- IFURIListNode *node;
- IFURIListNode *delNode;
- int i;
-
- WEBKIT_ASSERT(index > 0 && index < _count);
-
- node = _head;
-
- for (i = 0; i < index; i++) {
- delNode = node;
- node = node->next;
- freeNode(delNode);
- _count--;
- }
-
- _head = node;
-}
-
- at end
diff --git a/WebKit/History.subproj/IFURLsWithTitles.h b/WebKit/History.subproj/IFURLsWithTitles.h
deleted file mode 100644
index 73d1cef..0000000
--- a/WebKit/History.subproj/IFURLsWithTitles.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// IFURLsWithTitles.h
-// WebKit
-//
-// Created by John Sullivan on Wed Jun 12 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-// Convenience class for getting URLs and associated titles on and off an NSPasteboard
-
-#import <Cocoa/Cocoa.h>
-
-#define IFURLsWithTitlesPboardType @"IFURLsWithTitlesPboardType"
-
- at interface IFURLsWithTitles : NSObject
-
-// Writes parallel arrays of URLs and titles to the pasteboard. These items can be retrieved by
-// calling URLsFromPasteboard and titlesFromPasteboard. URLs must consist of NSURL objects.
-// titles must consist of NSStrings, or be nil. If titles is nil, or if titles is a different
-// length than URLs, empty strings will be used for all titles. If URLs is nil, this method
-// returns without doing anything. You must declare an IFURLsWithTitlesPboardType data type
-// for pasteboard before invoking this method, or it will return without doing anything.
-+(void)writeURLs:(NSArray *)URLs andTitles:(NSArray *)titles toPasteboard:(NSPasteboard *)pasteboard;
-
-// Reads an array of NSURLs off the pasteboard. Returns nil if pasteboard does not contain
-// data of type IFURLsWithTitlesPboardType. This array consists of the URLs that correspond to
-// the titles returned from titlesFromPasteboard.
-+(NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard;
-
-// Reads an array of NSStrings off the pasteboard. Returns nil if pasteboard does not contain
-// data of type IFURLsWithTitlesPboardType. This array consists of the titles that correspond to
-// the URLs returned from URLsFromPasteboard.
-+(NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard;
-
- at end
diff --git a/WebKit/History.subproj/IFURLsWithTitles.m b/WebKit/History.subproj/IFURLsWithTitles.m
deleted file mode 100644
index 0047a78..0000000
--- a/WebKit/History.subproj/IFURLsWithTitles.m
+++ /dev/null
@@ -1,87 +0,0 @@
-//
-// IFURLsWithTitles.m
-// WebBrowser
-//
-// Created by John Sullivan on Wed Jun 12 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFURLsWithTitles.h"
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFNSURLExtensions.h>
-
- at implementation IFURLsWithTitles
-
-+ (NSArray *)arrayWithIFURLsWithTitlesPboardType
-{
- // Make a canned array so we don't construct it on the fly over and over.
- static NSArray *cannedArray = nil;
-
- if (cannedArray == nil) {
- cannedArray = [[NSArray arrayWithObject:IFURLsWithTitlesPboardType] retain];
- }
-
- return cannedArray;
-}
-
-+(void)writeURLs:(NSArray *)URLs andTitles:(NSArray *)titles toPasteboard:(NSPasteboard *)pasteboard
-{
- NSMutableArray *URLStrings;
- NSMutableArray *titlesOrEmptyStrings;
- unsigned index, count;
-
- count = [URLs count];
- if (count == 0) {
- return;
- }
-
- if ([pasteboard availableTypeFromArray:[self arrayWithIFURLsWithTitlesPboardType]] == nil) {
- return;
- }
-
- if (count != [titles count]) {
- titles = nil;
- }
-
- URLStrings = [NSMutableArray arrayWithCapacity:count];
- titlesOrEmptyStrings = [NSMutableArray arrayWithCapacity:count];
- for (index = 0; index < count; ++index) {
- [URLStrings addObject:[[URLs objectAtIndex:index] absoluteString]];
- [titlesOrEmptyStrings addObject:(titles == nil) ? @"" : [titles objectAtIndex:index]];
- }
-
- [pasteboard setPropertyList:[NSArray arrayWithObjects:URLStrings, titlesOrEmptyStrings, nil]
- forType:IFURLsWithTitlesPboardType];
-}
-
-+(NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard
-{
- if ([pasteboard availableTypeFromArray:[self arrayWithIFURLsWithTitlesPboardType]] == nil) {
- return nil;
- }
-
- return [[pasteboard propertyListForType:IFURLsWithTitlesPboardType] objectAtIndex:1];
-}
-
-+(NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard
-{
- NSArray *URLStrings;
- NSMutableArray *URLs;
- unsigned index, count;
-
- if ([pasteboard availableTypeFromArray:[self arrayWithIFURLsWithTitlesPboardType]] == nil) {
- return nil;
- }
-
- URLStrings = [[pasteboard propertyListForType:IFURLsWithTitlesPboardType] objectAtIndex:0];
- count = [URLStrings count];
- URLs = [NSMutableArray arrayWithCapacity:count];
- for (index = 0; index < count; ++index) {
- [URLs addObject:[NSURL _IF_URLWithString:[URLStrings objectAtIndex:index]]];
- }
-
- return URLs;
-}
-
- at end
diff --git a/WebKit/History.subproj/IFWebHistory.h b/WebKit/History.subproj/IFWebHistory.h
deleted file mode 100644
index 56fb55b..0000000
--- a/WebKit/History.subproj/IFWebHistory.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// IFWebHistory.h
-// WebKit
-//
-// Created by John Sullivan on Mon Feb 18 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at class IFURIEntry;
- at class IFWebHistoryPrivate;
-
-// notification sent when history is modified
-#define IFWebHistoryEntriesChangedNotification @"IFWebHistoryEntriesChangedNotification"
-
- at interface IFWebHistory : NSObject {
- at private
- IFWebHistoryPrivate *_historyPrivate;
-}
-
-+ (IFWebHistory *)webHistoryWithFile: (NSString *)file;
-- (id)initWithFile: (NSString *)file;
-
-// modifying contents
-- (void)addEntry: (IFURIEntry *)entry;
-- (void)addEntries:(NSArray *)newEntries;
-- (void)removeEntry: (IFURIEntry *)entry;
-- (void)removeEntries: (NSArray *)entries;
-- (void)removeAllEntries;
-
-// Update an entry in place. Any nil "new" parameters aren't updated.
-- (void)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString;
-
-// retrieving contents for date-based presentation
-
-// get an array of NSCalendarDate, each one representing a unique day that contains one
-// or more history entries, ordered from most recent to oldest.
-- (NSArray *)orderedLastVisitedDays;
-
-// get an array of IFURIEntry that were last visited on the day represented by the
-// specified NSCalendarDate, ordered from most recent to oldest.
-- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)calendarDate;
-
-// retrieving contents for autocompletion in location field
-- (NSArray *)entriesWithAddressContainingString: (NSString *)string;
-
-// retrieving contents for searching (maybe replace with state-based search API)
-- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string;
-
-// testing contents for visited-link mechanism
-- (BOOL)containsURL: (NSURL *)url;
-
-// storing contents on disk
-
-// The file path used for storing history, specified in -[IFWebHistory initWithFile:] or +[IFWebHistory webHistoryWithFile:]
-- (NSString *)file;
-
-// Load history from file. This happens automatically at init time, and need not normally be called.
-- (BOOL)loadHistory;
-
-// Save history to file. It is the client's responsibility to call this at appropriate times.
-- (BOOL)saveHistory;
-
- at end
diff --git a/WebKit/History.subproj/IFWebHistory.m b/WebKit/History.subproj/IFWebHistory.m
deleted file mode 100644
index b1b7eed..0000000
--- a/WebKit/History.subproj/IFWebHistory.m
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// IFWebHistory.m
-// WebKit
-//
-// Created by John Sullivan on Mon Feb 18 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFWebHistory.h"
-#import "IFWebHistoryPrivate.h"
-
- at implementation IFWebHistory
-
-+ (IFWebHistory *)webHistoryWithFile: (NSString*)file
-{
- return [[[self alloc] initWithFile:file] autorelease];
-}
-
-- (id)initWithFile: (NSString *)file;
-{
- if ((self = [super init]) != nil) {
- _historyPrivate = [[IFWebHistoryPrivate alloc] initWithFile:file];
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- [_historyPrivate release];
- [super dealloc];
-}
-
-#pragma mark MODIFYING CONTENTS
-
-- (void)sendEntriesChangedNotification
-{
- [[NSNotificationCenter defaultCenter]
- postNotificationName: IFWebHistoryEntriesChangedNotification
- object: self];
-}
-
-- (void)addEntry: (IFURIEntry *)entry
-{
- [_historyPrivate addEntry: entry];
- [self sendEntriesChangedNotification];
-}
-
-- (void)removeEntry: (IFURIEntry *)entry
-{
- if ([_historyPrivate removeEntry: entry]) {
- [self sendEntriesChangedNotification];
- }
-}
-
-- (void)removeEntries: (NSArray *)entries
-{
- if ([_historyPrivate removeEntries:entries]) {
- [self sendEntriesChangedNotification];
- }
-}
-
-- (void)removeAllEntries
-{
- if ([_historyPrivate removeAllEntries]) {
- [self sendEntriesChangedNotification];
- }
-}
-
-- (void)addEntries:(NSArray *)newEntries
-{
- [_historyPrivate addEntries:newEntries];
- [self sendEntriesChangedNotification];
-}
-
-- (void)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString
-{
- if ([_historyPrivate updateURL:newURLString title:newTitle displayTitle:newDisplayTitle forURL:oldURLString] != nil) {
- // Consider passing changed entry as parameter to notification
- [self sendEntriesChangedNotification];
- }
-}
-
-
-#pragma mark DATE-BASED RETRIEVAL
-
-- (NSArray *)orderedLastVisitedDays
-{
- return [_historyPrivate orderedLastVisitedDays];
-}
-
-- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)date
-{
- return [_historyPrivate orderedEntriesLastVisitedOnDay: date];
-}
-
-#pragma mark STRING-BASED RETRIEVAL
-
-- (NSArray *)entriesWithAddressContainingString: (NSString *)string
-{
- return [_historyPrivate entriesWithAddressContainingString: string];
-}
-
-- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string
-{
- return [_historyPrivate entriesWithTitleOrAddressContainingString: string];
-}
-
-#pragma mark URL MATCHING
-
-- (BOOL)containsURL: (NSURL *)url
-{
- return [_historyPrivate containsURL: url];
-}
-
-#pragma mark SAVING TO DISK
-
-- (NSString *)file
-{
- return [_historyPrivate file];
-}
-
-- (BOOL)loadHistory
-{
- if ([_historyPrivate loadHistory]) {
- [self sendEntriesChangedNotification];
- return YES;
- }
- return NO;
-}
-
-- (BOOL)saveHistory
-{
- return [_historyPrivate saveHistory];
-}
-
- at end
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.h b/WebKit/History.subproj/IFWebHistoryPrivate.h
deleted file mode 100644
index 131e49b..0000000
--- a/WebKit/History.subproj/IFWebHistoryPrivate.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// IFWebHistoryPrivate.h
-// WebKit
-//
-// Created by John Sullivan on Tue Feb 19 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at class IFURIEntry;
-
- at interface IFWebHistoryPrivate : NSObject {
- at private
- NSMutableDictionary *_urlDictionary;
- NSMutableArray *_datesWithEntries;
- NSMutableArray *_entriesByDate;
- NSString *_file;
-}
-
-- (id)initWithFile: (NSString *)file;
-
-- (void)addEntry: (IFURIEntry *)entry;
-- (void)addEntries:(NSArray *)newEntries;
-- (BOOL)removeEntry: (IFURIEntry *)entry;
-- (BOOL)removeEntries: (NSArray *)entries;
-- (BOOL)removeAllEntries;
-- (IFURIEntry *)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString;
-
-- (NSArray *)orderedLastVisitedDays;
-- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)calendarDate;
-- (NSArray *)entriesWithAddressContainingString: (NSString *)string;
-- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string;
-- (BOOL)containsURL: (NSURL *)url;
-
-- (NSString *)file;
-- (BOOL)loadHistory;
-- (BOOL)saveHistory;
-
- at end
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.m b/WebKit/History.subproj/IFWebHistoryPrivate.m
deleted file mode 100644
index c909dcf..0000000
--- a/WebKit/History.subproj/IFWebHistoryPrivate.m
+++ /dev/null
@@ -1,482 +0,0 @@
-//
-// IFWebHistoryPrivate.m
-// WebKit
-//
-// Created by John Sullivan on Tue Feb 19 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFWebHistoryPrivate.h"
-
-#import <WebFoundation/IFNSCalendarDateExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
-#import <WebKit/WebKitDebug.h>
-#import "IFURIEntry.h"
-
- at interface IFWebHistoryPrivate (Private)
--(IFURIEntry *)_entryForURLString:(NSString *)urlString;
- at end
-
- at implementation IFWebHistoryPrivate
-
-#pragma mark OBJECT FRAMEWORK
-
-+ (void)initialize
-{
- [[NSUserDefaults standardUserDefaults] registerDefaults:
- [NSDictionary dictionaryWithObjectsAndKeys:
- @"1000", @"WebKitHistoryItemLimit",
- @"7", @"WebKitHistoryAgeInDaysLimit",
- nil]];
-}
-
-- (id)initWithFile: (NSString *)file
-{
- if (![super init]) {
- return nil;
- }
-
- _urlDictionary = [[NSMutableDictionary alloc] init];
- _datesWithEntries = [[NSMutableArray alloc] init];
- _entriesByDate = [[NSMutableArray alloc] init];
- _file = [file retain];
-
- // read history from disk
- [self loadHistory];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_urlDictionary release];
- [_datesWithEntries release];
- [_entriesByDate release];
- [_file release];
-
- [super dealloc];
-}
-
-#pragma mark MODIFYING CONTENTS
-
-// Returns whether the day is already in the list of days,
-// and fills in *index with the found or proposed index.
-- (BOOL)findIndex: (int *)index forDay: (NSCalendarDate *)date
-{
- int count;
-
- WEBKIT_ASSERT_VALID_ARG (index, index != nil);
-
- //FIXME: just does linear search through days; inefficient if many days
- count = [_datesWithEntries count];
- for (*index = 0; *index < count; ++*index) {
- NSComparisonResult result = [date _IF_compareDay: [_datesWithEntries objectAtIndex: *index]];
- if (result == NSOrderedSame) {
- return YES;
- }
- if (result == NSOrderedDescending) {
- return NO;
- }
- }
-
- return NO;
-}
-
-- (void)insertEntry: (IFURIEntry *)entry atDateIndex: (int)dateIndex
-{
- int index, count;
- NSMutableArray *entriesForDate;
- NSCalendarDate *entryDate;
-
- WEBKIT_ASSERT_VALID_ARG (entry, entry != nil);
- WEBKIT_ASSERT_VALID_ARG (dateIndex, dateIndex >= 0 && (uint)dateIndex < [_entriesByDate count]);
-
- //FIXME: just does linear search through entries; inefficient if many entries for this date
- entryDate = [entry lastVisitedDate];
- entriesForDate = [_entriesByDate objectAtIndex: dateIndex];
- count = [entriesForDate count];
- for (index = 0; index < count; ++index) {
- if ([entryDate compare: [[entriesForDate objectAtIndex: index] lastVisitedDate]] != NSOrderedAscending) {
- break;
- }
- }
-
- [entriesForDate insertObject: entry atIndex: index];
-}
-
-- (BOOL)removeEntryForURLString: (NSString *)urlString
-{
- NSMutableArray *entriesForDate;
- IFURIEntry *entry;
- int dateIndex;
- BOOL foundDate;
-
- entry = [_urlDictionary objectForKey: urlString];
- if (entry == nil) {
- return NO;
- }
-
- [_urlDictionary removeObjectForKey: urlString];
-
- foundDate = [self findIndex: &dateIndex forDay: [entry lastVisitedDate]];
-
- WEBKIT_ASSERT (foundDate);
-
- entriesForDate = [_entriesByDate objectAtIndex: dateIndex];
- [entriesForDate removeObject: entry];
-
- // remove this date entirely if there are no other entries on it
- if ([entriesForDate count] == 0) {
- [_entriesByDate removeObjectAtIndex: dateIndex];
- [_datesWithEntries removeObjectAtIndex: dateIndex];
- }
-
- return YES;
-}
-
-
-- (void)addEntry: (IFURIEntry *)entry
-{
- int dateIndex;
- NSString *urlString;
-
- WEBKIT_ASSERT_VALID_ARG (entry, [entry lastVisitedDate] != nil);
-
- urlString = [[entry url] absoluteString];
- [self removeEntryForURLString: urlString];
-
- if ([self findIndex: &dateIndex forDay: [entry lastVisitedDate]]) {
- // other entries already exist for this date
- [self insertEntry: entry atDateIndex: dateIndex];
- } else {
- // no other entries exist for this date
- [_datesWithEntries insertObject: [entry lastVisitedDate] atIndex: dateIndex];
- [_entriesByDate insertObject: [NSMutableArray arrayWithObject:entry] atIndex: dateIndex];
- }
-
- [_urlDictionary setObject: entry forKey: urlString];
-}
-
-- (BOOL)removeEntry: (IFURIEntry *)entry
-{
- IFURIEntry *matchingEntry;
- NSString *urlString;
-
- urlString = [[entry url] absoluteString];
-
- // If this exact object isn't stored, then make no change.
- // FIXME: Is this the right behavior if this entry isn't present, but another entry for the same URL is?
- // Maybe need to change the API to make something like removeEntryForURLString public instead.
- matchingEntry = [_urlDictionary objectForKey: urlString];
- if (matchingEntry != entry) {
- return NO;
- }
-
- [self removeEntryForURLString: urlString];
-
- return YES;
-}
-
-- (BOOL)removeEntries: (NSArray *)entries
-{
- int index, count;
-
- count = [entries count];
- if (count == 0) {
- return NO;
- }
-
- for (index = 0; index < count; ++index) {
- [self removeEntry:[entries objectAtIndex:index]];
- }
-
- return YES;
-}
-
-- (BOOL)removeAllEntries
-{
- if ([_urlDictionary count] == 0) {
- return NO;
- }
-
- [_entriesByDate removeAllObjects];
- [_datesWithEntries removeAllObjects];
- [_urlDictionary removeAllObjects];
-
- return YES;
-}
-
-- (void)addEntries:(NSArray *)newEntries
-{
- NSEnumerator *enumerator;
- IFURIEntry *entry;
-
- // There is no guarantee that the incoming entries are in any particular
- // order, but if this is called with a set of entries that were created by
- // iterating through the results of orderedLastVisitedDays and orderedEntriesLastVisitedOnDayy
- // then they will be ordered chronologically from newest to oldest. We can make adding them
- // faster (fewer compares) by inserting them from oldest to newest.
- enumerator = [newEntries reverseObjectEnumerator];
- while ((entry = [enumerator nextObject]) != nil) {
- [self addEntry:entry];
- }
-}
-
-- (IFURIEntry *)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString
-{
- IFURIEntry *entry;
-
- WEBKIT_ASSERT (oldURLString != nil);
-
- entry = [self _entryForURLString:oldURLString];
- if (entry == nil) {
- return nil;
- }
-
- if (newURLString != nil) {
- [entry setURL:[NSURL _IF_URLWithString:newURLString]];
- }
-
- if (newTitle != nil) {
- [entry setTitle:newTitle];
- }
-
- if (newDisplayTitle != nil) {
- [entry setDisplayTitle:newDisplayTitle];
- }
-
- return entry;
-}
-
-#pragma mark DATE-BASED RETRIEVAL
-
-- (NSArray *)orderedLastVisitedDays
-{
- return _datesWithEntries;
-}
-
-- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)date
-{
- int index;
-
- if ([self findIndex: &index forDay: date]) {
- return [_entriesByDate objectAtIndex: index];
- }
-
- return nil;
-}
-
-#pragma mark STRING-BASED RETRIEVAL
-
-- (NSArray *)entriesWithAddressContainingString: (NSString *)string
-{
- // FIXME: not yet implemented
- return nil;
-}
-
-- (NSArray *)entriesWithTitleOrAddressContainingString: (NSString *)string
-{
- // FIXME: not yet implemented
- return nil;
-}
-
-#pragma mark URL MATCHING
-
--(IFURIEntry *)_entryForURLString:(NSString *)urlString
-{
- return [_urlDictionary objectForKey: urlString];
-}
-
-- (BOOL)containsURL: (NSURL *)url
-{
- return [self _entryForURLString:[url absoluteString]] != nil;
-}
-
-#pragma mark ARCHIVING/UNARCHIVING
-
-// Return a date that marks the age limit for history entries saved to or
-// loaded from disk. Any entry on this day or older should be rejected,
-// as tested with -[NSCalendarDate compareDay:]
-- (NSCalendarDate *)_ageLimitDate
-{
- int ageInDaysLimit;
-
- ageInDaysLimit = [[NSUserDefaults standardUserDefaults] integerForKey: @"WebKitHistoryAgeInDaysLimit"];
- return [[NSCalendarDate calendarDate] dateByAddingYears:0 months:0 days:-ageInDaysLimit
- hours:0 minutes:0 seconds:0];
-}
-
-// Return a flat array of IFURIEntries. Leaves out entries older than the age limit.
-// Stops filling array when item count limit is reached, even if there are currently
-// more entries than that.
-- (NSArray *)arrayRepresentation
-{
- int dateCount, dateIndex;
- int limit;
- int totalSoFar;
- NSMutableArray *arrayRep;
- NSCalendarDate *ageLimitDate;
-
- arrayRep = [NSMutableArray array];
-
- limit = [[NSUserDefaults standardUserDefaults] integerForKey: @"WebKitHistoryItemLimit"];
- ageLimitDate = [self _ageLimitDate];
- totalSoFar = 0;
-
- dateCount = [_entriesByDate count];
- for (dateIndex = 0; dateIndex < dateCount; ++dateIndex) {
- int entryCount, entryIndex;
- NSArray *entries;
-
- // skip remaining days if they are older than the age limit
- if ([[_datesWithEntries objectAtIndex:dateIndex] _IF_compareDay:ageLimitDate] != NSOrderedDescending) {
- break;
- }
-
- entries = [_entriesByDate objectAtIndex:dateIndex];
- entryCount = [entries count];
- for (entryIndex = 0; entryIndex < entryCount; ++entryIndex) {
- if (totalSoFar++ >= limit) {
- break;
- }
- [arrayRep addObject: [[entries objectAtIndex:entryIndex] dictionaryRepresentation]];
- }
- }
-
- return arrayRep;
-}
-
-- (NSString *)file
-{
- return _file;
-}
-
-- (BOOL)_loadHistoryGuts: (int *)numberOfItemsLoaded
-{
- NSString *path;
- NSArray *array;
- NSEnumerator *enumerator;
- NSDictionary *dictionary;
- int index;
- int limit;
- NSCalendarDate *ageLimitDate;
- BOOL ageLimitPassed;
-
- *numberOfItemsLoaded = 0;
-
- path = [self file];
- if (path == nil) {
- WEBKITDEBUG("couldn't load history; couldn't find or create directory to store it in\n");
- return NO;
- }
-
- array = [NSArray arrayWithContentsOfFile: path];
- if (array == nil) {
- if (![[NSFileManager defaultManager] fileExistsAtPath: path]) {
- WEBKITDEBUG("no history file found at %s\n",
- DEBUG_OBJECT(path));
- } else {
- WEBKITDEBUG("attempt to read history from %s failed; perhaps contents are corrupted\n",
- DEBUG_OBJECT(path));
- }
- return NO;
- }
-
- limit = [[NSUserDefaults standardUserDefaults] integerForKey: @"WebKitHistoryItemLimit"];
- ageLimitDate = [self _ageLimitDate];
- index = 0;
- // reverse dates so you're loading the oldest first, to minimize the number of comparisons
- enumerator = [array reverseObjectEnumerator];
- ageLimitPassed = NO;
-
- while ((dictionary = [enumerator nextObject]) != nil) {
- IFURIEntry *entry;
-
- entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary] autorelease];
-
- if ([entry url] == nil) {
- // entry without url is useless; data on disk must have been bad; ignore this one
- continue;
- }
-
- // test against date limit
- if (!ageLimitPassed) {
- if ([[entry lastVisitedDate] _IF_compareDay:ageLimitDate] != NSOrderedDescending) {
- continue;
- } else {
- ageLimitPassed = YES;
- }
- }
-
- [self addEntry: entry];
- if (++index >= limit) {
- break;
- }
- }
-
- *numberOfItemsLoaded = MIN(index, limit);
- return YES;
-}
-
-- (BOOL)loadHistory
-{
- int numberOfItems;
- double start, duration;
- BOOL result;
-
- start = CFAbsoluteTimeGetCurrent();
- result = [self _loadHistoryGuts: &numberOfItems];
-
- if (result) {
- duration = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "loading %d history entries from %s took %f seconds\n",
- numberOfItems, DEBUG_OBJECT([self file]), duration);
- }
-
- return result;
-}
-
-- (BOOL)_saveHistoryGuts: (int *)numberOfItemsSaved
-{
- NSString *path;
- NSArray *array;
- *numberOfItemsSaved = 0;
-
- path = [self file];
- if (path == nil) {
- WEBKITDEBUG("couldn't save history; couldn't find or create directory to store it in\n");
- return NO;
- }
-
- array = [self arrayRepresentation];
- if (![array writeToFile:path atomically:YES]) {
- WEBKITDEBUG("attempt to save %s to %s failed\n", DEBUG_OBJECT(array), DEBUG_OBJECT(path));
- return NO;
- }
-
- *numberOfItemsSaved = [array count];
- return YES;
-}
-
-- (BOOL)saveHistory
-{
- int numberOfItems;
- double start, duration;
- BOOL result;
-
- start = CFAbsoluteTimeGetCurrent();
- result = [self _saveHistoryGuts: &numberOfItems];
-
- if (result) {
- duration = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "saving %d history entries to %s took %f seconds\n",
- numberOfItems, DEBUG_OBJECT([self file]), duration);
- }
-
- return result;
-}
-
- at end
diff --git a/WebKit/History.subproj/WebBackForwardList.h b/WebKit/History.subproj/WebBackForwardList.h
index 2b32010..4e743ae 100644
--- a/WebKit/History.subproj/WebBackForwardList.h
+++ b/WebKit/History.subproj/WebBackForwardList.h
@@ -1,14 +1,14 @@
-/* IFBackForwardList.h
+/* WebBackForwardList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
- at class IFURIList;
- at class IFURIEntry;
+ at class WebHistoryList;
+ at class WebHistoryItem;
- at interface IFBackForwardList : NSObject {
- IFURIList *uriList;
+ at interface WebBackForwardList : NSObject {
+ WebHistoryList *uriList;
int index;
NSLock *mutex;
int state;
@@ -17,16 +17,16 @@
-(id)init;
// add to the list
--(void)addEntry:(IFURIEntry *)entry;
+-(void)addEntry:(WebHistoryItem *)entry;
// change position in the list
-(void)goBack;
-(void)goForward;
// examine entries without changing position
--(IFURIEntry *)backEntry;
--(IFURIEntry *)currentEntry;
--(IFURIEntry *)forwardEntry;
+-(WebHistoryItem *)backEntry;
+-(WebHistoryItem *)currentEntry;
+-(WebHistoryItem *)forwardEntry;
// examine entire list
-(NSArray *)backList;
diff --git a/WebKit/History.subproj/WebBackForwardList.m b/WebKit/History.subproj/WebBackForwardList.m
index c44ad40..cdaa5cd 100644
--- a/WebKit/History.subproj/WebBackForwardList.m
+++ b/WebKit/History.subproj/WebBackForwardList.m
@@ -1,17 +1,17 @@
//
-// IFBackForwardList.m
+// WebBackForwardList.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001 __MyCompanyName__. All rights reserved.
//
-#import "IFBackForwardList.h"
+#import "WebBackForwardList.h"
-#import "IFURIEntry.h"
-#import "IFURIList.h"
+#import "WebHistoryItem.h"
+#import "WebHistoryList.h"
- at implementation IFBackForwardList
+ at implementation WebBackForwardList
-(id)init
{
@@ -20,7 +20,7 @@
return nil;
}
- uriList = [[IFURIList alloc] init];
+ uriList = [[WebHistoryList alloc] init];
[uriList setAllowsDuplicates:YES];
index = 0;
mutex = [[NSLock alloc] init];
@@ -36,7 +36,7 @@
[super dealloc];
}
--(void)addEntry:(IFURIEntry *)entry
+-(void)addEntry:(WebHistoryItem *)entry
{
[mutex lock];
if (index > 0) {
@@ -54,9 +54,9 @@
[mutex unlock];
}
--(IFURIEntry *)backEntry
+-(WebHistoryItem *)backEntry
{
- IFURIEntry *result;
+ WebHistoryItem *result;
int count;
[mutex lock];
@@ -71,9 +71,9 @@
return result;
}
--(IFURIEntry *)currentEntry
+-(WebHistoryItem *)currentEntry
{
- IFURIEntry *result;
+ WebHistoryItem *result;
[mutex lock];
result = [uriList entryAtIndex:index];
@@ -82,9 +82,9 @@
return result;
}
--(IFURIEntry *)forwardEntry
+-(WebHistoryItem *)forwardEntry
{
- IFURIEntry *result;
+ WebHistoryItem *result;
[mutex lock];
if (index > 0) {
@@ -150,7 +150,7 @@
result = [NSMutableString stringWithCapacity:512];
[result appendString:@"\n--------------------------------------------\n"];
- [result appendString:@"IFBackForwardList:\n"];
+ [result appendString:@"WebBackForwardList:\n"];
for (i = 0; i < [uriList count]; i++) {
if (i == index) {
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 56fb55b..2599d7f 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -1,5 +1,5 @@
//
-// IFWebHistory.h
+// WebHistory.h
// WebKit
//
// Created by John Sullivan on Mon Feb 18 2002.
@@ -8,24 +8,24 @@
#import <Foundation/Foundation.h>
- at class IFURIEntry;
- at class IFWebHistoryPrivate;
+ at class WebHistoryItem;
+ at class WebHistoryPrivate;
// notification sent when history is modified
-#define IFWebHistoryEntriesChangedNotification @"IFWebHistoryEntriesChangedNotification"
+#define WebHistoryEntriesChangedNotification @"WebHistoryEntriesChangedNotification"
- at interface IFWebHistory : NSObject {
+ at interface WebHistory : NSObject {
@private
- IFWebHistoryPrivate *_historyPrivate;
+ WebHistoryPrivate *_historyPrivate;
}
-+ (IFWebHistory *)webHistoryWithFile: (NSString *)file;
++ (WebHistory *)webHistoryWithFile: (NSString *)file;
- (id)initWithFile: (NSString *)file;
// modifying contents
-- (void)addEntry: (IFURIEntry *)entry;
+- (void)addEntry: (WebHistoryItem *)entry;
- (void)addEntries:(NSArray *)newEntries;
-- (void)removeEntry: (IFURIEntry *)entry;
+- (void)removeEntry: (WebHistoryItem *)entry;
- (void)removeEntries: (NSArray *)entries;
- (void)removeAllEntries;
@@ -41,7 +41,7 @@
// or more history entries, ordered from most recent to oldest.
- (NSArray *)orderedLastVisitedDays;
-// get an array of IFURIEntry that were last visited on the day represented by the
+// get an array of WebHistoryItem that were last visited on the day represented by the
// specified NSCalendarDate, ordered from most recent to oldest.
- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)calendarDate;
@@ -56,7 +56,7 @@
// storing contents on disk
-// The file path used for storing history, specified in -[IFWebHistory initWithFile:] or +[IFWebHistory webHistoryWithFile:]
+// The file path used for storing history, specified in -[WebHistory initWithFile:] or +[WebHistory webHistoryWithFile:]
- (NSString *)file;
// Load history from file. This happens automatically at init time, and need not normally be called.
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index b1b7eed..07462c6 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -1,17 +1,17 @@
//
-// IFWebHistory.m
+// WebHistory.m
// WebKit
//
// Created by John Sullivan on Mon Feb 18 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFWebHistory.h"
-#import "IFWebHistoryPrivate.h"
+#import "WebHistory.h"
+#import "WebHistoryPrivate.h"
- at implementation IFWebHistory
+ at implementation WebHistory
-+ (IFWebHistory *)webHistoryWithFile: (NSString*)file
++ (WebHistory *)webHistoryWithFile: (NSString*)file
{
return [[[self alloc] initWithFile:file] autorelease];
}
@@ -19,7 +19,7 @@
- (id)initWithFile: (NSString *)file;
{
if ((self = [super init]) != nil) {
- _historyPrivate = [[IFWebHistoryPrivate alloc] initWithFile:file];
+ _historyPrivate = [[WebHistoryPrivate alloc] initWithFile:file];
}
return self;
@@ -36,17 +36,17 @@
- (void)sendEntriesChangedNotification
{
[[NSNotificationCenter defaultCenter]
- postNotificationName: IFWebHistoryEntriesChangedNotification
+ postNotificationName: WebHistoryEntriesChangedNotification
object: self];
}
-- (void)addEntry: (IFURIEntry *)entry
+- (void)addEntry: (WebHistoryItem *)entry
{
[_historyPrivate addEntry: entry];
[self sendEntriesChangedNotification];
}
-- (void)removeEntry: (IFURIEntry *)entry
+- (void)removeEntry: (WebHistoryItem *)entry
{
if ([_historyPrivate removeEntry: entry]) {
[self sendEntriesChangedNotification];
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 8ebf93f..c994480 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -1,5 +1,5 @@
//
-// IFURIEntry.h
+// WebHistoryItem.h
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
- at interface IFURIEntry : NSObject
+ at interface WebHistoryItem : NSObject
{
NSURL *_url;
NSString *_title;
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 2747aaa..5a52d4e 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -1,17 +1,17 @@
//
-// IFURIEntry.m
+// WebHistoryItem.m
// WebKit
//
// Created by Kenneth Kocienda on Thu Nov 29 2001.
// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFURIEntry.h"
+#import "WebHistoryItem.h"
#import "WebKitReallyPrivate.h"
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSURLExtras.h>
- at implementation IFURIEntry
+ at implementation WebHistoryItem
-(id)init
{
@@ -77,7 +77,7 @@
// trying and failing to find it.
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
- [[NSBundle bundleForClass:[IFURIEntry class]] pathForResource:@"url_icon" ofType:@"tiff"];
+ [[NSBundle bundleForClass:[WebHistoryItem class]] pathForResource:@"url_icon" ofType:@"tiff"];
if (pathForDefaultImage != nil) {
defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
}
@@ -143,7 +143,7 @@
result = NO;
- if ([anObject isMemberOfClass:[IFURIEntry class]]) {
+ if ([anObject isMemberOfClass:[WebHistoryItem class]]) {
result = [_url isEqual:[anObject url]];
}
@@ -152,7 +152,7 @@
-(NSString *)description
{
- return [NSString stringWithFormat:@"IFURIEntry %@", _url];
+ return [NSString stringWithFormat:@"WebHistoryItem %@", _url];
}
@@ -187,7 +187,7 @@
// FIXME: doesn't save/restore images yet
storedURLString = [dict objectForKey: @"url"];
if (storedURLString != nil) {
- _url = [[NSURL _IF_URLWithString:storedURLString] retain];
+ _url = [[NSURL _web_URLWithString:storedURLString] retain];
}
_title = [[dict objectForKey: @"title"] copy];
_displayTitle = [[dict objectForKey: @"displayTitle"] copy];
diff --git a/WebKit/History.subproj/WebHistoryList.h b/WebKit/History.subproj/WebHistoryList.h
index 074b722..05f2ffa 100644
--- a/WebKit/History.subproj/WebHistoryList.h
+++ b/WebKit/History.subproj/WebHistoryList.h
@@ -1,17 +1,17 @@
-/* IFURIList.h
+/* WebHistoryList.h
Copyright 2001, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
- at class IFURIEntry;
+ at class WebHistoryItem;
-typedef struct IFURIListNode IFURIListNode;
+typedef struct WebHistoryListNode WebHistoryListNode;
- at interface IFURIList : NSObject
+ at interface WebHistoryList : NSObject
{
- IFURIListNode *_head;
- IFURIListNode *_tail;
+ WebHistoryListNode *_head;
+ WebHistoryListNode *_tail;
int _count;
BOOL _allowsDuplicates;
int _maximumSize;
@@ -27,14 +27,14 @@ typedef struct IFURIListNode IFURIListNode;
-(int)maximumSize;
-(void)setMaximumSize:(int)size;
--(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
--(void)addEntry:(IFURIEntry *)entry;
--(IFURIEntry *)removeURL:(NSURL *)url;
--(BOOL)removeEntry:(IFURIEntry *)entry;
+-(WebHistoryItem *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(void)addEntry:(WebHistoryItem *)entry;
+-(WebHistoryItem *)removeURL:(NSURL *)url;
+-(BOOL)removeEntry:(WebHistoryItem *)entry;
--(IFURIEntry *)entryForURL:(NSURL *)url;
--(IFURIEntry *)entryAtIndex:(int)index;
--(IFURIEntry *)removeEntryAtIndex:(int)index;
+-(WebHistoryItem *)entryForURL:(NSURL *)url;
+-(WebHistoryItem *)entryAtIndex:(int)index;
+-(WebHistoryItem *)removeEntryAtIndex:(int)index;
-(void)removeEntriesToIndex:(int)index;
@end
diff --git a/WebKit/History.subproj/WebHistoryList.m b/WebKit/History.subproj/WebHistoryList.m
index 600617e..819926e 100644
--- a/WebKit/History.subproj/WebHistoryList.m
+++ b/WebKit/History.subproj/WebHistoryList.m
@@ -1,26 +1,26 @@
-/* IFURIList.m
+/* WebHistoryList.m
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import "IFURIList.h"
-#import "IFURIEntry.h"
+#import "WebHistoryList.h"
+#import "WebHistoryItem.h"
#import "WebKitDebug.h"
-struct IFURIListNode
+struct WebHistoryListNode
{
unsigned hash;
- IFURIEntry *entry;
- IFURIListNode *prev;
- IFURIListNode *next;
+ WebHistoryItem *entry;
+ WebHistoryListNode *prev;
+ WebHistoryListNode *next;
};
-static IFURIListNode *newURIListNode(IFURIEntry *entry)
+static WebHistoryListNode *newURIListNode(WebHistoryItem *entry)
{
- IFURIListNode *node;
+ WebHistoryListNode *node;
[entry retain];
- node = malloc(sizeof(IFURIListNode));
+ node = malloc(sizeof(WebHistoryListNode));
node->hash = [entry hash];
node->entry = entry;
node->prev = nil;
@@ -29,7 +29,7 @@ static IFURIListNode *newURIListNode(IFURIEntry *entry)
return node;
}
-static void freeNode(IFURIListNode *node)
+static void freeNode(WebHistoryListNode *node)
{
// it is important to autorelase here rather than using
// a straight release since we often return an entry
@@ -40,7 +40,7 @@ static void freeNode(IFURIListNode *node)
}
- at implementation IFURIList
+ at implementation WebHistoryList
-(id)init
{
@@ -59,8 +59,8 @@ static void freeNode(IFURIListNode *node)
-(void)dealloc
{
- IFURIListNode *curNode;
- IFURIListNode *delNode;
+ WebHistoryListNode *curNode;
+ WebHistoryListNode *delNode;
curNode = _head;
@@ -101,19 +101,19 @@ static void freeNode(IFURIListNode *node)
--(IFURIEntry *)addURL:(NSURL *)url withTitle:(NSString *)title;
+-(WebHistoryItem *)addURL:(NSURL *)url withTitle:(NSString *)title;
{
- IFURIEntry *result;
+ WebHistoryItem *result;
- result = [[IFURIEntry alloc] initWithURL:url title:title];
+ result = [[WebHistoryItem alloc] initWithURL:url title:title];
[self addEntry:result];
return result;
}
--(void)addEntry:(IFURIEntry *)entry
+-(void)addEntry:(WebHistoryItem *)entry
{
- IFURIListNode *node;
+ WebHistoryListNode *node;
unsigned hash;
if (!_allowsDuplicates) {
@@ -165,10 +165,10 @@ static void freeNode(IFURIListNode *node)
}
}
--(IFURIEntry *)removeURL:(NSURL *)url
+-(WebHistoryItem *)removeURL:(NSURL *)url
{
- IFURIEntry *removedEntry;
- IFURIListNode *node;
+ WebHistoryItem *removedEntry;
+ WebHistoryListNode *node;
unsigned hash;
removedEntry = nil;
@@ -202,10 +202,10 @@ static void freeNode(IFURIListNode *node)
return removedEntry;
}
--(BOOL)removeEntry:(IFURIEntry *)entry
+-(BOOL)removeEntry:(WebHistoryItem *)entry
{
BOOL removed;
- IFURIListNode *node;
+ WebHistoryListNode *node;
unsigned hash;
removed = NO;
@@ -239,10 +239,10 @@ static void freeNode(IFURIListNode *node)
return removed;
}
--(IFURIEntry *)entryForURL:(NSURL *)url
+-(WebHistoryItem *)entryForURL:(NSURL *)url
{
- IFURIEntry *foundEntry;
- IFURIListNode *node;
+ WebHistoryItem *foundEntry;
+ WebHistoryListNode *node;
unsigned hash;
foundEntry = nil;
@@ -258,10 +258,10 @@ static void freeNode(IFURIListNode *node)
return foundEntry;
}
--(IFURIEntry *)entryAtIndex:(int)index
+-(WebHistoryItem *)entryAtIndex:(int)index
{
int i;
- IFURIListNode *node;
+ WebHistoryListNode *node;
WEBKIT_ASSERT(index >= 0 && index < _count);
@@ -274,10 +274,10 @@ static void freeNode(IFURIListNode *node)
return node->entry;
}
--(IFURIEntry *)removeEntryAtIndex:(int)index
+-(WebHistoryItem *)removeEntryAtIndex:(int)index
{
- IFURIEntry *removedEntry;
- IFURIListNode *node;
+ WebHistoryItem *removedEntry;
+ WebHistoryListNode *node;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
@@ -313,8 +313,8 @@ static void freeNode(IFURIListNode *node)
-(void)removeEntriesToIndex:(int)index
{
- IFURIListNode *node;
- IFURIListNode *delNode;
+ WebHistoryListNode *node;
+ WebHistoryListNode *delNode;
int i;
WEBKIT_ASSERT(index > 0 && index < _count);
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 131e49b..8e08f52 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -1,5 +1,5 @@
//
-// IFWebHistoryPrivate.h
+// WebHistoryPrivate.h
// WebKit
//
// Created by John Sullivan on Tue Feb 19 2002.
@@ -8,9 +8,9 @@
#import <Foundation/Foundation.h>
- at class IFURIEntry;
+ at class WebHistoryItem;
- at interface IFWebHistoryPrivate : NSObject {
+ at interface WebHistoryPrivate : NSObject {
@private
NSMutableDictionary *_urlDictionary;
NSMutableArray *_datesWithEntries;
@@ -20,12 +20,12 @@
- (id)initWithFile: (NSString *)file;
-- (void)addEntry: (IFURIEntry *)entry;
+- (void)addEntry: (WebHistoryItem *)entry;
- (void)addEntries:(NSArray *)newEntries;
-- (BOOL)removeEntry: (IFURIEntry *)entry;
+- (BOOL)removeEntry: (WebHistoryItem *)entry;
- (BOOL)removeEntries: (NSArray *)entries;
- (BOOL)removeAllEntries;
-- (IFURIEntry *)updateURL:(NSString *)newURLString
+- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
forURL:(NSString *)oldURLString;
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index c909dcf..c724242 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -1,23 +1,23 @@
//
-// IFWebHistoryPrivate.m
+// WebHistoryPrivate.m
// WebKit
//
// Created by John Sullivan on Tue Feb 19 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFWebHistoryPrivate.h"
+#import "WebHistoryPrivate.h"
-#import <WebFoundation/IFNSCalendarDateExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSCalendarDateExtras.h>
+#import <WebFoundation/WebNSURLExtras.h>
#import <WebKit/WebKitDebug.h>
-#import "IFURIEntry.h"
+#import "WebHistoryItem.h"
- at interface IFWebHistoryPrivate (Private)
--(IFURIEntry *)_entryForURLString:(NSString *)urlString;
+ at interface WebHistoryPrivate (Private)
+-(WebHistoryItem *)_entryForURLString:(NSString *)urlString;
@end
- at implementation IFWebHistoryPrivate
+ at implementation WebHistoryPrivate
#pragma mark OBJECT FRAMEWORK
@@ -70,7 +70,7 @@
//FIXME: just does linear search through days; inefficient if many days
count = [_datesWithEntries count];
for (*index = 0; *index < count; ++*index) {
- NSComparisonResult result = [date _IF_compareDay: [_datesWithEntries objectAtIndex: *index]];
+ NSComparisonResult result = [date _web_compareDay: [_datesWithEntries objectAtIndex: *index]];
if (result == NSOrderedSame) {
return YES;
}
@@ -82,7 +82,7 @@
return NO;
}
-- (void)insertEntry: (IFURIEntry *)entry atDateIndex: (int)dateIndex
+- (void)insertEntry: (WebHistoryItem *)entry atDateIndex: (int)dateIndex
{
int index, count;
NSMutableArray *entriesForDate;
@@ -107,7 +107,7 @@
- (BOOL)removeEntryForURLString: (NSString *)urlString
{
NSMutableArray *entriesForDate;
- IFURIEntry *entry;
+ WebHistoryItem *entry;
int dateIndex;
BOOL foundDate;
@@ -135,7 +135,7 @@
}
-- (void)addEntry: (IFURIEntry *)entry
+- (void)addEntry: (WebHistoryItem *)entry
{
int dateIndex;
NSString *urlString;
@@ -157,9 +157,9 @@
[_urlDictionary setObject: entry forKey: urlString];
}
-- (BOOL)removeEntry: (IFURIEntry *)entry
+- (BOOL)removeEntry: (WebHistoryItem *)entry
{
- IFURIEntry *matchingEntry;
+ WebHistoryItem *matchingEntry;
NSString *urlString;
urlString = [[entry url] absoluteString];
@@ -209,7 +209,7 @@
- (void)addEntries:(NSArray *)newEntries
{
NSEnumerator *enumerator;
- IFURIEntry *entry;
+ WebHistoryItem *entry;
// There is no guarantee that the incoming entries are in any particular
// order, but if this is called with a set of entries that were created by
@@ -222,12 +222,12 @@
}
}
-- (IFURIEntry *)updateURL:(NSString *)newURLString
+- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
forURL:(NSString *)oldURLString
{
- IFURIEntry *entry;
+ WebHistoryItem *entry;
WEBKIT_ASSERT (oldURLString != nil);
@@ -237,7 +237,7 @@
}
if (newURLString != nil) {
- [entry setURL:[NSURL _IF_URLWithString:newURLString]];
+ [entry setURL:[NSURL _web_URLWithString:newURLString]];
}
if (newTitle != nil) {
@@ -285,7 +285,7 @@
#pragma mark URL MATCHING
--(IFURIEntry *)_entryForURLString:(NSString *)urlString
+-(WebHistoryItem *)_entryForURLString:(NSString *)urlString
{
return [_urlDictionary objectForKey: urlString];
}
@@ -309,7 +309,7 @@
hours:0 minutes:0 seconds:0];
}
-// Return a flat array of IFURIEntries. Leaves out entries older than the age limit.
+// Return a flat array of WebHistoryItems. Leaves out entries older than the age limit.
// Stops filling array when item count limit is reached, even if there are currently
// more entries than that.
- (NSArray *)arrayRepresentation
@@ -332,7 +332,7 @@
NSArray *entries;
// skip remaining days if they are older than the age limit
- if ([[_datesWithEntries objectAtIndex:dateIndex] _IF_compareDay:ageLimitDate] != NSOrderedDescending) {
+ if ([[_datesWithEntries objectAtIndex:dateIndex] _web_compareDay:ageLimitDate] != NSOrderedDescending) {
break;
}
@@ -393,9 +393,9 @@
ageLimitPassed = NO;
while ((dictionary = [enumerator nextObject]) != nil) {
- IFURIEntry *entry;
+ WebHistoryItem *entry;
- entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary] autorelease];
+ entry = [[[WebHistoryItem alloc] initFromDictionaryRepresentation: dictionary] autorelease];
if ([entry url] == nil) {
// entry without url is useless; data on disk must have been bad; ignore this one
@@ -404,7 +404,7 @@
// test against date limit
if (!ageLimitPassed) {
- if ([[entry lastVisitedDate] _IF_compareDay:ageLimitDate] != NSOrderedDescending) {
+ if ([[entry lastVisitedDate] _web_compareDay:ageLimitDate] != NSOrderedDescending) {
continue;
} else {
ageLimitPassed = YES;
diff --git a/WebKit/History.subproj/WebURLsWithTitles.h b/WebKit/History.subproj/WebURLsWithTitles.h
index 73d1cef..60baf35 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.h
+++ b/WebKit/History.subproj/WebURLsWithTitles.h
@@ -1,5 +1,5 @@
//
-// IFURLsWithTitles.h
+// WebURLsWithTitles.h
// WebKit
//
// Created by John Sullivan on Wed Jun 12 2002.
@@ -9,25 +9,25 @@
#import <Cocoa/Cocoa.h>
-#define IFURLsWithTitlesPboardType @"IFURLsWithTitlesPboardType"
+#define WebURLsWithTitlesPboardType @"WebURLsWithTitlesPboardType"
- at interface IFURLsWithTitles : NSObject
+ at interface WebURLsWithTitles : NSObject
// Writes parallel arrays of URLs and titles to the pasteboard. These items can be retrieved by
// calling URLsFromPasteboard and titlesFromPasteboard. URLs must consist of NSURL objects.
// titles must consist of NSStrings, or be nil. If titles is nil, or if titles is a different
// length than URLs, empty strings will be used for all titles. If URLs is nil, this method
-// returns without doing anything. You must declare an IFURLsWithTitlesPboardType data type
+// returns without doing anything. You must declare an WebURLsWithTitlesPboardType data type
// for pasteboard before invoking this method, or it will return without doing anything.
+(void)writeURLs:(NSArray *)URLs andTitles:(NSArray *)titles toPasteboard:(NSPasteboard *)pasteboard;
// Reads an array of NSURLs off the pasteboard. Returns nil if pasteboard does not contain
-// data of type IFURLsWithTitlesPboardType. This array consists of the URLs that correspond to
+// data of type WebURLsWithTitlesPboardType. This array consists of the URLs that correspond to
// the titles returned from titlesFromPasteboard.
+(NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard;
// Reads an array of NSStrings off the pasteboard. Returns nil if pasteboard does not contain
-// data of type IFURLsWithTitlesPboardType. This array consists of the titles that correspond to
+// data of type WebURLsWithTitlesPboardType. This array consists of the titles that correspond to
// the URLs returned from URLsFromPasteboard.
+(NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard;
diff --git a/WebKit/History.subproj/WebURLsWithTitles.m b/WebKit/History.subproj/WebURLsWithTitles.m
index 0047a78..7a3dc80 100644
--- a/WebKit/History.subproj/WebURLsWithTitles.m
+++ b/WebKit/History.subproj/WebURLsWithTitles.m
@@ -1,17 +1,17 @@
//
-// IFURLsWithTitles.m
+// WebURLsWithTitles.m
// WebBrowser
//
// Created by John Sullivan on Wed Jun 12 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFURLsWithTitles.h"
+#import "WebURLsWithTitles.h"
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSURLExtras.h>
- at implementation IFURLsWithTitles
+ at implementation WebURLsWithTitles
+ (NSArray *)arrayWithIFURLsWithTitlesPboardType
{
@@ -19,7 +19,7 @@
static NSArray *cannedArray = nil;
if (cannedArray == nil) {
- cannedArray = [[NSArray arrayWithObject:IFURLsWithTitlesPboardType] retain];
+ cannedArray = [[NSArray arrayWithObject:WebURLsWithTitlesPboardType] retain];
}
return cannedArray;
@@ -52,7 +52,7 @@
}
[pasteboard setPropertyList:[NSArray arrayWithObjects:URLStrings, titlesOrEmptyStrings, nil]
- forType:IFURLsWithTitlesPboardType];
+ forType:WebURLsWithTitlesPboardType];
}
+(NSArray *)titlesFromPasteboard:(NSPasteboard *)pasteboard
@@ -61,7 +61,7 @@
return nil;
}
- return [[pasteboard propertyListForType:IFURLsWithTitlesPboardType] objectAtIndex:1];
+ return [[pasteboard propertyListForType:WebURLsWithTitlesPboardType] objectAtIndex:1];
}
+(NSArray *)URLsFromPasteboard:(NSPasteboard *)pasteboard
@@ -74,11 +74,11 @@
return nil;
}
- URLStrings = [[pasteboard propertyListForType:IFURLsWithTitlesPboardType] objectAtIndex:0];
+ URLStrings = [[pasteboard propertyListForType:WebURLsWithTitlesPboardType] objectAtIndex:0];
count = [URLStrings count];
URLs = [NSMutableArray arrayWithCapacity:count];
for (index = 0; index < count; ++index) {
- [URLs addObject:[NSURL _IF_URLWithString:[URLStrings objectAtIndex:index]]];
+ [URLs addObject:[NSURL _web_URLWithString:[URLStrings objectAtIndex:index]]];
}
return URLs;
diff --git a/WebKit/Misc.subproj/IFCache.h b/WebKit/Misc.subproj/IFCache.h
deleted file mode 100644
index 2b2ab53..0000000
--- a/WebKit/Misc.subproj/IFCache.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// IFCache.h
-// WebKit
-//
-// Created by Darin Adler on Thu Mar 28 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at interface IFCache : NSObject
-{
-}
-
-+ (NSArray *)statistics;
-+ (void)empty;
-+ (void)setDisabled:(BOOL)disabled;
-
-+ (int)javaScriptObjectsCount;
-+ (int)javaScriptInterpretersCount;
-+ (int)javaScriptNoGCAllowedObjectsCount;
-+ (int)javaScriptReferencedObjectsCount;
-+ (void)garbageCollectJavaScriptObjects;
-
- at end
diff --git a/WebKit/Misc.subproj/IFCache.mm b/WebKit/Misc.subproj/IFCache.mm
deleted file mode 100644
index ec64f32..0000000
--- a/WebKit/Misc.subproj/IFCache.mm
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// IFCache.m
-// WebKit
-//
-// Created by Darin Adler on Thu Mar 28 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFCache.h"
-
-#import <WebCore/WebCoreCache.h>
-#import <WebCore/WebCoreJavaScript.h>
-
- at implementation IFCache
-
-+ (NSArray *)statistics
-{
- return [WebCoreCache statistics];
-}
-
-+ (void)empty
-{
- [WebCoreCache empty];
-}
-
-+ (void)setDisabled:(BOOL)disabled
-{
- [WebCoreCache setDisabled:disabled];
-}
-
-+ (int)javaScriptObjectsCount
-{
- return [WebCoreJavaScript objectCount];
-}
-
-+ (int)javaScriptInterpretersCount
-{
- return [WebCoreJavaScript interpreterCount];
-}
-
-+ (int)javaScriptNoGCAllowedObjectsCount
-{
- return [WebCoreJavaScript noGCAllowedObjectCount];
-}
-
-+ (int)javaScriptReferencedObjectsCount
-{
- return [WebCoreJavaScript referencedObjectCount];
-}
-
-+ (void)garbageCollectJavaScriptObjects
-{
- [WebCoreJavaScript garbageCollect];
-}
-
- at end
diff --git a/WebKit/Misc.subproj/IFDownloadHandler.h b/WebKit/Misc.subproj/IFDownloadHandler.h
deleted file mode 100644
index b1237ee..0000000
--- a/WebKit/Misc.subproj/IFDownloadHandler.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// IFDownloadHandler.h
-// WebKit
-//
-// Created by Chris Blumenberg on Thu Apr 11 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <WebKit/IFWebDataSource.h>
-
- at interface IFDownloadHandler : NSObject {
- IFWebDataSource *dataSource;
- NSFileHandle *fileHandle;
-}
-
-- initWithDataSource:(IFWebDataSource *)dSource;
-- (void)receivedData:(NSData *)data;
-- (void)finishedLoading;
-- (void)cancel;
- at end
diff --git a/WebKit/Misc.subproj/IFDownloadHandler.mm b/WebKit/Misc.subproj/IFDownloadHandler.mm
deleted file mode 100644
index 85affaf..0000000
--- a/WebKit/Misc.subproj/IFDownloadHandler.mm
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// IFDownloadHandler.m
-// WebKit
-//
-// Created by Chris Blumenberg on Thu Apr 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc.
-//
-
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFDownloadHandler
-
-- initWithDataSource:(IFWebDataSource *)dSource
-{
- [super init];
-
- dataSource = [dSource retain];
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download started for: %s", [[[dSource inputURL] absoluteString] cString]);
- return self;
-}
-
-- (void)dealloc
-{
- [fileHandle release];
- [dataSource release];
-
- [super dealloc];
-}
-
-- (void)receivedData:(NSData *)data
-{
- NSString *path = [dataSource downloadPath];
- NSString *pathWithoutExtension, *newPathWithoutExtension, *extension;
- NSFileManager *fileManager;
- NSWorkspace *workspace;
- unsigned i;
-
- if(!fileHandle){
- fileManager = [NSFileManager defaultManager];
-
- if([fileManager fileExistsAtPath:path]){
- pathWithoutExtension = [path stringByDeletingPathExtension];
- extension = [path pathExtension];
-
- for(i=1; 1; i++){
- newPathWithoutExtension = [NSString stringWithFormat:@"%@-%d", pathWithoutExtension, i];
- path = [newPathWithoutExtension stringByAppendingPathExtension:extension];
- if(![fileManager fileExistsAtPath:path]){
- [dataSource _setDownloadPath:path];
- break;
- }
- }
- }
-
- if(![fileManager createFileAtPath:path contents:nil attributes:nil]){
- [dataSource stopLoading];
- // FIXME: send error
- return;
- }
-
- fileHandle = [[NSFileHandle fileHandleForWritingAtPath:path] retain];
-
- workspace = [NSWorkspace sharedWorkspace];
- [workspace noteFileSystemChanged:path];
- }
-
- [fileHandle writeData:data];
-}
-
-- (void)finishedLoading
-{
- NSString *path = [dataSource downloadPath];
- NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-
- [fileHandle closeFile];
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download complete. Saved to: %s", [path cString]);
-
- if([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally){
- [workspace openFile:path];
- }
-}
-
-- (void)cancel
-{
- NSFileManager *fileManager = [NSFileManager defaultManager];
- NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
- NSString *path = [dataSource downloadPath];
-
- [fileHandle closeFile];
- [fileManager removeFileAtPath:path handler:nil];
- [workspace noteFileSystemChanged:path];
-}
-
-
- at end
diff --git a/WebKit/Misc.subproj/IFException.h b/WebKit/Misc.subproj/IFException.h
deleted file mode 100644
index 3059e1e..0000000
--- a/WebKit/Misc.subproj/IFException.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2001, 2002 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.
- */
-
- at class NSString;
-
-extern NSString * const IFMethodNotYetImplemented;
-extern NSString * const IFRuntimeError;
diff --git a/WebKit/Misc.subproj/IFException.m b/WebKit/Misc.subproj/IFException.m
deleted file mode 100644
index e1cfd38..0000000
--- a/WebKit/Misc.subproj/IFException.m
+++ /dev/null
@@ -1,28 +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.
- */
-#import <Cocoa/Cocoa.h>
-
-NSString * const IFMethodNotYetImplemented = @"IFMethodNotYetImplemented";
-NSString * const IFRuntimeError = @"IFRuntimeError";
diff --git a/WebKit/Misc.subproj/IFNSViewExtras.h b/WebKit/Misc.subproj/IFNSViewExtras.h
deleted file mode 100644
index 5c92dda..0000000
--- a/WebKit/Misc.subproj/IFNSViewExtras.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- IFNSViewExtras.h
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <AppKit/AppKit.h>
-
- at class IFWebView;
-
- at interface NSView (IFExtensions)
-
-- (NSView *) _IF_superviewWithName:(NSString *)viewName;
-- (IFWebView *)_IF_parentWebView;
-
- at end
diff --git a/WebKit/Misc.subproj/IFNSViewExtras.m b/WebKit/Misc.subproj/IFNSViewExtras.m
deleted file mode 100644
index b5dbb91..0000000
--- a/WebKit/Misc.subproj/IFNSViewExtras.m
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- IFNSViewExtras.mm
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFWebView.h>
-
-#ifdef DEBUG_VIEWS
- at interface NSObject (Foo)
-- (void*)_renderFramePart;
-- (id)frameForView: (id)aView;
-- (id)_controller;
- at end
-#endif
-
- at implementation NSView (IFExtensions)
-
-- (NSView *) _IF_superviewWithName:(NSString *)viewName
-{
- NSView *view;
-
- view = self;
- while(view){
- view = [view superview];
- if([[view className] isEqualToString:viewName]){
- return view;
- }
- }
- return nil;
-}
-
-- (IFWebView *)_IF_parentWebView
-{
- IFWebView *view = (IFWebView *)[[[self superview] superview] superview];
-
- if ([view isKindOfClass: [IFWebView class]])
- return view;
- return nil;
-}
-
-#ifdef DEBUG_VIEWS
-- (void)_IF_printViewHierarchy: (int)level
-{
- NSArray *subviews;
- int _level = level, i;
- NSRect f;
- NSView *subview;
- void *rfp = 0;
-
- subviews = [self subviews];
- _level = level;
- while (_level-- > 0)
- printf (" ");
- f = [self frame];
-
- if ([self respondsToSelector: @selector(_controller)]){
- id aController = [self _controller];
- id aFrame = [aController frameForView: self];
- rfp = [aFrame _renderFramePart];
- }
-
- printf ("%s renderFramePart %p (%f,%f) w %f, h %f\n", [[[self class] className] cString], rfp, f.origin.x, f.origin.y, f.size.width, f.size.height);
- for (i = 0; i < (int)[subviews count]; i++){
- subview = [subviews objectAtIndex: i];
- [subview _IF_printViewHierarchy: level + 1];
- }
-}
-#endif
-
- at end
diff --git a/WebKit/Misc.subproj/IFStringTruncator.h b/WebKit/Misc.subproj/IFStringTruncator.h
deleted file mode 100644
index ac97638..0000000
--- a/WebKit/Misc.subproj/IFStringTruncator.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// IFStringTruncator.h
-//
-// Created by Darin Adler on Fri May 10 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-// Complete rewrite with API similar to slow truncator by Al Dul
-
-#import <Foundation/Foundation.h>
-
- at class NSFont;
-
- at interface IFStringTruncator : NSObject
-{
-}
-
-+ (NSString *)centerTruncateString:(NSString *)string toWidth:(float)maxWidth withFont:(NSFont *)font;
-
-// Default font is [NSFont menuFontOfSize:0].
-+ (NSString *)centerTruncateString:(NSString *)string toWidth:(float)maxWidth;
-
- at end
diff --git a/WebKit/Misc.subproj/IFStringTruncator.m b/WebKit/Misc.subproj/IFStringTruncator.m
deleted file mode 100644
index 33e7dc1..0000000
--- a/WebKit/Misc.subproj/IFStringTruncator.m
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// IFStringTruncator.m
-//
-// Created by Darin Adler on Fri May 10 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-// Complete rewrite with API similar to slow truncator by Al Dul
-
-#import <WebKit/IFStringTruncator.h>
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFTextRenderer.h>
-
-#define STRING_BUFFER_SIZE 2048
-#define ELLIPSIS_CHARACTER 0x2026
-
-static NSFont *currentFont;
-static IFTextRenderer *currentRenderer;
-static float currentEllipsisWidth;
-
- at implementation IFStringTruncator
-
-+ (unsigned)centerTruncateString:(NSString *)string length:(unsigned)length keepCount:(unsigned)keepCount toBuffer:(unichar *)buffer
-{
- unsigned omitStart;
- NSRange omitEndRange, beforeRange, afterRange;
- unsigned truncatedLength;
-
- WEBKIT_ASSERT(keepCount < STRING_BUFFER_SIZE);
-
- omitStart = (keepCount + 1) / 2;
-
- omitEndRange = [string rangeOfComposedCharacterSequenceAtIndex:omitStart + (length - keepCount) - 1];
-
- beforeRange.location = 0;
- beforeRange.length = [string rangeOfComposedCharacterSequenceAtIndex:omitStart].location;
-
- afterRange.location = omitEndRange.location + omitEndRange.length;
- afterRange.length = length - afterRange.location;
-
- truncatedLength = beforeRange.length + 1 + afterRange.length;
- WEBKIT_ASSERT(truncatedLength <= length);
-
- [string getCharacters:buffer range:beforeRange];
- buffer[beforeRange.length] = ELLIPSIS_CHARACTER;
- [string getCharacters:&buffer[beforeRange.length + 1] range:afterRange];
-
- return truncatedLength;
-}
-
-+ (NSString *)centerTruncateString:(NSString *)string toWidth:(float)maxWidth
-{
- return [self centerTruncateString:string toWidth:maxWidth withFont:[NSFont menuFontOfSize:0]];
-}
-
-+ (NSString *)centerTruncateString:(NSString *)string toWidth:(float)maxWidth withFont:(NSFont *)font
-{
- unichar stringBuffer[STRING_BUFFER_SIZE];
- unsigned length;
- unsigned keepCount;
- unsigned truncatedLength;
- float width;
- unichar ellipsis;
- unsigned keepCountForLargestKnownToFit, keepCountForSmallestKnownToNotFit;
- float widthForLargestKnownToFit, widthForSmallestKnownToNotFit;
- float ratio;
-
- WEBKIT_ASSERT_VALID_ARG(font, font);
- WEBKIT_ASSERT_VALID_ARG(maxWidth, maxWidth >= 0);
-
- if (![currentFont isEqual:font]) {
- [currentFont release];
- currentFont = [font retain];
- [currentRenderer release];
- [IFTextRendererFactory createSharedFactory];
- currentRenderer = [[[IFTextRendererFactory sharedFactory] rendererWithFont:font] retain];
- ellipsis = ELLIPSIS_CHARACTER;
- currentEllipsisWidth = [currentRenderer floatWidthForCharacters:&ellipsis stringLength:1 fromCharacterPosition: 0 numberOfCharacters: 1 applyRounding: NO attemptFontSubstitution: YES];
- }
-
- WEBKIT_ASSERT(currentRenderer);
-
- length = [string length];
- if (length > STRING_BUFFER_SIZE) {
- keepCount = STRING_BUFFER_SIZE - 1; // need 1 character for the ellipsis
- truncatedLength = [self centerTruncateString:string
- length:length
- keepCount:keepCount
- toBuffer:stringBuffer];
- } else {
- keepCount = length;
- [string getCharacters:stringBuffer];
- truncatedLength = length;
- }
-
- width = [currentRenderer floatWidthForCharacters:stringBuffer
- stringLength:truncatedLength fromCharacterPosition: 0 numberOfCharacters: truncatedLength applyRounding: NO attemptFontSubstitution: YES];
- if (width <= maxWidth) {
- return string;
- }
-
- keepCountForLargestKnownToFit = 0;
- widthForLargestKnownToFit = currentEllipsisWidth;
-
- keepCountForSmallestKnownToNotFit = keepCount;
- widthForSmallestKnownToNotFit = width;
-
- if (currentEllipsisWidth >= maxWidth) {
- keepCountForLargestKnownToFit = 1;
- keepCountForSmallestKnownToNotFit = 2;
- }
-
- while (keepCountForLargestKnownToFit + 1 < keepCountForSmallestKnownToNotFit) {
- WEBKIT_ASSERT(widthForLargestKnownToFit <= maxWidth);
- WEBKIT_ASSERT(widthForSmallestKnownToNotFit > maxWidth);
-
- ratio = (keepCountForSmallestKnownToNotFit - keepCountForLargestKnownToFit)
- / (widthForSmallestKnownToNotFit - widthForLargestKnownToFit);
- keepCount = maxWidth * ratio;
-
- if (keepCount <= keepCountForLargestKnownToFit) {
- keepCount = keepCountForLargestKnownToFit + 1;
- } else if (keepCount >= keepCountForSmallestKnownToNotFit) {
- keepCount = keepCountForSmallestKnownToNotFit - 1;
- }
-
- WEBKIT_ASSERT(keepCount < length);
- WEBKIT_ASSERT(keepCount > 0);
- WEBKIT_ASSERT(keepCount < keepCountForSmallestKnownToNotFit);
- WEBKIT_ASSERT(keepCount > keepCountForLargestKnownToFit);
-
- truncatedLength = [self centerTruncateString:string
- length:length
- keepCount:keepCount
- toBuffer:stringBuffer];
-
- width = [currentRenderer floatWidthForCharacters:stringBuffer stringLength:truncatedLength fromCharacterPosition: 0 numberOfCharacters: truncatedLength applyRounding: NO attemptFontSubstitution: YES];
- if (width <= maxWidth) {
- keepCountForLargestKnownToFit = keepCount;
- widthForLargestKnownToFit = width;
- } else {
- keepCountForSmallestKnownToNotFit = keepCount;
- widthForSmallestKnownToNotFit = width;
- }
- }
-
- if (keepCountForLargestKnownToFit == 0) {
- keepCountForLargestKnownToFit = 1;
- }
-
- if (keepCount != keepCountForLargestKnownToFit) {
- keepCount = keepCountForLargestKnownToFit;
- truncatedLength = [self centerTruncateString:string
- length:length
- keepCount:keepCount
- toBuffer:stringBuffer];
- }
-
- return [NSString stringWithCharacters:stringBuffer length:truncatedLength];
-}
-
- at end
diff --git a/WebKit/Misc.subproj/IFWebKitErrors.h b/WebKit/Misc.subproj/IFWebKitErrors.h
deleted file mode 100644
index 34af2bd..0000000
--- a/WebKit/Misc.subproj/IFWebKitErrors.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* IFWebKitErrors.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-// WebFoundation error codes < 10000
-// WebKit error codes >= 10000
-
-typedef enum {
- IFErrorCodeNoError = 0,
- IFErrorCodeCantShowMIMEType = 10000,
- IFErrorCodeFileDoesntExist = 10001,
- IFErrorCodeCouldntFindApplicationForFile = 10002,
- IFErrorCodeCouldntFindApplicationForURL = 10003,
- IFErrorCodeFileNotReadable = 10004,
- IFErrorCodeFinderCouldntOpenDirectory = 10005,
- IFErrorCodeCantShowDirectory = 10006,
- IFErrorCodeCantShowURL = 10007,
-} IFErrorCode;
-
-#define IFErrorDescriptionCantShowMIMEType NSLocalizedStringFromTable (@"Can't show content with specified mime type", @"IFError", @"IFErrorCodeCantShowMIMEType description")
-
-#define IFErrorDescriptionCouldntFindApplicationForFile NSLocalizedStringFromTable (@"Could not find application for specified file", @"IFError", @"IFErrorCodeCouldntFindApplicationForFile description")
-
-#define IFErrorDescriptionCouldntFindApplicationForURL NSLocalizedStringFromTable (@"Could not find application for specified URL", @"IFError", @"IFErrorCodeCouldntFindApplicationForURL description")
-
-#define IFErrorDescriptionFileDoesntExist NSLocalizedStringFromTable (@"Could not find file", @"IFError", @"IFErrorCodeFileDoesntExist description")
-
-#define IFErrorDescriptionFileNotReadable NSLocalizedStringFromTable (@"Could not read file", @"IFError", @"IFErrorCodeFileNotReadable description")
-
-#define IFErrorDescriptionFinderCouldntOpenDirectory NSLocalizedStringFromTable (@"Finder could not open directory", @"IFError", @"IFErrorCodeFinderCouldntOpenDirectory description")
-
-#define IFErrorDescriptionCantShowDirectory NSLocalizedStringFromTable (@"Can't show a file directory", @"IFError", @"IFErrorCodeCantShowDirectory description")
-
-#define IFErrorDescriptionCantShowURL NSLocalizedStringFromTable (@"Can't show the specified URL", @"IFError", @"IFErrorCodeCantShowURL description")
\ No newline at end of file
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.h b/WebKit/Misc.subproj/WebCoreStatistics.h
index 2b2ab53..c3c2419 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.h
+++ b/WebKit/Misc.subproj/WebCoreStatistics.h
@@ -1,5 +1,5 @@
//
-// IFCache.h
+// WebCoreStatistics.h
// WebKit
//
// Created by Darin Adler on Thu Mar 28 2002.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
- at interface IFCache : NSObject
+ at interface WebCoreStatistics : NSObject
{
}
diff --git a/WebKit/Misc.subproj/WebCoreStatistics.m b/WebKit/Misc.subproj/WebCoreStatistics.m
index ec64f32..70024d6 100644
--- a/WebKit/Misc.subproj/WebCoreStatistics.m
+++ b/WebKit/Misc.subproj/WebCoreStatistics.m
@@ -1,17 +1,17 @@
//
-// IFCache.m
+// WebCoreStatistics.m
// WebKit
//
// Created by Darin Adler on Thu Mar 28 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFCache.h"
+#import "WebCoreStatistics.h"
#import <WebCore/WebCoreCache.h>
#import <WebCore/WebCoreJavaScript.h>
- at implementation IFCache
+ at implementation WebCoreStatistics
+ (NSArray *)statistics
{
diff --git a/WebKit/Misc.subproj/WebDatabase.h b/WebKit/Misc.subproj/WebDatabase.h
index 872507a..bfd0271 100644
--- a/WebKit/Misc.subproj/WebDatabase.h
+++ b/WebKit/Misc.subproj/WebDatabase.h
@@ -1,11 +1,11 @@
-/* IFDatabase.h
+/* WebDatabase.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
- at interface IFDatabase : NSObject
+ at interface WebDatabase : NSObject
{
NSString *path;
unsigned count;
@@ -23,14 +23,14 @@
@end
- at interface IFDatabase (IFDatabaseCreation)
+ at interface WebDatabase (WebDatabaseCreation)
-(id)initWithPath:(NSString *)thePath;
@end
- at interface IFDatabase (IFDatabaseManagement)
+ at interface WebDatabase (WebDatabaseManagement)
-(BOOL)open;
-(BOOL)close;
diff --git a/WebKit/Misc.subproj/WebDatabase.m b/WebKit/Misc.subproj/WebDatabase.m
index 7fce7c7..80100f6 100644
--- a/WebKit/Misc.subproj/WebDatabase.m
+++ b/WebKit/Misc.subproj/WebDatabase.m
@@ -1,38 +1,38 @@
-/* IFDatabase.m
+/* WebDatabase.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/NSPrivateDecls.h>
-#import "IFDatabase.h"
+#import "WebDatabase.h"
-// implementation IFDatabase ------------------------------------------------------------------------
+// implementation WebDatabase ------------------------------------------------------------------------
- at implementation IFDatabase
+ at implementation WebDatabase
-(void)setObject:(id)object forKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
}
-(void)removeObjectForKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
}
-(void)removeAllObjects
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
}
-(id)objectForKey:(id)key
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
return nil;
}
-(NSEnumerator *)keys
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
return nil;
}
@@ -44,9 +44,9 @@
@end
-// implementation IFDatabase (IFDatabaseCreation) --------------------------------------------------------
+// implementation WebDatabase (WebDatabaseCreation) --------------------------------------------------------
- at implementation IFDatabase (IFDatabaseCreation)
+ at implementation WebDatabase (WebDatabaseCreation)
-(id)initWithPath:(NSString *)thePath
{
@@ -73,25 +73,25 @@
@end
-// implementation IFDatabase (IFDatabaseManagement) ------------------------------------------------------
+// implementation WebDatabase (WebDatabaseManagement) ------------------------------------------------------
- at implementation IFDatabase (IFDatabaseManagement)
+ at implementation WebDatabase (WebDatabaseManagement)
-(BOOL)open
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
return NO;
}
-(BOOL)close
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
return NO;
}
-(void)sync
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
}
-(NSString *)path
@@ -106,7 +106,7 @@
-(unsigned)count
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
return 0;
}
@@ -117,7 +117,7 @@
-(void)setSizeLimit:(unsigned)limit
{
- NSRequestConcreteImplementation(self, _cmd, [IFDatabase class]);
+ NSRequestConcreteImplementation(self, _cmd, [WebDatabase class]);
}
-(unsigned)usage
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.h b/WebKit/Misc.subproj/WebDownloadHandler.h
index b1237ee..27505a7 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.h
+++ b/WebKit/Misc.subproj/WebDownloadHandler.h
@@ -1,5 +1,5 @@
//
-// IFDownloadHandler.h
+// WebDownloadHandler.h
// WebKit
//
// Created by Chris Blumenberg on Thu Apr 11 2002.
@@ -7,14 +7,14 @@
//
#import <Foundation/Foundation.h>
-#import <WebKit/IFWebDataSource.h>
+#import <WebKit/WebDataSource.h>
- at interface IFDownloadHandler : NSObject {
- IFWebDataSource *dataSource;
+ at interface WebDownloadHandler : NSObject {
+ WebDataSource *dataSource;
NSFileHandle *fileHandle;
}
-- initWithDataSource:(IFWebDataSource *)dSource;
+- initWithDataSource:(WebDataSource *)dSource;
- (void)receivedData:(NSData *)data;
- (void)finishedLoading;
- (void)cancel;
diff --git a/WebKit/Misc.subproj/WebDownloadHandler.m b/WebKit/Misc.subproj/WebDownloadHandler.m
index 85affaf..4d49ae9 100644
--- a/WebKit/Misc.subproj/WebDownloadHandler.m
+++ b/WebKit/Misc.subproj/WebDownloadHandler.m
@@ -1,18 +1,18 @@
//
-// IFDownloadHandler.m
+// WebDownloadHandler.m
// WebKit
//
// Created by Chris Blumenberg on Thu Apr 11 2002.
// Copyright (c) 2002 Apple Computer, Inc.
//
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/WebDownloadHandler.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFDownloadHandler
+ at implementation WebDownloadHandler
-- initWithDataSource:(IFWebDataSource *)dSource
+- initWithDataSource:(WebDataSource *)dSource
{
[super init];
@@ -77,7 +77,7 @@
[fileHandle closeFile];
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "Download complete. Saved to: %s", [path cString]);
- if([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally){
+ if([dataSource contentPolicy] == WebContentPolicySaveAndOpenExternally){
[workspace openFile:path];
}
}
diff --git a/WebKit/Misc.subproj/WebException.h b/WebKit/Misc.subproj/WebException.h
index 3059e1e..1a71095 100644
--- a/WebKit/Misc.subproj/WebException.h
+++ b/WebKit/Misc.subproj/WebException.h
@@ -25,5 +25,5 @@
@class NSString;
-extern NSString * const IFMethodNotYetImplemented;
-extern NSString * const IFRuntimeError;
+extern NSString * const WebMethodNotYetImplemented;
+extern NSString * const WebRuntimeError;
diff --git a/WebKit/Misc.subproj/WebException.m b/WebKit/Misc.subproj/WebException.m
index e1cfd38..f8d2c49 100644
--- a/WebKit/Misc.subproj/WebException.m
+++ b/WebKit/Misc.subproj/WebException.m
@@ -24,5 +24,5 @@
*/
#import <Cocoa/Cocoa.h>
-NSString * const IFMethodNotYetImplemented = @"IFMethodNotYetImplemented";
-NSString * const IFRuntimeError = @"IFRuntimeError";
+NSString * const WebMethodNotYetImplemented = @"WebMethodNotYetImplemented";
+NSString * const WebRuntimeError = @"WebRuntimeError";
diff --git a/WebKit/Misc.subproj/WebFileDatabase.h b/WebKit/Misc.subproj/WebFileDatabase.h
index a4540a0..a6087a2 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.h
+++ b/WebKit/Misc.subproj/WebFileDatabase.h
@@ -1,12 +1,12 @@
-/* IFURLFileDatabase.h
+/* WebFileDatabase.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import "IFDatabase.h"
+#import "WebDatabase.h"
- at interface IFURLFileDatabase : IFDatabase
+ at interface WebFileDatabase : WebDatabase
{
NSMutableArray *ops;
NSMutableDictionary *setCache;
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 108fdee..158c43e 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -1,4 +1,4 @@
-/* IFURLFileDatabase.m
+/* WebFileDatabase.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -10,23 +10,23 @@
#import <pthread.h>
#import <fts.h>
-#import "IFURLFileDatabase.h"
-#import "IFNSFileManagerExtensions.h"
-#import "IFURLCacheLoaderConstantsPrivate.h"
+#import "WebFileDatabase.h"
+#import "WebNSFileManagerExtras.h"
+#import "WebCacheLoaderConstantsPrivate.h"
#import "WebFoundationDebug.h"
#define SIZE_FILE_NAME @".size"
#define SIZE_FILE_NAME_CSTRING ".size"
static pthread_once_t databaseInitControl = PTHREAD_ONCE_INIT;
-static NSNumber *IFURLFileDirectoryPosixPermissions;
-static NSNumber *IFURLFilePosixPermissions;
+static NSNumber *WebFileDirectoryPOSIXPermissions;
+static NSNumber *WebFilePOSIXPermissions;
typedef enum
{
- IFURLFileDatabaseSetObjectOp,
- IFURLFileDatabaseRemoveObjectOp,
-} IFURLFileDatabaseOpCode;
+ WebFileDatabaseSetObjectOp,
+ WebFileDatabaseRemoveObjectOp,
+} WebFileDatabaseOpcode;
enum
{
@@ -101,9 +101,9 @@ static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path)
return atimeArray;
}
-// interface IFURLFileReader -------------------------------------------------------------
+// interface WebFileReader -------------------------------------------------------------
- at interface IFURLFileReader : NSObject
+ at interface WebFileReader : NSObject
{
NSData *data;
caddr_t mappedBytes;
@@ -115,7 +115,7 @@ static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path)
@end
-// implementation IFURLFileReader -------------------------------------------------------------
+// implementation WebFileReader -------------------------------------------------------------
static NSMutableSet *notMappableFileNameSet = nil;
static NSLock *mutex;
@@ -126,7 +126,7 @@ static void URLFileReaderInit(void)
notMappableFileNameSet = [[NSMutableSet alloc] init];
}
- at implementation IFURLFileReader
+ at implementation WebFileReader
- (id)initWithPath:(NSString *)path
{
@@ -227,36 +227,36 @@ static void URLFileReaderInit(void)
@end
-// interface IFURLFileDatabaseOp -------------------------------------------------------------
+// interface WebFileDatabaseOp -------------------------------------------------------------
- at interface IFURLFileDatabaseOp : NSObject
+ at interface WebFileDatabaseOp : NSObject
{
- IFURLFileDatabaseOpCode opcode;
+ WebFileDatabaseOpcode opcode;
id key;
id object;
}
-+(id)opWithCode:(IFURLFileDatabaseOpCode)opcode key:(id)key object:(id)object;
--(id)initWithCode:(IFURLFileDatabaseOpCode)opcode key:(id)key object:(id)object;
++(id)opWithCode:(WebFileDatabaseOpcode)opcode key:(id)key object:(id)object;
+-(id)initWithCode:(WebFileDatabaseOpcode)opcode key:(id)key object:(id)object;
--(IFURLFileDatabaseOpCode)opcode;
+-(WebFileDatabaseOpcode)opcode;
-(id)key;
-(id)object;
--(void)perform:(IFURLFileDatabase *)target;
+-(void)perform:(WebFileDatabase *)target;
@end
-// implementation IFURLFileDatabaseOp -------------------------------------------------------------
+// implementation WebFileDatabaseOp -------------------------------------------------------------
- at implementation IFURLFileDatabaseOp
+ at implementation WebFileDatabaseOp
-+(id)opWithCode:(IFURLFileDatabaseOpCode)theOpcode key:(id)theKey object:(id)theObject
++(id)opWithCode:(WebFileDatabaseOpcode)theOpcode key:(id)theKey object:(id)theObject
{
- return [[[IFURLFileDatabaseOp alloc] initWithCode:theOpcode key:theKey object:theObject] autorelease];
+ return [[[WebFileDatabaseOp alloc] initWithCode:theOpcode key:theKey object:theObject] autorelease];
}
--(id)initWithCode:(IFURLFileDatabaseOpCode)theOpcode key:(id)theKey object:(id)theObject
+-(id)initWithCode:(WebFileDatabaseOpcode)theOpcode key:(id)theKey object:(id)theObject
{
WEBFOUNDATION_ASSERT_NOT_NIL(theKey);
@@ -273,7 +273,7 @@ static void URLFileReaderInit(void)
return nil;
}
--(IFURLFileDatabaseOpCode)opcode
+-(WebFileDatabaseOpcode)opcode
{
return opcode;
}
@@ -288,15 +288,15 @@ static void URLFileReaderInit(void)
return object;
}
--(void)perform:(IFURLFileDatabase *)target
+-(void)perform:(WebFileDatabase *)target
{
WEBFOUNDATION_ASSERT_NOT_NIL(target);
switch (opcode) {
- case IFURLFileDatabaseSetObjectOp:
+ case WebFileDatabaseSetObjectOp:
[target performSetObject:object forKey:key];
break;
- case IFURLFileDatabaseRemoveObjectOp:
+ case WebFileDatabaseRemoveObjectOp:
[target performRemoveObjectForKey:key];
break;
default:
@@ -316,9 +316,9 @@ static void URLFileReaderInit(void)
@end
-// interface IFURLFileDatabasePrivate -----------------------------------------------------------
+// interface WebFileDatabasePrivate -----------------------------------------------------------
- at interface IFURLFileDatabase (IFURLFileDatabasePrivate)
+ at interface WebFileDatabase (WebFileDatabasePrivate)
+(NSString *)uniqueFilePathForKey:(id)key;
-(void)writeSizeFile:(unsigned)value;
@@ -327,9 +327,9 @@ static void URLFileReaderInit(void)
@end
-// implementation IFURLFileDatabasePrivate ------------------------------------------------------
+// implementation WebFileDatabasePrivate ------------------------------------------------------
- at implementation IFURLFileDatabase (IFURLFileDatabasePrivate)
+ at implementation WebFileDatabase (WebFileDatabasePrivate)
+(NSString *)uniqueFilePathForKey:(id)key
{
@@ -367,7 +367,7 @@ static void URLFileReaderInit(void)
[mutex lock];
- fd = open(sizeFilePath, O_WRONLY | O_CREAT, [IFURLFilePosixPermissions intValue]);
+ fd = open(sizeFilePath, O_WRONLY | O_CREAT, [WebFilePOSIXPermissions intValue]);
if (fd > 0) {
buf = calloc(1, MAX_UNSIGNED_LENGTH);
sprintf(buf, "%d", value);
@@ -448,9 +448,9 @@ static void URLFileReaderInit(void)
@end
-// implementation IFURLFileDatabase -------------------------------------------------------------
+// implementation WebFileDatabase -------------------------------------------------------------
- at implementation IFURLFileDatabase
+ at implementation WebFileDatabase
// creation functions ---------------------------------------------------------------------------
#pragma mark creation functions
@@ -458,10 +458,10 @@ static void URLFileReaderInit(void)
static void databaseInit()
{
// set file perms to owner read/write/execute only
- IFURLFileDirectoryPosixPermissions = [[NSNumber numberWithInt:(IF_UREAD | IF_UWRITE | IF_UEXEC)] retain];
+ WebFileDirectoryPOSIXPermissions = [[NSNumber numberWithInt:(WEB_UREAD | WEB_UWRITE | WEB_UEXEC)] retain];
// set file perms to owner read/write only
- IFURLFilePosixPermissions = [[NSNumber numberWithInt:(IF_UREAD | IF_UWRITE)] retain];
+ WebFilePOSIXPermissions = [[NSNumber numberWithInt:(WEB_UREAD | WEB_UWRITE)] retain];
}
-(id)initWithPath:(NSString *)thePath
@@ -513,7 +513,7 @@ static void databaseInit()
-(void)setObject:(id)object forKey:(id)key
{
- IFURLFileDatabaseOp *op;
+ WebFileDatabaseOp *op;
WEBFOUNDATION_ASSERT_NOT_NIL(object);
WEBFOUNDATION_ASSERT_NOT_NIL(key);
@@ -523,7 +523,7 @@ static void databaseInit()
[mutex lock];
[setCache setObject:object forKey:key];
- op = [[IFURLFileDatabaseOp alloc] initWithCode:IFURLFileDatabaseSetObjectOp key:key object:object];
+ op = [[WebFileDatabaseOp alloc] initWithCode:WebFileDatabaseSetObjectOp key:key object:object];
[ops addObject:op];
[self setTimer];
@@ -532,7 +532,7 @@ static void databaseInit()
-(void)removeObjectForKey:(id)key
{
- IFURLFileDatabaseOp *op;
+ WebFileDatabaseOp *op;
WEBFOUNDATION_ASSERT_NOT_NIL(key);
@@ -541,7 +541,7 @@ static void databaseInit()
[mutex lock];
[removeCache addObject:key];
- op = [[IFURLFileDatabaseOp alloc] initWithCode:IFURLFileDatabaseRemoveObjectOp key:key object:nil];
+ op = [[WebFileDatabaseOp alloc] initWithCode:WebFileDatabaseRemoveObjectOp key:key object:nil];
[ops addObject:op];
[self setTimer];
@@ -557,7 +557,7 @@ static void databaseInit()
[removeCache removeAllObjects];
[ops removeAllObjects];
[self close];
- [[NSFileManager defaultManager] _IF_backgroundRemoveFileAtPath:path];
+ [[NSFileManager defaultManager] _web_backgroundRemoveFileAtPath:path];
[self open];
[self writeSizeFile:0];
usage = 0;
@@ -572,7 +572,7 @@ static void databaseInit()
id fileKey;
id object;
NSString *filePath;
- IFURLFileReader * volatile fileReader;
+ WebFileReader * volatile fileReader;
NSData *data;
NSUnarchiver * volatile unarchiver;
@@ -598,8 +598,8 @@ static void databaseInit()
[mutex unlock];
// go to disk
- filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
- fileReader = [[IFURLFileReader alloc] initWithPath:filePath];
+ filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [WebFileDatabase uniqueFilePathForKey:key]];
+ fileReader = [[WebFileReader alloc] initWithPath:filePath];
NS_DURING
if (fileReader && (data = [fileReader data])) {
@@ -628,7 +628,7 @@ static void databaseInit()
-(NSEnumerator *)keys
{
- // FIXME: [kocienda] Radar 2859370 (IFURLFileDatabase needs to implement keys method)
+ // FIXME: [kocienda] Radar 2859370 (WebFileDatabase needs to implement keys method)
return nil;
}
@@ -648,7 +648,7 @@ static void databaseInit()
WEBFOUNDATION_ASSERT_NOT_NIL(key);
WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "performSetObject - %s - %s",
- DEBUG_OBJECT(key), DEBUG_OBJECT([IFURLFileDatabase uniqueFilePathForKey:key]));
+ DEBUG_OBJECT(key), DEBUG_OBJECT([WebFileDatabase uniqueFilePathForKey:key]));
data = [NSMutableData data];
archiver = [[NSArchiver alloc] initForWritingWithMutableData:data];
@@ -657,19 +657,19 @@ static void databaseInit()
attributes = [NSDictionary dictionaryWithObjectsAndKeys:
NSUserName(), NSFileOwnerAccountName,
- IFURLFilePosixPermissions, NSFilePosixPermissions,
+ WebFilePOSIXPermissions, NSFilePosixPermissions,
NULL
];
directoryAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
NSUserName(), NSFileOwnerAccountName,
- IFURLFileDirectoryPosixPermissions, NSFilePosixPermissions,
+ WebFileDirectoryPOSIXPermissions, NSFilePosixPermissions,
NULL
];
defaultManager = [NSFileManager defaultManager];
- filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
+ filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [WebFileDatabase uniqueFilePathForKey:key]];
attributes = [defaultManager fileAttributesAtPath:filePath traverseLink:YES];
// update usage and truncate before writing file
@@ -677,7 +677,7 @@ static void databaseInit()
usage += [data length];
[self truncateToSizeLimit:[self sizeLimit]];
- result = [defaultManager _IF_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
+ result = [defaultManager _web_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
if (result) {
// we're going to write a new file
@@ -710,7 +710,7 @@ static void databaseInit()
WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "performRemoveObjectForKey - %s", DEBUG_OBJECT(key));
- filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
+ filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [WebFileDatabase uniqueFilePathForKey:key]];
attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filePath traverseLink:YES];
result = [[NSFileManager defaultManager] removeFileAtPath:filePath handler:nil];
if (result && attributes) {
@@ -745,11 +745,11 @@ static void databaseInit()
attributes = [NSDictionary dictionaryWithObjectsAndKeys:
[NSDate date], @"NSFileModificationDate",
NSUserName(), @"NSFileOwnerAccountName",
- IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
+ WebFileDirectoryPOSIXPermissions, @"NSFilePosixPermissions",
NULL
];
- isOpen = [manager _IF_createDirectoryAtPathWithIntermediateDirectories:path attributes:attributes];
+ isOpen = [manager _web_createDirectoryAtPathWithIntermediateDirectories:path attributes:attributes];
}
sizeFilePathString = [NSString stringWithFormat:@"%@/%@", path, SIZE_FILE_NAME];
@@ -758,7 +758,7 @@ static void databaseInit()
usage = [self readSizeFile];
// remove any leftover turds
- [manager _IF_deleteBackgroundRemoveLeftoverFiles:path];
+ [manager _web_deleteBackgroundRemoveLeftoverFiles:path];
}
return isOpen;
@@ -780,7 +780,7 @@ static void databaseInit()
-(void)lazySync:(NSTimer *)theTimer
{
- IFURLFileDatabaseOp *op;
+ WebFileDatabaseOp *op;
WEBFOUNDATION_ASSERT_NOT_NIL(theTimer);
diff --git a/WebKit/Misc.subproj/WebKitDebug.h b/WebKit/Misc.subproj/WebKitDebug.h
index 16cc221..6b025cc 100644
--- a/WebKit/Misc.subproj/WebKitDebug.h
+++ b/WebKit/Misc.subproj/WebKitDebug.h
@@ -117,7 +117,7 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
#define WEBKITDEBUG(format...) WEBKITDEBUGLEVEL(WEBKIT_LOG_GENERIC_DEBUG, format)
-#ifdef IF_MALLOC_TESTING
+#ifdef WEB_MALLOC_TESTING
#ifdef __cplusplus
extern "C" {
void setupDebugMalloc(void);
diff --git a/WebKit/Misc.subproj/WebKitDebug.m b/WebKit/Misc.subproj/WebKitDebug.m
index 09502e2..f6196ae 100644
--- a/WebKit/Misc.subproj/WebKitDebug.m
+++ b/WebKit/Misc.subproj/WebKitDebug.m
@@ -55,7 +55,7 @@ void WebKitLog(unsigned int level, const char *file, int line, const char *funct
#endif
-#ifdef IF_MALLOC_TESTING
+#ifdef WEB_MALLOC_TESTING
#include <objc/malloc.h>
unsigned int if_malloc_counter = 0;
@@ -67,7 +67,7 @@ size_t total_space = 0;
#define BLOCK_SIZE 1024*1024
#define NUM_BLOCKS 1024
-#define IF_MALLOC_MAGIC 0xfeadface
+#define WEB_MALLOC_MAGIC 0xfeadface
static malloc_zone_t *if_zone;
void *(*oldMalloc)(struct _malloc_zone_t *zone, size_t size);
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index 34af2bd..4f5fdc1 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -1,4 +1,4 @@
-/* IFWebKitErrors.h
+/* WebKitErrors.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -6,29 +6,29 @@
// WebKit error codes >= 10000
typedef enum {
- IFErrorCodeNoError = 0,
- IFErrorCodeCantShowMIMEType = 10000,
- IFErrorCodeFileDoesntExist = 10001,
- IFErrorCodeCouldntFindApplicationForFile = 10002,
- IFErrorCodeCouldntFindApplicationForURL = 10003,
- IFErrorCodeFileNotReadable = 10004,
- IFErrorCodeFinderCouldntOpenDirectory = 10005,
- IFErrorCodeCantShowDirectory = 10006,
- IFErrorCodeCantShowURL = 10007,
-} IFErrorCode;
+ WebErrorNoError = 0,
+ WebErrorCannotShowMIMEType = 10000,
+ WebErrorFileDoesNotExist = 10001,
+ WebErrorCouldNotFindApplicationForFile = 10002,
+ WebErrorCouldNotFindApplicationForURL = 10003,
+ WebErrorFileNotReadable = 10004,
+ WebErrorFinderCouldNotOpenDirectory = 10005,
+ WebErrorCannotShowDirectory = 10006,
+ WebErrorCannotShowURL = 10007,
+} WebErrorCode;
-#define IFErrorDescriptionCantShowMIMEType NSLocalizedStringFromTable (@"Can't show content with specified mime type", @"IFError", @"IFErrorCodeCantShowMIMEType description")
+#define WebErrorDescriptionCannotShowMIMEType NSLocalizedStringFromTable (@"Can't show content with specified mime type", @"WebError", @"WebErrorCannotShowMIMEType description")
-#define IFErrorDescriptionCouldntFindApplicationForFile NSLocalizedStringFromTable (@"Could not find application for specified file", @"IFError", @"IFErrorCodeCouldntFindApplicationForFile description")
+#define WebErrorDescriptionCouldNotFindApplicationForFile NSLocalizedStringFromTable (@"Could not find application for specified file", @"WebError", @"WebErrorCouldNotFindApplicationForFile description")
-#define IFErrorDescriptionCouldntFindApplicationForURL NSLocalizedStringFromTable (@"Could not find application for specified URL", @"IFError", @"IFErrorCodeCouldntFindApplicationForURL description")
+#define WebErrorDescriptionCouldNotFindApplicationForURL NSLocalizedStringFromTable (@"Could not find application for specified URL", @"WebError", @"WebErrorCouldNotFindApplicationForURL description")
-#define IFErrorDescriptionFileDoesntExist NSLocalizedStringFromTable (@"Could not find file", @"IFError", @"IFErrorCodeFileDoesntExist description")
+#define WebErrorDescriptionFileDoesNotExist NSLocalizedStringFromTable (@"Could not find file", @"WebError", @"WebErrorFileDoesNotExist description")
-#define IFErrorDescriptionFileNotReadable NSLocalizedStringFromTable (@"Could not read file", @"IFError", @"IFErrorCodeFileNotReadable description")
+#define WebErrorDescriptionFileNotReadable NSLocalizedStringFromTable (@"Could not read file", @"WebError", @"WebErrorFileNotReadable description")
-#define IFErrorDescriptionFinderCouldntOpenDirectory NSLocalizedStringFromTable (@"Finder could not open directory", @"IFError", @"IFErrorCodeFinderCouldntOpenDirectory description")
+#define WebErrorDescriptionFinderCouldNotOpenDirectory NSLocalizedStringFromTable (@"Finder could not open directory", @"WebError", @"WebErrorFinderCouldNotOpenDirectory description")
-#define IFErrorDescriptionCantShowDirectory NSLocalizedStringFromTable (@"Can't show a file directory", @"IFError", @"IFErrorCodeCantShowDirectory description")
+#define WebErrorDescriptionCannotShowDirectory NSLocalizedStringFromTable (@"Can't show a file directory", @"WebError", @"WebErrorCannotShowDirectory description")
-#define IFErrorDescriptionCantShowURL NSLocalizedStringFromTable (@"Can't show the specified URL", @"IFError", @"IFErrorCodeCantShowURL description")
\ No newline at end of file
+#define WebErrorDescriptionCannotShowURL NSLocalizedStringFromTable (@"Can't show the specified URL", @"WebError", @"WebErrorCannotShowURL description")
\ No newline at end of file
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.h b/WebKit/Misc.subproj/WebNSViewExtras.h
index 5c92dda..a7ceefc 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.h
+++ b/WebKit/Misc.subproj/WebNSViewExtras.h
@@ -1,15 +1,15 @@
/*
- IFNSViewExtras.h
+ WebNSViewExtras.h
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
#import <AppKit/AppKit.h>
- at class IFWebView;
+ at class WebView;
- at interface NSView (IFExtensions)
+ at interface NSView (WebExtras)
-- (NSView *) _IF_superviewWithName:(NSString *)viewName;
-- (IFWebView *)_IF_parentWebView;
+- (NSView *) _web_superviewWithName:(NSString *)viewName;
+- (WebView *)_web_parentWebView;
@end
diff --git a/WebKit/Misc.subproj/WebNSViewExtras.m b/WebKit/Misc.subproj/WebNSViewExtras.m
index b5dbb91..ba6c9f4 100644
--- a/WebKit/Misc.subproj/WebNSViewExtras.m
+++ b/WebKit/Misc.subproj/WebNSViewExtras.m
@@ -1,10 +1,10 @@
/*
- IFNSViewExtras.mm
+ WebNSViewExtras.mm
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFWebView.h>
+#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebView.h>
#ifdef DEBUG_VIEWS
@interface NSObject (Foo)
@@ -14,9 +14,9 @@
@end
#endif
- at implementation NSView (IFExtensions)
+ at implementation NSView (WebExtras)
-- (NSView *) _IF_superviewWithName:(NSString *)viewName
+- (NSView *) _web_superviewWithName:(NSString *)viewName
{
NSView *view;
@@ -30,17 +30,17 @@
return nil;
}
-- (IFWebView *)_IF_parentWebView
+- (WebView *)_web_parentWebView
{
- IFWebView *view = (IFWebView *)[[[self superview] superview] superview];
+ WebView *view = (WebView *)[[[self superview] superview] superview];
- if ([view isKindOfClass: [IFWebView class]])
+ if ([view isKindOfClass: [WebView class]])
return view;
return nil;
}
#ifdef DEBUG_VIEWS
-- (void)_IF_printViewHierarchy: (int)level
+- (void)_web_printViewHierarchy: (int)level
{
NSArray *subviews;
int _level = level, i;
@@ -63,7 +63,7 @@
printf ("%s renderFramePart %p (%f,%f) w %f, h %f\n", [[[self class] className] cString], rfp, f.origin.x, f.origin.y, f.size.width, f.size.height);
for (i = 0; i < (int)[subviews count]; i++){
subview = [subviews objectAtIndex: i];
- [subview _IF_printViewHierarchy: level + 1];
+ [subview _web_printViewHierarchy: level + 1];
}
}
#endif
diff --git a/WebKit/Misc.subproj/WebStringTruncator.h b/WebKit/Misc.subproj/WebStringTruncator.h
index ac97638..efb849c 100644
--- a/WebKit/Misc.subproj/WebStringTruncator.h
+++ b/WebKit/Misc.subproj/WebStringTruncator.h
@@ -1,5 +1,5 @@
//
-// IFStringTruncator.h
+// WebStringTruncator.h
//
// Created by Darin Adler on Fri May 10 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
@@ -10,7 +10,7 @@
@class NSFont;
- at interface IFStringTruncator : NSObject
+ at interface WebStringTruncator : NSObject
{
}
diff --git a/WebKit/Misc.subproj/WebStringTruncator.m b/WebKit/Misc.subproj/WebStringTruncator.m
index 33e7dc1..667f35a 100644
--- a/WebKit/Misc.subproj/WebStringTruncator.m
+++ b/WebKit/Misc.subproj/WebStringTruncator.m
@@ -1,26 +1,26 @@
//
-// IFStringTruncator.m
+// WebStringTruncator.m
//
// Created by Darin Adler on Fri May 10 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
// Complete rewrite with API similar to slow truncator by Al Dul
-#import <WebKit/IFStringTruncator.h>
+#import <WebKit/WebStringTruncator.h>
#import <Cocoa/Cocoa.h>
#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFTextRenderer.h>
+#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebTextRenderer.h>
#define STRING_BUFFER_SIZE 2048
#define ELLIPSIS_CHARACTER 0x2026
static NSFont *currentFont;
-static IFTextRenderer *currentRenderer;
+static WebTextRenderer *currentRenderer;
static float currentEllipsisWidth;
- at implementation IFStringTruncator
+ at implementation WebStringTruncator
+ (unsigned)centerTruncateString:(NSString *)string length:(unsigned)length keepCount:(unsigned)keepCount toBuffer:(unichar *)buffer
{
@@ -74,8 +74,8 @@ static float currentEllipsisWidth;
[currentFont release];
currentFont = [font retain];
[currentRenderer release];
- [IFTextRendererFactory createSharedFactory];
- currentRenderer = [[[IFTextRendererFactory sharedFactory] rendererWithFont:font] retain];
+ [WebTextRendererFactory createSharedFactory];
+ currentRenderer = [[[WebTextRendererFactory sharedFactory] rendererWithFont:font] retain];
ellipsis = ELLIPSIS_CHARACTER;
currentEllipsisWidth = [currentRenderer floatWidthForCharacters:&ellipsis stringLength:1 fromCharacterPosition: 0 numberOfCharacters: 1 applyRounding: NO attemptFontSubstitution: YES];
}
diff --git a/WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/classes.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
similarity index 100%
rename from WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/classes.nib
rename to WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/classes.nib
diff --git a/WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/info.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
similarity index 100%
rename from WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/info.nib
rename to WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/info.nib
diff --git a/WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/objects.nib b/WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib
similarity index 100%
rename from WebKit/Panels.subproj/English.lproj/IFAuthenticationPanel.nib/objects.nib
rename to WebKit/Panels.subproj/English.lproj/WebAuthenticationPanel.nib/objects.nib
diff --git a/WebKit/Panels.subproj/IFAuthenticationPanel.h b/WebKit/Panels.subproj/IFAuthenticationPanel.h
deleted file mode 100644
index 5487683..0000000
--- a/WebKit/Panels.subproj/IFAuthenticationPanel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- IFAuthenticationPanel.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <WebFoundation/IFAuthenticationManager.h>
-
- at interface IFAuthenticationPanel : NSObject
-{
- IBOutlet id mainLabel;
- IBOutlet id panel;
- IBOutlet id password;
- IBOutlet id smallLabel;
- IBOutlet id username;
- IBOutlet id imageView;
- BOOL nibLoaded;
- BOOL usingSheet;
- id callback;
- SEL selector;
- IFAuthenticationRequest *request;
-}
-
--(id)initWithCallback:(id)cb selector:(SEL)sel;
-
-// Interface-related methods
-- (IBAction)cancel:(id)sender;
-- (IBAction)logIn:(id)sender;
-
-- (BOOL)loadNib;
-
-- (void)runAsModalDialogWithRequest:(IFAuthenticationRequest *)req;
-- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(IFAuthenticationRequest *)req;
-
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
-
-
- at end
diff --git a/WebKit/Panels.subproj/IFAuthenticationPanel.m b/WebKit/Panels.subproj/IFAuthenticationPanel.m
deleted file mode 100644
index ba1bb0f..0000000
--- a/WebKit/Panels.subproj/IFAuthenticationPanel.m
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- IFAuthenticationPanel.m
-
- Copyright 2002 Apple, Inc. All rights reserved.
-*/
-
-
-#import <WebKit/IFAuthenticationPanel.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/WebKitDebug.h>
-
-
-#define IFAuthenticationPanelNibName @"IFAuthenticationPanel"
-
- at implementation IFAuthenticationPanel
-
--(id)initWithCallback:(id)cb selector:(SEL)sel
-{
- self = [self init];
- if (self != nil) {
- callback = [cb retain];
- selector = sel;
- }
- return self;
-}
-
-
-- (void)dealloc
-{
- [panel release];
-
- [callback release];
-
- [super dealloc];
-}
-
-// IB actions
-
-- (IBAction)cancel:(id)sender
-{
- [panel close];
- if (usingSheet) {
- [[NSApplication sharedApplication] endSheet:panel returnCode:1];
- } else {
- [[NSApplication sharedApplication] stopModalWithCode:1];
- }
-}
-
-- (IBAction)logIn:(id)sender
-{
- [panel close];
- if (usingSheet) {
- [[NSApplication sharedApplication] endSheet:panel returnCode:0];
- } else {
- [[NSApplication sharedApplication] stopModalWithCode:0];
- }
-}
-
-- (BOOL)loadNib
-{
- if (!nibLoaded) {
- if ([NSBundle loadNibNamed:IFAuthenticationPanelNibName owner:self]) {
- nibLoaded = YES;
- [imageView setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
- } else {
- NSLog(@"%s:%d %s: couldn't load nib named '%@'",
- __FILE__, __LINE__, __FUNCTION__,IFAuthenticationPanelNibName);
- return FALSE;
- }
- }
- return TRUE;
-}
-
-// Methods related to displaying the panel
-
-
--(void)setUpForRequest:(IFAuthenticationRequest *)req
-{
- [self loadNib];
-
- // FIXME Radar 2876448: we should display a different dialog depending on the
- // failure count (if the user tried and failed, the dialog should
- // explain possible reasons)
- // FIXME Radar 2876446: need to automatically adjust height of main label
- [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [req realm], [[req url] host]]];
- if ([req willPasswordBeSentInClear]) {
- [smallLabel setStringValue:@"Your password will be sent in the clear."];
- } else {
- [smallLabel setStringValue:@"Your log-in information will be sent securely."];
- }
-
- if ([req username] != nil) {
- [username setStringValue:[req username]];
- [panel setInitialFirstResponder:password];
- } else {
- [username setStringValue:@""];
- [password setStringValue:@""];
- [panel setInitialFirstResponder:username];
- }
-}
-
-- (void)runAsModalDialogWithRequest:(IFAuthenticationRequest *)req
-{
- [self setUpForRequest:req];
- usingSheet = FALSE;
- IFAuthenticationResult *result = nil;
-
- if ([[NSApplication sharedApplication] runModalForWindow:panel] == 0) {
- result = [IFAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
- }
-
- [callback performSelector:selector withObject:req withObject:result];
-}
-
-- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(IFAuthenticationRequest *)req
-{
- WEBKIT_ASSERT(!usingSheet);
-
- [self setUpForRequest:req];
-
- usingSheet = TRUE;
- request = [req retain];
-
- [[NSApplication sharedApplication] beginSheet:panel modalForWindow:window modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:NULL];
-}
-
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
-{
- IFAuthenticationResult *result = nil;
- IFAuthenticationRequest *req;
-
- WEBKIT_ASSERT(usingSheet);
- WEBKIT_ASSERT(request != nil);
-
- if (returnCode == 0) {
- result = [IFAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
- }
-
- // We take this tricky approach to nilling out and releasing the request,
- // because the callback below might remove our last ref.
- req = request;
- request = nil;
- [callback performSelector:selector withObject:req withObject:result];
- [req release];
-}
-
- at end
diff --git a/WebKit/Panels.subproj/IFPanelAuthenticationHandler.h b/WebKit/Panels.subproj/IFPanelAuthenticationHandler.h
deleted file mode 100644
index 09755ba..0000000
--- a/WebKit/Panels.subproj/IFPanelAuthenticationHandler.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- IFPanelAuthenticationHandler.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-#import <Foundation/Foundation.h>
-#import <WebFoundation/IFAuthenticationManager.h>
-
-
- at interface IFPanelAuthenticationHandler : NSObject <IFAuthenticationHandler>
-{
- NSMutableDictionary *windowToPanel;
- NSMutableDictionary *requestToWindow;
-}
-
-// IFAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(IFAuthenticationRequest *)request;
--(void)startAuthentication:(IFAuthenticationRequest *)request;
--(void)cancelAuthentication:(IFAuthenticationRequest *)request;
-
-
- at end
diff --git a/WebKit/Panels.subproj/IFPanelAuthenticationHandler.m b/WebKit/Panels.subproj/IFPanelAuthenticationHandler.m
deleted file mode 100644
index ba656f8..0000000
--- a/WebKit/Panels.subproj/IFPanelAuthenticationHandler.m
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- IFPanelAuthenticationHandler.m
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-
-#import <WebKit/IFPanelAuthenticationHandler.h>
-#import <WebKit/IFAuthenticationPanel.h>
-#import <WebKit/IFStandardPanels.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-
-static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
-
- at implementation IFPanelAuthenticationHandler
-
--(id)init
-{
- self = [super init];
- if (self != nil) {
- windowToPanel = [[NSMutableDictionary alloc] init];
- requestToWindow = [[NSMutableDictionary alloc] init];
- }
- return self;
-}
-
--(void)dealloc
-{
- [windowToPanel release];
- [requestToWindow release];
- [super dealloc];
-}
-
-// IFAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(IFAuthenticationRequest *)request
-{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
-
- if (window == nil) {
- window = IFModalDialogPretendWindow;
- }
-
- return [windowToPanel objectForKey:window] == nil;
-}
-
--(void)startAuthentication:(IFAuthenticationRequest *)request
-{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
-
- if (window == nil) {
- window = IFModalDialogPretendWindow;
- }
-
- if ([windowToPanel objectForKey:window] != nil) {
- [request authenticationDone:nil];
- return;
- }
-
- IFAuthenticationPanel *panel = [[IFAuthenticationPanel alloc] initWithCallback:self selector:@selector(_authenticationDoneWithRequest:result:)];
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
- [panel release];
-
- if (window == IFModalDialogPretendWindow) {
- [panel runAsModalDialogWithRequest:request];
- } else {
- [panel runAsSheetOnWindow:window withRequest:request];
- }
-}
-
--(void)cancelAuthentication:(IFAuthenticationRequest *)request
-{
- id window = [requestToWindow objectForKey:request];
- if (window != nil) {
- IFAuthenticationPanel *panel = [windowToPanel objectForKey:window];
- [panel cancel:self];
- }
-}
-
--(void)_authenticationDoneWithRequest:(IFAuthenticationRequest *)request result:(IFAuthenticationResult *)result
-{
- id window = [requestToWindow objectForKey:request];
- if (window != nil) {
- [windowToPanel removeObjectForKey:window];
- [requestToWindow removeObjectForKey:request];
- }
-
- [request authenticationDone:result];
-}
-
- at end
diff --git a/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.h b/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.h
deleted file mode 100644
index c658d6f..0000000
--- a/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- IFPanelAuthenticationHandler.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-#import <Foundation/Foundation.h>
-#import <WebFoundation/IFCookieManager.h>
-
- at class NSWindow;
-
- at interface IFPanelCookieAcceptHandler : NSObject <IFCookieAcceptHandler>
-{
- NSMutableDictionary *windowToPanel;
- NSMutableDictionary *requestToWindow;
-}
-
-- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
-
-// IFCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(IFCookieAcceptRequest *)request;
--(void)startCookieAcceptCheck:(IFCookieAcceptRequest *)request;
--(void)cancelCookieAcceptCheck:(IFCookieAcceptRequest *)request;
-
- at end
diff --git a/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.m b/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.m
deleted file mode 100644
index bbdf5da..0000000
--- a/WebKit/Panels.subproj/IFPanelCookieAcceptHandler.m
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- IFPanelCookieAcceptHandler.m
-
- Copyright 2002 Apple, Inc. All rights reserved.
- */
-
-
-#import <Cocoa/Cocoa.h>
-#import <WebKit/IFPanelCookieAcceptHandler.h>
-#import <WebKit/IFStandardPanels.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-
-static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
-
- at implementation IFPanelCookieAcceptHandler
-
--(id)init
-{
- self = [super init];
- if (self != nil) {
- windowToPanel = [[NSMutableDictionary alloc] init];
- requestToWindow = [[NSMutableDictionary alloc] init];
- }
- return self;
-}
-
--(void)dealloc
-{
- [windowToPanel release];
- [requestToWindow release];
- [super dealloc];
-}
-
-// IFCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(IFCookieAcceptRequest *)request
-{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
-
- if (window == nil) {
- window = IFModalDialogPretendWindow;
- }
-
- return [windowToPanel objectForKey:window] == nil;
-}
-
--(void)startCookieAcceptCheck:(IFCookieAcceptRequest *)request
-{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
-
- if (window == nil) {
- window = IFModalDialogPretendWindow;
- }
-
- if ([windowToPanel objectForKey:window] != nil) {
- [request cookieAcceptCheckDone:FALSE];
- return;
- }
-
- NSWindow *panel;
-
- if (window == IFModalDialogPretendWindow) {
- if ([[request cookies] count] == 1) {
- panel = NSGetAlertPanel(@"Accept cookie?",
- @"Server \"%@\" has sent 1 cookie.",
- @"Accept", @"Reject", nil,
- [[request url] host]);
- } else {
- panel = NSGetAlertPanel(@"Accept cookies?",
- @"Server \"%@\" has sent %d cookies.",
- @"Accept", @"Reject", nil,
- [[request url] host], [[request cookies] count]);
- }
-
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
- [panel release];
-
- [self doneWithCheck:panel returnCode:[NSApp runModalForWindow:panel] contextInfo:request];
- } else {
- if ([[request cookies] count] == 1) {
- NSBeginAlertSheet(@"Accept cookie?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent 1 cookie.", [[request url] host]);
- } else {
- NSBeginAlertSheet(@"Accept cookies?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent %d cookies.", [[request url] host], [[request cookies] count]);
- }
- panel = [window attachedSheet];
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
- }
-}
-
--(void)cancelCookieAcceptCheck:(IFCookieAcceptRequest *)request
-{
- id window = [requestToWindow objectForKey:request];
- if (window != nil) {
- NSWindow *panel = [windowToPanel objectForKey:window];
- [panel close];
- if (window == IFModalDialogPretendWindow) {
- [NSApp stopModalWithCode:NSAlertAlternateReturn];
- } else {
- [NSApp endSheet:panel returnCode:NSAlertAlternateReturn];
- }
- }
-}
-
-- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
-{
- IFCookieAcceptRequest *request = (IFCookieAcceptRequest *)contextInfo;
-
- id window = [requestToWindow objectForKey:request];
- if (window != nil) {
- [windowToPanel removeObjectForKey:window];
- [requestToWindow removeObjectForKey:request];
- }
-
- [request cookieAcceptCheckDone:(returnCode == NSAlertDefaultReturn)];
-}
-
- at end
diff --git a/WebKit/Panels.subproj/IFStandardPanels.h b/WebKit/Panels.subproj/IFStandardPanels.h
deleted file mode 100644
index 8f25f34..0000000
--- a/WebKit/Panels.subproj/IFStandardPanels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- IFStandardPanels.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class IFStandardPanelsPrivate;
-
- at interface IFStandardPanels : NSObject
-{
- at private
- IFStandardPanelsPrivate *_privatePanels;
-}
-
-+(IFStandardPanels *)sharedStandardPanels;
-
--(void)setUseStandardAuthenticationPanel:(BOOL)use;
--(BOOL)useStandardAuthenticationPanel;
--(void)setUseStandardCookieAcceptPanel:(BOOL)use;
--(BOOL)useStandardCookieAcceptPanel;
-
--(void)didStartLoadingURL:(NSURL *)url inWindow:(NSWindow *)window;
--(void)didStopLoadingURL:(NSURL *)url inWindow:(NSWindow *)window;
-
--(NSWindow *)frontmostWindowLoadingURL:(NSURL *)url;
-
- at end
diff --git a/WebKit/Panels.subproj/IFStandardPanels.m b/WebKit/Panels.subproj/IFStandardPanels.m
deleted file mode 100644
index b1f759f..0000000
--- a/WebKit/Panels.subproj/IFStandardPanels.m
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- IFStandardPanels.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFStandardPanels.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/IFPanelAuthenticationHandler.h>
-#import <WebKit/IFPanelCookieAcceptHandler.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebView.h>
-#import <WebFoundation/IFAuthenticationManager.h>
-#import <WebFoundation/IFCookieManager.h>
-
-#import <Carbon/Carbon.h>
-
- at interface IFStandardPanelsPrivate : NSObject
-{
- at public
- IFPanelAuthenticationHandler *panelAuthenticationHandler;
- IFPanelCookieAcceptHandler *panelCookieAcceptHandler;
- NSMutableDictionary *urlContainers;
-}
- at end
-
- at implementation IFStandardPanelsPrivate
-
--(id)init
-{
- self = [super init];
- if (self != nil) {
- urlContainers = [[NSMutableDictionary alloc] init];
- }
- return self;
-}
-
--(void)dealloc
-{
- [urlContainers release];
- [panelAuthenticationHandler release];
- [super dealloc];
-}
-
- at end
-
- at implementation IFStandardPanels
-
-// Private init method to implement the singleton pattern
--(id)_init
-{
- self = [super init];
- if (self != nil) {
- _privatePanels = [[IFStandardPanelsPrivate alloc] init];
- }
- return self;
-}
-
--(id)init
-{
- // FIXME: should assert instead (or return a reference to the shared instance)
- [self release];
- return nil;
-}
-
--(void)dealloc
-{
- [_privatePanels release];
- [super dealloc];
-}
-
-static IFStandardPanels *sharedStandardPanels = NULL;
-
-static void initSharedStandardPanels(void)
-{
- sharedStandardPanels = [[IFStandardPanels alloc] _init];
-}
-
-+(IFStandardPanels *)sharedStandardPanels
-{
- static pthread_once_t sharedStandardPanelsOnce = PTHREAD_ONCE_INIT;
- pthread_once(&sharedStandardPanelsOnce, initSharedStandardPanels);
- return sharedStandardPanels;
-}
-
--(void)setUseStandardAuthenticationPanel:(BOOL)use
-{
- if (use) {
- if (![self useStandardAuthenticationPanel]) {
- _privatePanels->panelAuthenticationHandler = [[IFPanelAuthenticationHandler alloc] init];
- [[IFAuthenticationManager sharedAuthenticationManager] addAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
- }
- } else {
- if ([self useStandardAuthenticationPanel]) {
- [[IFAuthenticationManager sharedAuthenticationManager] removeAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
- [_privatePanels->panelAuthenticationHandler release];
- _privatePanels->panelAuthenticationHandler = nil;
- }
- }
-}
-
--(BOOL)useStandardAuthenticationPanel
-{
- return _privatePanels->panelAuthenticationHandler != nil;
-}
-
--(void)setUseStandardCookieAcceptPanel:(BOOL)use
-{
- if (use) {
- if (![self useStandardCookieAcceptPanel]) {
- _privatePanels->panelCookieAcceptHandler = [[IFPanelCookieAcceptHandler alloc] init];
- [[IFCookieManager sharedCookieManager] addAcceptHandler:_privatePanels->panelCookieAcceptHandler];
- }
- } else {
- if ([self useStandardCookieAcceptPanel]) {
- [[IFCookieManager sharedCookieManager] removeAcceptHandler:_privatePanels->panelCookieAcceptHandler];
- [_privatePanels->panelCookieAcceptHandler release];
- _privatePanels->panelCookieAcceptHandler = nil;
- }
- }
-}
-
--(BOOL)useStandardCookieAcceptPanel
-{
- return _privatePanels->panelCookieAcceptHandler != nil;
-}
-
--(void)didStartLoadingURL:(NSURL *)url inWindow:(NSWindow *)window
-{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
-
- if (set == nil) {
- set = [NSCountedSet set];
- [_privatePanels->urlContainers setObject:set forKey:url];
- }
-
- [set addObject:window];
-}
-
--(void)didStopLoadingURL:(NSURL *)url inWindow:(NSWindow *)window
-{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
-
- if (set == nil) {
- return;
- }
-
- [set removeObject:window];
-
- if ([set count] == 0) {
- [_privatePanels->urlContainers removeObjectForKey:url];
- }
-}
-
--(void)_didStartLoadingURL:(NSURL *)url inController:(IFWebController *)controller
-{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
-
- if (set == nil) {
- set = [NSCountedSet set];
- [_privatePanels->urlContainers setObject:set forKey:url];
- }
-
- [set addObject:controller];
-}
-
--(void)_didStopLoadingURL:(NSURL *)url inController:(IFWebController *)controller
-{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
-
- if (set == nil) {
- return;
- }
-
- [set removeObject:controller];
-
- if ([set count] == 0) {
- [_privatePanels->urlContainers objectForKey:url];
- }
-}
-
-static BOOL WindowInFront(NSWindow *a, NSWindow *b)
-{
- UInt32 aIndex;
- UInt32 bIndex;
-
- GetWindowIndex([a windowRef], NULL, kWindowGroupContentsReturnWindows, &aIndex);
- GetWindowIndex([b windowRef], NULL, kWindowGroupContentsReturnWindows, &bIndex);
-
- return aIndex < bIndex;
- // void NSWindowList(int size, int list[])
- // void NSCountWindowsForContext(int context, int *count)
- // void NSWindowListForContext(int context, int size, int list[])
-}
-
--(NSWindow *)frontmostWindowLoadingURL:(NSURL *)url
-{
- NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
-
- if (set == nil) {
- return nil;
- }
-
- NSEnumerator *enumerator = [set objectEnumerator];
- NSWindow *frontmostWindow = nil;
- id object;
-
- while ((object = [enumerator nextObject]) != nil) {
- NSWindow *window;
- if ([object isKindOfClass:[NSWindow class]]) {
- window = object;
- } else {
- window = [[[object mainFrame] webView] window];
- }
-
- if (window != nil && [window isVisible] && (frontmostWindow == nil || WindowInFront(window, frontmostWindow))) {
- frontmostWindow = window;
- }
- }
-
- return frontmostWindow;
-}
-
- at end
-
-
-
diff --git a/WebKit/Panels.subproj/IFStandardPanelsPrivate.h b/WebKit/Panels.subproj/IFStandardPanelsPrivate.h
deleted file mode 100644
index da97eea..0000000
--- a/WebKit/Panels.subproj/IFStandardPanelsPrivate.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- IFStandardPanelsPrivate.h
-
- Copyright 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFStandardPanels.h>
-#import <WebKit/IFWebController.h>
-
- at interface IFStandardPanels (Private)
-
--(void)_didStartLoadingURL:(NSURL *)url inController:(IFWebController *)controller;
--(void)_didStopLoadingURL:(NSURL *)url inController:(IFWebController *)controller;
-
- at end
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.h b/WebKit/Panels.subproj/WebAuthenticationPanel.h
index 5487683..8643eb8 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.h
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.h
@@ -1,13 +1,13 @@
/*
- IFAuthenticationPanel.h
+ WebAuthenticationPanel.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
-#import <WebFoundation/IFAuthenticationManager.h>
+#import <WebFoundation/WebAuthenticationManager.h>
- at interface IFAuthenticationPanel : NSObject
+ at interface WebAuthenticationPanel : NSObject
{
IBOutlet id mainLabel;
IBOutlet id panel;
@@ -19,7 +19,7 @@
BOOL usingSheet;
id callback;
SEL selector;
- IFAuthenticationRequest *request;
+ WebAuthenticationRequest *request;
}
-(id)initWithCallback:(id)cb selector:(SEL)sel;
@@ -30,8 +30,8 @@
- (BOOL)loadNib;
-- (void)runAsModalDialogWithRequest:(IFAuthenticationRequest *)req;
-- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(IFAuthenticationRequest *)req;
+- (void)runAsModalDialogWithRequest:(WebAuthenticationRequest *)req;
+- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(WebAuthenticationRequest *)req;
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index ba1bb0f..3867a52 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -1,18 +1,18 @@
/*
- IFAuthenticationPanel.m
+ WebAuthenticationPanel.m
Copyright 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFAuthenticationPanel.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
+#import <WebKit/WebAuthenticationPanel.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebKitDebug.h>
-#define IFAuthenticationPanelNibName @"IFAuthenticationPanel"
+#define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
- at implementation IFAuthenticationPanel
+ at implementation WebAuthenticationPanel
-(id)initWithCallback:(id)cb selector:(SEL)sel
{
@@ -59,12 +59,12 @@
- (BOOL)loadNib
{
if (!nibLoaded) {
- if ([NSBundle loadNibNamed:IFAuthenticationPanelNibName owner:self]) {
+ if ([NSBundle loadNibNamed:WebAuthenticationPanelNibName owner:self]) {
nibLoaded = YES;
[imageView setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
} else {
NSLog(@"%s:%d %s: couldn't load nib named '%@'",
- __FILE__, __LINE__, __FUNCTION__,IFAuthenticationPanelNibName);
+ __FILE__, __LINE__, __FUNCTION__,WebAuthenticationPanelNibName);
return FALSE;
}
}
@@ -74,7 +74,7 @@
// Methods related to displaying the panel
--(void)setUpForRequest:(IFAuthenticationRequest *)req
+-(void)setUpForRequest:(WebAuthenticationRequest *)req
{
[self loadNib];
@@ -99,20 +99,20 @@
}
}
-- (void)runAsModalDialogWithRequest:(IFAuthenticationRequest *)req
+- (void)runAsModalDialogWithRequest:(WebAuthenticationRequest *)req
{
[self setUpForRequest:req];
usingSheet = FALSE;
- IFAuthenticationResult *result = nil;
+ WebAuthenticationResult *result = nil;
if ([[NSApplication sharedApplication] runModalForWindow:panel] == 0) {
- result = [IFAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
+ result = [WebAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
}
[callback performSelector:selector withObject:req withObject:result];
}
-- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(IFAuthenticationRequest *)req
+- (void)runAsSheetOnWindow:(NSWindow *)window withRequest:(WebAuthenticationRequest *)req
{
WEBKIT_ASSERT(!usingSheet);
@@ -126,14 +126,14 @@
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
- IFAuthenticationResult *result = nil;
- IFAuthenticationRequest *req;
+ WebAuthenticationResult *result = nil;
+ WebAuthenticationRequest *req;
WEBKIT_ASSERT(usingSheet);
WEBKIT_ASSERT(request != nil);
if (returnCode == 0) {
- result = [IFAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
+ result = [WebAuthenticationResult authenticationResultWithUsername:[username stringValue] password:[password stringValue]];
}
// We take this tricky approach to nilling out and releasing the request,
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
index 09755ba..265af4c 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.h
@@ -1,23 +1,23 @@
/*
- IFPanelAuthenticationHandler.h
+ WebPanelAuthenticationHandler.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import <WebFoundation/IFAuthenticationManager.h>
+#import <WebFoundation/WebAuthenticationManager.h>
- at interface IFPanelAuthenticationHandler : NSObject <IFAuthenticationHandler>
+ at interface WebPanelAuthenticationHandler : NSObject <WebAuthenticationHandler>
{
NSMutableDictionary *windowToPanel;
NSMutableDictionary *requestToWindow;
}
-// IFAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(IFAuthenticationRequest *)request;
--(void)startAuthentication:(IFAuthenticationRequest *)request;
--(void)cancelAuthentication:(IFAuthenticationRequest *)request;
+// WebAuthenticationHandler methods
+-(BOOL)readyToStartAuthentication:(WebAuthenticationRequest *)request;
+-(void)startAuthentication:(WebAuthenticationRequest *)request;
+-(void)cancelAuthentication:(WebAuthenticationRequest *)request;
@end
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index ba656f8..4d16d38 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -1,18 +1,18 @@
/*
- IFPanelAuthenticationHandler.m
+ WebPanelAuthenticationHandler.m
Copyright 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFPanelAuthenticationHandler.h>
-#import <WebKit/IFAuthenticationPanel.h>
-#import <WebKit/IFStandardPanels.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
+#import <WebKit/WebPanelAuthenticationHandler.h>
+#import <WebKit/WebAuthenticationPanel.h>
+#import <WebKit/WebStandardPanels.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
-static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
+static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
- at implementation IFPanelAuthenticationHandler
+ at implementation WebPanelAuthenticationHandler
-(id)init
{
@@ -31,24 +31,24 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
[super dealloc];
}
-// IFAuthenticationHandler methods
--(BOOL)readyToStartAuthentication:(IFAuthenticationRequest *)request
+// WebAuthenticationHandler methods
+-(BOOL)readyToStartAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
if (window == nil) {
- window = IFModalDialogPretendWindow;
+ window = WebModalDialogPretendWindow;
}
return [windowToPanel objectForKey:window] == nil;
}
--(void)startAuthentication:(IFAuthenticationRequest *)request
+-(void)startAuthentication:(WebAuthenticationRequest *)request
{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
if (window == nil) {
- window = IFModalDialogPretendWindow;
+ window = WebModalDialogPretendWindow;
}
if ([windowToPanel objectForKey:window] != nil) {
@@ -56,28 +56,28 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
return;
}
- IFAuthenticationPanel *panel = [[IFAuthenticationPanel alloc] initWithCallback:self selector:@selector(_authenticationDoneWithRequest:result:)];
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
+ WebAuthenticationPanel *panel = [[WebAuthenticationPanel alloc] initWithCallback:self selector:@selector(_authenticationDoneWithRequest:result:)];
+ [requestToWindow _web_setObject:window forUncopiedKey:request];
+ [windowToPanel _web_setObject:panel forUncopiedKey:window];
[panel release];
- if (window == IFModalDialogPretendWindow) {
+ if (window == WebModalDialogPretendWindow) {
[panel runAsModalDialogWithRequest:request];
} else {
[panel runAsSheetOnWindow:window withRequest:request];
}
}
--(void)cancelAuthentication:(IFAuthenticationRequest *)request
+-(void)cancelAuthentication:(WebAuthenticationRequest *)request
{
id window = [requestToWindow objectForKey:request];
if (window != nil) {
- IFAuthenticationPanel *panel = [windowToPanel objectForKey:window];
+ WebAuthenticationPanel *panel = [windowToPanel objectForKey:window];
[panel cancel:self];
}
}
--(void)_authenticationDoneWithRequest:(IFAuthenticationRequest *)request result:(IFAuthenticationResult *)result
+-(void)_authenticationDoneWithRequest:(WebAuthenticationRequest *)request result:(WebAuthenticationResult *)result
{
id window = [requestToWindow objectForKey:request];
if (window != nil) {
diff --git a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h
index c658d6f..3e2a2f3 100644
--- a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h
+++ b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.h
@@ -1,15 +1,15 @@
/*
- IFPanelAuthenticationHandler.h
+ WebPanelAuthenticationHandler.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
-#import <WebFoundation/IFCookieManager.h>
+#import <WebFoundation/WebCookieManager.h>
@class NSWindow;
- at interface IFPanelCookieAcceptHandler : NSObject <IFCookieAcceptHandler>
+ at interface WebPanelCookieAcceptHandler : NSObject <WebCookieAcceptHandler>
{
NSMutableDictionary *windowToPanel;
NSMutableDictionary *requestToWindow;
@@ -17,9 +17,9 @@
- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
-// IFCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(IFCookieAcceptRequest *)request;
--(void)startCookieAcceptCheck:(IFCookieAcceptRequest *)request;
--(void)cancelCookieAcceptCheck:(IFCookieAcceptRequest *)request;
+// WebCookieAcceptHandler methods
+-(BOOL)readyToStartCookieAcceptCheck:(WebCookieAcceptRequest *)request;
+-(void)startCookieAcceptCheck:(WebCookieAcceptRequest *)request;
+-(void)cancelCookieAcceptCheck:(WebCookieAcceptRequest *)request;
@end
diff --git a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
index bbdf5da..e09effc 100644
--- a/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
+++ b/WebKit/Panels.subproj/WebPanelCookieAcceptHandler.m
@@ -1,18 +1,18 @@
/*
- IFPanelCookieAcceptHandler.m
+ WebPanelCookieAcceptHandler.m
Copyright 2002 Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/IFPanelCookieAcceptHandler.h>
-#import <WebKit/IFStandardPanels.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
+#import <WebKit/WebPanelCookieAcceptHandler.h>
+#import <WebKit/WebStandardPanels.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
-static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
+static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
- at implementation IFPanelCookieAcceptHandler
+ at implementation WebPanelCookieAcceptHandler
-(id)init
{
@@ -31,24 +31,24 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
[super dealloc];
}
-// IFCookieAcceptHandler methods
--(BOOL)readyToStartCookieAcceptCheck:(IFCookieAcceptRequest *)request
+// WebCookieAcceptHandler methods
+-(BOOL)readyToStartCookieAcceptCheck:(WebCookieAcceptRequest *)request
{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
if (window == nil) {
- window = IFModalDialogPretendWindow;
+ window = WebModalDialogPretendWindow;
}
return [windowToPanel objectForKey:window] == nil;
}
--(void)startCookieAcceptCheck:(IFCookieAcceptRequest *)request
+-(void)startCookieAcceptCheck:(WebCookieAcceptRequest *)request
{
- id window = [[IFStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
+ id window = [[WebStandardPanels sharedStandardPanels] frontmostWindowLoadingURL:[request url]];
if (window == nil) {
- window = IFModalDialogPretendWindow;
+ window = WebModalDialogPretendWindow;
}
if ([windowToPanel objectForKey:window] != nil) {
@@ -58,7 +58,7 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
NSWindow *panel;
- if (window == IFModalDialogPretendWindow) {
+ if (window == WebModalDialogPretendWindow) {
if ([[request cookies] count] == 1) {
panel = NSGetAlertPanel(@"Accept cookie?",
@"Server \"%@\" has sent 1 cookie.",
@@ -71,8 +71,8 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
[[request url] host], [[request cookies] count]);
}
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
+ [requestToWindow _web_setObject:window forUncopiedKey:request];
+ [windowToPanel _web_setObject:panel forUncopiedKey:window];
[panel release];
[self doneWithCheck:panel returnCode:[NSApp runModalForWindow:panel] contextInfo:request];
@@ -83,18 +83,18 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
NSBeginAlertSheet(@"Accept cookies?", @"Accept", @"Reject", nil, window, self, @selector(doneWithCheck:returnCode:contextInfo:), nil, request, @"Server \"%@\" has sent %d cookies.", [[request url] host], [[request cookies] count]);
}
panel = [window attachedSheet];
- [requestToWindow _IF_setObject:window forUncopiedKey:request];
- [windowToPanel _IF_setObject:panel forUncopiedKey:window];
+ [requestToWindow _web_setObject:window forUncopiedKey:request];
+ [windowToPanel _web_setObject:panel forUncopiedKey:window];
}
}
--(void)cancelCookieAcceptCheck:(IFCookieAcceptRequest *)request
+-(void)cancelCookieAcceptCheck:(WebCookieAcceptRequest *)request
{
id window = [requestToWindow objectForKey:request];
if (window != nil) {
NSWindow *panel = [windowToPanel objectForKey:window];
[panel close];
- if (window == IFModalDialogPretendWindow) {
+ if (window == WebModalDialogPretendWindow) {
[NSApp stopModalWithCode:NSAlertAlternateReturn];
} else {
[NSApp endSheet:panel returnCode:NSAlertAlternateReturn];
@@ -104,7 +104,7 @@ static NSString *IFModalDialogPretendWindow = @"IFModalDialogPretendWindow";
- (void)doneWithCheck:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
{
- IFCookieAcceptRequest *request = (IFCookieAcceptRequest *)contextInfo;
+ WebCookieAcceptRequest *request = (WebCookieAcceptRequest *)contextInfo;
id window = [requestToWindow objectForKey:request];
if (window != nil) {
diff --git a/WebKit/Panels.subproj/WebStandardPanels.h b/WebKit/Panels.subproj/WebStandardPanels.h
index 8f25f34..08dcf68 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.h
+++ b/WebKit/Panels.subproj/WebStandardPanels.h
@@ -1,20 +1,20 @@
/*
- IFStandardPanels.h
+ WebStandardPanels.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
- at class IFStandardPanelsPrivate;
+ at class WebStandardPanelsPrivate;
- at interface IFStandardPanels : NSObject
+ at interface WebStandardPanels : NSObject
{
@private
- IFStandardPanelsPrivate *_privatePanels;
+ WebStandardPanelsPrivate *_privatePanels;
}
-+(IFStandardPanels *)sharedStandardPanels;
++(WebStandardPanels *)sharedStandardPanels;
-(void)setUseStandardAuthenticationPanel:(BOOL)use;
-(BOOL)useStandardAuthenticationPanel;
diff --git a/WebKit/Panels.subproj/WebStandardPanels.m b/WebKit/Panels.subproj/WebStandardPanels.m
index b1f759f..6f20b2d 100644
--- a/WebKit/Panels.subproj/WebStandardPanels.m
+++ b/WebKit/Panels.subproj/WebStandardPanels.m
@@ -1,30 +1,30 @@
/*
- IFStandardPanels.h
+ WebStandardPanels.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFStandardPanels.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/IFPanelAuthenticationHandler.h>
-#import <WebKit/IFPanelCookieAcceptHandler.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebView.h>
-#import <WebFoundation/IFAuthenticationManager.h>
-#import <WebFoundation/IFCookieManager.h>
+#import <WebKit/WebStandardPanels.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebPanelAuthenticationHandler.h>
+#import <WebKit/WebPanelCookieAcceptHandler.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebView.h>
+#import <WebFoundation/WebAuthenticationManager.h>
+#import <WebFoundation/WebCookieManager.h>
#import <Carbon/Carbon.h>
- at interface IFStandardPanelsPrivate : NSObject
+ at interface WebStandardPanelsPrivate : NSObject
{
@public
- IFPanelAuthenticationHandler *panelAuthenticationHandler;
- IFPanelCookieAcceptHandler *panelCookieAcceptHandler;
+ WebPanelAuthenticationHandler *panelAuthenticationHandler;
+ WebPanelCookieAcceptHandler *panelCookieAcceptHandler;
NSMutableDictionary *urlContainers;
}
@end
- at implementation IFStandardPanelsPrivate
+ at implementation WebStandardPanelsPrivate
-(id)init
{
@@ -44,14 +44,14 @@
@end
- at implementation IFStandardPanels
+ at implementation WebStandardPanels
// Private init method to implement the singleton pattern
-(id)_init
{
self = [super init];
if (self != nil) {
- _privatePanels = [[IFStandardPanelsPrivate alloc] init];
+ _privatePanels = [[WebStandardPanelsPrivate alloc] init];
}
return self;
}
@@ -69,14 +69,14 @@
[super dealloc];
}
-static IFStandardPanels *sharedStandardPanels = NULL;
+static WebStandardPanels *sharedStandardPanels = NULL;
static void initSharedStandardPanels(void)
{
- sharedStandardPanels = [[IFStandardPanels alloc] _init];
+ sharedStandardPanels = [[WebStandardPanels alloc] _init];
}
-+(IFStandardPanels *)sharedStandardPanels
++(WebStandardPanels *)sharedStandardPanels
{
static pthread_once_t sharedStandardPanelsOnce = PTHREAD_ONCE_INIT;
pthread_once(&sharedStandardPanelsOnce, initSharedStandardPanels);
@@ -87,12 +87,12 @@ static void initSharedStandardPanels(void)
{
if (use) {
if (![self useStandardAuthenticationPanel]) {
- _privatePanels->panelAuthenticationHandler = [[IFPanelAuthenticationHandler alloc] init];
- [[IFAuthenticationManager sharedAuthenticationManager] addAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
+ _privatePanels->panelAuthenticationHandler = [[WebPanelAuthenticationHandler alloc] init];
+ [[WebAuthenticationManager sharedAuthenticationManager] addAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
}
} else {
if ([self useStandardAuthenticationPanel]) {
- [[IFAuthenticationManager sharedAuthenticationManager] removeAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
+ [[WebAuthenticationManager sharedAuthenticationManager] removeAuthenticationHandler:_privatePanels->panelAuthenticationHandler];
[_privatePanels->panelAuthenticationHandler release];
_privatePanels->panelAuthenticationHandler = nil;
}
@@ -108,12 +108,12 @@ static void initSharedStandardPanels(void)
{
if (use) {
if (![self useStandardCookieAcceptPanel]) {
- _privatePanels->panelCookieAcceptHandler = [[IFPanelCookieAcceptHandler alloc] init];
- [[IFCookieManager sharedCookieManager] addAcceptHandler:_privatePanels->panelCookieAcceptHandler];
+ _privatePanels->panelCookieAcceptHandler = [[WebPanelCookieAcceptHandler alloc] init];
+ [[WebCookieManager sharedCookieManager] addAcceptHandler:_privatePanels->panelCookieAcceptHandler];
}
} else {
if ([self useStandardCookieAcceptPanel]) {
- [[IFCookieManager sharedCookieManager] removeAcceptHandler:_privatePanels->panelCookieAcceptHandler];
+ [[WebCookieManager sharedCookieManager] removeAcceptHandler:_privatePanels->panelCookieAcceptHandler];
[_privatePanels->panelCookieAcceptHandler release];
_privatePanels->panelCookieAcceptHandler = nil;
}
@@ -152,7 +152,7 @@ static void initSharedStandardPanels(void)
}
}
--(void)_didStartLoadingURL:(NSURL *)url inController:(IFWebController *)controller
+-(void)_didStartLoadingURL:(NSURL *)url inController:(WebController *)controller
{
NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
@@ -164,7 +164,7 @@ static void initSharedStandardPanels(void)
[set addObject:controller];
}
--(void)_didStopLoadingURL:(NSURL *)url inController:(IFWebController *)controller
+-(void)_didStopLoadingURL:(NSURL *)url inController:(WebController *)controller
{
NSCountedSet *set = [_privatePanels->urlContainers objectForKey:url];
diff --git a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
index da97eea..cf2a27b 100644
--- a/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
+++ b/WebKit/Panels.subproj/WebStandardPanelsPrivate.h
@@ -1,15 +1,15 @@
/*
- IFStandardPanelsPrivate.h
+ WebStandardPanelsPrivate.h
Copyright 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFStandardPanels.h>
-#import <WebKit/IFWebController.h>
+#import <WebKit/WebStandardPanels.h>
+#import <WebKit/WebController.h>
- at interface IFStandardPanels (Private)
+ at interface WebStandardPanels (Private)
--(void)_didStartLoadingURL:(NSURL *)url inController:(IFWebController *)controller;
--(void)_didStopLoadingURL:(NSURL *)url inController:(IFWebController *)controller;
+-(void)_didStartLoadingURL:(NSURL *)url inController:(WebController *)controller;
+-(void)_didStopLoadingURL:(NSURL *)url inController:(WebController *)controller;
@end
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.h b/WebKit/Plugins.subproj/IFNullPluginView.h
deleted file mode 100644
index f100be8..0000000
--- a/WebKit/Plugins.subproj/IFNullPluginView.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- IFNullPluginView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <AppKit/AppKit.h>
-
-
- at interface IFNullPluginView : NSImageView {
-
- BOOL errorSent;
- NSString *mimeType;
- NSURL *pluginPage;
-}
-
-- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments;
-
- at end
diff --git a/WebKit/Plugins.subproj/IFNullPluginView.mm b/WebKit/Plugins.subproj/IFNullPluginView.mm
deleted file mode 100644
index 7931805..0000000
--- a/WebKit/Plugins.subproj/IFNullPluginView.mm
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- IFNullPluginView.mm
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFNullPluginView.h>
-
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFNSViewExtras.h>
-
-#import <WebFoundation/IFNSURLExtensions.h>
-
-static NSImage *image = nil;
-
- at implementation IFNullPluginView
-
-- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments
-{
- NSBundle *bundle;
- NSString *imagePath, *pluginPageString;
-
- self = [super initWithFrame:frame];
- if (self) {
- // Set the view's image to the null plugin icon
- if (!image) {
- bundle = [NSBundle bundleForClass:[IFNullPluginView class]];
- imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
- image = [[NSImage alloc] initWithContentsOfFile:imagePath];
- }
- [self setImage:image];
-
- mimeType = [mime retain];
- pluginPageString = [arguments objectForKey:@"pluginspage"];
- if(pluginPageString)
- pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
-
- errorSent = NO;
- }
- return self;
-}
-
-- (void)dealloc
-{
- [pluginPage release];
- [mimeType release];
- [super dealloc];
-}
-
-- (void)drawRect:(NSRect)rect {
- IFWebView *webView;
- IFWebController *webController;
-
- [super drawRect:rect];
- if(!errorSent){
- errorSent = YES;
- webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
- webController = [webView controller];
- [[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
- }
-}
-
- at end
diff --git a/WebKit/Plugins.subproj/IFPlugin.h b/WebKit/Plugins.subproj/IFPlugin.h
deleted file mode 100644
index db7d004..0000000
--- a/WebKit/Plugins.subproj/IFPlugin.h
+++ /dev/null
@@ -1,82 +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.
- */
-
-#import <Foundation/Foundation.h>
-#import "npapi.h"
-#import <WebCore/WebCoreViewFactory.h>
-
- at interface IFPlugin : NSObject <WebCorePluginInfo>
-{
- NSMutableArray *mimeTypes;
- NSString *name, *path, *filename, *pluginDescription;
- BOOL isLoaded, isBundle, isCFM;
- NPPluginFuncs pluginFuncs;
- NPNetscapeFuncs browserFuncs;
- uint16 pluginSize;
- uint16 pluginVersion;
- CFBundleRef bundle;
- CFragConnectionID connID;
- SInt16 resourceRef;
-
- NPP_NewProcPtr NPP_New;
- NPP_DestroyProcPtr NPP_Destroy;
- NPP_SetWindowProcPtr NPP_SetWindow;
- NPP_NewStreamProcPtr NPP_NewStream;
- NPP_DestroyStreamProcPtr NPP_DestroyStream;
- NPP_StreamAsFileProcPtr NPP_StreamAsFile;
- NPP_WriteReadyProcPtr NPP_WriteReady;
- NPP_WriteProcPtr NPP_Write;
- NPP_PrintProcPtr NPP_Print;
- NPP_HandleEventProcPtr NPP_HandleEvent;
- NPP_URLNotifyProcPtr NPP_URLNotify;
- NPP_GetValueProcPtr NPP_GetValue;
- NPP_SetValueProcPtr NPP_SetValue;
- NPP_ShutdownProcPtr NPP_Shutdown;
-}
-
-- initWithPath:(NSString *)pluginPath;
-- (BOOL)load;
-- (void)unload;
-- (NSString *)mimeTypeForExtension:(NSString *)extension;
-- (NSString *)path;
-- (BOOL)isLoaded;
-- (NSString *)description;
-
-- (NPP_NewProcPtr)NPP_New;
-- (NPP_DestroyProcPtr)NPP_Destroy;
-- (NPP_SetWindowProcPtr)NPP_SetWindow;
-- (NPP_NewStreamProcPtr)NPP_NewStream;
-- (NPP_WriteReadyProcPtr)NPP_WriteReady;
-- (NPP_WriteProcPtr)NPP_Write;
-- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile;
-- (NPP_DestroyStreamProcPtr)NPP_DestroyStream;
-- (NPP_HandleEventProcPtr)NPP_HandleEvent;
-- (NPP_URLNotifyProcPtr)NPP_URLNotify;
-- (NPP_GetValueProcPtr)NPP_GetValue;
-- (NPP_SetValueProcPtr)NPP_SetValue;
-- (NPP_PrintProcPtr)NPP_Print;
-
- at end
-
diff --git a/WebKit/Plugins.subproj/IFPlugin.m b/WebKit/Plugins.subproj/IFPlugin.m
deleted file mode 100644
index 4cd52bd..0000000
--- a/WebKit/Plugins.subproj/IFPlugin.m
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Copyright (C) 2001, 2002 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.
- */
-
-#import "IFPlugin.h"
-#import "WebKitDebug.h"
-
-typedef void (* FunctionPointer) (void);
-typedef void (* TransitionVector) (void);
-FunctionPointer functionPointerForTVector(TransitionVector);
-TransitionVector tVectorForFunctionPointer(FunctionPointer);
-
- at implementation IFPlugin
-
-- (SInt16)_openResourceFile
-{
- FSRef fref;
- OSErr err;
-
- if(isBundle){
- return CFBundleOpenBundleResourceMap(bundle);
- }else{
- err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
- if(err != noErr){
- return -1;
- }
-
- return FSOpenResFile(&fref, fsRdPerm);
- }
-}
-
-- (void)_closeResourceFile:(SInt16)resRef
-{
- if(isBundle){
- CFBundleCloseBundleResourceMap(bundle, resRef);
- }else{
- CloseResFile(resRef);
- }
-}
-
-- (BOOL)_getPluginInfo
-{
- Str255 theString;
- char temp[256], description[256];
- NSMutableArray *mime; // mime is an array containing the mime type, extension(s) and descriptions for that mime type.
- NSString *tempString;
- uint n, i;
-
- SInt16 resRef = [self _openResourceFile];
- if(resRef == -1)
- return NO;
-
- UseResFile(resRef);
-
- mimeTypes = [NSMutableArray arrayWithCapacity:1];
- for(n=1, i=0; 1; n+=2, i++){
- GetIndString(theString, 128, n);
- if (theString[0] == 0)
- break;
- CopyPascalStringToC(theString, temp);
- mime = [NSMutableArray arrayWithCapacity:3];
- [mimeTypes insertObject:mime atIndex:i];
-
- //FIXME: Because our JS engine poops on semi-colons, I'm removing ";version=1.3"
- //Scott Adler is checking if semi-colons are allowed to be in mime-types
- if(!strcmp(temp, "application/x-java-applet;version=1.3")){
- strcpy(temp, "application/x-java-applet");
- }
- tempString = [NSString stringWithCString:temp];
- [mime insertObject:tempString atIndex:0]; // mime type
-
- GetIndString(theString, 128, n+1);
- CopyPascalStringToC(theString, temp);
- tempString = [NSString stringWithCString:temp];
- [mime insertObject:tempString atIndex:1]; // mime's extension
- }
- for(i=1; i<=[mimeTypes count]; i++){
- GetIndString(theString, 127, i);
- CopyPascalStringToC(theString, temp);
- tempString = [NSString stringWithCString:temp];
- mime = [mimeTypes objectAtIndex:(i-1)];
- [mime insertObject:tempString atIndex:2]; // mime's description
- }
- GetIndString(theString, 126, 1);
- CopyPascalStringToC(theString, description);
- pluginDescription = [[NSString stringWithCString:description] retain];
-
- GetIndString(theString, 126, 2);
- CopyPascalStringToC(theString, temp);
- name = [[NSString stringWithCString:temp] retain]; // plugin's name
- [mimeTypes retain];
-
- [self _closeResourceFile:resRef];
-
- return YES;
-}
-
-- initWithPath:(NSString *)pluginPath
-{
- NSFileManager *fileManager;
- NSDictionary *fileInfo;
- UInt32 type;
- CFURLRef pluginURL;
-
- path = pluginPath;
- fileManager = [NSFileManager defaultManager];
- fileInfo = [fileManager fileAttributesAtPath:pluginPath traverseLink:YES];
-
- // single-file plug-in with resource fork
- if([[fileInfo objectForKey:@"NSFileType"] isEqualToString:@"NSFileTypeRegular"]){
- type = [[fileInfo objectForKey:@"NSFileHFSTypeCode"] unsignedLongValue];
- isBundle = NO;
-
- // bundle
- }else if([[fileInfo objectForKey:@"NSFileType"] isEqualToString:@"NSFileTypeDirectory"]){
- pluginURL = CFURLCreateWithFileSystemPath(NULL, (CFStringRef)pluginPath, kCFURLPOSIXPathStyle, TRUE);
- bundle = CFBundleCreate(NULL, pluginURL);
- CFRelease(pluginURL);
- CFBundleGetPackageInfo(bundle, &type, NULL);
- isBundle = YES;
- }else{
- return nil;
- }
-
- if(type == FOUR_CHAR_CODE('BRPL') || type == FOUR_CHAR_CODE('IEPL') ){
- if(![self _getPluginInfo]){
- return nil;
- }
- }else{
- return nil;
- }
-
- filename = [[path lastPathComponent] retain];
- [path retain];
- isLoaded = NO;
- return self;
-}
-
-- (BOOL)load
-{
- OSErr err;
- FSSpec spec;
- FSRef fref;
- mainFuncPtr pluginMainFunc;
- initializeFuncPtr NP_Initialize = NULL;
- getEntryPointsFuncPtr NP_GetEntryPoints = NULL;
- NPError npErr;
- Boolean didLoad;
- NSBundle *tempBundle;
- NSFileHandle *executableFile;
- NSData *data;
-
- if(isLoaded)
- return YES;
-
- if(isBundle){ //CFM or Mach-o bundle
- tempBundle = [NSBundle bundleWithPath:path];
- executableFile = [NSFileHandle fileHandleForReadingAtPath:[tempBundle executablePath]];
- data = [executableFile readDataOfLength:8];
- if(!memcmp([data bytes], "Joy!peff", 8)){
- isCFM = TRUE;
- }else{
- isCFM = FALSE;
- }
- [executableFile closeFile];
- didLoad = CFBundleLoadExecutable(bundle);
- if (!didLoad)
- return NO;
-
- if(isCFM){
- pluginMainFunc = (mainFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("main") );
- if(!pluginMainFunc)
- return NO;
- }else{
- NP_Initialize = (initializeFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Initialize") );
- NP_GetEntryPoints = (getEntryPointsFuncPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_GetEntryPoints") );
- NPP_Shutdown = (NPP_ShutdownProcPtr)CFBundleGetFunctionPointerForName(bundle, CFSTR("NP_Shutdown") );
- if(!NP_Initialize || !NP_GetEntryPoints || !NPP_Shutdown)
- return NO;
- }
- }else{ // single CFM file
- err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
- if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
- return NO;
- }
- err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
- if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
- return NO;
- }
- err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
- if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: GetDiskFragment failed. Error=%d\n", err);
- return NO;
- }
- pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
- if(!pluginMainFunc)
- return NO;
-
- isCFM = TRUE;
- }
-
- // Plugins (at least QT) require that you call UseResFile on the resource file before loading it.
-
- resourceRef = [self _openResourceFile];
- if(resourceRef == -1)
- return NO;
-
- UseResFile(resourceRef);
-
- // swap function tables
- if(isCFM){
- browserFuncs.version = 11;
- browserFuncs.size = sizeof(NPNetscapeFuncs);
- browserFuncs.geturl = (NPN_GetURLProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetURL);
- browserFuncs.posturl = (NPN_PostURLProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_PostURL);
- browserFuncs.requestread = (NPN_RequestReadProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_RequestRead);
- browserFuncs.newstream = (NPN_NewStreamProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_NewStream);
- browserFuncs.write = (NPN_WriteProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_Write);
- browserFuncs.destroystream = (NPN_DestroyStreamProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_DestroyStream);
- browserFuncs.status = (NPN_StatusProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_Status);
- browserFuncs.uagent = (NPN_UserAgentProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_UserAgent);
- browserFuncs.memalloc = (NPN_MemAllocProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_MemAlloc);
- browserFuncs.memfree = (NPN_MemFreeProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_MemFree);
- browserFuncs.memflush = (NPN_MemFlushProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_MemFlush);
- browserFuncs.reloadplugins = (NPN_ReloadPluginsProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_ReloadPlugins);
- browserFuncs.geturlnotify = (NPN_GetURLNotifyProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetURLNotify);
- browserFuncs.posturlnotify = (NPN_PostURLNotifyProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_PostURLNotify);
- browserFuncs.getvalue = (NPN_GetValueProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetValue);
- browserFuncs.setvalue = (NPN_SetValueProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_SetValue);
- browserFuncs.invalidaterect = (NPN_InvalidateRectProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_InvalidateRect);
- browserFuncs.invalidateregion = (NPN_InvalidateRegionProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_InvalidateRegion);
- browserFuncs.forceredraw = (NPN_ForceRedrawProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_ForceRedraw);
- browserFuncs.getJavaEnv = (NPN_GetJavaEnvProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetJavaEnv);
- browserFuncs.getJavaPeer = (NPN_GetJavaPeerProcPtr)tVectorForFunctionPointer((FunctionPointer)NPN_GetJavaPeer);
-
- npErr = pluginMainFunc(&browserFuncs, &pluginFuncs, &NPP_Shutdown);
-
- pluginSize = pluginFuncs.size;
- pluginVersion = pluginFuncs.version;
- WEBKITDEBUG("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
-
- NPP_New = (NPP_NewProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.newp);
- NPP_Destroy = (NPP_DestroyProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.destroy);
- NPP_SetWindow = (NPP_SetWindowProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.setwindow);
- NPP_NewStream = (NPP_NewStreamProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.newstream);
- NPP_DestroyStream = (NPP_DestroyStreamProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.destroystream);
- NPP_StreamAsFile = (NPP_StreamAsFileProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.asfile);
- NPP_WriteReady = (NPP_WriteReadyProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.writeready);
- NPP_Write = (NPP_WriteProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.write);
- NPP_Print = (NPP_PrintProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.print);
- NPP_HandleEvent = (NPP_HandleEventProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.event);
- NPP_URLNotify = (NPP_URLNotifyProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.urlnotify);
- NPP_GetValue = (NPP_GetValueProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.getvalue);
- NPP_SetValue = (NPP_SetValueProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.setvalue);
- }else{ // no function pointer conversion necessary for mach-o
- browserFuncs.version = 11;
- browserFuncs.size = sizeof(NPNetscapeFuncs);
- browserFuncs.geturl = NPN_GetURL;
- browserFuncs.posturl = NPN_PostURL;
- browserFuncs.requestread = NPN_RequestRead;
- browserFuncs.newstream = NPN_NewStream;
- browserFuncs.write = NPN_Write;
- browserFuncs.destroystream = NPN_DestroyStream;
- browserFuncs.status = NPN_Status;
- browserFuncs.uagent = NPN_UserAgent;
- browserFuncs.memalloc = NPN_MemAlloc;
- browserFuncs.memfree = NPN_MemFree;
- browserFuncs.memflush = NPN_MemFlush;
- browserFuncs.reloadplugins = NPN_ReloadPlugins;
- browserFuncs.geturlnotify = NPN_GetURLNotify;
- browserFuncs.posturlnotify = NPN_PostURLNotify;
- browserFuncs.getvalue = NPN_GetValue;
- browserFuncs.setvalue = NPN_SetValue;
- browserFuncs.invalidaterect = NPN_InvalidateRect;
- browserFuncs.invalidateregion = NPN_InvalidateRegion;
- browserFuncs.forceredraw = NPN_ForceRedraw;
- browserFuncs.getJavaEnv = NPN_GetJavaEnv;
- browserFuncs.getJavaPeer = NPN_GetJavaPeer;
-
- NP_Initialize(&browserFuncs);
- NP_GetEntryPoints(&pluginFuncs);
-
- pluginSize = pluginFuncs.size;
- pluginVersion = pluginFuncs.version;
-
- NPP_New = pluginFuncs.newp;
- NPP_Destroy = pluginFuncs.destroy;
- NPP_SetWindow = pluginFuncs.setwindow;
- NPP_NewStream = pluginFuncs.newstream;
- NPP_DestroyStream = pluginFuncs.destroystream;
- NPP_StreamAsFile = pluginFuncs.asfile;
- NPP_WriteReady = pluginFuncs.writeready;
- NPP_Write = pluginFuncs.write;
- NPP_Print = pluginFuncs.print;
- NPP_HandleEvent = pluginFuncs.event;
- NPP_URLNotify = pluginFuncs.urlnotify;
- NPP_GetValue = pluginFuncs.getvalue;
- NPP_SetValue = pluginFuncs.setvalue;
- }
- WEBKITDEBUG("Plugin Loaded\n");
- isLoaded = TRUE;
- return YES;
-}
-
-- (void)unload
-{
- NPP_Shutdown();
-
- [self _closeResourceFile:resourceRef];
-
- if(isBundle){
- CFBundleUnloadExecutable(bundle);
- CFRelease(bundle);
- }else{
- CloseConnection(&connID);
- }
- WEBKITDEBUG("Plugin Unloaded\n");
- isLoaded = FALSE;
-}
-
-- (NSString *)mimeTypeForExtension:(NSString *)extension;
-{
- uint n;
- NSRange hasExtension;
-
- for(n=0; n<[mimeTypes count]; n++){
- hasExtension = [[[mimeTypes objectAtIndex:n] objectAtIndex:1] rangeOfString:extension];
- if(hasExtension.length){
- return [[mimeTypes objectAtIndex:n] objectAtIndex:0];
- }
- }
- return nil;
-}
-
-- (NPP_SetWindowProcPtr)NPP_SetWindow{
- return NPP_SetWindow;
-}
-
-- (NPP_NewProcPtr)NPP_New{
- return NPP_New;
-}
-
-- (NPP_DestroyProcPtr)NPP_Destroy{
- return NPP_Destroy;
-}
-
-- (NPP_NewStreamProcPtr)NPP_NewStream{
- return NPP_NewStream;
-}
-
-- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile{
- return NPP_StreamAsFile;
-}
-- (NPP_DestroyStreamProcPtr)NPP_DestroyStream{
- return NPP_DestroyStream;
-}
-
-- (NPP_WriteReadyProcPtr)NPP_WriteReady{
- return NPP_WriteReady;
-}
-- (NPP_WriteProcPtr)NPP_Write{
- return NPP_Write;
-}
-
-- (NPP_HandleEventProcPtr)NPP_HandleEvent{
- return NPP_HandleEvent;
-}
-
--(NPP_URLNotifyProcPtr)NPP_URLNotify{
- return NPP_URLNotify;
-}
-
--(NPP_GetValueProcPtr)NPP_GetValue{
- return NPP_GetValue;
-}
-
--(NPP_SetValueProcPtr)NPP_SetValue{
- return NPP_SetValue;
-}
-
--(NPP_PrintProcPtr)NPP_Print{
- return NPP_Print;
-}
-
-- (NSArray *)mimeTypes{
- return mimeTypes;
-}
-
-- (NSString *)name{
- return name;
-}
-
-- (NSString *)filename{
- return filename;
-}
-
-- (NSString *)path{
- return path;
-}
-
-- (BOOL)isLoaded{
- return isLoaded;
-}
-
-- (NSString *)pluginDescription{
- return pluginDescription;
-}
-- (NSString *)description{
-
- return [NSString stringWithFormat:@"name: %@\npath: %@\nisLoaded: %d\nmimeTypes:\n%@\npluginDescription:%@",
- name, path, isLoaded, [mimeTypes description], pluginDescription];
-}
- at end
-
-
-// function pointer converters
-
-FunctionPointer functionPointerForTVector(TransitionVector tvp)
-{
- uint32 temp[6] = {0x3D800000, 0x618C0000, 0x800C0000, 0x804C0004, 0x7C0903A6, 0x4E800420};
- uint32 *newGlue = NULL;
-
- if (tvp != NULL) {
- newGlue = (uint32 *)malloc(sizeof(temp));
- if (newGlue != NULL) {
- unsigned i;
- for (i = 0; i < 6; i++) newGlue[i] = temp[i];
- newGlue[0] |= ((UInt32)tvp >> 16);
- newGlue[1] |= ((UInt32)tvp & 0xFFFF);
- MakeDataExecutable(newGlue, sizeof(temp));
- }
- }
-
- return (FunctionPointer)newGlue;
-}
-
-TransitionVector tVectorForFunctionPointer(FunctionPointer fp)
-{
- FunctionPointer *newGlue = NULL;
- if (fp != NULL) {
- newGlue = (FunctionPointer *)malloc(2 * sizeof(FunctionPointer));
- if (newGlue != NULL) {
- newGlue[0] = fp;
- newGlue[1] = NULL;
- }
- }
- return (TransitionVector)newGlue;
-}
-
-
-
-
-
diff --git a/WebKit/Plugins.subproj/IFPluginDatabase.h b/WebKit/Plugins.subproj/IFPluginDatabase.h
deleted file mode 100644
index 2d76187..0000000
--- a/WebKit/Plugins.subproj/IFPluginDatabase.h
+++ /dev/null
@@ -1,41 +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.
- */
-
-#import <Foundation/Foundation.h>
-
- at class IFPlugin;
-
- at interface IFPluginDatabase : NSObject {
- NSArray *plugins;
-}
-
-+ (IFPluginDatabase *)installedPlugins;
-- (IFPlugin *)pluginForMimeType:(NSString *)mimeType;
-- (IFPlugin *)pluginForExtension:(NSString *)extension;
-- (IFPlugin *)pluginWithFilename:(NSString *)filename;
-- (NSArray *) MIMETypes;
-- (NSArray *) plugins;
-
- at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/IFPluginDatabase.m b/WebKit/Plugins.subproj/IFPluginDatabase.m
deleted file mode 100644
index 05e77df..0000000
--- a/WebKit/Plugins.subproj/IFPluginDatabase.m
+++ /dev/null
@@ -1,199 +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.
- */
-
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/WebKitDebug.h>
-
-NSArray *_pluginLocations(void);
-NSArray *_findPlugins(void);
-
- at implementation IFPluginDatabase
-static IFPluginDatabase *__IFPluginDatabase = nil;
-
-
-+ (IFPluginDatabase *)installedPlugins
-{
- if(!__IFPluginDatabase){
- __IFPluginDatabase = [IFPluginDatabase alloc];
- __IFPluginDatabase->plugins = _findPlugins();
-
- // register plug-in IFDocumentViews and IFDocumentRepresentations
- NSArray *mimes = [__IFPluginDatabase MIMETypes];
- NSString *mime;
- unsigned i;
-
- for(i=0; i<[mimes count]; i++){
- mime = [mimes objectAtIndex:i];
- [IFWebView registerViewClass:[IFPluginView class] forMIMEType:mime];
- [IFWebDataSource registerRepresentationClass:[IFPluginStream class] forMIMEType:mime];
- }
- }
- return __IFPluginDatabase;
-}
-
-// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (IFPlugin *)pluginForMimeType:(NSString *)mimeType
-{
- uint i, n;
- IFPlugin *plugin;
- NSArray *mimeArray;
-
- for(i=0; i<[plugins count]; i++){
- plugin = [plugins objectAtIndex:i];
- mimeArray = [plugin mimeTypes];
- for(n=0; n<[mimeArray count]; n++){
- if([[[mimeArray objectAtIndex:n] objectAtIndex:0] isEqualToString:mimeType]){
- return plugin;
- }
- }
- }
- return nil;
-}
-
-- (IFPlugin *)pluginForExtension:(NSString *)extension
-{
- uint i, n;
- IFPlugin *plugin;
- NSArray *mimeArray;
- NSRange hasExtension;
-
- for(i=0; i<[plugins count]; i++){
- plugin = [plugins objectAtIndex:i];
- mimeArray = [plugin mimeTypes];
- for(n=0; n<[mimeArray count]; n++){
- hasExtension = [[[mimeArray objectAtIndex:n] objectAtIndex:1] rangeOfString:extension];
- if(hasExtension.length){
- return plugin;
- }
- }
- }
- return nil;
-}
-
-- (IFPlugin *)pluginWithFilename:(NSString *)filename
-{
- uint i;
- IFPlugin *plugin;
-
- for(i=0; i<[plugins count]; i++){
- plugin = [plugins objectAtIndex:i];
- if([[plugin filename] isEqualToString:filename]){
- return plugin;
- }
- }
- return nil;
-}
-
-- (NSArray *) plugins
-{
- return plugins;
-}
-
-- (NSArray *) MIMETypes
-{
- NSMutableArray *allHandledMIMETypes;
- IFPlugin *plugin;
- NSArray *mimeArray;
- uint i, n;
-
- allHandledMIMETypes = [NSMutableArray arrayWithCapacity:20];
- for(i=0; i<[plugins count]; i++){
- plugin = [plugins objectAtIndex:i];
- mimeArray = [plugin mimeTypes];
- for(n=0; n<[mimeArray count]; n++){
- [allHandledMIMETypes addObject:[[mimeArray objectAtIndex:n] objectAtIndex:0]];
- }
- }
- return allHandledMIMETypes;
-}
-
- at end
-
-NSArray *_pluginLocations(void)
-{
- NSMutableArray *locations;
- NSBundle *applicationBundle;
-
- // Plug-ins are found in order of precedence.
- // If there are duplicates, the first found plug-in is used.
- // For example, if there is a QuickTime.plugin in the users's home directory
- // that is used instead of the /Library/Internet Plug-ins version.
- // The purpose is to allow non-admin user's to update their plug-ins.
-
- locations = [NSMutableArray arrayWithCapacity:3];
- [locations addObject:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]];
- [locations addObject:@"/Library/Internet Plug-Ins"];
-
- applicationBundle = [NSBundle mainBundle];
- [locations addObject:[applicationBundle builtInPlugInsPath]];
-
- return locations;
-}
-
-NSArray *_findPlugins(void)
-{
- NSFileManager *fileManager;
- NSArray *pluginDirectories, *files;
- NSString *file;
- NSMutableArray *pluginPaths, *pluginArray, *filenames;
- IFPlugin *plugin;
- uint i, n;
-
- pluginDirectories = _pluginLocations();
- fileManager = [NSFileManager defaultManager];
- pluginPaths = [NSMutableArray arrayWithCapacity:10];
- filenames = [NSMutableArray arrayWithCapacity:10];
-
- for(i=0; i<[pluginDirectories count]; i++){
- files = [fileManager directoryContentsAtPath:[pluginDirectories objectAtIndex:i]];
- for(n=0; n<[files count]; n++){
- file = [files objectAtIndex:n];
- if(![filenames containsObject:file]){ // avoid duplicates
- [filenames addObject:file];
- [pluginPaths addObject:[[pluginDirectories objectAtIndex:i] stringByAppendingPathComponent:file]];
- }
- }
- }
-
- pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
-
- for(i=0; i<[pluginPaths count]; i++){
- plugin = [IFPlugin alloc];
- if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
- [plugin retain];
- [pluginArray addObject:plugin];
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Found plugin: %s\n", [[plugin name] lossyCString]);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "%s", [[plugin description] lossyCString]);
- }
- }
- return [pluginArray retain];
-}
-
-
diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.h b/WebKit/Plugins.subproj/IFPluginNullEventSender.h
deleted file mode 100644
index f05d602..0000000
--- a/WebKit/Plugins.subproj/IFPluginNullEventSender.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- IFPluginNullEventSender.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import <npapi.h>
-
- at class IFPluginView;
-
- at interface IFPluginNullEventSender : NSObject{
- NPP instance;
- NPP_HandleEventProcPtr NPP_HandleEvent;
- bool shouldStop;
- NSWindow *window;
-}
-
--(id)initWithPluginView:(IFPluginView *)pluginView;
--(void)sendNullEvents;
--(void)stop;
- at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/IFPluginNullEventSender.m b/WebKit/Plugins.subproj/IFPluginNullEventSender.m
deleted file mode 100644
index e1cb516..0000000
--- a/WebKit/Plugins.subproj/IFPluginNullEventSender.m
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- IFPluginNullEventSender.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "IFPluginNullEventSender.h"
-#import <Carbon/Carbon.h>
-#import <WebKitDebug.h>
-#import <WebKit/IFPluginView.h>
-
- at implementation IFPluginNullEventSender
-
--(id)initWithPluginView:(IFPluginView *)pluginView
-{
- [super init];
-
- instance = [pluginView pluginInstance];
- NPP_HandleEvent = [pluginView NPP_HandleEvent];
- window = [[pluginView window] retain];
-
- return self;
-}
-
--(void) dealloc
-{
- [window release];
-
- [super dealloc];
-}
-
--(void)sendNullEvents
-{
- if (!shouldStop) {
- EventRecord event;
- bool acceptedEvent;
-
- [IFPluginView getCarbonEvent:&event];
-
- // plug-in should not react to cursor position when not active.
- if(![window isKeyWindow]){
- event.where.v = 0;
- event.where.h = 0;
- }
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- //WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(nullEvent): %d when: %u %d\n", acceptedEvent, (unsigned)event.when, shouldStop);
-
- [self performSelector:@selector(sendNullEvents) withObject:nil afterDelay:.01];
- }
-}
-
--(void) stop
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stopping null events\n");
- shouldStop = TRUE;
- [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(sendNullEvents) object:nil];
-}
-
- at end
-
diff --git a/WebKit/Plugins.subproj/IFPluginStream.h b/WebKit/Plugins.subproj/IFPluginStream.h
deleted file mode 100644
index 1701890..0000000
--- a/WebKit/Plugins.subproj/IFPluginStream.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- IFPluginStream.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-#import <WebFoundation/WebFoundation.h>
-
-#import <WebKit/WebKit.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/npapi.h>
-
- at protocol IFDocumentRepresentation;
-
- at interface IFPluginStream : NSObject <IFDocumentRepresentation>
-{
- IFPluginView *view;
- NSURL *URL;
- NPP instance;
- uint16 transferMode;
- int32 offset;
- NPStream npStream;
- NSString *path;
- NSString *mimeType;
- NSDictionary *attributes;
-
- void *notifyData;
-
- BOOL isFirstChunk;
- BOOL stopped;
-
- IFURLHandle *URLHandle;
-
- NPP_NewStreamProcPtr NPP_NewStream;
- NPP_DestroyStreamProcPtr NPP_DestroyStream;
- NPP_StreamAsFileProcPtr NPP_StreamAsFile;
- NPP_WriteReadyProcPtr NPP_WriteReady;
- NPP_WriteProcPtr NPP_Write;
- NPP_URLNotifyProcPtr NPP_URLNotify;
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer;
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData;
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData attributes:(NSDictionary *)theAttributes;
-
-- (void)startLoad;
-- (void)stop;
- at end
diff --git a/WebKit/Plugins.subproj/IFPluginStream.mm b/WebKit/Plugins.subproj/IFPluginStream.mm
deleted file mode 100644
index e40a4a6..0000000
--- a/WebKit/Plugins.subproj/IFPluginStream.mm
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- IFPluginStream.m
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKitDebug.h>
-
-#import <WebFoundation/WebFoundation.h>
-
-
-static NSString *getCarbonPath(NSString *posixPath);
-
- at implementation IFPluginStream
-
-- init
-{
- [super init];
-
- isFirstChunk = YES;
- stopped = YES;
-
- return self;
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer
-{
- return [self initWithURL:theURL pluginPointer:thePluginPointer notifyData:nil attributes:nil];
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData
-{
- return [self initWithURL:theURL pluginPointer:thePluginPointer notifyData:theNotifyData attributes:nil];
-}
-
-- initWithURL:(NSURL *)theURL pluginPointer:(NPP)thePluginPointer notifyData:(void *)theNotifyData attributes:(NSDictionary *)theAttributes
-{
- [super init];
-
- if(!theURL)
- return nil;
-
- if(!thePluginPointer)
- return nil;
-
- view = [(IFPluginView *)thePluginPointer->ndata retain];
- URL = [theURL retain];
- attributes = [theAttributes retain];
- instance = thePluginPointer;
- notifyData = theNotifyData;
-
- NPP_NewStream = [view NPP_NewStream];
- NPP_WriteReady = [view NPP_WriteReady];
- NPP_Write = [view NPP_Write];
- NPP_StreamAsFile = [view NPP_StreamAsFile];
- NPP_DestroyStream = [view NPP_DestroyStream];
- NPP_URLNotify = [view NPP_URLNotify];
-
- isFirstChunk = YES;
- stopped = YES;
-
- return self;
-}
-
-- (void) dealloc
-{
- [self stop];
-
- NSFileManager *fileManager = [NSFileManager defaultManager];
- if(path){
- [fileManager removeFileAtPath:path handler:nil];
- [path release];
- }
- free((void *)npStream.url);
- [URL release];
- [attributes release];
- [super dealloc];
-}
-
-- (void)startLoad
-{
- URLHandle = [[IFURLHandle alloc] initWithURL:URL attributes:attributes flags:0];
- if(URLHandle){
- [URLHandle addClient:self];
- [URLHandle loadInBackground];
- }
-}
-
-- (void)stop
-{
- if(!stopped){
- stopped = YES;
- if([URLHandle statusCode] == IFURLHandleStatusLoading)
- [URLHandle cancelLoadInBackground];
- [URLHandle removeClient:self];
- [URLHandle release];
- }
- [view release];
- view = nil;
-}
-
-- (void)receivedData:(NSData *)data
-{
- int32 numBytes;
- NPError npErr;
-
- if(isFirstChunk){
- isFirstChunk = NO;
-
- //FIXME: Need a way to check if stream is seekable
-
- npErr = NPP_NewStream(instance, (char *)[mimeType cString], &npStream, NO, &transferMode);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_NewStream: %d %s\n", npErr, [[URL absoluteString] cString]);
-
- if(npErr != NPERR_NO_ERROR){
- [self stop];
- return;
- }
-
- if(transferMode == NP_NORMAL)
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_NORMAL\n");
- else if(transferMode == NP_ASFILEONLY)
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILEONLY\n");
- else if(transferMode == NP_ASFILE)
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_ASFILE\n");
- else if(transferMode == NP_SEEK){
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "Stream type: NP_SEEK not yet supported\n");
- [self stop];
- return;
- }
- }
-
- if(transferMode != NP_ASFILEONLY){
- numBytes = NPP_WriteReady(instance, &npStream);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_WriteReady bytes=%lu\n", numBytes);
-
- numBytes = NPP_Write(instance, &npStream, offset, [data length], (void *)[data bytes]);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Write bytes=%lu\n", numBytes);
-
- offset += [data length];
- }
-}
-
-- (void)receivedError
-{
- NPError npErr;
-
- npErr = NPP_DestroyStream(instance, &npStream, NPRES_NETWORK_ERR);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_DestroyStream: %d\n", npErr);
-}
-
-- (void)finishedLoadingWithData:(NSData *)data
-{
- NPError npErr;
- NSFileManager *fileManager;
- NSString *filename;
-
- filename = [[URL path] lastPathComponent];
- if(transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) {
- // FIXME: Need to use something like mkstemp?
- path = [[NSString stringWithFormat:@"/tmp/%@", filename] retain];
- fileManager = [NSFileManager defaultManager];
- [fileManager removeFileAtPath:path handler:nil];
- [fileManager createFileAtPath:path contents:data attributes:nil];
-
- // FIXME: Will cString use the correct character set?
- NPP_StreamAsFile(instance, &npStream, [getCarbonPath(path) cString]);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_StreamAsFile: %s\n", [getCarbonPath(path) cString]);
- }
- npErr = NPP_DestroyStream(instance, &npStream, NPRES_DONE);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_DestroyStream: %d\n", npErr);
-
- if(notifyData){
- NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_URLNotify\n");
- }
-
- [self stop];
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
-{
- if(isFirstChunk){
- URL = [[dataSource inputURL] retain];
- NSString *URLString = [URL absoluteString];
- char *cURL = (char *)malloc([URLString cStringLength]+1);
- [URLString getCString:cURL];
-
- npStream.ndata = self;
- npStream.url = cURL;
- npStream.end = 0;
- npStream.lastmodified = 0;
- npStream.notifyData = 0;
- offset = 0;
- mimeType = [[dataSource contentType] retain];
-
- IFWebFrame *frame = [dataSource webFrame];
- IFWebView *webView = [frame webView];
- view = [[webView documentView] retain];
- instance = [view pluginInstance];
-
- NPP_NewStream = [view NPP_NewStream];
- NPP_WriteReady = [view NPP_WriteReady];
- NPP_Write = [view NPP_Write];
- NPP_StreamAsFile = [view NPP_StreamAsFile];
- NPP_DestroyStream = [view NPP_DestroyStream];
- NPP_URLNotify = [view NPP_URLNotify];
- }
- [self receivedData:data];
-}
-
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
-{
- [self receivedError];
-}
-
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
-{
- [self finishedLoadingWithData:[dataSource data]];
-}
-
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
-{
- [[view webController] _didStartLoading:URL];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
-{
- IFWebController *webController = [view webController];
-
- if(isFirstChunk){
- NSString *URLString = [[handle url] absoluteString];
- char *cURL = (char *)malloc([URLString cStringLength]+1);
- [URLString getCString:cURL];
-
- npStream.ndata = self;
- npStream.url = cURL;
- npStream.end = 0;
- npStream.lastmodified = 0;
- npStream.notifyData = notifyData;
- offset = 0;
- mimeType = [[handle contentType] retain];
- }
- [self receivedData:data];
-
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle: handle fromDataSource: [view webDataSource] complete: NO];
-}
-
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
-{
- IFWebController *webController = [view webController];
-
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
-
- [self finishedLoadingWithData:data];
-
- [webController _didStopLoading:URL];
-}
-
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
-{
- IFWebController *webController = [view webController];
-
- [webController _receivedProgress:[IFLoadProgress progress]
- forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
-
- [self receivedError];
-
- [webController _didStopLoading:URL];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
-{
- IFWebController *webController = [view webController];
-
- IFLoadProgress *loadProgress = [[IFLoadProgress alloc] initWithURLHandle:handle];
-
- [webController _receivedError: result forResourceHandle: handle
- partialProgress: loadProgress fromDataSource: [view webDataSource]];
- [loadProgress release];
-
- [self receivedError];
-
- [webController _didStopLoading:URL];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)toURL
-{
- IFWebController *webController = [view webController];
-
- [webController _didStopLoading:URL];
- // FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
- [webController _didStartLoading:toURL];
-}
-
- at end
-
-static NSString *getCarbonPath(NSString *posixPath)
-{
- OSStatus error;
- FSRef ref, rootRef, parentRef;
- FSCatalogInfo info;
- NSMutableArray *carbonPathPieces;
- HFSUniStr255 nameString;
-
- // Make an FSRef.
- error = FSPathMakeRef((const UInt8 *)[[NSFileManager defaultManager] fileSystemRepresentationWithPath:posixPath], &ref, NULL);
- if (error != noErr) {
- return nil;
- }
-
- // Get volume refNum.
- error = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &info, NULL, NULL, NULL);
- if (error != noErr) {
- return nil;
- }
-
- // Get root directory FSRef.
- error = FSGetVolumeInfo(info.volume, 0, NULL, kFSVolInfoNone, NULL, NULL, &rootRef);
- if (error != noErr) {
- return nil;
- }
-
- // Get the pieces of the path.
- carbonPathPieces = [NSMutableArray array];
- for (;;) {
- error = FSGetCatalogInfo(&ref, kFSCatInfoNone, NULL, &nameString, NULL, &parentRef);
- if (error != noErr) {
- return nil;
- }
- [carbonPathPieces insertObject:[NSString stringWithCharacters:nameString.unicode length:nameString.length] atIndex:0];
- if (FSCompareFSRefs(&ref, &rootRef) == noErr) {
- break;
- }
- ref = parentRef;
- }
-
- // Volume names need trailing : character.
- if ([carbonPathPieces count] == 1) {
- [carbonPathPieces addObject:@""];
- }
-
- return [carbonPathPieces componentsJoinedByString:@":"];
-}
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
deleted file mode 100644
index 51addf2..0000000
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- IFPluginView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebKit.h>
-#import <WebKit/IFWebFrame.h>
-
-#import <Cocoa/Cocoa.h>
-#import <npapi.h>
-
- at class IFPluginNullEventSender;
- at class IFWebDataSource;
- at class IFPlugin;
- at class IFWebController;
- at protocol IFDocumentView;
-
- at interface IFPluginView : NSView <IFDocumentView>
-{
- IFPluginNullEventSender *eventSender;
- unsigned argsCount;
- char **cAttributes, **cValues;
-
- IFWebController *webController;
- IFWebDataSource *webDataSource;
- IFWebFrame *webFrame;
-
- NPP instance;
- NPWindow window;
- NP_Port nPort;
- NPP_t instanceStruct;
-
- BOOL canRestart, isHidden, isStarted, fullMode;
-
- NSString *mime;
- NSURL *srcURL, *baseURL;
- NSTrackingRectTag trackingTag;
- NSMutableArray *streams;
- NSMutableDictionary *notificationData;
-
- NPP_NewProcPtr NPP_New;
- NPP_DestroyProcPtr NPP_Destroy;
- NPP_SetWindowProcPtr NPP_SetWindow;
- NPP_NewStreamProcPtr NPP_NewStream;
- NPP_DestroyStreamProcPtr NPP_DestroyStream;
- NPP_StreamAsFileProcPtr NPP_StreamAsFile;
- NPP_WriteReadyProcPtr NPP_WriteReady;
- NPP_WriteProcPtr NPP_Write;
- NPP_PrintProcPtr NPP_Print;
- NPP_HandleEventProcPtr NPP_HandleEvent;
- NPP_URLNotifyProcPtr NPP_URLNotify;
- NPP_GetValueProcPtr NPP_GetValue;
- NPP_SetValueProcPtr NPP_SetValue;
-}
-
-- (id)initWithFrame:(NSRect)r plugin:(IFPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
--(void)stop;
-- (IFWebDataSource *)webDataSource;
-- (IFWebController *)webController;
-+(void)getCarbonEvent:(EventRecord *)carbonEvent;
-
-- (NPP)pluginInstance;
-- (NPP_NewStreamProcPtr)NPP_NewStream;
-- (NPP_WriteReadyProcPtr)NPP_WriteReady;
-- (NPP_WriteProcPtr)NPP_Write;
-- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile;
-- (NPP_DestroyStreamProcPtr)NPP_DestroyStream;
-- (NPP_URLNotifyProcPtr)NPP_URLNotify;
-- (NPP_HandleEventProcPtr) NPP_HandleEvent;
-
- at end
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
deleted file mode 100644
index 1919947..0000000
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ /dev/null
@@ -1,918 +0,0 @@
-/*
- IFPluginView.mm
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#define USE_CARBON 1
-
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFPluginNullEventSender.h>
-#import <WebKit/IFNullPluginView.h>
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
-
-#import <AppKit/NSWindow_Private.h>
-#import <Carbon/Carbon.h>
-
- at implementation IFPluginView
-
-#pragma mark EVENTS
-
-+ (void)getCarbonEvent:(EventRecord *)carbonEvent
-{
- carbonEvent->what = nullEvent;
- carbonEvent->message = 0;
- carbonEvent->when = TickCount();
- GetGlobalMouse(&carbonEvent->where);
- carbonEvent->modifiers = GetCurrentKeyModifiers();
- if (!Button())
- carbonEvent->modifiers |= btnState;
-}
-
-- (void)getCarbonEvent:(EventRecord *)carbonEvent
-{
- [[self class] getCarbonEvent:carbonEvent];
-}
-
-- (EventModifiers)modifiersForEvent:(NSEvent *)event
-{
- EventModifiers modifiers;
- unsigned int modifierFlags = [event modifierFlags];
- NSEventType eventType = [event type];
-
- modifiers = 0;
-
- if (eventType != NSLeftMouseDown && eventType != NSRightMouseDown)
- modifiers |= btnState;
-
- if (modifierFlags & NSCommandKeyMask)
- modifiers |= cmdKey;
-
- if (modifierFlags & NSShiftKeyMask)
- modifiers |= shiftKey;
-
- if (modifierFlags & NSAlphaShiftKeyMask)
- modifiers |= alphaLock;
-
- if (modifierFlags & NSAlternateKeyMask)
- modifiers |= optionKey;
-
- if (modifierFlags & NSControlKeyMask || eventType == NSRightMouseDown)
- modifiers |= controlKey;
-
- return modifiers;
-}
-
-- (void)getCarbonEvent:(EventRecord *)carbonEvent withEvent:(NSEvent *)cocoaEvent
-{
- NSPoint where;
-
- where = [[cocoaEvent window] convertBaseToScreen:[cocoaEvent locationInWindow]];
-
- carbonEvent->what = nullEvent;
- carbonEvent->message = 0;
- carbonEvent->when = (UInt32)([cocoaEvent timestamp] * 60); // seconds to ticks
- carbonEvent->where.h = (short)where.x;
- carbonEvent->where.v = (short)(NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - where.y);
- carbonEvent->modifiers = [self modifiersForEvent:cocoaEvent];
-}
-
-- (UInt32)keyMessageForEvent:(NSEvent *)theEvent
-{
- NSData *data;
- UInt8 characterCode;
- UInt16 keyCode;
- UInt32 message=0;
-
- data = [[theEvent characters] dataUsingEncoding:CFStringConvertEncodingToNSStringEncoding(CFStringGetSystemEncoding())];
- if(data){
- [data getBytes:&characterCode length:1];
- keyCode = [theEvent keyCode];
- message = keyCode << 8 | characterCode;
- }
- return message;
-}
-
--(void)sendActivateEvent:(BOOL)activate
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event];
- event.what = activateEvt;
- event.message = (UInt32)[[self window] _windowRef];
- if (activate)
- event.modifiers |= activMask;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(activateEvent): %d isActive: %d\n", acceptedEvent, (event.modifiers & activeFlag));
-}
-
-- (void)sendUpdateEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event];
- event.what = updateEvt;
- event.message = (UInt32)[[self window] _windowRef];
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(updateEvt): %d\n", acceptedEvent);
-}
-
--(BOOL)acceptsFirstResponder
-{
- return YES;
-}
-
-- (BOOL)becomeFirstResponder
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event];
- event.what = getFocusEvent;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(getFocusEvent): %d\n", acceptedEvent);
- return YES;
-}
-
-- (BOOL)resignFirstResponder
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event];
- event.what = loseFocusEvent;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(loseFocusEvent): %d\n", acceptedEvent);
- return YES;
-}
-
-
--(void)mouseDown:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = mouseDown;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d\n", acceptedEvent, event.where.v, event.where.h);
-}
-
--(void)mouseUp:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = mouseUp;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d\n", acceptedEvent, event.where.v, event.where.h);
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = adjustCursorEvent;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseEntered): %d\n", acceptedEvent);
-}
-
-- (void)mouseExited:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = adjustCursorEvent;
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseExited): %d\n", acceptedEvent);
-
- // Set cursor back to arrow cursor.
- [[NSCursor arrowCursor] set];
-}
-
-- (void)keyUp:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = keyUp;
- event.message = [self keyMessageForEvent:theEvent];
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
-
- // If the plug-in didn't accept this event,
- // pass it along so that keyboard scrolling, for example, will work.
- if (!acceptedEvent)
- [super keyUp:theEvent];
-}
-
-- (void)keyDown:(NSEvent *)theEvent
-{
- EventRecord event;
- bool acceptedEvent;
-
- [self getCarbonEvent:&event withEvent:theEvent];
- event.what = keyDown;
- event.message = [self keyMessageForEvent:theEvent];
-
- acceptedEvent = NPP_HandleEvent(instance, &event);
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
-
- // If the plug-in didn't accept this event,
- // pass it along so that keyboard scrolling, for example, will work.
- if (!acceptedEvent)
- [super keyDown:theEvent];
-}
-
-#pragma mark IFPLUGINVIEW
-
-- (id)initWithFrame:(NSRect)r plugin:(IFPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
-{
- [super initWithFrame:r];
-
- instance = &instanceStruct;
- instance->ndata = self;
-
- mime = [mimeType retain];
- srcURL = [theURL retain];
- baseURL = [theBaseURL retain];
-
- // load the plug-in if it is not already loaded
- if(![plugin load])
- return nil;
-
- // copy function pointers
- NPP_New = [plugin NPP_New];
- NPP_Destroy = [plugin NPP_Destroy];
- NPP_SetWindow = [plugin NPP_SetWindow];
- NPP_NewStream = [plugin NPP_NewStream];
- NPP_WriteReady = [plugin NPP_WriteReady];
- NPP_Write = [plugin NPP_Write];
- NPP_StreamAsFile = [plugin NPP_StreamAsFile];
- NPP_DestroyStream = [plugin NPP_DestroyStream];
- NPP_HandleEvent = [plugin NPP_HandleEvent];
- NPP_URLNotify = [plugin NPP_URLNotify];
- NPP_GetValue = [plugin NPP_GetValue];
- NPP_SetValue = [plugin NPP_SetValue];
- NPP_Print = [plugin NPP_Print];
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "%s", [[arguments description] cString]);
-
- // Convert arguments dictionary to 2 string arrays.
- // These arrays are passed to NPP_New, but the strings need to be
- // modifiable and live the entire life of the plugin.
-
- // The Java plug-in requires the first argument to be the base URL
- if ([mime isEqualToString:@"application/x-java-applet"]) {
- cAttributes = (char **)malloc(([arguments count] + 1) * sizeof(char *));
- cValues = (char **)malloc(([arguments count] + 1) * sizeof(char *));
- cAttributes[0] = strdup("DOCBASE");
- cValues[0] = strdup([[baseURL absoluteString] UTF8String]);
- argsCount++;
- } else {
- cAttributes = (char **)malloc([arguments count] * sizeof(char *));
- cValues = (char **)malloc([arguments count] * sizeof(char *));
- }
-
- NSEnumerator *e = [arguments keyEnumerator];
- NSString *key;
- while ((key = [e nextObject])) {
- cAttributes[argsCount] = strdup([key UTF8String]);
- cValues[argsCount] = strdup([[arguments objectForKey:key] UTF8String]);
- argsCount++;
- }
-
- streams = [[NSMutableArray alloc] init];
- notificationData = [[NSMutableDictionary alloc] init];
-
- // Initialize globals
- canRestart = YES;
-
- return self;
-}
-
--(void)dealloc
-{
- unsigned i;
-
- [self stop];
-
- for (i = 0; i < argsCount; i++) {
- free(cAttributes[i]);
- free(cValues[i]);
- }
- [streams removeAllObjects];
- [streams release];
- [mime release];
- [srcURL release];
- [baseURL release];
- [notificationData release];
- free(cAttributes);
- free(cValues);
- [super dealloc];
-}
-
-- (void)setUpWindowAndPort
-{
- CGrafPtr port = GetWindowPort([[self window] _windowRef]);
- NSRect contentViewFrame = [[[self window] contentView] frame];
- NSRect boundsInWindow = [self convertRect:[self bounds] toView:nil];
- NSRect visibleRectInWindow = [self convertRect:[self visibleRect] toView:nil];
-
- // flip Y coordinates
- boundsInWindow.origin.y = contentViewFrame.size.height - boundsInWindow.origin.y - boundsInWindow.size.height;
- visibleRectInWindow.origin.y = contentViewFrame.size.height - visibleRectInWindow.origin.y - visibleRectInWindow.size.height;
-
- nPort.port = port;
-
- // FIXME: Are these values correct? Without them, Flash freaks.
- nPort.portx = -(int32)boundsInWindow.origin.x;
- nPort.porty = -(int32)boundsInWindow.origin.y;
-
- window.window = &nPort;
-
- window.x = (int32)boundsInWindow.origin.x;
- window.y = (int32)boundsInWindow.origin.y;
-
- window.width = (uint32)boundsInWindow.size.width;
- window.height = (uint32)boundsInWindow.size.height;
-
- window.clipRect.top = (uint16)visibleRectInWindow.origin.y;
- window.clipRect.left = (uint16)visibleRectInWindow.origin.x;
- window.clipRect.bottom = (uint16)(visibleRectInWindow.origin.y + visibleRectInWindow.size.height);
- window.clipRect.right = (uint16)(visibleRectInWindow.origin.x + visibleRectInWindow.size.width);
-
- window.type = NPWindowTypeWindow;
-}
-
-- (void) setWindow
-{
- [self setUpWindowAndPort];
-
-#ifndef NDEBUG
- NPError npErr =
-#endif
- NPP_SetWindow(instance, &window);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_SetWindow: %d, port=0x%08x\n", npErr, (int)nPort.port);
-
-#if 0
- // Draw test
- Rect portRect;
- GetPortBounds(port, &portRect);
- SetPort(port);
- MoveTo(0,0);
- LineTo(portRect.right, portRect.bottom);
-#endif
-}
-
-- (void)removeTrackingRect
-{
- if (trackingTag) {
- [self removeTrackingRect:trackingTag];
- // Must release the window to balance the retain in resetTrackingRect.
- [[self window] release];
- trackingTag = 0;
- }
-}
-
-- (void)resetTrackingRect
-{
- [self removeTrackingRect];
- if (isStarted) {
- // Must retain the window so that removeTrackingRect can work after the window is closed.
- [[self window] retain];
- trackingTag = [self addTrackingRect:[self bounds] owner:self userData:nil assumeInside:NO];
- }
-}
-
--(void)start
-{
- NSNotificationCenter *notificationCenter;
- NSWindow *theWindow;
- IFPluginStream *stream;
-
- if(isStarted || !canRestart)
- return;
-
- isStarted = YES;
-
-#ifndef NDEBUG
- NPError npErr =
-#endif
- NPP_New((char *)[mime cString], instance, fullMode ? NP_FULL : NP_EMBED, argsCount, cAttributes, cValues, NULL);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_New: %d\n", npErr);
-
- // Create a WindowRef is one doesn't already exist
- [[self window] _windowRef];
-
- [self setWindow];
-
- theWindow = [self window];
- notificationCenter = [NSNotificationCenter defaultCenter];
- NSView *view;
- for (view = self; view; view = [view superview]) {
- [notificationCenter addObserver:self selector:@selector(viewHasMoved:)
- name:NSViewFrameDidChangeNotification object:view];
- [notificationCenter addObserver:self selector:@selector(viewHasMoved:)
- name:NSViewBoundsDidChangeNotification object:view];
- }
- [notificationCenter addObserver:self selector:@selector(windowWillClose:)
- name:NSWindowWillCloseNotification object:theWindow];
- [notificationCenter addObserver:self selector:@selector(windowBecameKey:)
- name:NSWindowDidBecomeKeyNotification object:theWindow];
- [notificationCenter addObserver:self selector:@selector(windowResignedKey:)
- name:NSWindowDidResignKeyNotification object:theWindow];
- [notificationCenter addObserver:self selector:@selector(defaultsHaveChanged:)
- name:NSUserDefaultsDidChangeNotification object:nil];
-
- if ([theWindow isKeyWindow])
- [self sendActivateEvent:YES];
-
- IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
- webController = [[webView controller] retain];
- webFrame = [[webController frameForView:webView] retain];
- webDataSource = [[webFrame dataSource] retain];
-
- if(srcURL){
- stream = [[IFPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
- if(stream){
- [stream startLoad];
- [streams addObject:stream];
- [stream release];
- }
- }
-
- eventSender = [[IFPluginNullEventSender alloc] initWithPluginView:self];
- [eventSender sendNullEvents];
- [self resetTrackingRect];
-}
-
-- (void)stop
-{
- [self removeTrackingRect];
-
- if (!isStarted)
- return;
- isStarted = NO;
-
- // Stop any active streams
- [streams makeObjectsPerformSelector:@selector(stop)];
-
- // Stop the null events
- [eventSender stop];
- [eventSender release];
-
- // Set cursor back to arrow cursor
- [[NSCursor arrowCursor] set];
-
- // Stop notifications
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- // Release web objects here to avoid circular retain
- [webController release];
- [webFrame release];
- [webDataSource release];
-
-#ifndef NDEBUG
- NPError npErr =
-#endif
- NPP_Destroy(instance, NULL);
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
-}
-
-- (IFWebDataSource *)webDataSource
-{
- return webDataSource;
-}
-
-- (IFWebController *) webController
-{
- return webController;
-}
-
-#pragma mark IFDOCUMENTVIEW
-
-- initWithFrame:(NSRect)frame
-{
- [super initWithFrame:frame];
-
- instance = &instanceStruct;
- instance->ndata = self;
-
- canRestart = YES;
- fullMode = YES;
-
- [self setFrame:NSMakeRect(0, 0, 1, 1)];
-
- return self;
-}
-
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
-{
- IFPlugin *plugin;
-
- mime = [[dataSource contentType] retain];
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mime];
-
- if(![plugin load])
- return;
-
- // copy function pointers
- NPP_New = [plugin NPP_New];
- NPP_Destroy = [plugin NPP_Destroy];
- NPP_SetWindow = [plugin NPP_SetWindow];
- NPP_NewStream = [plugin NPP_NewStream];
- NPP_WriteReady = [plugin NPP_WriteReady];
- NPP_Write = [plugin NPP_Write];
- NPP_StreamAsFile = [plugin NPP_StreamAsFile];
- NPP_DestroyStream = [plugin NPP_DestroyStream];
- NPP_HandleEvent = [plugin NPP_HandleEvent];
- NPP_URLNotify = [plugin NPP_URLNotify];
- NPP_GetValue = [plugin NPP_GetValue];
- NPP_SetValue = [plugin NPP_SetValue];
- NPP_Print = [plugin NPP_Print];
-
- [self start];
-}
-
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)layout
-{
- NSRect superFrame = [[self _IF_superviewWithName:@"IFWebView"] frame];
-
- [self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
- [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
- [self setUpWindowAndPort];
-}
-
-
-
-#pragma mark NSVIEW
-
-- (void)drawRect:(NSRect)rect
-{
- if(!isStarted)
- [self start];
- if(isStarted)
- [self sendUpdateEvent];
-}
-
-- (BOOL)isFlipped
-{
- return YES;
-}
-
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow
-{
- // We must remove the tracking rect before we move to the new window.
- // Once we move to the new window, it will be too late.
- [self removeTrackingRect];
- [super viewWillMoveToWindow:newWindow];
-}
-
-- (void)viewDidMoveToWindow
-{
- if (![self window])
- [self stop];
- [self resetTrackingRect];
- [super viewDidMoveToWindow];
-}
-
-#pragma mark NOTIFICATIONS
-
--(void)viewHasMoved:(NSNotification *)notification
-{
- [self setUpWindowAndPort];
-
- // reset the tracking rect
- [self resetTrackingRect];
-}
-
--(void) windowWillClose:(NSNotification *)notification
-{
- [self stop];
-}
-
--(void) windowBecameKey:(NSNotification *)notification
-{
- [self sendActivateEvent:YES];
- [self performSelector:@selector(sendUpdateEvent) withObject:nil afterDelay:.001];
-}
-
--(void) windowResignedKey:(NSNotification *)notification
-{
- [self sendActivateEvent:NO];
- [self performSelector:@selector(sendUpdateEvent) withObject:nil afterDelay:.001];
-}
-
-- (void) defaultsHaveChanged:(NSNotification *)notification
-{
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if([defaults boolForKey:@"WebKitPluginsEnabled"]){
- canRestart = YES;
- [self start];
- }else{
- canRestart = NO;
- [self stop];
- [self setNeedsDisplay:YES];
- }
-}
-
-- (void) frameStateChanged:(NSNotification *)notification
-{
- IFWebFrame *frame;
- IFWebFrameState frameState;
- NSValue *notifyDataValue;
- void *notifyData;
- NSURL *url;
-
- frame = [notification object];
- url = [[frame dataSource] inputURL];
- notifyDataValue = [notificationData objectForKey:url];
-
- if(!notifyDataValue)
- return;
-
- notifyData = [notifyDataValue pointerValue];
- frameState = (IFWebFrameState)[[[notification userInfo] objectForKey:IFCurrentFrameState] intValue];
- if(frameState == IFWEBFRAMESTATE_COMPLETE){
- NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
- }
- //FIXME: Need to send other NPReasons
-}
-
-#pragma mark PLUGIN-TO-BROWSER
-
-- (NPError) loadURL:(NSString *)URLString inTarget:(NSString *)target withNotifyData:(void *)notifyData andHandleAttributes:(NSDictionary *)attributes
-{
- IFPluginStream *stream;
- IFWebDataSource *dataSource;
- IFWebFrame *frame;
- NSURL *url;
-
- if([URLString _IF_looksLikeAbsoluteURL])
- url = [NSURL _IF_URLWithString:URLString];
- else
- url = [NSURL _IF_URLWithString:URLString relativeToURL:baseURL];
-
- if(!url)
- return NPERR_INVALID_URL;
-
- if(!target){
- stream = [[IFPluginStream alloc] initWithURL:url pluginPointer:instance notifyData:notifyData attributes:attributes];
- if(stream){
- [stream startLoad];
- [streams addObject:stream];
- [stream release];
- }else{
- return NPERR_INVALID_URL;
- }
- }else{
- frame = [webFrame frameNamed:target];
- if(!frame){
- [[webController windowContext] openNewWindowWithURL:url];
- // FIXME: Need to send NPP_URLNotify at the right time.
- // FIXME: Need to name new frame
- if(notifyData)
- NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
- }else{
- if(notifyData){
- if(![target isEqualToString:@"_self"] && ![target isEqualToString:@"_current"] &&
- ![target isEqualToString:@"_parent"] && ![target isEqualToString:@"_top"]){
-
- [notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
- }
- // Plug-in docs say to return NPERR_INVALID_PARAM here
- // but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
- // so we have to allow this as well. Needed for iTools.
- }
- dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
- if([frame setProvisionalDataSource:dataSource])
- [frame startLoading];
- }
- }
- return NPERR_NO_ERROR;
-}
-
--(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData
-{
- NSString *theTarget = nil;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURLNotify: %s target: %s\n", url, target);
-
- if(!url)
- return NPERR_INVALID_URL;
-
- if(target)
- theTarget = [NSString stringWithCString:target];
-
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:notifyData andHandleAttributes:nil];
-}
-
--(NPError)getURL:(const char *)url target:(const char *)target
-{
- NSString *theTarget = nil;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_GetURL: %s target: %s\n", url, target);
-
- if(!url)
- return NPERR_INVALID_URL;
-
- if(target)
- theTarget = [NSString stringWithCString:target];
-
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget withNotifyData:NULL andHandleAttributes:nil];
-}
-
--(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData
-{
- NSDictionary *attributes=nil;
- NSData *postData;
- NSURL *tempURL;
- NSString *path, *theTarget = nil;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURLNotify: %s\n", url);
-
- if(!url)
- return NPERR_INVALID_URL;
-
- if(target)
- theTarget = [NSString stringWithCString:target];
-
- if(file){
- if([[NSString stringWithCString:buf] _IF_looksLikeAbsoluteURL]){
- tempURL = [NSURL fileURLWithPath:[NSString stringWithCString:url]];
- path = [tempURL path];
- }else{
- path = [NSString stringWithCString:buf];
- }
- postData = [NSData dataWithContentsOfFile:path];
- }else{
- postData = [NSData dataWithBytes:buf length:len];
- }
-
- attributes = [NSDictionary dictionaryWithObjectsAndKeys:
- postData, IFHTTPURLHandleRequestData,
- @"POST", IFHTTPURLHandleRequestMethod, nil];
-
- return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget
- withNotifyData:notifyData andHandleAttributes:attributes];
-}
-
--(NPError)postURL:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file
-{
- NSString *theTarget = nil;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_PostURL: %s\n", url);
-
- if(!url)
- return NPERR_INVALID_URL;
-
- if(target)
- theTarget = [NSString stringWithCString:target];
-
- return [self postURLNotify:url target:target len:len buf:buf file:file notifyData:NULL];
-}
-
--(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_NewStream\n");
- return NPERR_GENERIC_ERROR;
-}
-
--(NPError)write:(NPStream*)stream len:(SInt32)len buffer:(void *)buffer
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Write\n");
- return NPERR_GENERIC_ERROR;
-}
-
--(NPError)destroyStream:(NPStream*)stream reason:(NPReason)reason
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_DestroyStream\n");
- if(!stream->ndata)
- return NPERR_INVALID_INSTANCE_ERROR;
-
- [(IFPluginStream *)stream->ndata stop];
- return NPERR_NO_ERROR;
-}
-
--(void)status:(const char *)message
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_Status: %s\n", message);
- if(webController){
- [[webController windowContext] setStatusText:[NSString stringWithCString:message]];
- }
-}
-
--(void)invalidateRect:(NPRect *)invalidRect
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRect\n");
- [self sendUpdateEvent];
-}
-
--(void)invalidateRegion:(NPRegion)invalidateRegion
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPN_InvalidateRegion\n");
- [self sendUpdateEvent];
-}
-
--(void)forceRedraw
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "forceRedraw\n");
- [self sendUpdateEvent];
-}
-
-- (NPP)pluginInstance
-{
- return instance;
-}
-
-- (NPP_NewStreamProcPtr)NPP_NewStream
-{
- return NPP_NewStream;
-}
-
-- (NPP_WriteReadyProcPtr)NPP_WriteReady
-{
- return NPP_WriteReady;
-}
-
-
-- (NPP_WriteProcPtr)NPP_Write
-{
- return NPP_Write;
-}
-
-
-- (NPP_StreamAsFileProcPtr)NPP_StreamAsFile
-{
- return NPP_StreamAsFile;
-}
-
-
-- (NPP_DestroyStreamProcPtr)NPP_DestroyStream
-{
- return NPP_DestroyStream;
-}
-
-
-- (NPP_URLNotifyProcPtr)NPP_URLNotify
-{
- return NPP_URLNotify;
-}
-
-- (NPP_HandleEventProcPtr) NPP_HandleEvent
-{
- return NPP_HandleEvent;
-}
-
- at end
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
index f100be8..0f03017 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.h
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -1,12 +1,12 @@
/*
- IFNullPluginView.h
+ WebNullPluginView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <AppKit/AppKit.h>
- at interface IFNullPluginView : NSImageView {
+ at interface WebNullPluginView : NSImageView {
BOOL errorSent;
NSString *mimeType;
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 7931805..f17eac2 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -1,19 +1,19 @@
/*
- IFNullPluginView.mm
+ WebNullPluginView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFNullPluginView.h>
+#import <WebKit/WebNullPluginView.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFNSViewExtras.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebNSViewExtras.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSURLExtras.h>
static NSImage *image = nil;
- at implementation IFNullPluginView
+ at implementation WebNullPluginView
- initWithFrame:(NSRect)frame mimeType:(NSString *)mime arguments:(NSDictionary *)arguments
{
@@ -24,7 +24,7 @@ static NSImage *image = nil;
if (self) {
// Set the view's image to the null plugin icon
if (!image) {
- bundle = [NSBundle bundleForClass:[IFNullPluginView class]];
+ bundle = [NSBundle bundleForClass:[WebNullPluginView class]];
imagePath = [bundle pathForResource:@"nullplugin" ofType:@"tiff"];
image = [[NSImage alloc] initWithContentsOfFile:imagePath];
}
@@ -33,7 +33,7 @@ static NSImage *image = nil;
mimeType = [mime retain];
pluginPageString = [arguments objectForKey:@"pluginspage"];
if(pluginPageString)
- pluginPage = [[NSURL _IF_URLWithString:pluginPageString] retain];
+ pluginPage = [[NSURL _web_URLWithString:pluginPageString] retain];
errorSent = NO;
}
@@ -48,13 +48,13 @@ static NSImage *image = nil;
}
- (void)drawRect:(NSRect)rect {
- IFWebView *webView;
- IFWebController *webController;
+ WebView *webView;
+ WebController *webController;
[super drawRect:rect];
if(!errorSent){
errorSent = YES;
- webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
+ webView = (WebView *)[self _web_superviewWithName:@"WebView"];
webController = [webView controller];
[[webController policyHandler] pluginNotFoundForMIMEType:mimeType pluginPageURL:pluginPage];
}
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index db7d004..638a40a 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -27,7 +27,7 @@
#import "npapi.h"
#import <WebCore/WebCoreViewFactory.h>
- at interface IFPlugin : NSObject <WebCorePluginInfo>
+ at interface WebPlugin : NSObject <WebCorePluginInfo>
{
NSMutableArray *mimeTypes;
NSString *name, *path, *filename, *pluginDescription;
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index 4cd52bd..f351ec7 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "IFPlugin.h"
+#import "WebPlugin.h"
#import "WebKitDebug.h"
typedef void (* FunctionPointer) (void);
@@ -31,7 +31,7 @@ typedef void (* TransitionVector) (void);
FunctionPointer functionPointerForTVector(TransitionVector);
TransitionVector tVectorForFunctionPointer(FunctionPointer);
- at implementation IFPlugin
+ at implementation WebPlugin
- (SInt16)_openResourceFile
{
@@ -202,17 +202,17 @@ TransitionVector tVectorForFunctionPointer(FunctionPointer);
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("WebPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return NO;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ WEBKITDEBUG("WebPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return NO;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- WEBKITDEBUG("IFPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ WEBKITDEBUG("WebPlugin: load: GetDiskFragment failed. Error=%d\n", err);
return NO;
}
pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index 2d76187..50f277d 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -25,16 +25,16 @@
#import <Foundation/Foundation.h>
- at class IFPlugin;
+ at class WebPlugin;
- at interface IFPluginDatabase : NSObject {
+ at interface WebPluginDatabase : NSObject {
NSArray *plugins;
}
-+ (IFPluginDatabase *)installedPlugins;
-- (IFPlugin *)pluginForMimeType:(NSString *)mimeType;
-- (IFPlugin *)pluginForExtension:(NSString *)extension;
-- (IFPlugin *)pluginWithFilename:(NSString *)filename;
++ (WebPluginDatabase *)installedPlugins;
+- (WebPlugin *)pluginForMimeType:(NSString *)mimeType;
+- (WebPlugin *)pluginForExtension:(NSString *)extension;
+- (WebPlugin *)pluginWithFilename:(NSString *)filename;
- (NSArray *) MIMETypes;
- (NSArray *) plugins;
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index 05e77df..401369b 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -23,46 +23,46 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebDataSource.h>
+#import <WebKit/WebPlugin.h>
+#import <WebKit/WebPluginStream.h>
+#import <WebKit/WebPluginView.h>
+#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebDataSource.h>
#import <WebKit/WebKitDebug.h>
NSArray *_pluginLocations(void);
NSArray *_findPlugins(void);
- at implementation IFPluginDatabase
-static IFPluginDatabase *__IFPluginDatabase = nil;
+ at implementation WebPluginDatabase
+static WebPluginDatabase *__IFPluginDatabase = nil;
-+ (IFPluginDatabase *)installedPlugins
++ (WebPluginDatabase *)installedPlugins
{
if(!__IFPluginDatabase){
- __IFPluginDatabase = [IFPluginDatabase alloc];
+ __IFPluginDatabase = [WebPluginDatabase alloc];
__IFPluginDatabase->plugins = _findPlugins();
- // register plug-in IFDocumentViews and IFDocumentRepresentations
+ // register plug-in WebDocumentViews and WebDocumentRepresentations
NSArray *mimes = [__IFPluginDatabase MIMETypes];
NSString *mime;
unsigned i;
for(i=0; i<[mimes count]; i++){
mime = [mimes objectAtIndex:i];
- [IFWebView registerViewClass:[IFPluginView class] forMIMEType:mime];
- [IFWebDataSource registerRepresentationClass:[IFPluginStream class] forMIMEType:mime];
+ [WebView registerViewClass:[WebPluginView class] forMIMEType:mime];
+ [WebDataSource registerRepresentationClass:[WebPluginStream class] forMIMEType:mime];
}
}
return __IFPluginDatabase;
}
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (IFPlugin *)pluginForMimeType:(NSString *)mimeType
+- (WebPlugin *)pluginForMimeType:(NSString *)mimeType
{
uint i, n;
- IFPlugin *plugin;
+ WebPlugin *plugin;
NSArray *mimeArray;
for(i=0; i<[plugins count]; i++){
@@ -77,10 +77,10 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)pluginForExtension:(NSString *)extension
+- (WebPlugin *)pluginForExtension:(NSString *)extension
{
uint i, n;
- IFPlugin *plugin;
+ WebPlugin *plugin;
NSArray *mimeArray;
NSRange hasExtension;
@@ -97,10 +97,10 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
return nil;
}
-- (IFPlugin *)pluginWithFilename:(NSString *)filename
+- (WebPlugin *)pluginWithFilename:(NSString *)filename
{
uint i;
- IFPlugin *plugin;
+ WebPlugin *plugin;
for(i=0; i<[plugins count]; i++){
plugin = [plugins objectAtIndex:i];
@@ -119,7 +119,7 @@ static IFPluginDatabase *__IFPluginDatabase = nil;
- (NSArray *) MIMETypes
{
NSMutableArray *allHandledMIMETypes;
- IFPlugin *plugin;
+ WebPlugin *plugin;
NSArray *mimeArray;
uint i, n;
@@ -163,7 +163,7 @@ NSArray *_findPlugins(void)
NSArray *pluginDirectories, *files;
NSString *file;
NSMutableArray *pluginPaths, *pluginArray, *filenames;
- IFPlugin *plugin;
+ WebPlugin *plugin;
uint i, n;
pluginDirectories = _pluginLocations();
@@ -185,7 +185,7 @@ NSArray *_findPlugins(void)
pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
for(i=0; i<[pluginPaths count]; i++){
- plugin = [IFPlugin alloc];
+ plugin = [WebPlugin alloc];
if([plugin initWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
index f05d602..9468762 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
@@ -1,21 +1,21 @@
/*
- IFPluginNullEventSender.h
+ WebPluginNullEventSender.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
#import <npapi.h>
- at class IFPluginView;
+ at class WebPluginView;
- at interface IFPluginNullEventSender : NSObject{
+ at interface WebPluginNullEventSender : NSObject{
NPP instance;
NPP_HandleEventProcPtr NPP_HandleEvent;
bool shouldStop;
NSWindow *window;
}
--(id)initWithPluginView:(IFPluginView *)pluginView;
+-(id)initWithPluginView:(WebPluginView *)pluginView;
-(void)sendNullEvents;
-(void)stop;
@end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
index e1cb516..f84be7b 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -1,16 +1,16 @@
/*
- IFPluginNullEventSender.m
+ WebPluginNullEventSender.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import "IFPluginNullEventSender.h"
+#import "WebPluginNullEventSender.h"
#import <Carbon/Carbon.h>
#import <WebKitDebug.h>
-#import <WebKit/IFPluginView.h>
+#import <WebKit/WebPluginView.h>
- at implementation IFPluginNullEventSender
+ at implementation WebPluginNullEventSender
--(id)initWithPluginView:(IFPluginView *)pluginView
+-(id)initWithPluginView:(WebPluginView *)pluginView
{
[super init];
@@ -34,7 +34,7 @@
EventRecord event;
bool acceptedEvent;
- [IFPluginView getCarbonEvent:&event];
+ [WebPluginView getCarbonEvent:&event];
// plug-in should not react to cursor position when not active.
if(![window isKeyWindow]){
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index 1701890..8c959f0 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -1,5 +1,5 @@
/*
- IFPluginStream.h
+ WebPluginStream.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
@@ -7,14 +7,14 @@
#import <WebFoundation/WebFoundation.h>
#import <WebKit/WebKit.h>
-#import <WebKit/IFPluginView.h>
+#import <WebKit/WebPluginView.h>
#import <WebKit/npapi.h>
- at protocol IFDocumentRepresentation;
+ at protocol WebDocumentRepresentation;
- at interface IFPluginStream : NSObject <IFDocumentRepresentation>
+ at interface WebPluginStream : NSObject <WebDocumentRepresentation>
{
- IFPluginView *view;
+ WebPluginView *view;
NSURL *URL;
NPP instance;
uint16 transferMode;
@@ -29,7 +29,7 @@
BOOL isFirstChunk;
BOOL stopped;
- IFURLHandle *URLHandle;
+ WebResourceHandle *URLHandle;
NPP_NewStreamProcPtr NPP_NewStream;
NPP_DestroyStreamProcPtr NPP_DestroyStream;
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index e40a4a6..c7b7ad5 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -1,21 +1,23 @@
/*
- IFPluginStream.m
+ WebPluginStream.m
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebControllerPrivate.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebPluginStream.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
+ at interface WebPluginStream (WebResourceClient) <WebResourceClient>
+ at end
static NSString *getCarbonPath(NSString *posixPath);
- at implementation IFPluginStream
+ at implementation WebPluginStream
- init
{
@@ -47,7 +49,7 @@ static NSString *getCarbonPath(NSString *posixPath);
if(!thePluginPointer)
return nil;
- view = [(IFPluginView *)thePluginPointer->ndata retain];
+ view = [(WebPluginView *)thePluginPointer->ndata retain];
URL = [theURL retain];
attributes = [theAttributes retain];
instance = thePluginPointer;
@@ -83,7 +85,7 @@ static NSString *getCarbonPath(NSString *posixPath);
- (void)startLoad
{
- URLHandle = [[IFURLHandle alloc] initWithURL:URL attributes:attributes flags:0];
+ URLHandle = [[WebResourceHandle alloc] initWithURL:URL attributes:attributes flags:0];
if(URLHandle){
[URLHandle addClient:self];
[URLHandle loadInBackground];
@@ -94,7 +96,7 @@ static NSString *getCarbonPath(NSString *posixPath);
{
if(!stopped){
stopped = YES;
- if([URLHandle statusCode] == IFURLHandleStatusLoading)
+ if([URLHandle statusCode] == WebResourceHandleStatusLoading)
[URLHandle cancelLoadInBackground];
[URLHandle removeClient:self];
[URLHandle release];
@@ -182,7 +184,7 @@ static NSString *getCarbonPath(NSString *posixPath);
[self stop];
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
{
if(isFirstChunk){
URL = [[dataSource inputURL] retain];
@@ -198,8 +200,8 @@ static NSString *getCarbonPath(NSString *posixPath);
offset = 0;
mimeType = [[dataSource contentType] retain];
- IFWebFrame *frame = [dataSource webFrame];
- IFWebView *webView = [frame webView];
+ WebFrame *frame = [dataSource webFrame];
+ WebView *webView = [frame webView];
view = [[webView documentView] retain];
instance = [view pluginInstance];
@@ -213,24 +215,24 @@ static NSString *getCarbonPath(NSString *posixPath);
[self receivedData:data];
}
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
[self receivedError];
}
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
{
[self finishedLoadingWithData:[dataSource data]];
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
[[view webController] _didStartLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
- IFWebController *webController = [view webController];
+ WebController *webController = [view webController];
if(isFirstChunk){
NSString *URLString = [[handle url] absoluteString];
@@ -247,15 +249,15 @@ static NSString *getCarbonPath(NSString *posixPath);
}
[self receivedData:data];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ [webController _receivedProgress:[WebLoadProgress progressWithResourceHandle:handle]
forResourceHandle: handle fromDataSource: [view webDataSource] complete: NO];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
+- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data: (NSData *)data
{
- IFWebController *webController = [view webController];
+ WebController *webController = [view webController];
- [webController _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ [webController _receivedProgress:[WebLoadProgress progressWithResourceHandle:handle]
forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self finishedLoadingWithData:data];
@@ -263,11 +265,11 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
- IFWebController *webController = [view webController];
+ WebController *webController = [view webController];
- [webController _receivedProgress:[IFLoadProgress progress]
+ [webController _receivedProgress:[WebLoadProgress progress]
forResourceHandle: handle fromDataSource: [view webDataSource] complete: YES];
[self receivedError];
@@ -275,11 +277,11 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
{
- IFWebController *webController = [view webController];
+ WebController *webController = [view webController];
- IFLoadProgress *loadProgress = [[IFLoadProgress alloc] initWithURLHandle:handle];
+ WebLoadProgress *loadProgress = [[WebLoadProgress alloc] initWithResourceHandle:handle];
[webController _receivedError: result forResourceHandle: handle
partialProgress: loadProgress fromDataSource: [view webDataSource]];
@@ -290,9 +292,9 @@ static NSString *getCarbonPath(NSString *posixPath);
[webController _didStopLoading:URL];
}
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)toURL
+- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)toURL
{
- IFWebController *webController = [view webController];
+ WebController *webController = [view webController];
[webController _didStopLoading:URL];
// FIXME: This next line is not sufficient. We don't do anything to remember the new URL.
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 51addf2..7e191aa 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -1,29 +1,29 @@
/*
- IFPluginView.h
+ WebPluginView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <WebKit/WebKit.h>
-#import <WebKit/IFWebFrame.h>
+#import <WebKit/WebFrame.h>
#import <Cocoa/Cocoa.h>
#import <npapi.h>
- at class IFPluginNullEventSender;
- at class IFWebDataSource;
- at class IFPlugin;
- at class IFWebController;
- at protocol IFDocumentView;
+ at class WebPluginNullEventSender;
+ at class WebDataSource;
+ at class WebPlugin;
+ at class WebController;
+ at protocol WebDocumentView;
- at interface IFPluginView : NSView <IFDocumentView>
+ at interface WebPluginView : NSView <WebDocumentView>
{
- IFPluginNullEventSender *eventSender;
+ WebPluginNullEventSender *eventSender;
unsigned argsCount;
char **cAttributes, **cValues;
- IFWebController *webController;
- IFWebDataSource *webDataSource;
- IFWebFrame *webFrame;
+ WebController *webController;
+ WebDataSource *webDataSource;
+ WebFrame *webFrame;
NPP instance;
NPWindow window;
@@ -53,10 +53,10 @@
NPP_SetValueProcPtr NPP_SetValue;
}
-- (id)initWithFrame:(NSRect)r plugin:(IFPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
+- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments;
-(void)stop;
-- (IFWebDataSource *)webDataSource;
-- (IFWebController *)webController;
+- (WebDataSource *)webDataSource;
+- (WebController *)webController;
+(void)getCarbonEvent:(EventRecord *)carbonEvent;
- (NPP)pluginInstance;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 1919947..7447b65 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -1,32 +1,32 @@
/*
- IFPluginView.mm
+ WebPluginView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
#define USE_CARBON 1
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFPluginStream.h>
-#import <WebKit/IFPluginNullEventSender.h>
-#import <WebKit/IFNullPluginView.h>
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFNSViewExtras.h>
+#import <WebKit/WebPluginView.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebPluginStream.h>
+#import <WebKit/WebPluginNullEventSender.h>
+#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebPlugin.h>
+#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/WebNSURLExtras.h>
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
- at implementation IFPluginView
+ at implementation WebPluginView
#pragma mark EVENTS
@@ -262,9 +262,9 @@
[super keyDown:theEvent];
}
-#pragma mark IFPLUGINVIEW
+#pragma mark WEB_PLUGIN_VIEW
-- (id)initWithFrame:(NSRect)r plugin:(IFPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
+- (id)initWithFrame:(NSRect)r plugin:(WebPlugin *)plugin url:(NSURL *)theURL baseURL:(NSURL *)theBaseURL mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
{
[super initWithFrame:r];
@@ -427,7 +427,7 @@
{
NSNotificationCenter *notificationCenter;
NSWindow *theWindow;
- IFPluginStream *stream;
+ WebPluginStream *stream;
if(isStarted || !canRestart)
return;
@@ -466,13 +466,13 @@
if ([theWindow isKeyWindow])
[self sendActivateEvent:YES];
- IFWebView *webView = (IFWebView *)[self _IF_superviewWithName:@"IFWebView"];
+ WebView *webView = (WebView *)[self _web_superviewWithName:@"WebView"];
webController = [[webView controller] retain];
webFrame = [[webController frameForView:webView] retain];
webDataSource = [[webFrame dataSource] retain];
if(srcURL){
- stream = [[IFPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
+ stream = [[WebPluginStream alloc] initWithURL:srcURL pluginPointer:instance];
if(stream){
[stream startLoad];
[streams addObject:stream];
@@ -480,7 +480,7 @@
}
}
- eventSender = [[IFPluginNullEventSender alloc] initWithPluginView:self];
+ eventSender = [[WebPluginNullEventSender alloc] initWithPluginView:self];
[eventSender sendNullEvents];
[self resetTrackingRect];
}
@@ -518,17 +518,17 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_Destroy: %d\n", npErr);
}
-- (IFWebDataSource *)webDataSource
+- (WebDataSource *)webDataSource
{
return webDataSource;
}
-- (IFWebController *) webController
+- (WebController *) webController
{
return webController;
}
-#pragma mark IFDOCUMENTVIEW
+#pragma mark WEB_DOCUMENT_VIEW
- initWithFrame:(NSRect)frame
{
@@ -545,12 +545,12 @@
return self;
}
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
- IFPlugin *plugin;
+ WebPlugin *plugin;
mime = [[dataSource contentType] retain];
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mime];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:mime];
if(![plugin load])
return;
@@ -573,19 +573,19 @@
[self start];
}
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
}
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
+- (void)dataSourceUpdated:(WebDataSource *)dataSource
{
}
- (void)layout
{
- NSRect superFrame = [[self _IF_superviewWithName:@"IFWebView"] frame];
+ NSRect superFrame = [[self _web_superviewWithName:@"WebView"] frame];
[self setFrame:NSMakeRect(0, 0, superFrame.size.width, superFrame.size.height)];
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
@@ -667,8 +667,8 @@
- (void) frameStateChanged:(NSNotification *)notification
{
- IFWebFrame *frame;
- IFWebFrameState frameState;
+ WebFrame *frame;
+ WebFrameState frameState;
NSValue *notifyDataValue;
void *notifyData;
NSURL *url;
@@ -681,8 +681,8 @@
return;
notifyData = [notifyDataValue pointerValue];
- frameState = (IFWebFrameState)[[[notification userInfo] objectForKey:IFCurrentFrameState] intValue];
- if(frameState == IFWEBFRAMESTATE_COMPLETE){
+ frameState = (WebFrameState)[[[notification userInfo] objectForKey:WebCurrentFrameState] intValue];
+ if(frameState == WebFrameStateComplete){
NPP_URLNotify(instance, [[url absoluteString] cString], NPRES_DONE, notifyData);
}
//FIXME: Need to send other NPReasons
@@ -692,21 +692,21 @@
- (NPError) loadURL:(NSString *)URLString inTarget:(NSString *)target withNotifyData:(void *)notifyData andHandleAttributes:(NSDictionary *)attributes
{
- IFPluginStream *stream;
- IFWebDataSource *dataSource;
- IFWebFrame *frame;
+ WebPluginStream *stream;
+ WebDataSource *dataSource;
+ WebFrame *frame;
NSURL *url;
- if([URLString _IF_looksLikeAbsoluteURL])
- url = [NSURL _IF_URLWithString:URLString];
+ if([URLString _web_looksLikeAbsoluteURL])
+ url = [NSURL _web_URLWithString:URLString];
else
- url = [NSURL _IF_URLWithString:URLString relativeToURL:baseURL];
+ url = [NSURL _web_URLWithString:URLString relativeToURL:baseURL];
if(!url)
return NPERR_INVALID_URL;
if(!target){
- stream = [[IFPluginStream alloc] initWithURL:url pluginPointer:instance notifyData:notifyData attributes:attributes];
+ stream = [[WebPluginStream alloc] initWithURL:url pluginPointer:instance notifyData:notifyData attributes:attributes];
if(stream){
[stream startLoad];
[streams addObject:stream];
@@ -729,13 +729,13 @@
[notificationData setObject:[NSValue valueWithPointer:notifyData] forKey:url];
[[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(frameStateChanged:) name:IFFrameStateChangedNotification object:frame];
+ selector:@selector(frameStateChanged:) name:WebFrameStateChangedNotification object:frame];
}
// Plug-in docs say to return NPERR_INVALID_PARAM here
// but IE allows an NPP_*URLNotify when the target is _self, _current, _parent or _top
// so we have to allow this as well. Needed for iTools.
}
- dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
+ dataSource = [[[WebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
if([frame setProvisionalDataSource:dataSource])
[frame startLoading];
}
@@ -789,7 +789,7 @@
theTarget = [NSString stringWithCString:target];
if(file){
- if([[NSString stringWithCString:buf] _IF_looksLikeAbsoluteURL]){
+ if([[NSString stringWithCString:buf] _web_looksLikeAbsoluteURL]){
tempURL = [NSURL fileURLWithPath:[NSString stringWithCString:url]];
path = [tempURL path];
}else{
@@ -801,8 +801,8 @@
}
attributes = [NSDictionary dictionaryWithObjectsAndKeys:
- postData, IFHTTPURLHandleRequestData,
- @"POST", IFHTTPURLHandleRequestMethod, nil];
+ postData, WebHTTPResourceHandleRequestData,
+ @"POST", WebHTTPResourceHandleRequestMethod, nil];
return [self loadURL:[NSString stringWithCString:url] inTarget:theTarget
withNotifyData:notifyData andHandleAttributes:attributes];
@@ -841,7 +841,7 @@
if(!stream->ndata)
return NPERR_INVALID_INSTANCE_ERROR;
- [(IFPluginStream *)stream->ndata stop];
+ [(WebPluginStream *)stream->ndata stop];
return NPERR_NO_ERROR;
}
diff --git a/WebKit/Plugins.subproj/npapi.m b/WebKit/Plugins.subproj/npapi.m
index 7d86ed5..6136a9b 100644
--- a/WebKit/Plugins.subproj/npapi.m
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -26,7 +26,7 @@
#import "npapi.h"
#import "WebKitDebug.h"
- at interface IFPluginView : NSObject
+ at interface WebPluginView : NSObject
-(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData;
-(NPError)getURL:(const char *)url target:(const char *)target;
-(NPError)postURLNotify:(const char *)url target:(const char *)target len:(UInt32)len buf:(const char *)buf file:(NPBool)file notifyData:(void *)notifyData;
@@ -86,49 +86,49 @@ NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
NPError NPN_GetURLNotify(NPP instance, const char* url, const char* target, void* notifyData)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin getURLNotify:url target:target notifyData:notifyData];
}
NPError NPN_GetURL(NPP instance, const char* url, const char* target)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin getURL:url target:target];
}
NPError NPN_PostURLNotify(NPP instance, const char* url, const char* target, UInt32 len, const char* buf, NPBool file, void* notifyData)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin postURLNotify:url target:target len:len buf:buf file:file notifyData:notifyData];
}
NPError NPN_PostURL(NPP instance, const char* url, const char* target, UInt32 len, const char* buf, NPBool file)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin postURL:url target:target len:len buf:buf file:file];
}
NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* target, NPStream** stream)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin newStream:type target:target stream:stream];
}
SInt32 NPN_Write(NPP instance, NPStream* stream, SInt32 len, void* buffer)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin write:stream len:len buffer:buffer];
}
NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPReason reason)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
return [plugin destroyStream:stream reason:reason];
}
void NPN_Status(NPP instance, const char* message)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
[plugin status:message];
}
@@ -147,19 +147,19 @@ NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value)
void NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
[plugin invalidateRect:invalidRect];
}
void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
[plugin invalidateRegion:invalidRegion];
}
void NPN_ForceRedraw(NPP instance)
{
- IFPluginView *plugin = (IFPluginView *)instance->ndata;
+ WebPluginView *plugin = (WebPluginView *)instance->ndata;
[plugin forceRedraw];
}
diff --git a/WebKit/WebCoreSupport.subproj/IFCookieAdapter.h b/WebKit/WebCoreSupport.subproj/IFCookieAdapter.h
deleted file mode 100644
index ef4d8c3..0000000
--- a/WebKit/WebCoreSupport.subproj/IFCookieAdapter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// IFCookieAdapter.h
-// WebKit
-//
-// Created by Maciej Stachowiak on Thu Jun 27 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <WebCore/WebCoreCookieAdapter.h>
-
- at interface IFCookieAdapter : WebCoreCookieAdapter
-{
-}
-
-+ (void)createSharedAdapter;
-
-- (BOOL)cookiesEnabled;
-- (NSString *)cookiesForURL:(NSURL *)url;
-- (void)setCookies:(NSString *)cookies forURL:(NSURL *)url;
-
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFCookieAdapter.m b/WebKit/WebCoreSupport.subproj/IFCookieAdapter.m
deleted file mode 100644
index 155b898..0000000
--- a/WebKit/WebCoreSupport.subproj/IFCookieAdapter.m
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// IFCookieAdapter.m
-// WebKit
-//
-// Created by Maciej Stachowiak on Thu Jun 27 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFCookieAdapter.h"
-#import <WebFoundation/IFCookieManager.h>
-#import <WebKit/WebKitDebug.h>
-
-
- at implementation IFCookieAdapter
-
-+ (void)createSharedAdapter
-{
- if (![self sharedAdapter]) {
- [[[self alloc] init] release];
- }
- WEBKIT_ASSERT([[self sharedAdapter] isMemberOfClass:self]);
-}
-
-- (BOOL)cookiesEnabled
-{
- BOOL result;
- id acceptCookiesPref = (id)CFPreferencesCopyAppValue((CFStringRef)IFAcceptCookiesPreference, (CFStringRef)IFWebFoundationPreferenceDomain);
-
- if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceNever]) {
- result = NO;
- } else if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceAsk]) {
- result = YES;
- } else if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceAlways]) {
- result = YES;
- } else {
- // Treat missing or bad value as always accept
- result = YES;
- }
- [acceptCookiesPref release];
-
- return result;
-}
-
-- (NSString *)cookiesForURL:(NSURL *)url
-{
- return [[[IFCookieManager sharedCookieManager] cookieRequestHeadersForURL:url] objectForKey:@"Cookie"];
-}
-
-- (void)setCookies:(NSString *)cookies forURL:(NSURL *)url
-{
- [[IFCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"] forURL:url];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.h b/WebKit/WebCoreSupport.subproj/IFImageRenderer.h
deleted file mode 100644
index 209ed6e..0000000
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* IFImageRenderer.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <WebCore/WebCoreImageRenderer.h>
-
- at interface IFImageRenderer : NSImage <WebCoreImageRenderer>
-{
- NSTimer *frameTimer;
- NSView *frameView;
- NSRect imageRect;
- NSRect targetRect;
- int loadStatus;
- NSColor *patternColor;
- int patternColorLoadStatus;
- BOOL animationFinished;
-}
-
-+ (void)stopAnimationsInView: (NSView *)aView;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m b/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
deleted file mode 100644
index 3fd90d2..0000000
--- a/WebKit/WebCoreSupport.subproj/IFImageRenderer.m
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- IFImageRenderer.m
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFException.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFImageRenderer
-
-static NSMutableArray *activeImageRenderers;
-
-+ (void)stopAnimationsInView: (NSView *)aView
-{
- int i, count;
-
- count = [activeImageRenderers count];
- for (i = count-1; i >= 0; i--){
- IFImageRenderer *renderer = [activeImageRenderers objectAtIndex: i];
- if (renderer->frameView == aView){
- [renderer stopAnimation];
- }
- }
-
-}
-
-
-- copyWithZone:(NSZone *)zone
-{
- IFImageRenderer *copy = [super copyWithZone:zone];
-
- // FIXME: If we copy while doing an incremental load, it won't work.
-
- copy->frameTimer = nil;
- copy->frameView = nil;
- copy->patternColor = nil;
-
- return copy;
-}
-
-- (BOOL)incrementalLoadWithBytes: (const void *)bytes length:(unsigned)length complete:(BOOL)isComplete
-{
- NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
- //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
- NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
- NSSize size;
-
- loadStatus = [imageRep incrementalLoadFromData:data complete:isComplete];
- [data release];
- switch (loadStatus){
- case NSImageRepLoadStatusUnknownType: // not enough data to determine image format. please feed me more data
- //printf ("NSImageRepLoadStatusUnknownType size %d, isComplete %d\n", length, isComplete);
- return NO;
- case NSImageRepLoadStatusReadingHeader: // image format known, reading header. not yet valid. more data needed
- //printf ("NSImageRepLoadStatusReadingHeader size %d, isComplete %d\n", length, isComplete);
- return NO;
- case NSImageRepLoadStatusWillNeedAllData: // can't read incrementally. will wait for complete data to become avail.
- //printf ("NSImageRepLoadStatusWillNeedAllData size %d, isComplete %d\n", length, isComplete);
- return NO;
- case NSImageRepLoadStatusInvalidData: // image decompression encountered error.
- //printf ("NSImageRepLoadStatusInvalidData size %d, isComplete %d\n", length, isComplete);
- return NO;
- case NSImageRepLoadStatusUnexpectedEOF: // ran out of data before full image was decompressed.
- //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
- return NO;
- case NSImageRepLoadStatusCompleted: // all is well, the full pixelsHigh image is valid.
- //printf ("NSImageRepLoadStatusUnexpectedEOF size %d, isComplete %d\n", length, isComplete);
- // Force the image to use the pixel size and ignore the dpi.
- size = NSMakeSize([imageRep pixelsWide], [imageRep pixelsHigh]);
- [imageRep setSize:size];
- [self setSize:size];
- return YES;
- default:
- // We have some data. Return YES so we can attempt a to draw what we've got.
- return YES;
- }
-
- return NO;
-}
-
-
-- (void)dealloc
-{
- [self stopAnimation];
- [patternColor release];
- [super dealloc];
-}
-
-
-- (id)firstRepProperty:(NSString *)propertyName
-{
- id firstRep = [[self representations] objectAtIndex:0];
- id property = nil;
- if ([firstRep respondsToSelector:@selector(valueForProperty:)])
- property = [firstRep valueForProperty:propertyName];
- return property;
-}
-
-- (int)frameCount
-{
- id property = [self firstRepProperty:NSImageFrameCount];
- return property != nil ? [property intValue] : 1;
-}
-
-- (int)currentFrame
-{
- id property = [self firstRepProperty:NSImageCurrentFrame];
- return property != nil ? [property intValue] : 1;
-}
-
-- (void)setCurrentFrame:(int)frame
-{
- NSBitmapImageRep* imageRep = [[self representations] objectAtIndex:0];
- [imageRep setProperty:NSImageCurrentFrame withValue:[NSNumber numberWithInt:frame]];
-}
-
-#define MINIMUM_DURATON (1.0/30.0)
-
-- (float)frameDuration
-{
- id property = [self firstRepProperty:NSImageCurrentFrameDuration];
- float duration = (property != nil ? [property floatValue] : 0.0);
- if (duration < MINIMUM_DURATON){
- /*
- Many annoying ads specify a 0 duration to make an image flash
- as quickly as possible. However a zero duration is faster than
- the refresh rate. We need to pick a minimum duration.
-
- Browsers handle the minimum time case differently. IE seems to use something
- close to 1/30th of a second. Konqueror uses 0. The ImageMagick library
- uses 1/100th. The units in the GIF specification are 1/100th of second.
- We will use 1/30th of second as the minimum time.
- */
- duration = MINIMUM_DURATON;
- }
- return duration;
-}
-
-- (void)_scheduleFrame
-{
- if (!animationFinished){
- frameTimer = [[NSTimer scheduledTimerWithTimeInterval:[self frameDuration]
- target:self
- selector:@selector(nextFrame:)
- userInfo:nil
- repeats:NO] retain];
- if (!activeImageRenderers)
- activeImageRenderers = [[NSMutableArray alloc] init];
-
- [activeImageRenderers addObject: self];
- }
-}
-
-
-- (void)nextFrame:(id)context
-{
- int currentFrame;
- NSWindow *window;
-
- // Release the timer that just fired.
- [frameTimer release];
- frameTimer = nil;
-
- currentFrame = [self currentFrame] + 1;
- if (currentFrame >= [self frameCount]) {
- if ([self frameDuration] == 0) {
- animationFinished = YES; // Don't repeat if the last frame has a duration of 0.
- // IE doesn't repeat, so we don't.
- return;
- }
- else
- currentFrame = 0;
- }
- [self setCurrentFrame:currentFrame];
-
- window = [frameView window];
-
- // We can't use isOpaque because it returns YES for many non-opaque images (Radar 2966937).
- // But we can at least assume that any image representatin without alpha is opaque.
- if (![[[self representations] objectAtIndex:0] hasAlpha]) {
- if ([frameView canDraw]) {
- [frameView lockFocus];
- [self drawInRect:targetRect
- fromRect:imageRect
- operation:NSCompositeSourceOver // Renders transparency correctly
- fraction:1.0];
- [frameView unlockFocus];
- }
- [self _scheduleFrame];
- } else {
- // No need to schedule the next frame in this case. The display
- // will eventually cause the image to be redrawn and the next frame
- // will be scheduled in beginAnimationInRect:fromRect:
- [frameView displayRect:targetRect];
- }
-
- [window flushWindow];
-}
-
-- (void)beginAnimationInRect: (NSRect)ir fromRect: (NSRect)fr
-{
- // The previous, if any, frameView, is released in stopAnimation.
- [self stopAnimation];
-
- [self drawInRect: ir
- fromRect: fr
- operation: NSCompositeSourceOver // Renders transparency correctly
- fraction: 1.0];
-
- if ([self frameCount] > 1 && animationFinished != YES) {
- imageRect = fr;
- targetRect = ir;
- frameView = [[NSView focusView] retain];
- [self _scheduleFrame];
- }
-}
-
-- (void)stopAnimation
-{
- [frameTimer invalidate];
- [frameTimer release];
- frameTimer = nil;
-
- [frameView release];
- frameView = nil;
-
- [activeImageRenderers removeObject: self];
-}
-
-- (void)resize:(NSSize)s
-{
- [self setScalesWhenResized: YES];
- [self setSize: s];
-}
-
-- (void)tileInRect:(NSRect)rect fromPoint:(NSPoint)point
-{
- // If it's too early to draw, just do nothing.
- if (loadStatus <= 0 && loadStatus != NSImageRepLoadStatusCompleted) {
- return;
- }
-
- NSSize size = [self size];
-
- // Check and see if a single draw of the image can convert the entire area we are supposed to tile.
- WEBKIT_ASSERT([[NSView focusView] isFlipped]);
- NSRect oneTileRect;
- oneTileRect.origin.x = rect.origin.x + fmodf(fmodf(-point.x, size.width) - size.width, size.width);
- oneTileRect.origin.y = rect.origin.y + fmodf(fmodf(-point.y, size.height) - size.height, size.height);
- oneTileRect.size = size;
-
- // If the single image draw covers the whole area, then just draw once.
- if (NSContainsRect(oneTileRect, rect)) {
- NSRect fromRect;
- fromRect.origin.x = rect.origin.x - oneTileRect.origin.x;
- fromRect.origin.y = (oneTileRect.origin.y + oneTileRect.size.height) - (rect.origin.y + rect.size.height);
- fromRect.size = rect.size;
-
- [self drawInRect:rect
- fromRect:fromRect
- operation:NSCompositeSourceOver
- fraction:1.0];
-
- return;
- }
-
- // Since we need to tile, construct an NSColor so we can get CoreGraphics to do it for us.
- if (patternColorLoadStatus != loadStatus) {
- [patternColor release];
- patternColor = nil;
- }
- if (patternColor == nil) {
- patternColor = [[NSColor colorWithPatternImage:self] retain];
- patternColorLoadStatus = loadStatus;
- }
-
- // Compute the appropriate phase relative to the top level view in the window.
- // Conveniently, the oneTileRect we computed above has the appropriate origin.
- NSPoint originInWindow = [[NSView focusView] convertPoint:oneTileRect.origin toView:nil];
- CGSize phase = CGSizeMake(fmodf(originInWindow.x, size.width), fmodf(originInWindow.y, size.height));
-
- [NSGraphicsContext saveGraphicsState];
-
- CGContextSetPatternPhase((CGContextRef)[[NSGraphicsContext currentContext] graphicsPort], phase);
- [patternColor set];
- [NSBezierPath fillRect:rect];
-
- [NSGraphicsContext restoreGraphicsState];
-}
-
-// required by protocol -- apparently inherited methods don't count
-
-- (NSSize)size
-{
- return [super size];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.h b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.h
deleted file mode 100644
index 7a17213..0000000
--- a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// IFImageRendererFactory.h
-// WebKit
-//
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreImageRendererFactory.h>
-
- at class IFImageRenderer;
-
- at interface IFImageRendererFactory : WebCoreImageRendererFactory
-{
-}
-
-+ (void)createSharedFactory;
-+ (IFImageRendererFactory *)sharedFactory;
-- (id <WebCoreImageRenderer>)imageRendererWithBytes: (const void *)bytes length:(unsigned)length;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
deleted file mode 100644
index d1facaf..0000000
--- a/WebKit/WebCoreSupport.subproj/IFImageRendererFactory.m
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2002 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.
- */
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/IFImageRendererFactory.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFImageRendererFactory
-
-+ (void)createSharedFactory
-{
- if (![self sharedFactory]) {
- [[[self alloc] init] release];
- }
- WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
-}
-
-+ (IFImageRendererFactory *)sharedFactory
-{
- return (IFImageRendererFactory *)[super sharedFactory];
-}
-
-- (id <WebCoreImageRenderer>)imageRenderer
-{
- NSImage *imageRenderer = [[IFImageRenderer alloc] init];
-
- NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initForIncrementalLoad];
- [imageRenderer addRepresentation: rep];
- [rep release];
- [imageRenderer setFlipped: YES];
-
- [imageRenderer setScalesWhenResized: NO];
- return [imageRenderer autorelease];
-}
-
-
-- (id <WebCoreImageRenderer>)imageRendererWithBytes: (const void *)bytes length:(unsigned)length
-{
- // FIXME: Why must we copy the data here?
- //NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
- NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
- IFImageRenderer *imageRenderer = [[IFImageRenderer alloc] initWithData: data];
- [imageRenderer setScalesWhenResized: NO];
- NSArray *reps = [imageRenderer representations];
- NSImageRep *rep = [reps objectAtIndex: 0];
- // Force the image to use the pixel size and ignore the dpi.
- [rep setSize:NSMakeSize([rep pixelsWide], [rep pixelsHigh])];
- [data release];
- [imageRenderer setFlipped: YES];
- return [imageRenderer autorelease];
-}
-
-- (id <WebCoreImageRenderer>)imageRendererWithSize: (NSSize)s
-{
- IFImageRenderer *imageRenderer = [[[IFImageRenderer alloc] initWithSize: s] autorelease];
- [imageRenderer setScalesWhenResized: NO];
- return imageRenderer;
-}
-
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.h b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.h
deleted file mode 100644
index bb27633..0000000
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// IFResourceURLHandleClient.h
-// WebKit
-//
-// Created by Darin Adler on Sat Jun 15 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebFoundation/IFURLHandleClient.h>
-
- at protocol WebCoreResourceLoader;
- at class IFWebDataSource;
-
- at interface IFResourceURLHandleClient : NSObject <IFURLHandleClient>
-{
- id <WebCoreResourceLoader> loader;
- IFWebDataSource *dataSource;
- NSURL *currentURL;
-}
-
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)dataSource;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
deleted file mode 100644
index 9645dcc..0000000
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-// IFResourceURLHandleClient.m
-// WebKit
-//
-// Created by Darin Adler on Sat Jun 15 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFResourceURLHandleClient.h>
-
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFURLHandle.h>
-
-#import <WebCore/WebCoreResourceLoader.h>
-
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFResourceURLHandleClient
-
-- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(IFWebDataSource *)s
-{
- [super init];
-
- loader = [l retain];
- dataSource = [s retain];
-
- return self;
-}
-
-- (void)didStartLoadingWithURL:(NSURL *)URL
-{
- WEBKIT_ASSERT(currentURL == nil);
- currentURL = [URL retain];
- [[dataSource controller] _didStartLoading:currentURL];
-}
-
-- (void)didStopLoading
-{
- WEBKIT_ASSERT(currentURL != nil);
- [[dataSource controller] _didStopLoading:currentURL];
- [currentURL release];
- currentURL = nil;
-}
-
-- (void)dealloc
-{
- WEBKIT_ASSERT(currentURL == nil);
-
- [loader release];
- [dataSource release];
-
- [super dealloc];
-}
-
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)source
-{
- IFURLHandle *handle;
- IFResourceURLHandleClient *client;
-
- handle = [[[IFURLHandle alloc] initWithURL:URL attributes:nil flags:0] autorelease];
- if (handle == nil) {
- [rLoader cancel];
-
- IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation
- failingURL:URL
- isTerminal:YES];
- [[source controller] _receivedError:badURLError forResourceHandle:nil
- partialProgress:nil fromDataSource:source];
-
- return nil;
- } else {
- [source _addURLHandle:handle];
-
- client = [[self alloc] initWithLoader:rLoader dataSource:source];
- [handle addClient:client];
- [client release];
-
- [handle loadInBackground];
-
- return handle;
- }
-}
-
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
-{
- [[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
- forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
-}
-
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
-{
- [[dataSource controller] _receivedError:error forResourceHandle:handle
- partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
-}
-
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
-{
- [self didStartLoadingWithURL:[handle url]];
- [self receivedProgressWithHandle:handle complete: NO];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
-{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-
- [self receivedProgressWithHandle:handle complete: NO];
- [loader addData:data];
-}
-
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
-{
- IFError *error;
-
- [loader cancel];
-
- [dataSource _removeURLHandle:handle];
-
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
- [self receivedError:error forHandle:handle];
- [error release];
-
- [self didStopLoading];
-}
-
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
-{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
- WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
-
- [loader finish];
-
- [dataSource _removeURLHandle:handle];
-
- IFError *nonTerminalError = [handle error];
- if (nonTerminalError) {
- [self receivedError:nonTerminalError forHandle:handle];
- }
-
- [self receivedProgressWithHandle:handle complete:YES];
-
- [self didStopLoading];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
-{
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-
- [loader cancel];
-
- [dataSource _removeURLHandle:handle];
-
- [self receivedError:error forHandle:handle];
-
- [self didStopLoading];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
-{
- WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
-
- [[dataSource _bridge] setURL:URL];
-
- // FIXME: We do want to tell the client about redirects.
- // But the current API doesn't give any way to tell redirects on
- // the main page from redirects on subresources, so for now we are
- // just disabling this. Before, we had code that tried to send the
- // redirect, but sent it to the wrong object.
- //[[dataSource _locationChangeHandler] serverRedirectTo:toURL forDataSource:dataSource];
-
- [self didStopLoading];
- [self didStartLoadingWithURL:URL];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.h b/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
deleted file mode 100644
index 72cfa40..0000000
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// IFTextRenderer.h
-// WebKit
-//
-// Created by Darin Adler on Thu May 02 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreTextRenderer.h>
-
-typedef struct WidthMap WidthMap;
-typedef struct GlyphMap GlyphMap;
-
- at interface IFTextRenderer : NSObject <WebCoreTextRenderer>
-{
- int ascent;
- int descent;
- int lineSpacing;
- ATSGlyphRef spaceGlyph;
-
- struct AttributeGroup *styleGroup;
-
- at public
- NSFont *font;
- GlyphMap *characterToGlyphMap;
- WidthMap *glyphToWidthMap;
-}
-
-- initWithFont:(NSFont *)font;
-
-// Set applyRounding = NO to get an Cocoa equivalent width.
-- (float)floatWidthForCharacters:(const unichar *)characters stringLength:(unsigned)length fromCharacterPosition: (int)pos numberOfCharacters: (int)len applyRounding: (BOOL)applyRounding attemptFontSubstitution: (BOOL)attemptFontSubstitution;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
deleted file mode 100644
index 7c86764..0000000
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
- IFTextRenderer.m
-
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "IFTextRenderer.h"
-
-#import <Cocoa/Cocoa.h>
-
-#import <ApplicationServices/ApplicationServices.h>
-#import <CoreGraphics/CoreGraphicsPrivate.h>
-
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <QD/ATSUnicodePriv.h>
-
-#define NON_BREAKING_SPACE 0xA0
-#define SPACE 0x20
-
-#define ROUND_TO_INT(x) (unsigned int)((x)+.5)
-
-#define LOCAL_BUFFER_SIZE 1024
-
-// Covers most of latin1.
-#define INITIAL_BLOCK_SIZE 0x200
-
-// Get additional blocks of glyphs and widths in bigger chunks.
-// This will typically be for other character sets.
-#define INCREMENTAL_BLOCK_SIZE 0x400
-
-#define UNINITIALIZED_GLYPH_WIDTH 65535
-
-// combining char, hangul jamo, or Apple corporate variant tag
-#define JunseongStart 0x1160
-#define JonseongEnd 0x11F9
-#define IsHangulConjoiningJamo(X) (X >= JunseongStart && X <= JonseongEnd)
-#define IsNonBaseChar(X) ((CFCharacterSetIsCharacterMember(nonBaseChars, X) || IsHangulConjoiningJamo(X) || (((X) & 0x1FFFF0) == 0xF870)))
-
-
-typedef float IFGlyphWidth;
-
-struct WidthMap {
- ATSGlyphRef startRange;
- ATSGlyphRef endRange;
- WidthMap *next;
- IFGlyphWidth *widths;
-};
-
-struct GlyphMap {
- UniChar startRange;
- UniChar endRange;
- GlyphMap *next;
- ATSGlyphRef *glyphs;
-};
-
-
- at interface NSLanguage : NSObject
-{
-}
-+ (NSLanguage *)defaultLanguage;
- at end
-
- at interface NSFont (IFPrivate)
-- (ATSUFontID)_atsFontID;
-- (CGFontRef)_backingCGSFont;
-// Private method to find a font for a character.
-+ (NSFont *) findFontLike:(NSFont *)aFont forCharacter:(UInt32)c inLanguage:(NSLanguage *) language;
-+ (NSFont *) findFontLike:(NSFont *)aFont forString:(NSString *)string withRange:(NSRange)range inLanguage:(NSLanguage *) language;
-- (NSGlyph)_defaultGlyphForChar:(unichar)uu;
- at end
-
- at class NSCGSFont;
-
-
-static CFCharacterSetRef nonBaseChars = NULL;
-
-
- at interface IFTextRenderer (IFPrivate)
-- (WidthMap *)extendGlyphToWidthMapToInclude:(ATSGlyphRef)glyphID;
-- (ATSGlyphRef)extendCharacterToGlyphMapToInclude:(UniChar) c;
- at end
-
-
-static void freeWidthMap (WidthMap *map)
-{
- if (!map)
- return;
- freeWidthMap (map->next);
- free (map->widths);
- free (map);
-}
-
-
-static void freeGlyphMap (GlyphMap *map)
-{
- if (!map)
- return;
- freeGlyphMap (map->next);
- free (map->glyphs);
- free (map);
-}
-
-
-static inline ATSGlyphRef glyphForCharacter (GlyphMap *map, UniChar c)
-{
- if (map == 0)
- return nonGlyphID;
-
- if (c >= map->startRange && c <= map->endRange)
- return ((ATSGlyphRef *)map->glyphs)[c-map->startRange];
-
- return glyphForCharacter (map->next, c);
-}
-
-
-static void setGlyphForCharacter (GlyphMap *map, ATSGlyphRef glyph, UniChar c)
-{
- if (map == 0)
- return;
-
- if (c >= map->startRange && c <= map->endRange)
- ((ATSGlyphRef *)map->glyphs)[c-map->startRange] = glyph;
- else
- setGlyphForCharacter (map->next, glyph, c);
-}
-
-
-#ifdef _TIMING
-static double totalCGGetAdvancesTime = 0;
-#endif
-
-static inline IFGlyphWidth widthForGlyph (IFTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph)
-{
- IFGlyphWidth width;
- bool errorResult;
-
- if (map == 0){
- map = [renderer extendGlyphToWidthMapToInclude: glyph];
- return widthForGlyph (renderer, map, glyph);
- }
-
- if (glyph >= map->startRange && glyph <= map->endRange){
- width = ((IFGlyphWidth *)map->widths)[glyph-map->startRange];
- if (width == UNINITIALIZED_GLYPH_WIDTH){
-
-#ifdef _TIMING
- double startTime = CFAbsoluteTimeGetCurrent();
-#endif
- errorResult = CGFontGetGlyphScaledAdvances ([renderer->font _backingCGSFont], &glyph, 1, &map->widths[glyph-map->startRange], [renderer->font pointSize]);
- if (errorResult == 0)
- [NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: unable to cache glyph widths - for %@ %f", [renderer->font displayName], [renderer->font pointSize]];
-
-#ifdef _TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - startTime;
- totalCGGetAdvancesTime += thisTime;
-#endif
- return ((IFGlyphWidth *)map->widths)[glyph-map->startRange];
- }
- return width;
- }
-
- return widthForGlyph (renderer, map->next, glyph);
-}
-
-
-static inline IFGlyphWidth widthForCharacter (IFTextRenderer *renderer, UniChar c)
-{
- return widthForGlyph (renderer, renderer->glyphToWidthMap, glyphForCharacter(renderer->characterToGlyphMap, c));
-}
-
-
-static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
-{
- if (theFont) {
- ATSUFontID fontId = (ATSUFontID)[theFont _atsFontID];
- ATSUAttributeTag tag = kATSUFontTag;
- ByteCount size = sizeof(ATSUFontID);
- ATSUFontID *valueArray[1] = {&fontId};
-
- if (fontId) {
- if (ATSUSetAttributes(style, 1, &tag, &size, (void **)valueArray) != noErr)
- [NSException raise:NSInternalInconsistencyException format:@"Failed to set font (%@) ATSUStyle 0x%X", theFont, style];
- }
- }
-}
-
-
-static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsigned int length)
-{
- unsigned int k;
-
- if (length <= 1)
- return length;
-
- if (IsNonBaseChar(characters[0]))
- return 1;
-
- // Find all the non base characters after the current character.
- for (k = 1; k < length; k++)
- if (!IsNonBaseChar(characters[k]))
- break;
- return k;
-}
-
-
- at implementation IFTextRenderer
-
-+ (void)initialize
-{
- nonBaseChars = CFCharacterSetGetPredefined(kCFCharacterSetNonBase);
-}
-
-
-- (NSFont *)substituteFontForString: (NSString *)string
-{
- NSFont *substituteFont;
-
- substituteFont = [NSFont findFontLike:font forString:string withRange:NSMakeRange (0,[string length]) inLanguage:[NSLanguage defaultLanguage]];
-
- if ([substituteFont isEqual: font])
- return nil;
-
- return substituteFont;
-}
-
-
-- (NSFont *)substituteFontForCharacters: (const unichar *)characters length: (int)numCharacters
-{
- NSFont *substituteFont;
- NSString *string = [[NSString alloc] initWithCharactersNoCopy:(unichar *)characters length: numCharacters freeWhenDone: NO];
-
- substituteFont = [self substituteFontForString: string];
-
- [string release];
-
- return substituteFont;
-}
-
-
-/* Convert non-breaking spaces into spaces, and skip control characters. */
-- (void)convertCharacters: (const UniChar *)characters length: (unsigned)numCharacters toGlyphs: (ATSGlyphVector *)glyphs skipControlCharacters:(BOOL)skipControlCharacters
-{
- unsigned i, numCharactersInBuffer;
- UniChar localBuffer[LOCAL_BUFFER_SIZE];
- UniChar *buffer = localBuffer;
- OSStatus status;
-
- for (i = 0; i < numCharacters; i++) {
- if ((skipControlCharacters && characters[i] < 0x0020) || characters[i] == NON_BREAKING_SPACE) {
- break;
- }
- }
-
- if (i < numCharacters) {
- if (numCharacters > LOCAL_BUFFER_SIZE) {
- buffer = (UniChar *)malloc(sizeof(UniChar) * numCharacters);
- }
-
- numCharactersInBuffer = 0;
- for (i = 0; i < numCharacters; i++) {
- if (characters[i] == NON_BREAKING_SPACE) {
- buffer[numCharactersInBuffer++] = SPACE;
- } else if (!(skipControlCharacters && characters[i] < 0x0020)) {
- buffer[numCharactersInBuffer++] = characters[i];
- }
- }
-
- characters = buffer;
- numCharacters = numCharactersInBuffer;
- }
-
- status = ATSUConvertCharToGlyphs(styleGroup, characters, 0, numCharacters, 0, glyphs);
-
- if (buffer != localBuffer) {
- free(buffer);
- }
-}
-
-
-- initWithFont:(NSFont *)f
-{
- if ([f glyphPacking] != NSNativeShortGlyphPacking &&
- [f glyphPacking] != NSTwoByteGlyphPacking)
- [NSException raise:NSInternalInconsistencyException format:@"%@: Don't know how to pack glyphs for font %@ %f", self, [f displayName], [f pointSize]];
-
- [super init];
-
- font = [f retain];
- ascent = -1;
- descent = -1;
- lineSpacing = -1;
-
- OSStatus errCode;
- ATSUStyle style;
-
- if ((errCode = ATSUCreateStyle(&style)) != noErr)
- [NSException raise:NSInternalInconsistencyException format:@"%@: Failed to alloc ATSUStyle %d", self, errCode];
-
- FillStyleWithAttributes(style, font);
-
- if ((errCode = ATSUGetStyleGroup(style, &styleGroup)) != noErr) {
- [NSException raise:NSInternalInconsistencyException format:@"%@: Failed to create attribute group from ATSUStyle 0x%X %d", self, style, errCode];
- }
-
- ATSUDisposeStyle(style);
-
- spaceGlyph = nonGlyphID;
-
- return self;
-}
-
-
-- (void)dealloc
-{
- [font release];
-
- if (styleGroup)
- ATSUDisposeStyleGroup(styleGroup);
-
- freeWidthMap (glyphToWidthMap);
- freeGlyphMap (characterToGlyphMap);
-
- [super dealloc];
-}
-
-
-- (int)widthForString:(NSString *)string
-{
- UniChar localCharacterBuffer[LOCAL_BUFFER_SIZE];
- UniChar *characterBuffer = localCharacterBuffer;
- const UniChar *usedCharacterBuffer = CFStringGetCharactersPtr((CFStringRef)string);
- unsigned int length;
- int width;
-
- // Get the characters from the string into a buffer.
- length = [string length];
- if (!usedCharacterBuffer) {
- if (length > LOCAL_BUFFER_SIZE)
- characterBuffer = (UniChar *)malloc(length * sizeof(UniChar));
- [string getCharacters:characterBuffer];
- usedCharacterBuffer = characterBuffer;
- }
-
- width = [self widthForCharacters:usedCharacterBuffer length:length];
-
- if (characterBuffer != localCharacterBuffer)
- free(characterBuffer);
-
- return width;
-}
-
-
-- (int)ascent
-{
- if (ascent < 0) {
- ascent = ROUND_TO_INT([font ascender]);
- }
- return ascent;
-}
-
-
-- (int)descent
-{
- if (descent < 0) {
- descent = ROUND_TO_INT(-[font descender]);
- }
- return descent;
-}
-
-
-- (int)lineSpacing
-{
- if (lineSpacing < 0) {
- lineSpacing = ROUND_TO_INT([font defaultLineHeightForFont]);
- }
- return lineSpacing;
-}
-
-
-- (void) slowPackGlyphsForCharacters:(const UniChar *)characters numCharacters: (unsigned int)numCharacters glyphBuffer:(CGGlyph **)glyphBuffer numGlyphs:(unsigned int *)numGlyphs
-{
- ATSGlyphVector glyphVector;
- unsigned int j;
- CGGlyph *glyphBufPtr;
- ATSLayoutRecord *glyphRecord;
-
- ATSInitializeGlyphVector(numCharacters, 0, &glyphVector);
- [self convertCharacters: characters length: numCharacters toGlyphs: &glyphVector skipControlCharacters: YES];
-
- *numGlyphs = glyphVector.numGlyphs;
- *glyphBuffer = glyphBufPtr = (CGGlyph *)malloc (*numGlyphs * sizeof(CGGlyph));
- glyphRecord = (ATSLayoutRecord *)glyphVector.firstRecord;
- for (j = 0; j < *numGlyphs; j++){
- *glyphBufPtr++ = glyphRecord->glyphID;
- glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + glyphVector.recordSize);
- }
-
- ATSClearGlyphVector(&glyphVector);
-}
-
-
-- (NSPoint)drawGlyphs: (CGGlyph *)glyphs numGlyphs: (unsigned int)numGlyphs fromGlyphPosition: (int)from toGlyphPosition: (int)to atPoint: (NSPoint)point withTextColor: (NSColor *)textColor backgroundColor: (NSColor *)backgroundColor
-{
- unsigned int i;
- CGSize *advances, localAdvanceBuffer[LOCAL_BUFFER_SIZE];
- CGContextRef cgContext;
- NSPoint advancePoint = point;
- float startX, backgroundWidth = 0.0;
-
- if (numGlyphs == 0)
- return point;
-
- // Determine if we can use the local stack buffer, otherwise allocate.
- if (numGlyphs > LOCAL_BUFFER_SIZE) {
- advances = (CGSize *)malloc(numGlyphs * sizeof(CGSize));
- } else {
- advances = localAdvanceBuffer;
- }
-
- // Calculate advances for the entire string taking into account.
- // 1. Rounding of spaces.
- // 2. Rounding at the end of words.
- for (i = 0; i < numGlyphs; i++) {
- advances[i].width = widthForGlyph(self, glyphToWidthMap, glyphs[i]);
- if (glyphs[i] == spaceGlyph){
- if (i > 0){
- advances[i-1].width = ROUND_TO_INT (advances[i-1].width);
- }
- advances[i].width = ROUND_TO_INT(advances[i].width);
- }
- advances[i].height = 0;
- advancePoint.x += advances[i].width;
- }
-
- startX = point.x;
- for (i = 0; (int)i < MIN(from,(int)numGlyphs); i++)
- startX += advances[i].width;
-
- for (i = from; (int)i < MIN(to,(int)numGlyphs); i++)
- backgroundWidth += advances[i].width;
-
- if (backgroundColor != nil){
- [backgroundColor set];
- [NSBezierPath fillRect:NSMakeRect(startX, point.y - [self ascent], backgroundWidth, [self lineSpacing])];
- }
-
- // Setup the color and font.
- [textColor set];
- [font set];
-
- // Finally, draw the glyphs.
- if (from < (int)numGlyphs){
- cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
- CGContextSetTextPosition (cgContext, startX, point.y);
- CGContextShowGlyphsWithAdvances (cgContext, &glyphs[from], &advances[from], to - from);
- }
-
- if (advances != localAdvanceBuffer) {
- free(advances);
- }
- return advancePoint;
-}
-
-// Useful page for testing http://home.att.net/~jameskass
-
-- (NSPoint)slowDrawCharacters:(const UniChar *)characters length: (unsigned int)length fromCharacterPosition:(int)from toCharacterPosition:(int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor attemptFontSubstitution: (BOOL)attemptFontSubstitution
-{
- unsigned int charPos = 0, lastDrawnGlyph = 0;
- unsigned int clusterLength, i, numGlyphs, fragmentLength;
- NSFont *substituteFont;
- CGGlyph *glyphs;
- ATSGlyphRef glyphID;
- int fromGlyph = INT32_MAX, toGlyph = INT32_MAX;
-
- if (from == -1)
- from = 0;
- if (to == -1)
- to = length;
-
- [self slowPackGlyphsForCharacters: characters numCharacters: length glyphBuffer: &glyphs numGlyphs: &numGlyphs];
-
- // FIXME: This assumes that we'll always get one glyph per character cluster.
- for (i = 0; i < numGlyphs; i++){
- glyphID = glyphs[i];
-
- clusterLength = findLengthOfCharacterCluster (&characters[charPos], length - charPos);
-
- if ((int)charPos >= from && fromGlyph == INT32_MAX)
- fromGlyph = i;
-
- if ((int)charPos >= to && toGlyph == INT32_MAX)
- toGlyph = i-1;
-
- if (glyphID == 0 && attemptFontSubstitution){
-
- // Draw everthing up to this point.
- fragmentLength = i - lastDrawnGlyph;
- if (fragmentLength > 0){
- int _fromGlyph = fromGlyph-lastDrawnGlyph;
-
- if (_fromGlyph < 0)
- _fromGlyph = 0;
- point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: _fromGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
- }
-
- // Draw the character in the alternate font.
- substituteFont = [self substituteFontForCharacters: &characters[charPos] length: clusterLength];
- if (substituteFont){
- point = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] slowDrawCharacters: &characters[charPos] length: clusterLength fromCharacterPosition: from - charPos toCharacterPosition:to - charPos atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: NO];
- }
- // No substitute font, draw null glyph
- else
- point = [self drawGlyphs: &glyphs[i] numGlyphs: 1 fromGlyphPosition: fromGlyph-i toGlyphPosition:MIN((toGlyph-(int)i), 1) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
-
- lastDrawnGlyph = i+1;
- }
-
- charPos += clusterLength;
- }
-
- fragmentLength = numGlyphs - lastDrawnGlyph;
- if (fragmentLength > 0){
- int _fromGlyph = fromGlyph-lastDrawnGlyph;
-
- if (_fromGlyph < 0)
- _fromGlyph = 0;
- point = [self drawGlyphs: &glyphs[lastDrawnGlyph] numGlyphs: fragmentLength fromGlyphPosition: _fromGlyph toGlyphPosition:MIN(toGlyph-lastDrawnGlyph,fragmentLength) atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
- }
- if (glyphs)
- free(glyphs);
-
- return point;
-}
-
-
-typedef enum {
- _IFNonBaseCharacter,
- _IFMissingGlyph,
- _IFDrawSucceeded,
-} _IFFailedDrawReason;
-
-- (_IFFailedDrawReason)_drawCharacters:(const UniChar *)characters length: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition:(int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor
-{
- uint i, numGlyphs;
- CGGlyph *glyphs, localGlyphBuffer[LOCAL_BUFFER_SIZE];
- ATSGlyphRef glyphID;
- _IFFailedDrawReason result = _IFDrawSucceeded;
-
- // FIXME: Deal with other styles of glyph packing.
- if ([font glyphPacking] != NSNativeShortGlyphPacking &&
- [font glyphPacking] != NSTwoByteGlyphPacking)
- [NSException raise:NSInternalInconsistencyException format:@"%@: Don't know how to deal with font %@", self, [font displayName]];
-
- // Determine if we can use the local stack buffer, otherwise allocate.
- if (length > LOCAL_BUFFER_SIZE) {
- glyphs = (CGGlyph *)malloc(length * sizeof(CGGlyph));
- } else {
- glyphs = localGlyphBuffer;
- }
-
- // Pack the glyph buffer and ensure that we have glyphs for all the
- // characters. If we're missing a glyph or have a non-base character
- // stop drawing and return a failure code.
- numGlyphs = 0;
- for (i = 0; i < length; i++) {
- UniChar c = characters[i];
-
- // Skip control characters.
- if (c < 0x0020) {
- continue;
- }
-
- // Icky. Deal w/ non breaking spaces.
- if (c == NON_BREAKING_SPACE)
- c = SPACE;
-
- // Is the a non-base character?
- if (IsNonBaseChar(c)) {
- result = _IFNonBaseCharacter;
- goto cleanup;
- }
-
- glyphID = glyphForCharacter (characterToGlyphMap, c);
- if (glyphID == nonGlyphID) {
- glyphID = [self extendCharacterToGlyphMapToInclude: c];
- }
-
- // Does this font not contain a glyph for the character?
- if (glyphID == 0){
- result = _IFMissingGlyph;
- goto cleanup;
- }
-
- glyphs[numGlyphs++] = glyphID;
- }
-
- if (from == -1)
- from = 0;
- if (to == -1)
- to = numGlyphs;
-
- [self drawGlyphs:glyphs numGlyphs:numGlyphs fromGlyphPosition:from toGlyphPosition:to atPoint:point withTextColor:textColor backgroundColor:backgroundColor];
-
-cleanup:
- if (glyphs != localGlyphBuffer) {
- free(glyphs);
- }
- return result;
-}
-
-
-- (void)drawCharacters:(const UniChar *)characters stringLength: (unsigned int)length fromCharacterPosition: (int)from toCharacterPosition: (int)to atPoint:(NSPoint)point withTextColor:(NSColor *)textColor backgroundColor: (NSColor *)backgroundColor
-{
- //printf("draw: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
-
- NSFont *substituteFont;
- _IFFailedDrawReason reason = [self _drawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition: to atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
-
- // ASSUMPTION: We normally fail because we're trying to render characters
- // that don't have glyphs in the specified fonts. If we failed in this way
- // look for a font corresponding to the first character cluster in the string
- // and try rendering the entire string with that font. If that fails we fall back
- // to the safe slow drawing.
- if (reason == _IFMissingGlyph) {
- unsigned int clusterLength;
-
- clusterLength = findLengthOfCharacterCluster(characters, length);
- substituteFont = [self substituteFontForCharacters: characters length: clusterLength];
- if (substituteFont)
- reason = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] _drawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition: to atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
-
- if (!substituteFont || reason != _IFDrawSucceeded)
- [self slowDrawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition:to atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: YES];
- }
- else if (reason == _IFNonBaseCharacter) {
- [self slowDrawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition:to atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: YES];
- }
-}
-
-
-- (void)drawUnderlineForString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color
-{
- NSGraphicsContext *graphicsContext = [NSGraphicsContext currentContext];
- int width = [self widthForString: string];
- CGContextRef cgContext;
- float lineWidth;
-
- // This will draw the text from the top of the bounding box down.
- // Qt expects to draw from the baseline.
- // Remember that descender is negative.
- point.y -= [self lineSpacing] - [self descent];
-
- BOOL flag = [graphicsContext shouldAntialias];
-
- [graphicsContext setShouldAntialias: NO];
-
- [color set];
-
- cgContext = (CGContextRef)[graphicsContext graphicsPort];
- lineWidth = 0.0;
- if ([graphicsContext isDrawingToScreen] && lineWidth == 0.0) {
- CGSize size = CGSizeApplyAffineTransform(CGSizeMake(1.0, 1.0), CGAffineTransformInvert(CGContextGetCTM(cgContext)));
- lineWidth = size.width;
- }
- CGContextSetLineWidth(cgContext, lineWidth);
- CGContextMoveToPoint(cgContext, point.x, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
- CGContextAddLineToPoint(cgContext, point.x + width, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
- CGContextStrokePath(cgContext);
-
- [graphicsContext setShouldAntialias: flag];
-}
-
-
-- (float)slowFloatWidthForCharacters: (const UniChar *)characters stringLength: (unsigned)length fromCharacterPostion: (int)pos numberOfCharacters: (int)len applyRounding: (BOOL)applyRounding
-{
- float totalWidth = 0;
- unsigned int charPos = 0, clusterLength, i, numGlyphs;
- ATSGlyphVector glyphVector;
- IFGlyphWidth glyphWidth;
- ATSLayoutRecord *glyphRecord;
- ATSGlyphRef glyphID;
- float lastWidth = 0;
-
- ATSInitializeGlyphVector(length, 0, &glyphVector);
- [self convertCharacters: characters length: length toGlyphs: &glyphVector skipControlCharacters: YES];
- numGlyphs = glyphVector.numGlyphs;
- glyphRecord = (ATSLayoutRecord *)glyphVector.firstRecord;
- for (i = 0; i < numGlyphs; i++){
- glyphID = glyphRecord->glyphID;
-
- // Drop out early if we've measured to the end of the requested
- // fragment.
- if ((int)charPos - pos >= len){
- if (glyphID == spaceGlyph){
- totalWidth -= lastWidth;
- totalWidth += ROUND_TO_INT(lastWidth);
- }
- break;
- }
-
- // No need to measure until we reach start of string.
- if ((int)charPos < pos)
- continue;
-
- clusterLength = findLengthOfCharacterCluster (&characters[charPos], length - charPos);
-
- glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + glyphVector.recordSize);
- glyphWidth = widthForGlyph(self, glyphToWidthMap, glyphID);
- if (glyphID == spaceGlyph && applyRounding){
- if (totalWidth > 0 && lastWidth > 0){
- totalWidth -= lastWidth;
- totalWidth += ROUND_TO_INT(lastWidth);
- }
- glyphWidth = ROUND_TO_INT(glyphWidth);
- }
- lastWidth = glyphWidth;
-
- if ((int)charPos >= pos)
- totalWidth += lastWidth;
-
- charPos += clusterLength;
- }
- ATSClearGlyphVector(&glyphVector);
-
- return totalWidth;
-}
-
-
-- (float)floatWidthForCharacters:(const UniChar *)characters stringLength:(unsigned)stringLength characterPosition: (int)pos
-{
- // Return the width of the first complete character at the specified position. Even though
- // the first 'character' may contain more than one unicode characters this method will
- // work correctly.
- return [self floatWidthForCharacters:characters stringLength:stringLength fromCharacterPosition:pos numberOfCharacters:1 applyRounding: YES attemptFontSubstitution: YES];
-}
-
-
-- (float)floatWidthForCharacters:(const UniChar *)characters stringLength:(unsigned)stringLength fromCharacterPosition: (int)pos numberOfCharacters: (int)len
-{
- return [self floatWidthForCharacters:characters stringLength:stringLength fromCharacterPosition:pos numberOfCharacters:len applyRounding: YES attemptFontSubstitution: YES];
-}
-
-
-- (float)floatWidthForCharacters:(const UniChar *)characters stringLength:(unsigned)stringLength fromCharacterPosition: (int)pos numberOfCharacters: (int)len applyRounding: (BOOL)applyRounding attemptFontSubstitution: (BOOL)attemptSubstitution
-{
- float totalWidth = 0;
- unsigned int i, clusterLength;
- NSFont *substituteFont = nil;
- ATSGlyphRef glyphID;
- float lastWidth = 0;
-
- //printf("width: font %s, size %.1f, text \"%s\"\n", [[font fontName] cString], [font pointSize], [[NSString stringWithCharacters:characters length:length] UTF8String]);
- for (i = pos; i < stringLength; i++) {
- UniChar c = characters[i];
-
- // Skip control characters.
- if (c < 0x0020) {
- continue;
- }
-
- if (c == NON_BREAKING_SPACE) {
- c = SPACE;
- }
-
- // Drop out early if we've measured to the end of the requested
- // fragment.
- if ((int)i - pos >= len) {
- // Check if next character is a space. If so, we have to apply rounding.
- if (c == SPACE) {
- totalWidth -= lastWidth;
- totalWidth += ROUND_TO_INT(lastWidth);
- }
- break;
- }
-
- if (IsNonBaseChar(c)) {
- return [self slowFloatWidthForCharacters: &characters[pos] stringLength: stringLength-pos fromCharacterPostion: 0 numberOfCharacters: len applyRounding: applyRounding];
- }
-
- glyphID = glyphForCharacter(characterToGlyphMap, c);
- if (glyphID == nonGlyphID) {
- glyphID = [self extendCharacterToGlyphMapToInclude: c];
- }
-
- // Try to find a substitute font if this font didn't have a glyph for a character in the
- // string. If one isn't found we end up drawing and measuring the 0 glyph, usually a box.
- if (glyphID == 0 && attemptSubstitution) {
- // FIXME: It may better to attempt to measure the entire string in the
- // alternate font rather than character by character, as we often do
- // substitution for the entire fragment (as we do in the drawing case.)
- clusterLength = findLengthOfCharacterCluster (&characters[i], stringLength - i);
- substituteFont = [self substituteFontForCharacters: &characters[i] length: clusterLength];
- if (substituteFont) {
- lastWidth = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] floatWidthForCharacters: &characters[i] stringLength: clusterLength fromCharacterPosition: pos numberOfCharacters: len applyRounding: YES attemptFontSubstitution: NO];
- }
- }
-
- if (glyphID > 0 || ((glyphID == 0) && substituteFont == nil)) {
- if (glyphID == spaceGlyph && applyRounding) {
- if (lastWidth > 0){
- totalWidth -= lastWidth;
- totalWidth += ROUND_TO_INT(lastWidth);
- }
- lastWidth = ROUND_TO_INT(widthForGlyph(self, glyphToWidthMap, glyphID));
- }
- else
- lastWidth = widthForGlyph(self, glyphToWidthMap, glyphID);
- }
-
- totalWidth += lastWidth;
- }
-
- return totalWidth;
-}
-
-- (int)widthForCharacters:(const UniChar *)characters length:(unsigned)stringLength
-{
- return ROUND_TO_INT([self floatWidthForCharacters:characters stringLength:stringLength fromCharacterPosition:0 numberOfCharacters:stringLength applyRounding:YES attemptFontSubstitution: YES]);
-}
-
-- (ATSGlyphRef)extendCharacterToGlyphMapToInclude:(UniChar) c
-{
- GlyphMap *map = (GlyphMap *)calloc (1, sizeof(GlyphMap));
- ATSLayoutRecord *glyphRecord;
- ATSGlyphVector glyphVector;
- UniChar end, start;
- unsigned int blockSize;
- ATSGlyphRef glyphID;
-
- if (characterToGlyphMap == 0)
- blockSize = INITIAL_BLOCK_SIZE;
- else
- blockSize = INCREMENTAL_BLOCK_SIZE;
- start = (c / blockSize) * blockSize;
- end = start + (blockSize - 1);
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "%s (0x%04x) adding glyphs for 0x%04x to 0x%04x\n", DEBUG_OBJECT(font), c, start, end);
-
- map->startRange = start;
- map->endRange = end;
-
- unsigned int i, count = end - start + 1;
- short unsigned int buffer[INCREMENTAL_BLOCK_SIZE+2];
-
- for (i = 0; i < count; i++){
- if (IsNonBaseChar(i+start))
- buffer[i] = 0;
- else
- buffer[i] = i+start;
- }
-
- ATSInitializeGlyphVector(count, 0, &glyphVector);
- [self convertCharacters: &buffer[0] length: count toGlyphs: &glyphVector skipControlCharacters: NO];
- if (glyphVector.numGlyphs != count)
- [NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: count and glyphID count not equal - for %@ %f", self, [font displayName], [font pointSize]];
-
- map->glyphs = (ATSGlyphRef *)malloc (count * sizeof(ATSGlyphRef));
- glyphRecord = (ATSLayoutRecord *)glyphVector.firstRecord;
- for (i = 0; i < count; i++) {
- map->glyphs[i] = glyphRecord->glyphID;
- glyphRecord = (ATSLayoutRecord *)((char *)glyphRecord + glyphVector.recordSize);
- }
- ATSClearGlyphVector(&glyphVector);
-
- if (characterToGlyphMap == 0)
- characterToGlyphMap = map;
- else {
- GlyphMap *lastMap = characterToGlyphMap;
- while (lastMap->next != 0)
- lastMap = lastMap->next;
- lastMap->next = map;
- }
-
- if (spaceGlyph == nonGlyphID)
- spaceGlyph = glyphForCharacter (characterToGlyphMap, SPACE);
-
- glyphID = map->glyphs[c - start];
-
- // Special case for characters 007F-00A0.
- if (glyphID == 0 && c >= 0x7F && c <= 0xA0){
- glyphID = [font _defaultGlyphForChar: c];
- map->glyphs[c - start] = glyphID;
- }
-
- return glyphID;
-}
-
-
-- (WidthMap *)extendGlyphToWidthMapToInclude:(ATSGlyphRef)glyphID
-{
- WidthMap *map = (WidthMap *)calloc (1, sizeof(WidthMap));
- unsigned int end;
- ATSGlyphRef start;
- unsigned int blockSize;
- unsigned int i, count;
-
- if (glyphToWidthMap == 0){
- if ([font numberOfGlyphs] < INITIAL_BLOCK_SIZE)
- blockSize = [font numberOfGlyphs];
- else
- blockSize = INITIAL_BLOCK_SIZE;
- }
- else
- blockSize = INCREMENTAL_BLOCK_SIZE;
- start = (glyphID / blockSize) * blockSize;
- end = ((unsigned int)start) + blockSize;
- if (end > 0xffff)
- end = 0xffff;
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "%s (0x%04x) adding widths for range 0x%04x to 0x%04x\n", DEBUG_OBJECT(font), glyphID, start, end);
-
- map->startRange = start;
- map->endRange = end;
- count = end - start + 1;
-
- map->widths = (IFGlyphWidth *)malloc (count * sizeof(IFGlyphWidth));
-
- for (i = 0; i < count; i++){
- map->widths[i] = UNINITIALIZED_GLYPH_WIDTH;
- }
-
- if (glyphToWidthMap == 0)
- glyphToWidthMap = map;
- else {
- WidthMap *lastMap = glyphToWidthMap;
- while (lastMap->next != 0)
- lastMap = lastMap->next;
- lastMap->next = map;
- }
-
-#ifdef _TIMING
- WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "%s total time to advances lookup %f seconds\n", DEBUG_OBJECT(font), totalCGGetAdvancesTime);
-#endif
- return map;
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
deleted file mode 100644
index ae5593b..0000000
--- a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// IFTextRendererFactory.h
-// WebKit
-//
-// Created by Darin Adler on Thu May 02 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreTextRendererFactory.h>
-
- at class IFTextRenderer;
-
- at interface IFTextRendererFactory : WebCoreTextRendererFactory
-{
- NSMutableDictionary *cache;
-}
-
-+ (void)createSharedFactory;
-+ (IFTextRendererFactory *)sharedFactory;
-- init;
-
-- (IFTextRenderer *)rendererWithFont:(NSFont *)font;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m
deleted file mode 100644
index 097e39b..0000000
--- a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// IFTextRendererFactory.m
-// WebKit
-//
-// Created by Darin Adler on Thu May 02 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFTextRenderer.h>
-#import <WebKit/WebKitDebug.h>
-
- at interface IFFontCacheKey : NSObject
-{
- NSString *family;
- NSFontTraitMask traits;
- float size;
-}
-
-- initWithFamily:(NSString *)f traits:(NSFontTraitMask)t size:(float)s;
-
- at end
-
- at implementation IFFontCacheKey
-
-- initWithFamily:(NSString *)f traits:(NSFontTraitMask)t size:(float)s;
-{
- [super init];
- family = [f copy];
- traits = t;
- size = s;
- return self;
-}
-
-- (void)dealloc
-{
- [family release];
- [super dealloc];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [self retain];
-}
-
-- (unsigned)hash
-{
- return [family hash] ^ traits ^ (int)size;
-}
-
-- (BOOL)isEqual:(id)o
-{
- IFFontCacheKey *other = o;
- return [self class] == [other class]
- && [family isEqualToString:other->family]
- && traits == other->traits
- && size == other->size;
-}
-
- at end
-
- at implementation IFTextRendererFactory
-
-+ (void)createSharedFactory;
-{
- if (![self sharedFactory]) {
- [[[self alloc] init] release];
- }
- WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
-}
-
-+ (IFTextRendererFactory *)sharedFactory;
-{
- return (IFTextRendererFactory *)[super sharedFactory];
-}
-
-- init
-{
- [super init];
-
- cache = [[NSMutableDictionary alloc] init];
-
- return self;
-}
-
-- (void)dealloc
-{
- [cache release];
-
- [super dealloc];
-}
-
-- (IFTextRenderer *)rendererWithFont:(NSFont *)font
-{
- IFTextRenderer *renderer = [cache objectForKey:font];
- if (renderer == nil) {
- renderer = [[IFTextRenderer alloc] initWithFont:font];
- [cache setObject:renderer forKey:font];
- [renderer release];
- }
- return renderer;
-}
-
-- (NSFont *)fontWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
-{
- NSFont *font;
- NSEnumerator *e;
- NSString *availableFamily;
-
- font = [[NSFontManager sharedFontManager] fontWithFamily:family traits:traits weight:5 size:size];
- if (font != nil) {
- return font;
- }
-
- // FIXME: For now do a simple case insensitive search for a matching font.
- // The font manager requires exact name matches. This will at least address the problem
- // of matching arial to Arial, etc.
- e = [[[NSFontManager sharedFontManager] availableFontFamilies] objectEnumerator];
- while ((availableFamily = [e nextObject])) {
- if ([family caseInsensitiveCompare:availableFamily] == NSOrderedSame) {
- font = [[NSFontManager sharedFontManager] fontWithFamily:availableFamily traits:traits weight:5 size:size];
- if (font != nil) {
- return font;
- }
- }
- }
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_FONTCACHE, "unable to find font for family %s", [family lossyCString]);
- return [[NSFontManager sharedFontManager] fontWithFamily:@"Helvetica" traits:traits weight:5 size:size];
-}
-
-- (NSFont *)cachedFontWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
-{
- static NSMutableDictionary *fontCache = nil;
- NSString *fontKey;
- NSFont *font;
-
-#ifdef DEBUG_GETFONT
- static int getFontCount = 0;
- getFontCount++;
- printf("getFountCount = %d, family = %s, traits = 0x%08x, size = %f\n", getFontCount, [_family lossyCString], _trait, _size);
-#endif
-
- if (!fontCache) {
- fontCache = [[NSMutableDictionary alloc] init];
- }
-
- fontKey = [[IFFontCacheKey alloc] initWithFamily:family traits:traits size:size];
- font = [fontCache objectForKey:fontKey];
- if (font == nil) {
- font = [self fontWithFamily:family traits:traits size:size];
- [fontCache setObject:font forKey:fontKey];
- }
- [fontKey release];
-
- return font;
-}
-
-- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
-{
- return [self rendererWithFont:[self cachedFontWithFamily:family traits:traits size:size]];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.h b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.h
deleted file mode 100644
index 3cf699e..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// IFWebCoreBridge.h
-// WebKit
-//
-// Created by Darin Adler on Thu Jun 13 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreBridge.h>
-
-#import <WebKit/IFWebDataSource.h>
-
- at interface IFWebCoreBridge : WebCoreBridge <WebCoreBridge>
-{
- IFWebDataSource *dataSource;
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)setDataSource:(IFWebDataSource *)ds;
-
- at end
-
-// Convenience interface for getting here from an IFWebDataSource.
-// This returns nil if the representation is not an IFHTMLRepresentation.
-
- at interface IFWebDataSource (IFWebCoreBridge)
-- (IFWebCoreBridge *)_bridge;
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
deleted file mode 100644
index bc63c55..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- IFWebCoreBridge.mm
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFWebCoreBridge.h>
-
-#import <WebKit/IFHTMLRepresentationPrivate.h>
-#import <WebKit/IFResourceURLHandleClient.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFLoadProgress.h>
-
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFURLHandle.h>
-
- at implementation IFWebDataSource (IFWebCoreBridge)
-
-- (IFWebCoreBridge *)_bridge
-{
- id representation = [self representation];
- return [representation respondsToSelector:@selector(_bridge)] ? [representation _bridge] : nil;
-}
-
- at end
-
- at interface NSApplication (DeclarationStolenFromAppKit)
-- (void)_cycleWindowsReversed:(BOOL)reversed;
- at end
-
- at implementation IFWebCoreBridge
-
-- (WebCoreFrame *)frame
-{
- return [[dataSource webFrame] _frameBridge];
-}
-
-- (WebCoreBridge *)parent
-{
- WEBKIT_ASSERT(dataSource);
- return [[dataSource parent] _bridge];
-}
-
-- (NSArray *)childFrames
-{
- WEBKIT_ASSERT(dataSource);
- NSArray *frames = [dataSource children];
- NSEnumerator *e = [frames objectEnumerator];
- NSMutableArray *frameBridges = [NSMutableArray arrayWithCapacity:[frames count]];
- IFWebFrame *frame;
- while ((frame = [e nextObject])) {
- id frameBridge = [frame _frameBridge];
- if (frameBridge)
- [frameBridges addObject:frameBridge];
- }
- return frameBridges;
-}
-
-- (WebCoreFrame *)childFrameNamed:(NSString *)name
-{
- IFWebDataSource *pd;
-
- pd = [[dataSource webFrame] provisionalDataSource];
- if (pd)
- return [[pd frameNamed: name] _frameBridge];
-
- return [[dataSource frameNamed:name] _frameBridge];
-}
-
-- (WebCoreFrame *)descendantFrameNamed:(NSString *)name
-{
- return [[[dataSource webFrame] frameNamed:name] _frameBridge];
-}
-
-- (BOOL)createChildFrameNamed:(NSString *)frameName
- withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)renderPart
- allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
-{
- WEBKIT_ASSERT(dataSource);
-
- IFWebFrame *frame = [[dataSource controller] createFrameNamed:frameName for:nil inParent:dataSource allowsScrolling:allowsScrolling];
- if (frame == nil) {
- return NO;
- }
-
- [[frame _frameBridge] setRenderPart:renderPart];
-
- [[frame webView] _setMarginWidth:width];
- [[frame webView] _setMarginHeight:height];
-
- [[frame _frameBridge] loadURL:URL attributes:nil flags:0 withParent:dataSource];
-
- return YES;
-}
-
-- (WebCoreBridge *)openNewWindowWithURL:(NSURL *)url
-{
- IFWebController *newController = [[[dataSource controller] windowContext] openNewWindowWithURL:url];
- IFWebDataSource *newDataSource;
-
- newDataSource = [[newController mainFrame] provisionalDataSource];
- if ([newDataSource isDocumentHTML])
- return [(IFHTMLRepresentation *)[newDataSource representation] _bridge];
-
- return nil;
-}
-
-- (BOOL)areToolbarsVisisble
-{
- return [[[dataSource controller] windowContext] areToolbarsVisible];
-}
-
-- (void)setToolbarsVisible:(BOOL)visible
-{
- [[[dataSource controller] windowContext] setToolbarsVisible:visible];
-}
-
-- (BOOL)areScrollbarsVisible
-{
- return [[[dataSource webFrame] webView] allowsScrolling];
-}
-
-- (void)setScrollbarsVisible:(BOOL)visible
-{
- return [[[dataSource webFrame] webView] setAllowsScrolling:visible];
-}
-
-- (BOOL)isStatusBarVisisble
-{
- return [[[dataSource controller] windowContext] isStatusBarVisible];
-}
-
-- (void)setStatusBarVisible:(BOOL)visible
-{
- [[[dataSource controller] windowContext] setStatusBarVisible:visible];
-}
-
-- (void)setWindowFrame:(NSRect)frame
-{
- [[[dataSource controller] windowContext] setFrame:frame];
-}
-
-
-- (NSWindow *)window
-{
- return [[[dataSource controller] windowContext] window];
-}
-
-- (void)setTitle:(NSString *)title
-{
- WEBKIT_ASSERT(dataSource);
- [dataSource _setTitle:title];
-}
-
-- (void)setStatusText:(NSString *)status
-{
- WEBKIT_ASSERT(dataSource);
- [[[dataSource controller] windowContext] setStatusText:status];
-}
-
-- (WebCoreFrame *)mainFrame
-{
- return [[[dataSource controller] mainFrame] _frameBridge];
-}
-
-- (WebCoreFrame *)frameNamed:(NSString *)name
-{
- return [[[dataSource controller] frameNamed:name] _frameBridge];
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)withDataSource
-{
- if (dataSource == nil) {
- [self setDataSource: withDataSource];
- [self openURL:[dataSource inputURL]];
- if ([dataSource redirectedURL]) {
- [self setURL:[dataSource redirectedURL]];
- }
- } else {
- WEBKIT_ASSERT(dataSource == withDataSource);
- }
-
- [self addData:data withEncoding:[dataSource encoding]];
-}
-
-- (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSURL *)URL
-{
- return [IFResourceURLHandleClient startLoadingResource:resourceLoader withURL:URL dataSource:dataSource];
-}
-
-- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes
-{
- IFURLHandle *handle;
- IFLoadProgress *loadProgress;
-
- handle = [[IFURLHandle alloc] initWithURL:URL];
- loadProgress = [[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
- [[dataSource controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource: dataSource complete:YES];
- [loadProgress release];
- [handle release];
-}
-
-- (void)setDataSource: (IFWebDataSource *)ds
-{
- // FIXME: non-retained because data source owns representation owns bridge
- dataSource = ds;
-}
-
-- (BOOL)openedByScript
-{
- return [[dataSource controller] _openedByScript];
-}
-
-- (void)setOpenedByScript:(BOOL)openedByScript
-{
- [[dataSource controller] _setOpenedByScript:openedByScript];
-}
-
-- (void)unfocusWindow
-{
- if ([[self window] isKeyWindow] || [[[self window] attachedSheet] isKeyWindow]) {
- [NSApp _cycleWindowsReversed:FALSE];
- }
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.h b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.h
deleted file mode 100644
index 34ea61b..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// IFWebCoreFrame.h
-// WebKit
-//
-// Created by Darin Adler on Sun Jun 16 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreFrame.h>
-
- at class IFWebDataSource;
- at class IFWebFrame;
-
- at interface IFWebCoreFrame : WebCoreFrame <WebCoreFrame>
-{
- IFWebFrame *frame;
-}
-
-- initWithWebFrame:(IFWebFrame *)frame;
-
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(IFWebDataSource *)parent;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
deleted file mode 100644
index f47b6ae..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// IFWebCoreFrame.m
-// WebKit
-//
-// Created by Darin Adler on Sun Jun 16 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFWebCoreFrame.h>
-
-#import <WebFoundation/IFURLCacheLoaderConstants.h>
-
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFWebCoreFrame
-
-// owned by the IFWebFrame
-
-- initWithWebFrame:(IFWebFrame *)f
-{
- [super init];
-
- frame = f; // don't retain
-
- return self;
-}
-
-- (IFWebView *)view
-{
- return [frame webView];
-}
-
-- (IFHTMLView *)HTMLView
-{
- return (IFHTMLView *)[[self view] documentView];
-}
-
-- (WebCoreBridge *)bridge
-{
- WebCoreBridge *bridge = [[frame provisionalDataSource] _bridge];
- if (bridge) {
- return bridge;
- }
- return [[frame dataSource] _bridge];
-}
-
-- (WebCoreBridge *)committedBridge
-{
- return [[frame dataSource] _bridge];
-}
-
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(IFWebDataSource *)parent
-{
- IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
- [newDataSource _setParent:parent];
- if ([frame setProvisionalDataSource:newDataSource]) {
- [frame startLoading];
- }
- [newDataSource release];
-}
-
-- (void)loadURL:(NSURL *)URL
-{
- [self loadURL:URL attributes:nil flags:0 withParent:[[frame dataSource] parent]];
-}
-
-- (void)postWithURL:(NSURL *)URL data:(NSData *)data
-{
- // When posting, use the IFURLHandleFlagLoadFromOrigin load flag.
- // This prevents a potential bug which may cause a page
- // with a form that uses itself as an action to be returned
- // from the cache without submitting.
- NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:
- data, IFHTTPURLHandleRequestData,
- @"POST", IFHTTPURLHandleRequestMethod,
- nil];
- [self loadURL:URL attributes:attributes flags:IFURLHandleFlagLoadFromOrigin withParent:[[frame dataSource] parent]];
- [attributes release];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.h b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.h
deleted file mode 100644
index 3d0f567..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// IFWebCoreViewFactory.h
-// WebKit
-//
-// Created by Darin Adler on Tue May 07 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebCore/WebCoreViewFactory.h>
-
- at interface IFWebCoreViewFactory : WebCoreViewFactory
-{
-}
-
-+ (void)createSharedFactory;
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m b/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
deleted file mode 100644
index 45300da..0000000
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreViewFactory.m
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// IFWebCoreViewFactory.m
-// WebKit
-//
-// Created by Darin Adler on Tue May 07 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-
-#import <WebKit/IFNullPluginView.h>
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebCoreViewFactory.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFNSURLExtensions.h>
-
- at implementation IFWebCoreViewFactory
-
-+ (void)createSharedFactory;
-{
- if (![self sharedFactory]) {
- [[[self alloc] init] release];
- }
- WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
-}
-
-- (NSView *)viewForPluginWithURL:(NSURL *)pluginURL serviceType:(NSString *)serviceType arguments:(NSArray *)args baseURL:(NSURL *)baseURL
-{
- NSMutableDictionary *arguments;
- NSString *mimeType, *extension;
- NSRange r1, r2, r3;
- IFPlugin *plugin;
- uint i;
-
- arguments = [NSMutableDictionary dictionary];
- for (i = 0; i < [args count]; i++){
- NSString *arg = [args objectAtIndex:i];
- if ([arg rangeOfString:@"__KHTML__"].length == 0) {
- r1 = [arg rangeOfString:@"="]; // parse out attributes and values
- r2 = [arg rangeOfString:@"\""];
- r3.location = r2.location + 1;
- r3.length = [arg length] - r2.location - 2; // don't include quotes
- [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
- }
- }
-
- if ([serviceType length]) {
- mimeType = serviceType;
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mimeType];
- } else {
- extension = [[pluginURL path] pathExtension];
- plugin = [[IFPluginDatabase installedPlugins] pluginForExtension:extension];
- mimeType = [plugin mimeTypeForExtension:extension];
- }
-
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
-}
-
-- (NSArray *)pluginsInfo
-{
- return [[IFPluginDatabase installedPlugins] plugins];
-}
-
-- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)baseURL parameters:(NSDictionary *)parameters
-{
- IFPlugin *plugin;
-
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:@"application/x-java-applet"];
- if (plugin == nil) {
- return nil;
- }
-
- return [[[IFPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.h b/WebKit/WebCoreSupport.subproj/WebBridge.h
index 3cf699e..745315e 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.h
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.h
@@ -1,5 +1,5 @@
//
-// IFWebCoreBridge.h
+// WebBridge.h
// WebKit
//
// Created by Darin Adler on Thu Jun 13 2002.
@@ -8,21 +8,21 @@
#import <WebCore/WebCoreBridge.h>
-#import <WebKit/IFWebDataSource.h>
+#import <WebKit/WebDataSource.h>
- at interface IFWebCoreBridge : WebCoreBridge <WebCoreBridge>
+ at interface WebBridge : WebCoreBridge <WebCoreBridge>
{
- IFWebDataSource *dataSource;
+ WebDataSource *dataSource;
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)setDataSource:(IFWebDataSource *)ds;
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
+- (void)setDataSource:(WebDataSource *)ds;
@end
-// Convenience interface for getting here from an IFWebDataSource.
-// This returns nil if the representation is not an IFHTMLRepresentation.
+// Convenience interface for getting here from an WebDataSource.
+// This returns nil if the representation is not an WebHTMLRepresentation.
- at interface IFWebDataSource (IFWebCoreBridge)
-- (IFWebCoreBridge *)_bridge;
+ at interface WebDataSource (WebBridge)
+- (WebBridge *)_bridge;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index bc63c55..0fd1459 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -1,26 +1,26 @@
/*
- IFWebCoreBridge.mm
+ WebBridge.mm
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/WebBridge.h>
-#import <WebKit/IFHTMLRepresentationPrivate.h>
-#import <WebKit/IFResourceURLHandleClient.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFLoadProgress.h>
+#import <WebKit/WebHTMLRepresentationPrivate.h>
+#import <WebKit/WebSubresourceClient.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebLoadProgress.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebResourceHandle.h>
- at implementation IFWebDataSource (IFWebCoreBridge)
+ at implementation WebDataSource (WebBridge)
-- (IFWebCoreBridge *)_bridge
+- (WebBridge *)_bridge
{
id representation = [self representation];
return [representation respondsToSelector:@selector(_bridge)] ? [representation _bridge] : nil;
@@ -32,9 +32,9 @@
- (void)_cycleWindowsReversed:(BOOL)reversed;
@end
- at implementation IFWebCoreBridge
+ at implementation WebBridge
-- (WebCoreFrame *)frame
+- (WebCoreFrameBridge *)frame
{
return [[dataSource webFrame] _frameBridge];
}
@@ -51,7 +51,7 @@
NSArray *frames = [dataSource children];
NSEnumerator *e = [frames objectEnumerator];
NSMutableArray *frameBridges = [NSMutableArray arrayWithCapacity:[frames count]];
- IFWebFrame *frame;
+ WebFrame *frame;
while ((frame = [e nextObject])) {
id frameBridge = [frame _frameBridge];
if (frameBridge)
@@ -60,9 +60,9 @@
return frameBridges;
}
-- (WebCoreFrame *)childFrameNamed:(NSString *)name
+- (WebCoreFrameBridge *)childFrameNamed:(NSString *)name
{
- IFWebDataSource *pd;
+ WebDataSource *pd;
pd = [[dataSource webFrame] provisionalDataSource];
if (pd)
@@ -71,7 +71,7 @@
return [[dataSource frameNamed:name] _frameBridge];
}
-- (WebCoreFrame *)descendantFrameNamed:(NSString *)name
+- (WebCoreFrameBridge *)descendantFrameNamed:(NSString *)name
{
return [[[dataSource webFrame] frameNamed:name] _frameBridge];
}
@@ -82,7 +82,7 @@
{
WEBKIT_ASSERT(dataSource);
- IFWebFrame *frame = [[dataSource controller] createFrameNamed:frameName for:nil inParent:dataSource allowsScrolling:allowsScrolling];
+ WebFrame *frame = [[dataSource controller] createFrameNamed:frameName for:nil inParent:dataSource allowsScrolling:allowsScrolling];
if (frame == nil) {
return NO;
}
@@ -99,12 +99,12 @@
- (WebCoreBridge *)openNewWindowWithURL:(NSURL *)url
{
- IFWebController *newController = [[[dataSource controller] windowContext] openNewWindowWithURL:url];
- IFWebDataSource *newDataSource;
+ WebController *newController = [[[dataSource controller] windowContext] openNewWindowWithURL:url];
+ WebDataSource *newDataSource;
newDataSource = [[newController mainFrame] provisionalDataSource];
if ([newDataSource isDocumentHTML])
- return [(IFHTMLRepresentation *)[newDataSource representation] _bridge];
+ return [(WebHTMLRepresentation *)[newDataSource representation] _bridge];
return nil;
}
@@ -162,17 +162,17 @@
[[[dataSource controller] windowContext] setStatusText:status];
}
-- (WebCoreFrame *)mainFrame
+- (WebCoreFrameBridge *)mainFrame
{
return [[[dataSource controller] mainFrame] _frameBridge];
}
-- (WebCoreFrame *)frameNamed:(NSString *)name
+- (WebCoreFrameBridge *)frameNamed:(NSString *)name
{
return [[[dataSource controller] frameNamed:name] _frameBridge];
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)withDataSource
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)withDataSource
{
if (dataSource == nil) {
[self setDataSource: withDataSource];
@@ -187,24 +187,24 @@
[self addData:data withEncoding:[dataSource encoding]];
}
-- (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSURL *)URL
+- (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader withURL:(NSURL *)URL
{
- return [IFResourceURLHandleClient startLoadingResource:resourceLoader withURL:URL dataSource:dataSource];
+ return [WebSubresourceClient startLoadingResource:resourceLoader withURL:URL dataSource:dataSource];
}
- (void)objectLoadedFromCache:(NSURL *)URL size:(unsigned)bytes
{
- IFURLHandle *handle;
- IFLoadProgress *loadProgress;
+ WebResourceHandle *handle;
+ WebLoadProgress *loadProgress;
- handle = [[IFURLHandle alloc] initWithURL:URL];
- loadProgress = [[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
+ handle = [[WebResourceHandle alloc] initWithURL:URL];
+ loadProgress = [[WebLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:bytes];
[[dataSource controller] _receivedProgress:loadProgress forResourceHandle:handle fromDataSource: dataSource complete:YES];
[loadProgress release];
[handle release];
}
-- (void)setDataSource: (IFWebDataSource *)ds
+- (void)setDataSource: (WebDataSource *)ds
{
// FIXME: non-retained because data source owns representation owns bridge
dataSource = ds;
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
index ef4d8c3..8ad49ad 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.h
@@ -1,5 +1,5 @@
//
-// IFCookieAdapter.h
+// WebCookieAdapter.h
// WebKit
//
// Created by Maciej Stachowiak on Thu Jun 27 2002.
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import <WebCore/WebCoreCookieAdapter.h>
- at interface IFCookieAdapter : WebCoreCookieAdapter
+ at interface WebCookieAdapter : WebCoreCookieAdapter
{
}
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index 155b898..2eba569 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -1,17 +1,17 @@
//
-// IFCookieAdapter.m
+// WebCookieAdapter.m
// WebKit
//
// Created by Maciej Stachowiak on Thu Jun 27 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFCookieAdapter.h"
-#import <WebFoundation/IFCookieManager.h>
+#import "WebCookieAdapter.h"
+#import <WebFoundation/WebCookieManager.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFCookieAdapter
+ at implementation WebCookieAdapter
+ (void)createSharedAdapter
{
@@ -24,13 +24,13 @@
- (BOOL)cookiesEnabled
{
BOOL result;
- id acceptCookiesPref = (id)CFPreferencesCopyAppValue((CFStringRef)IFAcceptCookiesPreference, (CFStringRef)IFWebFoundationPreferenceDomain);
+ id acceptCookiesPref = (id)CFPreferencesCopyAppValue((CFStringRef)WebAcceptCookiesPreference, (CFStringRef)WebFoundationPreferenceDomain);
- if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceNever]) {
+ if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceNever]) {
result = NO;
- } else if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceAsk]) {
+ } else if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceAsk]) {
result = YES;
- } else if ([acceptCookiesPref isEqualTo:IFAcceptCookiesPreferenceAlways]) {
+ } else if ([acceptCookiesPref isEqualTo:WebAcceptCookiesPreferenceAlways]) {
result = YES;
} else {
// Treat missing or bad value as always accept
@@ -43,12 +43,12 @@
- (NSString *)cookiesForURL:(NSURL *)url
{
- return [[[IFCookieManager sharedCookieManager] cookieRequestHeadersForURL:url] objectForKey:@"Cookie"];
+ return [[[WebCookieManager sharedCookieManager] cookieRequestHeadersForURL:url] objectForKey:@"Cookie"];
}
- (void)setCookies:(NSString *)cookies forURL:(NSURL *)url
{
- [[IFCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"] forURL:url];
+ [[WebCookieManager sharedCookieManager] setCookiesFromResponseHeaders:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"] forURL:url];
}
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.h b/WebKit/WebCoreSupport.subproj/WebFrameBridge.h
index 34ea61b..2f33da2 100644
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.h
+++ b/WebKit/WebCoreSupport.subproj/WebFrameBridge.h
@@ -1,23 +1,23 @@
//
-// IFWebCoreFrame.h
+// WebFrameBridge.h
// WebKit
//
// Created by Darin Adler on Sun Jun 16 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebCore/WebCoreFrame.h>
+#import <WebCore/WebCoreFrameBridge.h>
- at class IFWebDataSource;
- at class IFWebFrame;
+ at class WebDataSource;
+ at class WebFrame;
- at interface IFWebCoreFrame : WebCoreFrame <WebCoreFrame>
+ at interface WebFrameBridge : WebCoreFrameBridge <WebCoreFrameBridge>
{
- IFWebFrame *frame;
+ WebFrame *frame;
}
-- initWithWebFrame:(IFWebFrame *)frame;
+- initWithWebFrame:(WebFrame *)frame;
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(IFWebDataSource *)parent;
+- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
index f47b6ae..ebbebdd 100644
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
@@ -1,27 +1,27 @@
//
-// IFWebCoreFrame.m
+// WebFrameBridge.m
// WebKit
//
// Created by Darin Adler on Sun Jun 16 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFWebCoreFrame.h>
+#import <WebKit/WebFrameBridge.h>
-#import <WebFoundation/IFURLCacheLoaderConstants.h>
+#import <WebFoundation/WebCacheLoaderConstants.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebView.h>
+#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFWebCoreFrame
+ at implementation WebFrameBridge
-// owned by the IFWebFrame
+// owned by the WebFrame
-- initWithWebFrame:(IFWebFrame *)f
+- initWithWebFrame:(WebFrame *)f
{
[super init];
@@ -30,14 +30,14 @@
return self;
}
-- (IFWebView *)view
+- (WebView *)view
{
return [frame webView];
}
-- (IFHTMLView *)HTMLView
+- (WebHTMLView *)HTMLView
{
- return (IFHTMLView *)[[self view] documentView];
+ return (WebHTMLView *)[[self view] documentView];
}
- (WebCoreBridge *)bridge
@@ -54,9 +54,9 @@
return [[frame dataSource] _bridge];
}
-- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(IFWebDataSource *)parent
+- (void)loadURL:(NSURL *)URL attributes:(NSDictionary *)attributes flags:(unsigned)flags withParent:(WebDataSource *)parent
{
- IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
+ WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
[newDataSource _setParent:parent];
if ([frame setProvisionalDataSource:newDataSource]) {
[frame startLoading];
@@ -71,15 +71,15 @@
- (void)postWithURL:(NSURL *)URL data:(NSData *)data
{
- // When posting, use the IFURLHandleFlagLoadFromOrigin load flag.
+ // When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
// This prevents a potential bug which may cause a page
// with a form that uses itself as an action to be returned
// from the cache without submitting.
NSDictionary *attributes = [[NSDictionary alloc] initWithObjectsAndKeys:
- data, IFHTTPURLHandleRequestData,
- @"POST", IFHTTPURLHandleRequestMethod,
+ data, WebHTTPResourceHandleRequestData,
+ @"POST", WebHTTPResourceHandleRequestMethod,
nil];
- [self loadURL:URL attributes:attributes flags:IFURLHandleFlagLoadFromOrigin withParent:[[frame dataSource] parent]];
+ [self loadURL:URL attributes:attributes flags:WebResourceHandleFlagLoadFromOrigin withParent:[[frame dataSource] parent]];
[attributes release];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
index 209ed6e..ceee7db 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.h
@@ -1,11 +1,11 @@
-/* IFImageRenderer.h
+/* WebImageRenderer.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
#import <WebCore/WebCoreImageRenderer.h>
- at interface IFImageRenderer : NSImage <WebCoreImageRenderer>
+ at interface WebImageRenderer : NSImage <WebCoreImageRenderer>
{
NSTimer *frameTimer;
NSView *frameView;
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
index 3fd90d2..23d3a1e 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRenderer.m
@@ -1,13 +1,13 @@
/*
- IFImageRenderer.m
+ WebImageRenderer.m
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFException.h>
-#import <WebKit/IFImageRenderer.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFImageRenderer
+ at implementation WebImageRenderer
static NSMutableArray *activeImageRenderers;
@@ -17,7 +17,7 @@ static NSMutableArray *activeImageRenderers;
count = [activeImageRenderers count];
for (i = count-1; i >= 0; i--){
- IFImageRenderer *renderer = [activeImageRenderers objectAtIndex: i];
+ WebImageRenderer *renderer = [activeImageRenderers objectAtIndex: i];
if (renderer->frameView == aView){
[renderer stopAnimation];
}
@@ -28,7 +28,7 @@ static NSMutableArray *activeImageRenderers;
- copyWithZone:(NSZone *)zone
{
- IFImageRenderer *copy = [super copyWithZone:zone];
+ WebImageRenderer *copy = [super copyWithZone:zone];
// FIXME: If we copy while doing an incremental load, it won't work.
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.h b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.h
index 7a17213..d9ee95b 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.h
@@ -1,5 +1,5 @@
//
-// IFImageRendererFactory.h
+// WebImageRendererFactory.h
// WebKit
//
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
@@ -7,14 +7,14 @@
#import <WebCore/WebCoreImageRendererFactory.h>
- at class IFImageRenderer;
+ at class WebImageRenderer;
- at interface IFImageRendererFactory : WebCoreImageRendererFactory
+ at interface WebImageRendererFactory : WebCoreImageRendererFactory
{
}
+ (void)createSharedFactory;
-+ (IFImageRendererFactory *)sharedFactory;
++ (WebImageRendererFactory *)sharedFactory;
- (id <WebCoreImageRenderer>)imageRendererWithBytes: (const void *)bytes length:(unsigned)length;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
index d1facaf..b9fff83 100644
--- a/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebImageRendererFactory.m
@@ -24,11 +24,11 @@
*/
#import <Cocoa/Cocoa.h>
-#import <WebKit/IFImageRendererFactory.h>
-#import <WebKit/IFImageRenderer.h>
+#import <WebKit/WebImageRendererFactory.h>
+#import <WebKit/WebImageRenderer.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFImageRendererFactory
+ at implementation WebImageRendererFactory
+ (void)createSharedFactory
{
@@ -38,14 +38,14 @@
WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
}
-+ (IFImageRendererFactory *)sharedFactory
++ (WebImageRendererFactory *)sharedFactory
{
- return (IFImageRendererFactory *)[super sharedFactory];
+ return (WebImageRendererFactory *)[super sharedFactory];
}
- (id <WebCoreImageRenderer>)imageRenderer
{
- NSImage *imageRenderer = [[IFImageRenderer alloc] init];
+ NSImage *imageRenderer = [[WebImageRenderer alloc] init];
NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initForIncrementalLoad];
[imageRenderer addRepresentation: rep];
@@ -62,7 +62,7 @@
// FIXME: Why must we copy the data here?
//NSData *data = [[NSData alloc] initWithBytesNoCopy: (void *)bytes length: length freeWhenDone: NO];
NSData *data = [[NSData alloc] initWithBytes: (void *)bytes length: length];
- IFImageRenderer *imageRenderer = [[IFImageRenderer alloc] initWithData: data];
+ WebImageRenderer *imageRenderer = [[WebImageRenderer alloc] initWithData: data];
[imageRenderer setScalesWhenResized: NO];
NSArray *reps = [imageRenderer representations];
NSImageRep *rep = [reps objectAtIndex: 0];
@@ -75,7 +75,7 @@
- (id <WebCoreImageRenderer>)imageRendererWithSize: (NSSize)s
{
- IFImageRenderer *imageRenderer = [[[IFImageRenderer alloc] initWithSize: s] autorelease];
+ WebImageRenderer *imageRenderer = [[[WebImageRenderer alloc] initWithSize: s] autorelease];
[imageRenderer setScalesWhenResized: NO];
return imageRenderer;
}
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
index bb27633..c1c1f90 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.h
@@ -1,24 +1,24 @@
//
-// IFResourceURLHandleClient.h
+// WebSubresourceClient.h
// WebKit
//
// Created by Darin Adler on Sat Jun 15 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebFoundation/IFURLHandleClient.h>
+#import <WebFoundation/WebResourceClient.h>
@protocol WebCoreResourceLoader;
- at class IFWebDataSource;
+ at class WebDataSource;
- at interface IFResourceURLHandleClient : NSObject <IFURLHandleClient>
+ at interface WebSubresourceClient : NSObject <WebResourceClient>
{
id <WebCoreResourceLoader> loader;
- IFWebDataSource *dataSource;
+ WebDataSource *dataSource;
NSURL *currentURL;
}
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)dataSource;
++ (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader
+ withURL:(NSURL *)URL dataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 9645dcc..2fa636d 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -1,27 +1,27 @@
//
-// IFResourceURLHandleClient.m
+// WebSubresourceClient.m
// WebKit
//
// Created by Darin Adler on Sat Jun 15 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFResourceURLHandleClient.h>
+#import <WebKit/WebSubresourceClient.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebResourceHandle.h>
#import <WebCore/WebCoreResourceLoader.h>
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFResourceURLHandleClient
+ at implementation WebSubresourceClient
-- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(IFWebDataSource *)s
+- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(WebDataSource *)s
{
[super init];
@@ -56,18 +56,18 @@
[super dealloc];
}
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)source
++ (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
+ withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
- IFURLHandle *handle;
- IFResourceURLHandleClient *client;
+ WebResourceHandle *handle;
+ WebSubresourceClient *client;
- handle = [[[IFURLHandle alloc] initWithURL:URL attributes:nil flags:0] autorelease];
+ handle = [[[WebResourceHandle alloc] initWithURL:URL attributes:nil flags:0] autorelease];
if (handle == nil) {
[rLoader cancel];
- IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation
+ WebError *badURLError = [WebError errorWithCode:WebResultBadURLError
+ inDomain:WebErrorDomainWebFoundation
failingURL:URL
isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
@@ -87,25 +87,25 @@
}
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
+- (void)receivedProgressWithHandle:(WebResourceHandle *)handle complete:(BOOL)isComplete
{
- [[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ [[dataSource controller] _receivedProgress:[WebLoadProgress progressWithResourceHandle:handle]
forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
}
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
+- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
{
[[dataSource controller] _receivedError:error forResourceHandle:handle
- partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
+ partialProgress:[WebLoadProgress progressWithResourceHandle:handle] fromDataSource:dataSource];
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
[self didStartLoadingWithURL:[handle url]];
[self receivedProgressWithHandle:handle complete: NO];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -113,33 +113,33 @@
[loader addData:data];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
- IFError *error;
+ WebError *error;
[loader cancel];
[dataSource _removeURLHandle:handle];
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
+ error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[dataSource inputURL]];
[self receivedError:error forHandle:handle];
[error release];
[self didStopLoading];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
+- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
+ WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
[loader finish];
[dataSource _removeURLHandle:handle];
- IFError *nonTerminalError = [handle error];
+ WebError *nonTerminalError = [handle error];
if (nonTerminalError) {
[self receivedError:nonTerminalError forHandle:handle];
}
@@ -149,7 +149,7 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)error
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -162,7 +162,7 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
+- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKIT_ASSERT(currentURL != nil);
WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
index bb27633..c1c1f90 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.h
@@ -1,24 +1,24 @@
//
-// IFResourceURLHandleClient.h
+// WebSubresourceClient.h
// WebKit
//
// Created by Darin Adler on Sat Jun 15 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebFoundation/IFURLHandleClient.h>
+#import <WebFoundation/WebResourceClient.h>
@protocol WebCoreResourceLoader;
- at class IFWebDataSource;
+ at class WebDataSource;
- at interface IFResourceURLHandleClient : NSObject <IFURLHandleClient>
+ at interface WebSubresourceClient : NSObject <WebResourceClient>
{
id <WebCoreResourceLoader> loader;
- IFWebDataSource *dataSource;
+ WebDataSource *dataSource;
NSURL *currentURL;
}
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)dataSource;
++ (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)resourceLoader
+ withURL:(NSURL *)URL dataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 9645dcc..2fa636d 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -1,27 +1,27 @@
//
-// IFResourceURLHandleClient.m
+// WebSubresourceClient.m
// WebKit
//
// Created by Darin Adler on Sat Jun 15 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFResourceURLHandleClient.h>
+#import <WebKit/WebSubresourceClient.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebResourceHandle.h>
#import <WebCore/WebCoreResourceLoader.h>
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFResourceURLHandleClient
+ at implementation WebSubresourceClient
-- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(IFWebDataSource *)s
+- initWithLoader:(id <WebCoreResourceLoader>)l dataSource:(WebDataSource *)s
{
[super init];
@@ -56,18 +56,18 @@
[super dealloc];
}
-+ (IFURLHandle *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
- withURL:(NSURL *)URL dataSource:(IFWebDataSource *)source
++ (WebResourceHandle *)startLoadingResource:(id <WebCoreResourceLoader>)rLoader
+ withURL:(NSURL *)URL dataSource:(WebDataSource *)source
{
- IFURLHandle *handle;
- IFResourceURLHandleClient *client;
+ WebResourceHandle *handle;
+ WebSubresourceClient *client;
- handle = [[[IFURLHandle alloc] initWithURL:URL attributes:nil flags:0] autorelease];
+ handle = [[[WebResourceHandle alloc] initWithURL:URL attributes:nil flags:0] autorelease];
if (handle == nil) {
[rLoader cancel];
- IFError *badURLError = [IFError errorWithCode:IFURLHandleResultBadURLError
- inDomain:IFErrorCodeDomainWebFoundation
+ WebError *badURLError = [WebError errorWithCode:WebResultBadURLError
+ inDomain:WebErrorDomainWebFoundation
failingURL:URL
isTerminal:YES];
[[source controller] _receivedError:badURLError forResourceHandle:nil
@@ -87,25 +87,25 @@
}
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
+- (void)receivedProgressWithHandle:(WebResourceHandle *)handle complete:(BOOL)isComplete
{
- [[dataSource controller] _receivedProgress:[IFLoadProgress progressWithURLHandle:handle]
+ [[dataSource controller] _receivedProgress:[WebLoadProgress progressWithResourceHandle:handle]
forResourceHandle:handle fromDataSource:dataSource complete:isComplete];
}
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
+- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
{
[[dataSource controller] _receivedError:error forResourceHandle:handle
- partialProgress:[IFLoadProgress progressWithURLHandle:handle] fromDataSource:dataSource];
+ partialProgress:[WebLoadProgress progressWithResourceHandle:handle] fromDataSource:dataSource];
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
[self didStartLoadingWithURL:[handle url]];
[self receivedProgressWithHandle:handle complete: NO];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -113,33 +113,33 @@
[loader addData:data];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
- IFError *error;
+ WebError *error;
[loader cancel];
[dataSource _removeURLHandle:handle];
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
+ error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[dataSource inputURL]];
[self receivedError:error forHandle:handle];
[error release];
[self didStopLoading];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data:(NSData *)data
+- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data:(NSData *)data
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
+ WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
[loader finish];
[dataSource _removeURLHandle:handle];
- IFError *nonTerminalError = [handle error];
+ WebError *nonTerminalError = [handle error];
if (nonTerminalError) {
[self receivedError:nonTerminalError forHandle:handle];
}
@@ -149,7 +149,7 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)error
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)error
{
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
@@ -162,7 +162,7 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
+- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKIT_ASSERT(currentURL != nil);
WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
index 72cfa40..a9baac2 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
@@ -1,5 +1,5 @@
//
-// IFTextRenderer.h
+// WebTextRenderer.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
@@ -11,7 +11,7 @@
typedef struct WidthMap WidthMap;
typedef struct GlyphMap GlyphMap;
- at interface IFTextRenderer : NSObject <WebCoreTextRenderer>
+ at interface WebTextRenderer : NSObject <WebCoreTextRenderer>
{
int ascent;
int descent;
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 7c86764..0c9a238 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -1,17 +1,17 @@
/*
- IFTextRenderer.m
+ WebTextRenderer.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import "IFTextRenderer.h"
+#import "WebTextRenderer.h"
#import <Cocoa/Cocoa.h>
#import <ApplicationServices/ApplicationServices.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
-#import <WebKit/IFTextRendererFactory.h>
+#import <WebKit/WebTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
#import <QD/ATSUnicodePriv.h>
@@ -39,13 +39,13 @@
#define IsNonBaseChar(X) ((CFCharacterSetIsCharacterMember(nonBaseChars, X) || IsHangulConjoiningJamo(X) || (((X) & 0x1FFFF0) == 0xF870)))
-typedef float IFGlyphWidth;
+typedef float WebGlyphWidth;
struct WidthMap {
ATSGlyphRef startRange;
ATSGlyphRef endRange;
WidthMap *next;
- IFGlyphWidth *widths;
+ WebGlyphWidth *widths;
};
struct GlyphMap {
@@ -62,7 +62,7 @@ struct GlyphMap {
+ (NSLanguage *)defaultLanguage;
@end
- at interface NSFont (IFPrivate)
+ at interface NSFont (WebPrivate)
- (ATSUFontID)_atsFontID;
- (CGFontRef)_backingCGSFont;
// Private method to find a font for a character.
@@ -77,7 +77,7 @@ struct GlyphMap {
static CFCharacterSetRef nonBaseChars = NULL;
- at interface IFTextRenderer (IFPrivate)
+ at interface WebTextRenderer (WebPrivate)
- (WidthMap *)extendGlyphToWidthMapToInclude:(ATSGlyphRef)glyphID;
- (ATSGlyphRef)extendCharacterToGlyphMapToInclude:(UniChar) c;
@end
@@ -131,9 +131,9 @@ static void setGlyphForCharacter (GlyphMap *map, ATSGlyphRef glyph, UniChar c)
static double totalCGGetAdvancesTime = 0;
#endif
-static inline IFGlyphWidth widthForGlyph (IFTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph)
+static inline WebGlyphWidth widthForGlyph (WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph)
{
- IFGlyphWidth width;
+ WebGlyphWidth width;
bool errorResult;
if (map == 0){
@@ -142,7 +142,7 @@ static inline IFGlyphWidth widthForGlyph (IFTextRenderer *renderer, WidthMap *ma
}
if (glyph >= map->startRange && glyph <= map->endRange){
- width = ((IFGlyphWidth *)map->widths)[glyph-map->startRange];
+ width = ((WebGlyphWidth *)map->widths)[glyph-map->startRange];
if (width == UNINITIALIZED_GLYPH_WIDTH){
#ifdef _TIMING
@@ -156,7 +156,7 @@ static inline IFGlyphWidth widthForGlyph (IFTextRenderer *renderer, WidthMap *ma
double thisTime = CFAbsoluteTimeGetCurrent() - startTime;
totalCGGetAdvancesTime += thisTime;
#endif
- return ((IFGlyphWidth *)map->widths)[glyph-map->startRange];
+ return ((WebGlyphWidth *)map->widths)[glyph-map->startRange];
}
return width;
}
@@ -165,7 +165,7 @@ static inline IFGlyphWidth widthForGlyph (IFTextRenderer *renderer, WidthMap *ma
}
-static inline IFGlyphWidth widthForCharacter (IFTextRenderer *renderer, UniChar c)
+static inline WebGlyphWidth widthForCharacter (WebTextRenderer *renderer, UniChar c)
{
return widthForGlyph (renderer, renderer->glyphToWidthMap, glyphForCharacter(renderer->characterToGlyphMap, c));
}
@@ -205,7 +205,7 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
}
- at implementation IFTextRenderer
+ at implementation WebTextRenderer
+ (void)initialize
{
@@ -508,7 +508,7 @@ static unsigned int findLengthOfCharacterCluster(const UniChar *characters, unsi
// Draw the character in the alternate font.
substituteFont = [self substituteFontForCharacters: &characters[charPos] length: clusterLength];
if (substituteFont){
- point = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] slowDrawCharacters: &characters[charPos] length: clusterLength fromCharacterPosition: from - charPos toCharacterPosition:to - charPos atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: NO];
+ point = [[[WebTextRendererFactory sharedFactory] rendererWithFont: substituteFont] slowDrawCharacters: &characters[charPos] length: clusterLength fromCharacterPosition: from - charPos toCharacterPosition:to - charPos atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: NO];
}
// No substitute font, draw null glyph
else
@@ -629,7 +629,7 @@ cleanup:
clusterLength = findLengthOfCharacterCluster(characters, length);
substituteFont = [self substituteFontForCharacters: characters length: clusterLength];
if (substituteFont)
- reason = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] _drawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition: to atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
+ reason = [[[WebTextRendererFactory sharedFactory] rendererWithFont: substituteFont] _drawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition: to atPoint: point withTextColor: textColor backgroundColor: backgroundColor];
if (!substituteFont || reason != _IFDrawSucceeded)
[self slowDrawCharacters: characters length: length fromCharacterPosition: from toCharacterPosition:to atPoint: point withTextColor: textColor backgroundColor: backgroundColor attemptFontSubstitution: YES];
@@ -678,7 +678,7 @@ cleanup:
float totalWidth = 0;
unsigned int charPos = 0, clusterLength, i, numGlyphs;
ATSGlyphVector glyphVector;
- IFGlyphWidth glyphWidth;
+ WebGlyphWidth glyphWidth;
ATSLayoutRecord *glyphRecord;
ATSGlyphRef glyphID;
float lastWidth = 0;
@@ -793,7 +793,7 @@ cleanup:
clusterLength = findLengthOfCharacterCluster (&characters[i], stringLength - i);
substituteFont = [self substituteFontForCharacters: &characters[i] length: clusterLength];
if (substituteFont) {
- lastWidth = [[[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] floatWidthForCharacters: &characters[i] stringLength: clusterLength fromCharacterPosition: pos numberOfCharacters: len applyRounding: YES attemptFontSubstitution: NO];
+ lastWidth = [[[WebTextRendererFactory sharedFactory] rendererWithFont: substituteFont] floatWidthForCharacters: &characters[i] stringLength: clusterLength fromCharacterPosition: pos numberOfCharacters: len applyRounding: YES attemptFontSubstitution: NO];
}
}
@@ -915,7 +915,7 @@ cleanup:
map->endRange = end;
count = end - start + 1;
- map->widths = (IFGlyphWidth *)malloc (count * sizeof(IFGlyphWidth));
+ map->widths = (WebGlyphWidth *)malloc (count * sizeof(WebGlyphWidth));
for (i = 0; i < count; i++){
map->widths[i] = UNINITIALIZED_GLYPH_WIDTH;
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
index ae5593b..aab2c53 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
@@ -1,5 +1,5 @@
//
-// IFTextRendererFactory.h
+// WebTextRendererFactory.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
@@ -8,17 +8,17 @@
#import <WebCore/WebCoreTextRendererFactory.h>
- at class IFTextRenderer;
+ at class WebTextRenderer;
- at interface IFTextRendererFactory : WebCoreTextRendererFactory
+ at interface WebTextRendererFactory : WebCoreTextRendererFactory
{
NSMutableDictionary *cache;
}
+ (void)createSharedFactory;
-+ (IFTextRendererFactory *)sharedFactory;
++ (WebTextRendererFactory *)sharedFactory;
- init;
-- (IFTextRenderer *)rendererWithFont:(NSFont *)font;
+- (WebTextRenderer *)rendererWithFont:(NSFont *)font;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 097e39b..58ab1b6 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -1,16 +1,16 @@
//
-// IFTextRendererFactory.m
+// WebTextRendererFactory.m
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFTextRenderer.h>
+#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebTextRenderer.h>
#import <WebKit/WebKitDebug.h>
- at interface IFFontCacheKey : NSObject
+ at interface WebFontCacheKey : NSObject
{
NSString *family;
NSFontTraitMask traits;
@@ -21,7 +21,7 @@
@end
- at implementation IFFontCacheKey
+ at implementation WebFontCacheKey
- initWithFamily:(NSString *)f traits:(NSFontTraitMask)t size:(float)s;
{
@@ -50,7 +50,7 @@
- (BOOL)isEqual:(id)o
{
- IFFontCacheKey *other = o;
+ WebFontCacheKey *other = o;
return [self class] == [other class]
&& [family isEqualToString:other->family]
&& traits == other->traits
@@ -59,7 +59,7 @@
@end
- at implementation IFTextRendererFactory
+ at implementation WebTextRendererFactory
+ (void)createSharedFactory;
{
@@ -69,9 +69,9 @@
WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
}
-+ (IFTextRendererFactory *)sharedFactory;
++ (WebTextRendererFactory *)sharedFactory;
{
- return (IFTextRendererFactory *)[super sharedFactory];
+ return (WebTextRendererFactory *)[super sharedFactory];
}
- init
@@ -90,11 +90,11 @@
[super dealloc];
}
-- (IFTextRenderer *)rendererWithFont:(NSFont *)font
+- (WebTextRenderer *)rendererWithFont:(NSFont *)font
{
- IFTextRenderer *renderer = [cache objectForKey:font];
+ WebTextRenderer *renderer = [cache objectForKey:font];
if (renderer == nil) {
- renderer = [[IFTextRenderer alloc] initWithFont:font];
+ renderer = [[WebTextRenderer alloc] initWithFont:font];
[cache setObject:renderer forKey:font];
[renderer release];
}
@@ -145,7 +145,7 @@
fontCache = [[NSMutableDictionary alloc] init];
}
- fontKey = [[IFFontCacheKey alloc] initWithFamily:family traits:traits size:size];
+ fontKey = [[WebFontCacheKey alloc] initWithFamily:family traits:traits size:size];
font = [fontCache objectForKey:fontKey];
if (font == nil) {
font = [self fontWithFamily:family traits:traits size:size];
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.h b/WebKit/WebCoreSupport.subproj/WebViewFactory.h
index 3d0f567..b29bcc1 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.h
@@ -1,5 +1,5 @@
//
-// IFWebCoreViewFactory.h
+// WebViewFactory.h
// WebKit
//
// Created by Darin Adler on Tue May 07 2002.
@@ -8,7 +8,7 @@
#import <WebCore/WebCoreViewFactory.h>
- at interface IFWebCoreViewFactory : WebCoreViewFactory
+ at interface WebViewFactory : WebCoreViewFactory
{
}
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 45300da..1815f5a 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -1,5 +1,5 @@
//
-// IFWebCoreViewFactory.m
+// WebViewFactory.m
// WebKit
//
// Created by Darin Adler on Tue May 07 2002.
@@ -7,16 +7,16 @@
//
-#import <WebKit/IFNullPluginView.h>
-#import <WebKit/IFPlugin.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebCoreViewFactory.h>
+#import <WebKit/WebNullPluginView.h>
+#import <WebKit/WebPlugin.h>
+#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebPluginView.h>
+#import <WebKit/WebViewFactory.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebFoundation/WebNSURLExtras.h>
- at implementation IFWebCoreViewFactory
+ at implementation WebViewFactory
+ (void)createSharedFactory;
{
@@ -31,7 +31,7 @@
NSMutableDictionary *arguments;
NSString *mimeType, *extension;
NSRange r1, r2, r3;
- IFPlugin *plugin;
+ WebPlugin *plugin;
uint i;
arguments = [NSMutableDictionary dictionary];
@@ -48,34 +48,34 @@
if ([serviceType length]) {
mimeType = serviceType;
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:mimeType];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:mimeType];
} else {
extension = [[pluginURL path] pathExtension];
- plugin = [[IFPluginDatabase installedPlugins] pluginForExtension:extension];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForExtension:extension];
mimeType = [plugin mimeTypeForExtension:extension];
}
if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
+ return [[[WebNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
}
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
+ return [[[WebPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL baseURL:baseURL mime:mimeType arguments:arguments] autorelease];
}
- (NSArray *)pluginsInfo
{
- return [[IFPluginDatabase installedPlugins] plugins];
+ return [[WebPluginDatabase installedPlugins] plugins];
}
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)baseURL parameters:(NSDictionary *)parameters
{
- IFPlugin *plugin;
+ WebPlugin *plugin;
- plugin = [[IFPluginDatabase installedPlugins] pluginForMimeType:@"application/x-java-applet"];
+ plugin = [[WebPluginDatabase installedPlugins] pluginForMimeType:@"application/x-java-applet"];
if (plugin == nil) {
return nil;
}
- return [[[IFPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
+ return [[[WebPluginView alloc] initWithFrame:frame plugin:plugin url:nil baseURL:baseURL mime:@"application/x-java-applet" arguments:parameters] autorelease];
}
@end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 0bf2852..0749954 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -518,62 +518,62 @@
//354
35081D9202B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLRepresentation.h;
- path = WebView.subproj/IFHTMLRepresentation.h;
+ name = WebHTMLRepresentation.h;
+ path = WebView.subproj/WebHTMLRepresentation.h;
refType = 4;
};
35081D9302B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLRepresentation.mm;
- path = WebView.subproj/IFHTMLRepresentation.mm;
+ name = WebHTMLRepresentation.m;
+ path = WebView.subproj/WebHTMLRepresentation.m;
refType = 4;
};
35081D9402B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLView.h;
- path = WebView.subproj/IFHTMLView.h;
+ name = WebHTMLView.h;
+ path = WebView.subproj/WebHTMLView.h;
refType = 4;
};
35081D9502B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLView.mm;
- path = WebView.subproj/IFHTMLView.mm;
+ name = WebHTMLView.m;
+ path = WebView.subproj/WebHTMLView.m;
refType = 4;
};
35081D9602B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLViewPrivate.h;
- path = WebView.subproj/IFHTMLViewPrivate.h;
+ name = WebHTMLViewPrivate.h;
+ path = WebView.subproj/WebHTMLViewPrivate.h;
refType = 4;
};
35081D9702B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFHTMLViewPrivate.mm;
- path = WebView.subproj/IFHTMLViewPrivate.mm;
+ name = WebHTMLViewPrivate.m;
+ path = WebView.subproj/WebHTMLViewPrivate.m;
refType = 4;
};
35081D9802B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFImageRepresentation.h;
- path = WebView.subproj/IFImageRepresentation.h;
+ name = WebImageRepresentation.h;
+ path = WebView.subproj/WebImageRepresentation.h;
refType = 4;
};
35081D9902B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFImageRepresentation.m;
- path = WebView.subproj/IFImageRepresentation.m;
+ name = WebImageRepresentation.m;
+ path = WebView.subproj/WebImageRepresentation.m;
refType = 4;
};
35081D9A02B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFImageView.h;
- path = WebView.subproj/IFImageView.h;
+ name = WebImageView.h;
+ path = WebView.subproj/WebImageView.h;
refType = 4;
};
35081D9B02B6D4D80ACA2ACA = {
isa = PBXFileReference;
- name = IFImageView.m;
- path = WebView.subproj/IFImageView.m;
+ name = WebImageView.m;
+ path = WebView.subproj/WebImageView.m;
refType = 4;
};
35081D9C02B6D4D80ACA2ACA = {
@@ -641,26 +641,26 @@
};
35081DA602B6D4E40ACA2ACA = {
isa = PBXFileReference;
- name = IFTextRepresentation.h;
- path = WebView.subproj/IFTextRepresentation.h;
+ name = WebTextRepresentation.h;
+ path = WebView.subproj/WebTextRepresentation.h;
refType = 4;
};
35081DA702B6D4E40ACA2ACA = {
isa = PBXFileReference;
- name = IFTextRepresentation.m;
- path = WebView.subproj/IFTextRepresentation.m;
+ name = WebTextRepresentation.m;
+ path = WebView.subproj/WebTextRepresentation.m;
refType = 4;
};
35081DA802B6D4E40ACA2ACA = {
isa = PBXFileReference;
- name = IFTextView.h;
- path = WebView.subproj/IFTextView.h;
+ name = WebTextView.h;
+ path = WebView.subproj/WebTextView.h;
refType = 4;
};
35081DA902B6D4E40ACA2ACA = {
isa = PBXFileReference;
- name = IFTextView.m;
- path = WebView.subproj/IFTextView.m;
+ name = WebTextView.m;
+ path = WebView.subproj/WebTextView.m;
refType = 4;
};
35081DAA02B6D4E40ACA2ACA = {
@@ -689,8 +689,8 @@
};
35081DAE02B6D4F50ACA2ACA = {
isa = PBXFileReference;
- name = IFDocument.h;
- path = WebView.subproj/IFDocument.h;
+ name = WebDocument.h;
+ path = WebView.subproj/WebDocument.h;
refType = 4;
};
35081DAF02B6D4F50ACA2ACA = {
@@ -732,140 +732,140 @@
//394
39446064020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebController.mm;
- path = WebView.subproj/IFWebController.mm;
+ name = WebController.m;
+ path = WebView.subproj/WebController.m;
refType = 4;
};
39446065020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebControllerPrivate.h;
- path = WebView.subproj/IFWebControllerPrivate.h;
+ name = WebControllerPrivate.h;
+ path = WebView.subproj/WebControllerPrivate.h;
refType = 4;
};
39446066020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebControllerPrivate.mm;
- path = WebView.subproj/IFWebControllerPrivate.mm;
+ name = WebControllerPrivate.m;
+ path = WebView.subproj/WebControllerPrivate.m;
refType = 4;
};
3944606B020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFDynamicScrollBarsView.h;
- path = WebView.subproj/IFDynamicScrollBarsView.h;
+ name = WebDynamicScrollBarsView.h;
+ path = WebView.subproj/WebDynamicScrollBarsView.h;
refType = 4;
};
3944606C020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFDynamicScrollBarsView.m;
- path = WebView.subproj/IFDynamicScrollBarsView.m;
+ name = WebDynamicScrollBarsView.m;
+ path = WebView.subproj/WebDynamicScrollBarsView.m;
refType = 4;
};
3944606E020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFPreferences.h;
- path = WebView.subproj/IFPreferences.h;
+ name = WebPreferences.h;
+ path = WebView.subproj/WebPreferences.h;
refType = 4;
};
3944606F020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebController.h;
- path = WebView.subproj/IFWebController.h;
+ name = WebController.h;
+ path = WebView.subproj/WebController.h;
refType = 4;
};
39446070020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebDataSource.h;
- path = WebView.subproj/IFWebDataSource.h;
+ name = WebDataSource.h;
+ path = WebView.subproj/WebDataSource.h;
refType = 4;
};
39446071020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebDataSource.mm;
- path = WebView.subproj/IFWebDataSource.mm;
+ name = WebDataSource.m;
+ path = WebView.subproj/WebDataSource.m;
refType = 4;
};
39446072020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebDataSourcePrivate.h;
- path = WebView.subproj/IFWebDataSourcePrivate.h;
+ name = WebDataSourcePrivate.h;
+ path = WebView.subproj/WebDataSourcePrivate.h;
refType = 4;
};
39446073020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebDataSourcePrivate.mm;
- path = WebView.subproj/IFWebDataSourcePrivate.mm;
+ name = WebDataSourcePrivate.m;
+ path = WebView.subproj/WebDataSourcePrivate.m;
refType = 4;
};
39446074020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebFrame.h;
- path = WebView.subproj/IFWebFrame.h;
+ name = WebFrame.h;
+ path = WebView.subproj/WebFrame.h;
refType = 4;
};
39446076020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebView.h;
- path = WebView.subproj/IFWebView.h;
+ name = WebView.h;
+ path = WebView.subproj/WebView.h;
refType = 4;
};
39446077020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebView.mm;
- path = WebView.subproj/IFWebView.mm;
+ name = WebView.m;
+ path = WebView.subproj/WebView.m;
refType = 4;
};
39446078020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebViewPrivate.h;
- path = WebView.subproj/IFWebViewPrivate.h;
+ name = WebViewPrivate.h;
+ path = WebView.subproj/WebViewPrivate.h;
refType = 4;
};
39446079020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFWebViewPrivate.mm;
- path = WebView.subproj/IFWebViewPrivate.mm;
+ name = WebViewPrivate.m;
+ path = WebView.subproj/WebViewPrivate.m;
refType = 4;
};
3944607A020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFException.h;
- path = Misc.subproj/IFException.h;
+ name = WebException.h;
+ path = Misc.subproj/WebException.h;
refType = 4;
};
3944607B020F50ED0ECA1767 = {
isa = PBXFileReference;
- name = IFException.m;
- path = Misc.subproj/IFException.m;
+ name = WebException.m;
+ path = Misc.subproj/WebException.m;
refType = 4;
};
3944607D020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFBackForwardList.h;
+ path = WebBackForwardList.h;
refType = 4;
};
3944607E020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFBackForwardList.m;
+ path = WebBackForwardList.m;
refType = 4;
};
3944607F020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFURIEntry.h;
+ path = WebHistoryItem.h;
refType = 4;
};
39446080020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFURIEntry.m;
+ path = WebHistoryItem.m;
refType = 4;
};
39446081020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFURIList.h;
+ path = WebHistoryList.h;
refType = 4;
};
39446082020F50ED0ECA1767 = {
isa = PBXFileReference;
- path = IFURIList.m;
+ path = WebHistoryList.m;
refType = 4;
};
39446088020F50ED0ECA1767 = {
@@ -1089,8 +1089,8 @@
};
9CAE9D070252A4130ECA16EA = {
isa = PBXFileReference;
- name = IFPreferencesPrivate.h;
- path = WebView.subproj/IFPreferencesPrivate.h;
+ name = WebPreferencesPrivate.h;
+ path = WebView.subproj/WebPreferencesPrivate.h;
refType = 2;
};
9CAE9D080252A4130ECA16EA = {
@@ -1104,26 +1104,26 @@
};
9CE1F8A002A5C6F30ECA2ACD = {
isa = PBXFileReference;
- name = IFImageRenderer.h;
- path = WebCoreSupport.subproj/IFImageRenderer.h;
+ name = WebImageRenderer.h;
+ path = WebCoreSupport.subproj/WebImageRenderer.h;
refType = 2;
};
9CE1F8A102A5C6F30ECA2ACD = {
isa = PBXFileReference;
- name = IFImageRenderer.m;
- path = WebCoreSupport.subproj/IFImageRenderer.m;
+ name = WebImageRenderer.m;
+ path = WebCoreSupport.subproj/WebImageRenderer.m;
refType = 2;
};
9CE1F8A202A5C6F30ECA2ACD = {
isa = PBXFileReference;
- name = IFImageRendererFactory.h;
- path = WebCoreSupport.subproj/IFImageRendererFactory.h;
+ name = WebImageRendererFactory.h;
+ path = WebCoreSupport.subproj/WebImageRendererFactory.h;
refType = 2;
};
9CE1F8A302A5C6F30ECA2ACD = {
isa = PBXFileReference;
- name = IFImageRendererFactory.m;
- path = WebCoreSupport.subproj/IFImageRendererFactory.m;
+ name = WebImageRendererFactory.m;
+ path = WebCoreSupport.subproj/WebImageRendererFactory.m;
refType = 2;
};
9CE1F8A402A5C6F30ECA2ACD = {
@@ -1152,14 +1152,14 @@
};
9CF0E249021361B00ECA16EA = {
isa = PBXFileReference;
- name = IFWebFramePrivate.h;
- path = WebView.subproj/IFWebFramePrivate.h;
+ name = WebFramePrivate.h;
+ path = WebView.subproj/WebFramePrivate.h;
refType = 2;
};
9CF0E24A021361B00ECA16EA = {
isa = PBXFileReference;
- name = IFWebFramePrivate.mm;
- path = WebView.subproj/IFWebFramePrivate.mm;
+ name = WebFramePrivate.m;
+ path = WebView.subproj/WebFramePrivate.m;
refType = 2;
};
9CF0E24B021361B10ECA16EA = {
@@ -1206,56 +1206,56 @@
};
F5065218027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmark_Private.h;
- path = Bookmarks.subproj/IFBookmark_Private.h;
+ name = WebBookmarkPrivate.h;
+ path = Bookmarks.subproj/WebBookmarkPrivate.h;
refType = 2;
};
F5065219027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmark.h;
- path = Bookmarks.subproj/IFBookmark.h;
+ name = WebBookmark.h;
+ path = Bookmarks.subproj/WebBookmark.h;
refType = 2;
};
F506521A027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmark.m;
- path = Bookmarks.subproj/IFBookmark.m;
+ name = WebBookmark.m;
+ path = Bookmarks.subproj/WebBookmark.m;
refType = 2;
};
F506521B027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkGroup.h;
- path = Bookmarks.subproj/IFBookmarkGroup.h;
+ name = WebBookmarkGroup.h;
+ path = Bookmarks.subproj/WebBookmarkGroup.h;
refType = 2;
};
F506521C027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkGroup.m;
- path = Bookmarks.subproj/IFBookmarkGroup.m;
+ name = WebBookmarkGroup.m;
+ path = Bookmarks.subproj/WebBookmarkGroup.m;
refType = 2;
};
F506521D027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkLeaf.h;
- path = Bookmarks.subproj/IFBookmarkLeaf.h;
+ name = WebBookmarkLeaf.h;
+ path = Bookmarks.subproj/WebBookmarkLeaf.h;
refType = 2;
};
F506521E027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkLeaf.m;
- path = Bookmarks.subproj/IFBookmarkLeaf.m;
+ name = WebBookmarkLeaf.m;
+ path = Bookmarks.subproj/WebBookmarkLeaf.m;
refType = 2;
};
F506521F027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkList.h;
- path = Bookmarks.subproj/IFBookmarkList.h;
+ name = WebBookmarkList.h;
+ path = Bookmarks.subproj/WebBookmarkList.h;
refType = 2;
};
F5065220027F557E01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkList.m;
- path = Bookmarks.subproj/IFBookmarkList.m;
+ name = WebBookmarkList.m;
+ path = Bookmarks.subproj/WebBookmarkList.m;
refType = 2;
};
F5065221027F557E01C1A526 = {
@@ -1320,14 +1320,14 @@
};
F508472202DED36E01257167 = {
isa = PBXFileReference;
- name = IFPanelCookieAcceptHandler.h;
- path = Panels.subproj/IFPanelCookieAcceptHandler.h;
+ name = WebPanelCookieAcceptHandler.h;
+ path = Panels.subproj/WebPanelCookieAcceptHandler.h;
refType = 4;
};
F508472302DED36E01257167 = {
isa = PBXFileReference;
- name = IFPanelCookieAcceptHandler.m;
- path = Panels.subproj/IFPanelCookieAcceptHandler.m;
+ name = WebPanelCookieAcceptHandler.m;
+ path = Panels.subproj/WebPanelCookieAcceptHandler.m;
refType = 4;
};
F508472402DED36E01257167 = {
@@ -1344,14 +1344,14 @@
};
F508946902B71D59018A9CD4 = {
isa = PBXFileReference;
- name = IFNSViewExtras.h;
- path = Misc.subproj/IFNSViewExtras.h;
+ name = WebNSViewExtras.h;
+ path = Misc.subproj/WebNSViewExtras.h;
refType = 4;
};
F508946A02B71D59018A9CD4 = {
isa = PBXFileReference;
- name = IFNSViewExtras.m;
- path = Misc.subproj/IFNSViewExtras.m;
+ name = WebNSViewExtras.m;
+ path = Misc.subproj/WebNSViewExtras.m;
refType = 4;
};
F508946B02B71D59018A9CD4 = {
@@ -1368,8 +1368,8 @@
};
F50AD3870282028B01C1A526 = {
isa = PBXFileReference;
- name = IFBookmarkGroup_Private.h;
- path = Bookmarks.subproj/IFBookmarkGroup_Private.h;
+ name = WebBookmarkGroupPrivate.h;
+ path = Bookmarks.subproj/WebBookmarkGroupPrivate.h;
refType = 2;
};
F50AD3880282028B01C1A526 = {
@@ -1380,8 +1380,8 @@
};
F5143A370221DCCE01A80181 = {
isa = PBXFileReference;
- name = IFWebFrame.mm;
- path = WebView.subproj/IFWebFrame.mm;
+ name = WebFrame.m;
+ path = WebView.subproj/WebFrame.m;
refType = 2;
};
F5143A380221DCCE01A80181 = {
@@ -1392,12 +1392,12 @@
};
F520FB190221DEFD01C1A525 = {
isa = PBXFileReference;
- path = IFWebHistory.h;
+ path = WebHistory.h;
refType = 4;
};
F520FB1A0221DEFD01C1A525 = {
isa = PBXFileReference;
- path = IFWebHistory.m;
+ path = WebHistory.m;
refType = 4;
};
F520FB1B0221DEFD01C1A525 = {
@@ -1473,14 +1473,14 @@
};
F5488CF402CB04EE01FF6274 = {
isa = PBXFileReference;
- name = IFCookieAdapter.h;
- path = WebCoreSupport.subproj/IFCookieAdapter.h;
+ name = WebCookieAdapter.h;
+ path = WebCoreSupport.subproj/WebCookieAdapter.h;
refType = 4;
};
F5488CF502CB04EE01FF6274 = {
isa = PBXFileReference;
- name = IFCookieAdapter.m;
- path = WebCoreSupport.subproj/IFCookieAdapter.m;
+ name = WebCookieAdapter.m;
+ path = WebCoreSupport.subproj/WebCookieAdapter.m;
refType = 4;
};
F5488CF602CB04EE01FF6274 = {
@@ -1497,8 +1497,8 @@
};
F567433E026B5B7B01A80181 = {
isa = PBXFileReference;
- name = IFLocationChangeHandler.h;
- path = WebView.subproj/IFLocationChangeHandler.h;
+ name = WebLocationChangeHandler.h;
+ path = WebView.subproj/WebLocationChangeHandler.h;
refType = 2;
};
F567433F026B5B7B01A80181 = {
@@ -1524,14 +1524,14 @@
};
F5883BE0025E5E9D01000102 = {
isa = PBXFileReference;
- name = IFNullPluginView.h;
- path = Plugins.subproj/IFNullPluginView.h;
+ name = WebNullPluginView.h;
+ path = Plugins.subproj/WebNullPluginView.h;
refType = 4;
};
F5883BE1025E5E9D01000102 = {
isa = PBXFileReference;
- name = IFNullPluginView.mm;
- path = Plugins.subproj/IFNullPluginView.mm;
+ name = WebNullPluginView.m;
+ path = Plugins.subproj/WebNullPluginView.m;
refType = 4;
};
F5883BE2025E5E9D01000102 = {
@@ -1548,8 +1548,8 @@
};
F58BAB380250363E01C1A526 = {
isa = PBXFileReference;
- name = IFLoadProgress.mm;
- path = WebView.subproj/IFLoadProgress.mm;
+ name = WebLoadProgress.m;
+ path = WebView.subproj/WebLoadProgress.m;
refType = 4;
};
F58BAB390250363E01C1A526 = {
@@ -1560,8 +1560,8 @@
};
F58BAB3A025036CA01C1A526 = {
isa = PBXFileReference;
- name = IFLoadProgress.h;
- path = WebView.subproj/IFLoadProgress.h;
+ name = WebLoadProgress.h;
+ path = WebView.subproj/WebLoadProgress.h;
refType = 4;
};
F58BAB3B025036CA01C1A526 = {
@@ -1590,8 +1590,8 @@
};
F5927D4A02D253C401CA2DBB = {
isa = PBXFileReference;
- name = IFWebControllerPolicyHandler.h;
- path = WebView.subproj/IFWebControllerPolicyHandler.h;
+ name = WebControllerPolicyHandler.h;
+ path = WebView.subproj/WebControllerPolicyHandler.h;
refType = 4;
};
F5927D4B02D253C401CA2DBB = {
@@ -1605,8 +1605,8 @@
};
F5927D4E02D26C5E01CA2DBB = {
isa = PBXFileReference;
- name = IFWebKitErrors.h;
- path = Misc.subproj/IFWebKitErrors.h;
+ name = WebKitErrors.h;
+ path = Misc.subproj/WebKitErrors.h;
refType = 4;
};
F5927D4F02D26C5E01CA2DBB = {
@@ -1620,14 +1620,14 @@
};
F59668C802AD2923018635CA = {
isa = PBXFileReference;
- name = IFStringTruncator.h;
- path = Misc.subproj/IFStringTruncator.h;
+ name = WebStringTruncator.h;
+ path = Misc.subproj/WebStringTruncator.h;
refType = 4;
};
F59668C902AD2923018635CA = {
isa = PBXFileReference;
- name = IFStringTruncator.m;
- path = Misc.subproj/IFStringTruncator.m;
+ name = WebStringTruncator.m;
+ path = Misc.subproj/WebStringTruncator.m;
refType = 4;
};
F59668CA02AD2923018635CA = {
@@ -1659,8 +1659,8 @@
};
F59EAE3E0253C7EE018635CA = {
isa = PBXFileReference;
- name = IFCache.h;
- path = Misc.subproj/IFCache.h;
+ name = WebCoreStatistics.h;
+ path = Misc.subproj/WebCoreStatistics.h;
refType = 4;
};
F59EAE400253C7EE018635CA = {
@@ -1674,8 +1674,8 @@
};
F59EAE410253C8DE018635CA = {
isa = PBXFileReference;
- name = IFCache.mm;
- path = Misc.subproj/IFCache.mm;
+ name = WebCoreStatistics.m;
+ path = Misc.subproj/WebCoreStatistics.m;
refType = 4;
};
F59EAE420253C8DE018635CA = {
@@ -1686,8 +1686,8 @@
};
F5A55DC702BAA2E8018635CC = {
isa = PBXFileReference;
- name = IFHTMLRepresentationPrivate.h;
- path = WebView.subproj/IFHTMLRepresentationPrivate.h;
+ name = WebHTMLRepresentationPrivate.h;
+ path = WebView.subproj/WebHTMLRepresentationPrivate.h;
refType = 4;
};
F5A55DC802BAA2E8018635CC = {
@@ -1698,26 +1698,26 @@
};
F5A672B70263866E01000102 = {
isa = PBXFileReference;
- name = IFPluginNullEventSender.h;
- path = Plugins.subproj/IFPluginNullEventSender.h;
+ name = WebPluginNullEventSender.h;
+ path = Plugins.subproj/WebPluginNullEventSender.h;
refType = 4;
};
F5A672B80263866E01000102 = {
isa = PBXFileReference;
- name = IFPluginNullEventSender.m;
- path = Plugins.subproj/IFPluginNullEventSender.m;
+ name = WebPluginNullEventSender.m;
+ path = Plugins.subproj/WebPluginNullEventSender.m;
refType = 4;
};
F5A672B90263866E01000102 = {
isa = PBXFileReference;
- name = IFPluginStream.h;
- path = Plugins.subproj/IFPluginStream.h;
+ name = WebPluginStream.h;
+ path = Plugins.subproj/WebPluginStream.h;
refType = 4;
};
F5A672BA0263866E01000102 = {
isa = PBXFileReference;
- name = IFPluginStream.mm;
- path = Plugins.subproj/IFPluginStream.mm;
+ name = WebPluginStream.m;
+ path = Plugins.subproj/WebPluginStream.m;
refType = 4;
};
F5A672BB0263866E01000102 = {
@@ -1746,14 +1746,14 @@
};
F5A7B11902BC8413018635CA = {
isa = PBXFileReference;
- name = IFWebCoreFrame.h;
- path = WebCoreSupport.subproj/IFWebCoreFrame.h;
+ name = WebFrameBridge.h;
+ path = WebCoreSupport.subproj/WebFrameBridge.h;
refType = 4;
};
F5A7B11A02BC8413018635CA = {
isa = PBXFileReference;
- name = IFWebCoreFrame.m;
- path = WebCoreSupport.subproj/IFWebCoreFrame.m;
+ name = WebFrameBridge.m;
+ path = WebCoreSupport.subproj/WebFrameBridge.m;
refType = 4;
};
F5A7B11B02BC8413018635CA = {
@@ -1770,8 +1770,8 @@
};
F5AEBB3D024A527601C1A526 = {
isa = PBXFileReference;
- name = IFPreferences.mm;
- path = WebView.subproj/IFPreferences.mm;
+ name = WebPreferences.m;
+ path = WebView.subproj/WebPreferences.m;
refType = 4;
};
F5AEBB3E024A527601C1A526 = {
@@ -1782,14 +1782,14 @@
};
F5AFB45E02B94DC8018635CA = {
isa = PBXFileReference;
- name = IFWebCoreBridge.h;
- path = WebCoreSupport.subproj/IFWebCoreBridge.h;
+ name = WebBridge.h;
+ path = WebCoreSupport.subproj/WebBridge.h;
refType = 4;
};
F5AFB45F02B94DC8018635CA = {
isa = PBXFileReference;
- name = IFWebCoreBridge.mm;
- path = WebCoreSupport.subproj/IFWebCoreBridge.mm;
+ name = WebBridge.m;
+ path = WebCoreSupport.subproj/WebBridge.m;
refType = 4;
};
F5AFB46002B94DC8018635CA = {
@@ -1831,14 +1831,14 @@
};
F5B36B410281DF55018635CB = {
isa = PBXFileReference;
- name = IFTextRenderer.h;
- path = WebCoreSupport.subproj/IFTextRenderer.h;
+ name = WebTextRenderer.h;
+ path = WebCoreSupport.subproj/WebTextRenderer.h;
refType = 4;
};
F5B36B420281DF55018635CB = {
isa = PBXFileReference;
- name = IFTextRenderer.m;
- path = WebCoreSupport.subproj/IFTextRenderer.m;
+ name = WebTextRenderer.m;
+ path = WebCoreSupport.subproj/WebTextRenderer.m;
refType = 4;
};
F5B36B430281DF55018635CB = {
@@ -1857,14 +1857,14 @@
};
F5B36B450281DF9C018635CB = {
isa = PBXFileReference;
- name = IFTextRendererFactory.h;
- path = WebCoreSupport.subproj/IFTextRendererFactory.h;
+ name = WebTextRendererFactory.h;
+ path = WebCoreSupport.subproj/WebTextRendererFactory.h;
refType = 4;
};
F5B36B460281DF9C018635CB = {
isa = PBXFileReference;
- name = IFTextRendererFactory.m;
- path = WebCoreSupport.subproj/IFTextRendererFactory.m;
+ name = WebTextRendererFactory.m;
+ path = WebCoreSupport.subproj/WebTextRendererFactory.m;
refType = 4;
};
F5B36B480281DF9C018635CB = {
@@ -1887,12 +1887,12 @@
};
F5B92B820223191D01C1A525 = {
isa = PBXFileReference;
- path = IFWebHistoryPrivate.h;
+ path = WebHistoryPrivate.h;
refType = 4;
};
F5B92B830223191D01C1A525 = {
isa = PBXFileReference;
- path = IFWebHistoryPrivate.m;
+ path = WebHistoryPrivate.m;
refType = 4;
};
F5B92B840223191D01C1A525 = {
@@ -1956,14 +1956,14 @@
};
F5C81E4102994EA401C1A525 = {
isa = PBXFileReference;
- name = IFBookmarkSeparator.h;
- path = Bookmarks.subproj/IFBookmarkSeparator.h;
+ name = WebBookmarkSeparator.h;
+ path = Bookmarks.subproj/WebBookmarkSeparator.h;
refType = 2;
};
F5C81E4202994EA401C1A525 = {
isa = PBXFileReference;
- name = IFBookmarkSeparator.m;
- path = Bookmarks.subproj/IFBookmarkSeparator.m;
+ name = WebBookmarkSeparator.m;
+ path = Bookmarks.subproj/WebBookmarkSeparator.m;
refType = 2;
};
F5C81E4302994EA401C1A525 = {
@@ -1980,8 +1980,8 @@
};
F5D538E802441F2601A80181 = {
isa = PBXFileReference;
- name = IFMainURLHandleClient.h;
- path = WebView.subproj/IFMainURLHandleClient.h;
+ name = WebMainResourceClient.h;
+ path = WebView.subproj/WebMainResourceClient.h;
refType = 2;
};
F5D538EA02441F2601A80181 = {
@@ -1992,8 +1992,8 @@
};
F5D538EC02441FDD01A80181 = {
isa = PBXFileReference;
- name = IFMainURLHandleClient.mm;
- path = WebView.subproj/IFMainURLHandleClient.mm;
+ name = WebMainResourceClient.m;
+ path = WebView.subproj/WebMainResourceClient.m;
refType = 2;
};
F5D538ED02441FDD01A80181 = {
@@ -2004,12 +2004,12 @@
};
F5E0A76E02B8FEE401C1A525 = {
isa = PBXFileReference;
- path = IFURLsWithTitles.h;
+ path = WebURLsWithTitles.h;
refType = 4;
};
F5E0A76F02B8FEE401C1A525 = {
isa = PBXFileReference;
- path = IFURLsWithTitles.m;
+ path = WebURLsWithTitles.m;
refType = 4;
};
F5E0A77002B8FEE401C1A525 = {
@@ -2029,14 +2029,14 @@
};
F5E0E10802BC45F8018635CA = {
isa = PBXFileReference;
- name = IFResourceURLHandleClient.h;
- path = WebCoreSupport.subproj/IFResourceURLHandleClient.h;
+ name = WebSubresourceClient.h;
+ path = WebCoreSupport.subproj/WebSubresourceClient.h;
refType = 4;
};
F5E0E10902BC45F8018635CA = {
isa = PBXFileReference;
- name = IFResourceURLHandleClient.m;
- path = WebCoreSupport.subproj/IFResourceURLHandleClient.m;
+ name = WebSubresourceClient.m;
+ path = WebCoreSupport.subproj/WebSubresourceClient.m;
refType = 4;
};
F5E0E10A02BC45F8018635CA = {
@@ -2074,14 +2074,14 @@
};
F5EBC45502134BC301CA1520 = {
isa = PBXFileReference;
- name = IFPluginView.h;
- path = Plugins.subproj/IFPluginView.h;
+ name = WebPluginView.h;
+ path = Plugins.subproj/WebPluginView.h;
refType = 4;
};
F5EBC45602134BC301CA1520 = {
isa = PBXFileReference;
- name = IFPluginView.mm;
- path = Plugins.subproj/IFPluginView.mm;
+ name = WebPluginView.m;
+ path = Plugins.subproj/WebPluginView.m;
refType = 4;
};
F5EBC45802134BC301CA1520 = {
@@ -2098,26 +2098,26 @@
};
F5F7171E0288493C018635CA = {
isa = PBXFileReference;
- name = IFPlugin.h;
- path = Plugins.subproj/IFPlugin.h;
+ name = WebPlugin.h;
+ path = Plugins.subproj/WebPlugin.h;
refType = 4;
};
F5F7171F0288493C018635CA = {
isa = PBXFileReference;
- name = IFPlugin.m;
- path = Plugins.subproj/IFPlugin.m;
+ name = WebPlugin.m;
+ path = Plugins.subproj/WebPlugin.m;
refType = 4;
};
F5F717200288493C018635CA = {
isa = PBXFileReference;
- name = IFPluginDatabase.h;
- path = Plugins.subproj/IFPluginDatabase.h;
+ name = WebPluginDatabase.h;
+ path = Plugins.subproj/WebPluginDatabase.h;
refType = 4;
};
F5F717210288493C018635CA = {
isa = PBXFileReference;
- name = IFPluginDatabase.m;
- path = Plugins.subproj/IFPluginDatabase.m;
+ name = WebPluginDatabase.m;
+ path = Plugins.subproj/WebPluginDatabase.m;
refType = 4;
};
F5F717220288493C018635CA = {
@@ -2178,14 +2178,14 @@
};
F5F7174C02885C5B018635CA = {
isa = PBXFileReference;
- name = IFWebCoreViewFactory.h;
- path = WebCoreSupport.subproj/IFWebCoreViewFactory.h;
+ name = WebViewFactory.h;
+ path = WebCoreSupport.subproj/WebViewFactory.h;
refType = 4;
};
F5F7174D02885C5B018635CA = {
isa = PBXFileReference;
- name = IFWebCoreViewFactory.m;
- path = WebCoreSupport.subproj/IFWebCoreViewFactory.m;
+ name = WebViewFactory.m;
+ path = WebCoreSupport.subproj/WebViewFactory.m;
refType = 4;
};
F5F7174E02885C5B018635CA = {
@@ -2202,14 +2202,14 @@
};
F5F81C3502B67C0F018635CA = {
isa = PBXFileReference;
- name = IFDOMNode.h;
- path = WebView.subproj/IFDOMNode.h;
+ name = WebDOMNode.h;
+ path = WebView.subproj/WebDOMNode.h;
refType = 4;
};
F5F81C3602B67C0F018635CA = {
isa = PBXFileReference;
- name = IFDOMNode.mm;
- path = WebView.subproj/IFDOMNode.mm;
+ name = WebDOMNode.m;
+ path = WebView.subproj/WebDOMNode.m;
refType = 4;
};
F5F81C3702B67C0F018635CA = {
@@ -2229,14 +2229,14 @@
};
F5F81C3902B67C26018635CA = {
isa = PBXFileReference;
- name = IFRenderNode.h;
- path = WebView.subproj/IFRenderNode.h;
+ name = WebRenderNode.h;
+ path = WebView.subproj/WebRenderNode.h;
refType = 4;
};
F5F81C3A02B67C26018635CA = {
isa = PBXFileReference;
- name = IFRenderNode.mm;
- path = WebView.subproj/IFRenderNode.mm;
+ name = WebRenderNode.m;
+ path = WebView.subproj/WebRenderNode.m;
refType = 4;
};
F5F81C3B02B67C26018635CA = {
@@ -2256,14 +2256,14 @@
};
F5FBAB8F02B88CBF01FF6074 = {
isa = PBXFileReference;
- name = IFDownloadHandler.h;
- path = Misc.subproj/IFDownloadHandler.h;
+ name = WebDownloadHandler.h;
+ path = Misc.subproj/WebDownloadHandler.h;
refType = 4;
};
F5FBAB9002B88CBF01FF6074 = {
isa = PBXFileReference;
- name = IFDownloadHandler.mm;
- path = Misc.subproj/IFDownloadHandler.mm;
+ name = WebDownloadHandler.m;
+ path = Misc.subproj/WebDownloadHandler.m;
refType = 4;
};
F5FBAB9102B88CBF01FF6074 = {
@@ -2317,14 +2317,14 @@
};
F83DCC71029D09F301000131 = {
isa = PBXFileReference;
- name = IFPanelAuthenticationHandler.h;
- path = Panels.subproj/IFPanelAuthenticationHandler.h;
+ name = WebPanelAuthenticationHandler.h;
+ path = Panels.subproj/WebPanelAuthenticationHandler.h;
refType = 4;
};
F83DCC72029D09F301000131 = {
isa = PBXFileReference;
- name = IFPanelAuthenticationHandler.m;
- path = Panels.subproj/IFPanelAuthenticationHandler.m;
+ name = WebPanelAuthenticationHandler.m;
+ path = Panels.subproj/WebPanelAuthenticationHandler.m;
refType = 4;
};
F83DCC73029D09F301000131 = {
@@ -2361,26 +2361,26 @@
};
F8CA15B5029A39D901000122 = {
isa = PBXFileReference;
- name = IFAuthenticationPanel.h;
- path = Panels.subproj/IFAuthenticationPanel.h;
+ name = WebAuthenticationPanel.h;
+ path = Panels.subproj/WebAuthenticationPanel.h;
refType = 4;
};
F8CA15B6029A39D901000122 = {
isa = PBXFileReference;
- name = IFAuthenticationPanel.m;
- path = Panels.subproj/IFAuthenticationPanel.m;
+ name = WebAuthenticationPanel.m;
+ path = Panels.subproj/WebAuthenticationPanel.m;
refType = 4;
};
F8CA15B7029A39D901000122 = {
isa = PBXFileReference;
- name = IFStandardPanels.h;
- path = Panels.subproj/IFStandardPanels.h;
+ name = WebStandardPanels.h;
+ path = Panels.subproj/WebStandardPanels.h;
refType = 4;
};
F8CA15B8029A39D901000122 = {
isa = PBXFileReference;
- name = IFStandardPanels.m;
- path = Panels.subproj/IFStandardPanels.m;
+ name = WebStandardPanels.m;
+ path = Panels.subproj/WebStandardPanels.m;
refType = 4;
};
F8CA15B9029A39D901000122 = {
@@ -2415,14 +2415,14 @@
F8CA15BF029A39FC01000122,
);
isa = PBXVariantGroup;
- name = IFAuthenticationPanel.nib;
+ name = WebAuthenticationPanel.nib;
path = "";
refType = 4;
};
F8CA15BF029A39FC01000122 = {
isa = PBXFileReference;
name = English;
- path = Panels.subproj/English.lproj/IFAuthenticationPanel.nib;
+ path = Panels.subproj/English.lproj/WebAuthenticationPanel.nib;
refType = 4;
};
F8CA15C0029A39FC01000122 = {
@@ -2433,8 +2433,8 @@
};
F8CA15C1029A3E0D01000122 = {
isa = PBXFileReference;
- name = IFStandardPanelsPrivate.h;
- path = Panels.subproj/IFStandardPanelsPrivate.h;
+ name = WebStandardPanelsPrivate.h;
+ path = Panels.subproj/WebStandardPanelsPrivate.h;
refType = 4;
};
F8CA15C2029A3E0D01000122 = {
diff --git a/WebKit/WebView.subproj/IFDOMNode.h b/WebKit/WebView.subproj/IFDOMNode.h
deleted file mode 100644
index fb0cee4..0000000
--- a/WebKit/WebView.subproj/IFDOMNode.h
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// IFDOMNode.h
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at class IFWebView;
-
- at interface IFDOMNode : NSObject
-{
- NSArray *children;
- NSString *name;
- NSString *value;
- NSString *source;
-}
-
-- initWithWebView:(IFWebView *)view;
-
-- (NSArray *)children;
-- (NSString *)name;
-- (NSString *)value;
-- (NSString *)source;
-
- at end
diff --git a/WebKit/WebView.subproj/IFDOMNode.mm b/WebKit/WebView.subproj/IFDOMNode.mm
deleted file mode 100644
index 73d412b..0000000
--- a/WebKit/WebView.subproj/IFDOMNode.mm
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// IFDOMNode.m
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFDOMNode.h"
-
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-
- at interface WebKitDOMTreeCopier : NSObject <WebCoreDOMTreeCopier>
- at end
-
- at implementation IFDOMNode
-
-- initWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
-{
- [super init];
-
- children = [c copy];
- name = [n copy];
- value = [v copy];
- source = [s copy];
-
- return self;
-}
-
-- initWithWebView:(IFWebView *)view
-{
- WebKitDOMTreeCopier *copier;
-
- [self dealloc];
-
- if (![[view documentView] isMemberOfClass:[IFHTMLView class]]) {
- return nil;
- }
-
- copier = [[WebKitDOMTreeCopier alloc] init];
- IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
- self = [[[htmlView _bridge] copyDOMTree:copier] retain];
- [copier release];
-
- return self;
-}
-
-- (void)dealloc
-{
- [children release];
- [name release];
- [value release];
- [source release];
-
- [super dealloc];
-}
-
-- (NSArray *)children
-{
- return children;
-}
-
-- (NSString *)name
-{
- return name;
-}
-
-- (NSString *)value
-{
- return value;
-}
-
-- (NSString *)source
-{
- return source;
-}
-
- at end
-
- at implementation WebKitDOMTreeCopier
-
-- (NSObject *)nodeWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
-{
- return [[[IFDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFDocument.h b/WebKit/WebView.subproj/IFDocument.h
deleted file mode 100644
index 5a2c3df..0000000
--- a/WebKit/WebView.subproj/IFDocument.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- IFDocument.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class IFWebDataSource;
- at class IFError;
-
- at protocol IFDocumentView <NSObject>
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
-- (void)layout;
- at end
-
- at protocol IFDocumentDragSettings
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
- at end
-
- at protocol IFDocumentSearching
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
- at end
-
- at protocol IFDocumentRepresentation <NSObject>
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h b/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
deleted file mode 100644
index 7266e5a..0000000
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// IFDynamicScrollBarsView.h
-// WebKit
-//
-// Created by John Sullivan on Tue Jan 22 2002.
-// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-#import <WebCore/WebCoreFrameView.h>
-
-// FIXME 2980779: This has grown to be more than just a dynamic scroll bar view,
-// and it no longer works outside of WebKit.
-
- at interface IFDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
-{
- NSCursor *cursor;
- BOOL disallowsScrolling;
-}
-
-- (void)setAllowsScrolling:(BOOL)flag;
-- (BOOL)allowsScrolling;
-
- at end
diff --git a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m b/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
deleted file mode 100644
index f733c69..0000000
--- a/WebKit/WebView.subproj/IFDynamicScrollBarsView.m
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// IFDynamicScrollBarsView.m
-// WebKit
-//
-// Created by John Sullivan on Tue Jan 22 2002.
-// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/IFDynamicScrollBarsView.h>
-
- at implementation IFDynamicScrollBarsView
-
-- (void)updateScrollers
-{
- BOOL scrollsVertically;
- BOOL scrollsHorizontally;
-
- if (disallowsScrolling) {
- scrollsVertically = NO;
- scrollsHorizontally = NO;
- } else {
- NSSize documentSize = [[self documentView] frame].size;
- NSSize frameSize = [self frame].size;
-
- scrollsVertically = documentSize.height > frameSize.height;
- if (scrollsVertically)
- scrollsHorizontally = documentSize.width + [NSScroller scrollerWidth] > frameSize.width;
- else {
- scrollsHorizontally = documentSize.width > frameSize.width;
- if (scrollsHorizontally)
- scrollsVertically = documentSize.height + [NSScroller scrollerWidth] > frameSize.height;
- }
- }
-
- [self setHasVerticalScroller:scrollsVertically];
- [self setHasHorizontalScroller:scrollsHorizontally];
-}
-
-// Make the horizontal and vertical scroll bars come and go as needed.
-- (void)reflectScrolledClipView:(NSClipView *)clipView
-{
- if (clipView == [self contentView]) {
- // FIXME: This hack here prevents infinite recursion that takes place when we
- // gyrate between having a vertical scroller and not having one. A reproducible
- // case is clicking on the "the Policy Routing text" link at
- // http://www.linuxpowered.com/archive/howto/Net-HOWTO-8.html.
- // The underlying cause is some problem in the NSText machinery, but I was not
- // able to pin it down.
- static BOOL inUpdateScrollers;
- if (!inUpdateScrollers) {
- inUpdateScrollers = YES;
- [self updateScrollers];
- inUpdateScrollers = NO;
- }
- }
- [super reflectScrolledClipView:clipView];
-}
-
-- (void)setCursor:(NSCursor *)cur
-{
- // Do nothing for cases where the cursor isn't changing.
- // Also turn arrowCursor into nil.
- if (!cur) {
- if (!cursor) {
- return;
- }
- } else {
- if ([cur isEqual:[NSCursor arrowCursor]]) {
- cur = nil;
- } else if (cursor && [cursor isEqual:cur]) {
- return;
- }
- }
-
- [cursor release];
- cursor = [cur retain];
-
- // We have to make both of these calls, because:
- // - Just setting a cursor rect will have no effect, if the mouse cursor is already
- // inside the area of the rect.
- // - Just calling invalidateCursorRectsForView will not call resetCursorRects if
- // there is no cursor rect set currently and the view has no subviews.
- // Therefore we have to call resetCursorRects to ensure that a cursor rect is set
- // at all, if we are going to want one, and then invalidateCursorRectsForView: to
- // call resetCursorRects from the proper context that will actually result in
- // updating the cursor.
- [self resetCursorRects];
- [[self window] invalidateCursorRectsForView:self];
-}
-
-- (void)resetCursorRects
-{
- [self discardCursorRects];
- if (cursor) {
- [self addCursorRect:[self visibleRect] cursor:cursor];
- }
-}
-
-- (void)setAllowsScrolling:(BOOL)flag
-{
- disallowsScrolling = !flag;
- [self updateScrollers];
-}
-
-- (BOOL)allowsScrolling
-{
- return !disallowsScrolling;
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLRepresentation.h b/WebKit/WebView.subproj/IFHTMLRepresentation.h
deleted file mode 100644
index fe40df8..0000000
--- a/WebKit/WebView.subproj/IFHTMLRepresentation.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- IFHTMLRepresentation.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFError;
- at class IFWebDataSource;
-
- at protocol IFDocumentRepresentation;
-
- at class IFHTMLRepresentationPrivate;
-
- at interface IFHTMLRepresentation : NSObject <IFDocumentRepresentation>
-{
- IFHTMLRepresentationPrivate *_private;
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLRepresentation.mm b/WebKit/WebView.subproj/IFHTMLRepresentation.mm
deleted file mode 100644
index 5479b3f..0000000
--- a/WebKit/WebView.subproj/IFHTMLRepresentation.mm
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- IFHTMLRepresentation.mm
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebCoreBridge.h>
-
- at interface IFHTMLRepresentationPrivate : NSObject
-{
- at public
- IFWebCoreBridge *bridge;
-}
- at end
-
- at implementation IFHTMLRepresentationPrivate
- at end
-
- at implementation IFHTMLRepresentation
-
-- init
-{
- [super init];
-
- _private = [[IFHTMLRepresentationPrivate alloc] init];
- _private->bridge = [[IFWebCoreBridge alloc] init];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_private->bridge release];
- [_private release];
-
- [super dealloc];
-}
-
-- (IFWebCoreBridge *)_bridge
-{
- return _private->bridge;
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
-{
- [_private->bridge receivedData:data withDataSource:dataSource];
-}
-
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLRepresentationPrivate.h b/WebKit/WebView.subproj/IFHTMLRepresentationPrivate.h
deleted file mode 100644
index ff9d874..0000000
--- a/WebKit/WebView.subproj/IFHTMLRepresentationPrivate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- IFHTMLRepresentationPrivate.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFHTMLRepresentation.h>
-
- at class IFWebCoreBridge;
-
- at interface IFHTMLRepresentation (IFPrivate)
-- (IFWebCoreBridge *)_bridge;
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLView.h b/WebKit/WebView.subproj/IFHTMLView.h
deleted file mode 100644
index ddf0dc5..0000000
--- a/WebKit/WebView.subproj/IFHTMLView.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- IFHTMLView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Private header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-/*
- =============================================================================
-*/
-
- at class IFWebDataSource;
- at class IFWebController;
- at class IFHTMLViewPrivate;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
- at protocol IFDocumentSearching;
-
- at interface IFHTMLView : NSView <IFDocumentLoading, IFDocumentDragSettings, IFDocumentSearching>
-{
- at private
- IFHTMLViewPrivate *_private;
-}
-
-- initWithFrame: (NSRect)frame;
-
-// These methods is typically called by the view's controller when
-// the data source is changed.
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
-
-- (void)setNeedsLayout: (bool)flag;
-
-// This method should not be public until we have a more completely
-// understood way to subclass IFWebView.
-- (void)layout;
-
-// Set needsToApplyStyles if you change anything that might impact styles, like
-// font preferences.
-- (void)setNeedsToApplyStyles: (bool)flag;
-
-// Reapplies style information to the document. This should not be called directly,
-// instead call setNeedsToApplyStyles:.
-- (void)reapplyStyles;
-
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations;
-
-// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
-
-// Returns an array of built-in context menu items for this node.
-// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *);
-#endif
-- (void)setContextMenusEnabled: (BOOL)flag;
-- (BOOL)contextMenusEnabled;
-
-// Remove the selection.
-- (void)deselectText;
-
-// Search from the end of the currently selected location, or from the beginning of the document if nothing
-// is selected.
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
-
-// Get an attributed string that represents the current selection.
-- (NSAttributedString *)selectedText;
-
- at end
-
-/*
- Areas still to consider:
-
- ALT image text and link URLs
- Should this be built-in? or able to be overriden?
-
- node events
-
- client access to form elements for auto-completion, passwords
-
- selection
- Selection on data source is reflected in view.
- Does the view also need a cover selection API?
-
- subclassing of IFWebView
-*/
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
deleted file mode 100644
index 37bd00d..0000000
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- IFHTMLView.mm
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFHTMLView.h>
-
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/WebKitDebug.h>
-
-// Needed for the mouse moved notification.
-#import <AppKit/NSResponder_Private.h>
-
- at implementation IFHTMLView
-
-- initWithFrame: (NSRect) frame
-{
- [super initWithFrame: frame];
-
- _private = [[IFHTMLViewPrivate alloc] init];
-
- _private->needsLayout = YES;
-
- _private->canDragTo = YES;
- _private->canDragFrom = YES;
-
- // We added add/remove this view as a mouse moved observer when its window becomes/resigns main.
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowDidBecomeMain:) name: NSWindowDidBecomeMainNotification object: nil];
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowDidResignMain:) name: NSWindowDidResignMainNotification object: nil];
-
- // Add this view initially as a mouse move observer. Subsequently we will add/remove this view
- // when the window becomes/resigns main.
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
-
- return self;
-}
-
-- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
-{
- SEL action = [item action];
- if (action == @selector(copy:)) {
- return [[[self _bridge] selectedText] length] != 0;
- }
- return YES;
-}
-
-
-- (void)copy:(id)sender
-{
- IFWebCoreBridge *bridge = [self _bridge];
- NSPasteboard *pboard = [NSPasteboard generalPasteboard];
-
- [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
- [pboard setString:[bridge selectedText] forType:NSStringPboardType];
-}
-
-
-- (void)selectAll: sender
-{
- IFWebCoreBridge *bridge = [self _bridge];
- [bridge selectAll];
-}
-
-
-- (void)dealloc
-{
- [self _reset];
- [[NSNotificationCenter defaultCenter] removeObserver: self];
- [_private release];
- [super dealloc];
-}
-
-
-- (BOOL)acceptsFirstResponder
-{
- return YES;
-}
-
-
-- (void)removeNotifications
-{
- [[NSNotificationCenter defaultCenter] removeObserver: self name: NSMouseMovedNotification object: nil];
- [[NSNotificationCenter defaultCenter] removeObserver: self name: NSWindowDidResignMainNotification object: nil];
- [[NSNotificationCenter defaultCenter] removeObserver: self name: NSWindowDidResignMainNotification object: nil];
-}
-
-
-- (void)viewDidMoveToWindow
-{
- if ([self window]) {
- _private->inWindow = YES;
- } else {
- // Reset when we are moved out of a window after being moved into one.
- // Without this check, we reset ourselves before we even start.
- // This is only needed because viewDidMoveToWindow is called even when
- // the window is not changing (bug in AppKit).
- if (_private->inWindow) {
- [self removeNotifications];
- [self _reset];
- _private->inWindow = NO;
- }
- }
- [super viewDidMoveToWindow];
-}
-
-
-// This method is typically called by the view's controller when
-// the data source is changed.
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
-{
- [[dataSource _bridge]
- createKHTMLViewWithNSView:[[[dataSource webFrame] webView] documentView]
- width:(int)[self frame].size.width height:(int)[self frame].size.height
- marginWidth:[[[dataSource webFrame] webView] _marginWidth]
- marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
-}
-
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
-{
- [[self _bridge] installInFrame:[[self _IF_parentWebView] frameScrollView]];
-}
-
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
-{
-}
-
-- (void)reapplyStyles
-{
- if (!_private->needsToApplyStyles) {
- return;
- }
-
-#ifdef _KWQ_TIMING
- double start = CFAbsoluteTimeGetCurrent();
-#endif
-
- [[self _bridge] reapplyStyles];
-
-#ifdef _KWQ_TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_TIMING, "%s apply style seconds = %f\n", [self URL], thisTime);
-#endif
-
- _private->needsToApplyStyles = NO;
-}
-
-
-// This method should not be public until we have more completely
-// understood how IFWebView will be subclassed.
-- (void)layout
-{
- // Ensure that we will receive mouse move events. Is this the best place to put this?
- [[self window] setAcceptsMouseMovedEvents: YES];
- [[self window] _setShouldPostEventNotifications: YES];
-
- if (!_private->needsLayout) {
- return;
- }
-
-#ifdef _KWQ_TIMING
- double start = CFAbsoluteTimeGetCurrent();
-#endif
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_VIEW, "%s doing layout\n", DEBUG_OBJECT(self));
- [[self _bridge] forceLayout];
- _private->needsLayout = NO;
-
-#ifdef _KWQ_TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL(WEBKIT_LOG_TIMING, "%s layout seconds = %f\n", [self URL], thisTime);
-#endif
-}
-
-
-// Stop animating animated GIFs, etc.
-- (void)stopAnimations
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::stopAnimations is not implemented"];
-}
-
-
-// Drag and drop links and images. Others?
-- (void)setCanDragFrom: (BOOL)flag
-{
- _private->canDragFrom = flag;
-}
-
-- (BOOL)canDragFrom
-{
- return _private->canDragFrom;
-}
-
-- (void)setCanDragTo: (BOOL)flag
-{
- _private->canDragTo = flag;
-}
-
-- (BOOL)canDragTo
-{
- return _private->canDragTo;
-}
-
-// Returns an array of built-in context menu items for this node.
-// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
-#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *)
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::defaultContextMenuItemsForNode: is not implemented"];
- return nil;
-}
-#endif
-
-- (void)setContextMenusEnabled: (BOOL)flag
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setContextMenusEnabled: is not implemented"];
-}
-
-
-- (BOOL)contextMenusEnabled;
-{
- return NO;
-}
-
-
-// Remove the selection.
-- (void)deselectText
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::deselectText: is not implemented"];
-}
-
-
-
-// Search from the end of the currently selected location, or from the beginning of the document if nothing
-// is selected.
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::searchFor:direction:caseSensitive: is not implemented"];
-}
-
-
-// Get an attributed string that represents the current selection.
-- (NSAttributedString *)selectedText
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::selectedText is not implemented"];
- return nil;
-}
-
-
-- (BOOL)isOpaque
-{
- return YES;
-}
-
-
-- (void)setNeedsDisplay:(BOOL)flag
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s flag = %d\n", DEBUG_OBJECT(self), (int)flag);
- [super setNeedsDisplay: flag];
-}
-
-
-- (void)setNeedsLayout: (bool)flag
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s flag = %d\n", DEBUG_OBJECT(self), (int)flag);
- _private->needsLayout = flag;
-}
-
-
-- (void)setNeedsToApplyStyles: (bool)flag
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s flag = %d\n", DEBUG_OBJECT(self), (int)flag);
- _private->needsToApplyStyles = flag;
-}
-
-
-// This should eventually be removed.
-- (void)drawRect:(NSRect)rect
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_VIEW, "%s drawing\n", DEBUG_OBJECT(self));
-
- [self reapplyStyles];
-
- [self layout];
-
-#ifdef _KWQ_TIMING
- double start = CFAbsoluteTimeGetCurrent();
-#endif
-
- [self lockFocus];
-
- //double start = CFAbsoluteTimeGetCurrent();
- [[self _bridge] drawRect:rect];
- //WebKitDebugAtLevel (WEBKIT_LOG_TIMING, "draw time %e\n", CFAbsoluteTimeGetCurrent() - start);
-
-#ifdef DEBUG_LAYOUT
- NSRect vframe = [self frame];
- [[NSColor blackColor] set];
- NSBezierPath *path;
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, 0)];
- [path lineToPoint:NSMakePoint(vframe.size.width, vframe.size.height)];
- [path closePath];
- [path stroke];
- path = [NSBezierPath bezierPath];
- [path setLineWidth:(float)0.1];
- [path moveToPoint:NSMakePoint(0, vframe.size.height)];
- [path lineToPoint:NSMakePoint(vframe.size.width, 0)];
- [path closePath];
- [path stroke];
-#endif
-
- [self unlockFocus];
-
-#ifdef _KWQ_TIMING
- double thisTime = CFAbsoluteTimeGetCurrent() - start;
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s draw seconds = %f\n", widget->part()->baseURL().url().latin1(), thisTime);
-#endif
-}
-
-- (BOOL)isFlipped
-{
- return YES;
-}
-
-
-- (void)windowDidBecomeMain: (NSNotification *)notification
-{
- if ([notification object] == [self window])
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mouseMovedNotification:) name: NSMouseMovedNotification object: nil];
-}
-
-
-- (void)windowDidResignMain: (NSNotification *)notification
-{
- if ([notification object] == [self window])
- [[NSNotificationCenter defaultCenter] removeObserver: self name: NSMouseMovedNotification object: nil];
-}
-
-- (void)mouseUp: (NSEvent *)event
-{
- [[self _bridge] mouseUp:event];
-}
-
-- (void)mouseDown: (NSEvent *)event
-{
- [[self _bridge] mouseDown:event];
-}
-
-- (void)mouseMovedNotification:(NSNotification *)notification
-{
- // Only act on the mouse move event if it's inside this view (and not inside a subview).
- NSEvent *event = [[notification userInfo] objectForKey:@"NSEvent"];
- if ([event window] == [self window] && [[self window] isMainWindow]
- && [[[self window] contentView] hitTest:[event locationInWindow]] == self) {
- [[self _bridge] mouseMoved:event];
- }
-}
-
-- (void)mouseDragged:(NSEvent *)event
-{
- [self autoscroll:event];
- [[self _bridge] mouseDragged:event];
-}
-
-#if 0
-
-// Why don't we call KHTMLView's keyPressEvent/keyReleaseEvent?
-// Because we currently don't benefit from any of the code in there.
-
-// It implements its own version of keyboard scrolling, but we have our
-// version in IFWebView. It implements some keyboard access to individual
-// nodes, but we are probably going to handle that on the NSView side.
-// We already handle normal typing through the responder chain.
-
-// One of the benefits of not calling through to KHTMLView is that we don't
-// have to have the isScrollEvent function at all.
-
-- (void)keyDown: (NSEvent *)event
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyDown: %s\n", DEBUG_OBJECT(event));
- int state = 0;
-
- // FIXME: We don't want to call keyPressEvent for scrolling key events,
- // so we have to have some logic for deciding which events go to the KHTMLView.
- // Best option is probably to only pass in certain events that we know it
- // handles in a way we like.
-
- if (passToWidget) {
- [self _addModifiers:[event modifierFlags] toState:&state];
- QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
- KHTMLView *widget = _private->widget;
- if (widget)
- widget->keyPressEvent(&kEvent);
- } else {
- [super keyDown:event];
- }
-}
-
-- (void)keyUp: (NSEvent *)event
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
- int state = 0;
-
- // FIXME: Make sure this logic matches keyDown above.
-
- if (passToWidget) {
- [self _addModifiers:[event modifierFlags] toState:&state];
- QKeyEvent kEvent(QEvent::KeyPress, 0, 0, state, NSSTRING_TO_QSTRING([event characters]), [event isARepeat], 1);
-
- KHTMLView *widget = _private->widget;
- if (widget)
- widget->keyReleaseEvent(&kEvent);
- } else {
- [super keyUp:event];
- }
-}
-
-#endif
-
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.h b/WebKit/WebView.subproj/IFHTMLViewPrivate.h
deleted file mode 100644
index 1ec8d1b..0000000
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* IFHTMLViewPrivate.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- IFHTMLView.
-*/
-
-#import <WebKit/IFHTMLView.h>
-
- at class IFWebCoreBridge;
-
- at interface IFHTMLViewPrivate : NSObject
-{
- at public
- IFWebController *controller;
- BOOL needsLayout;
- BOOL needsToApplyStyles;
- BOOL canDragTo;
- BOOL canDragFrom;
- NSCursor *cursor;
- BOOL liveAllowsScrolling;
- BOOL inWindow;
-}
- at end
-
- at interface IFHTMLView (IFPrivate)
-- (void)_reset;
-- (void)_setController: (IFWebController *)controller;
-- (IFWebCoreBridge *)_bridge;
-- (void)_adjustFrames;
- at end
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm b/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
deleted file mode 100644
index 8a6561b..0000000
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
+++ /dev/null
@@ -1,80 +0,0 @@
-/* IFHTMLViewPrivate.mm
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
-*/
-
-#import <WebKit/IFHTMLViewPrivate.h>
-
-#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-
- at interface NSView (IFHTMLViewPrivate)
-- (void)_IF_stopIfPluginView;
- at end
-
- at implementation NSView (IFHTMLViewPrivate)
-- (void)_IF_stopIfPluginView
-{
- if ([self isKindOfClass:[IFPluginView class]]) {
- IFPluginView *pluginView = (IFPluginView *)self;
- [pluginView stop];
- }
-}
- at end
-
- at implementation IFHTMLViewPrivate
-
-- (void)dealloc
-{
- [cursor release];
-
- [super dealloc];
-}
-
- at end
-
- at implementation IFHTMLView (IFPrivate)
-
-- (void)_adjustFrames
-{
- // Ick! khtml set the frame size during layout and
- // the frame origins during drawing! So we have to
- // layout and do a draw with rendering disabled to
- // correclty adjust the frames.
- [[self _bridge] adjustFrames:[self frame]];
-}
-
-
-- (void)_reset
-{
- NSArray *subviews = [[self subviews] copy];
- [subviews makeObjectsPerformSelector:@selector(_IF_stopIfPluginView)];
- [subviews release];
-
- [IFImageRenderer stopAnimationsInView:self];
-}
-
-- (void)_setController:(IFWebController *)controller
-{
- // Not retained; the controller owns the view.
- _private->controller = controller;
-}
-
-// Required so view can access the part's selection.
-- (IFWebCoreBridge *)_bridge
-{
- IFWebView *webView = [self _IF_parentWebView];
- IFWebFrame *webFrame = [[webView _controller] frameForView:webView];
- return [[webFrame dataSource] _bridge];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFImageRepresentation.h b/WebKit/WebView.subproj/IFImageRepresentation.h
deleted file mode 100644
index 0507b43..0000000
--- a/WebKit/WebView.subproj/IFImageRepresentation.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- IFImageRepresentation.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class IFError;
- at class IFWebDataSource;
- at class IFImageRenderer;
- at protocol IFDocumentRepresentation;
-
- at interface IFImageRepresentation : NSObject <IFDocumentRepresentation>
-{
- IFImageRenderer *image;
-}
-
-- (IFImageRenderer *)image;
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
- at end
diff --git a/WebKit/WebView.subproj/IFImageRepresentation.m b/WebKit/WebView.subproj/IFImageRepresentation.m
deleted file mode 100644
index 79fcc8b..0000000
--- a/WebKit/WebView.subproj/IFImageRepresentation.m
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- IFImageRepresentation.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "IFImageRepresentation.h"
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRendererFactory.h>
-
- at implementation IFImageRepresentation
-
-- init
-{
- self = [super init];
- if (self) {
- //image = [[IFImageRenderer alloc] init];
- }
- return self;
-}
-
-
-- (void)dealloc
-{
- [image release];
- [super dealloc];
-}
-
-- (IFImageRenderer *)image
-{
- return image;
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
-{
- //[image incrementalLoadWithBytes:[data bytes] length:[data length] complete:isComplete];
-}
-
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
-{
- NSData *resourceData = [dataSource data];
- image = [[[IFImageRendererFactory sharedFactory] imageRendererWithBytes:[resourceData bytes]
- length:[resourceData length]] retain];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFImageView.h b/WebKit/WebView.subproj/IFImageView.h
deleted file mode 100644
index e1f78b7..0000000
--- a/WebKit/WebView.subproj/IFImageView.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- IFImageView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class IFImageRepresentation;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
-
- at interface IFImageView : NSView <IFDocumentLoading, IFDocumentDragSettings>
-{
- IFImageRepresentation *representation;
- BOOL canDragFrom;
- BOOL canDragTo;
- BOOL didSetFrame;
-}
- at end
diff --git a/WebKit/WebView.subproj/IFImageView.m b/WebKit/WebView.subproj/IFImageView.m
deleted file mode 100644
index c0fefd8..0000000
--- a/WebKit/WebView.subproj/IFImageView.m
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- IFImageView.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFImageView.h>
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRepresentation.h>
-#import <WebKit/IFWebDataSource.h>
-
- at implementation IFImageView
-
-- (id)initWithFrame:(NSRect)frame
-{
- self = [super initWithFrame:frame];
- if (self) {
- canDragFrom = YES;
- canDragTo = YES;
- }
- return self;
-}
-
-- (void)dealloc
-{
- [[representation image] stopAnimation];
- [representation release];
-
- [super dealloc];
-}
-
-- (BOOL)isFlipped
-{
- return YES;
-}
-
-- (void)drawRect:(NSRect)rect
-{
- [[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
-}
-
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
-{
-}
-
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
-{
- representation = [[dataSource representation] retain];
-}
-
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
-{
-}
-
-- (void)layout
-{
- IFImageRenderer *image = [representation image];
- if (image) {
- [self setFrameSize:[image size]];
- [image setFlipped:YES];
- }
-
-}
-
-- (void)setCanDragFrom: (BOOL)flag
-{
- canDragFrom = flag;
-}
-
-- (BOOL)canDragFrom
-{
- return canDragFrom;
-}
-
-- (void)setCanDragTo: (BOOL)flag
-{
- canDragTo = flag;
-}
-
-- (BOOL)canDragTo
-{
- return canDragTo;
-}
-
-- (void)viewDidMoveToWindow
-{
- if (![self window])
- [[representation image] stopAnimation];
- [super viewDidMoveToWindow];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFLoadProgress.h b/WebKit/WebView.subproj/IFLoadProgress.h
deleted file mode 100644
index af6596e..0000000
--- a/WebKit/WebView.subproj/IFLoadProgress.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- IFLoadProgress.h
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFURLHandle;
-
- at interface IFLoadProgress : NSObject
-{
- int bytesSoFar; // 0 if this is the start of load
- int totalToLoad; // -1 if this is not known.
- // bytesSoFar == totalLoaded when complete
-}
-
-- (id)init; // both -1
-- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total;
-- (id)initWithURLHandle:(IFURLHandle *)handle;
-
-+ (IFLoadProgress *)progress; // both -1
-+ (IFLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total;
-+ (IFLoadProgress *)progressWithURLHandle:(IFURLHandle *)handle;
-
-- (int)bytesSoFar;
-- (int)totalToLoad;
-
- at end
diff --git a/WebKit/WebView.subproj/IFLoadProgress.mm b/WebKit/WebView.subproj/IFLoadProgress.mm
deleted file mode 100644
index 7649ec8..0000000
--- a/WebKit/WebView.subproj/IFLoadProgress.mm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* IFLoadProgress.mm
-
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFLoadProgress.h>
-
-#import <WebFoundation/IFURLHandle.h>
-
- at implementation IFLoadProgress
-
-- (id)init
-{
- return [self initWithBytesSoFar:-1 totalToLoad:-1];
-}
-
-- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total
-{
- if (![super init]) {
- return nil;
- }
-
- bytesSoFar = bytes;
- totalToLoad = total;
-
- return self;
-}
-
-- (id)initWithURLHandle:(IFURLHandle *)handle
-{
- int b = [handle contentLengthReceived];
- int t = [handle statusCode] == IFURLHandleStatusLoadComplete ? b : [handle contentLength];
- return [self initWithBytesSoFar:b totalToLoad:t];
-}
-
-+ (IFLoadProgress *)progress
-{
- return [[[IFLoadProgress alloc] init] autorelease];
-}
-
-+ (IFLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total
-{
- return [[[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:total] autorelease];
-}
-
-+ (IFLoadProgress *)progressWithURLHandle:(IFURLHandle *)handle
-{
- return [[[IFLoadProgress alloc] initWithURLHandle:handle] autorelease];
-}
-
-- (int)bytesSoFar
-{
- return bytesSoFar;
-}
-
-- (int)totalToLoad
-{
- return totalToLoad;
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFLocationChangeHandler.h b/WebKit/WebView.subproj/IFLocationChangeHandler.h
deleted file mode 100644
index c7d5b4c..0000000
--- a/WebKit/WebView.subproj/IFLocationChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- IFLocationChangeHandler.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFError;
- at class IFWebDataSource;
-
-/*
- =============================================================================
-
- IFLocationChangeHandlers track changes to a frames location. This includes
- changes that may result in a download, or a resource being opened externally.
- rather than a change to the frame document.
-
- Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
- method.
-
- A location change that results in changing a frame's document will trigger the
- following messages, sent in order:
-
- - (void)locationChangeStarted;
- - (void)locationChangeCommitted; // Only sent for the IFContentPolicyShow policy.
- - (void)locationChangeDone: (IFError *)error;
-
- None of the IFLocationChangeHandler methods should block for any extended period
- of time.
-
- =============================================================================
-*/
-
- at protocol IFLocationChangeHandler <NSObject>
-
-- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
-
-- (void)locationChangeCommittedForDataSource: (IFWebDataSource *)dataSource;
-
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-
-- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
-
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
-
- at end
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.h b/WebKit/WebView.subproj/IFMainURLHandleClient.h
deleted file mode 100644
index 6ee6adf..0000000
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- IFMainURLHandleClient.h
-
- Private header.
-
- Copyright 2001, 2002 Apple Computer Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFDownloadHandler;
- at class IFWebDataSource;
- at protocol IFURLHandleClient;
- at protocol IFResourceProgressHandler;
-
- at interface IFMainURLHandleClient : NSObject <IFURLHandleClient>
-{
- NSURL *currentURL;
- IFWebDataSource *dataSource;
- BOOL processedBufferedData;
- BOOL isFirstChunk;
- IFDownloadHandler *downloadHandler;
- id <IFResourceProgressHandler> downloadProgressHandler;
-}
-- initWithDataSource:(IFWebDataSource *)dataSource;
-- (IFDownloadHandler *)downloadHandler;
- at end
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
deleted file mode 100644
index 3037599..0000000
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- IFMainURLHandleClient.mm
- Copyright (c) 2001, 2002, Apple Computer, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLHandle.h>
-
-// FIXME: This is quite similar IFResourceURLHandleClient; they should share code.
-
- at implementation IFMainURLHandleClient
-
-- initWithDataSource: (IFWebDataSource *)ds
-{
- self = [super init];
-
- if (self) {
- dataSource = [ds retain];
- isFirstChunk = YES;
- }
-
- return self;
-}
-
-- (void)didStartLoadingWithURL:(NSURL *)URL
-{
- WEBKIT_ASSERT(currentURL == nil);
- currentURL = [URL retain];
- [[dataSource controller] _didStartLoading:currentURL];
-}
-
-- (void)didStopLoading
-{
- WEBKIT_ASSERT(currentURL != nil);
- [[dataSource controller] _didStopLoading:currentURL];
- [currentURL release];
- currentURL = nil;
-}
-
-- (void)dealloc
-{
- WEBKIT_ASSERT(currentURL == nil);
- WEBKIT_ASSERT(downloadHandler == nil);
-
- [downloadProgressHandler release];
- [dataSource release];
-
- [super dealloc];
-}
-
-- (IFDownloadHandler *)downloadHandler
-{
- return downloadHandler;
-}
-
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
-{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
-
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
- if (isComplete) {
- [dataSource _setPrimaryLoadComplete:YES];
- }
- [downloadProgressHandler receivedProgress:progress forResourceHandle:handle
- fromDataSource:dataSource complete:isComplete];
- } else {
- [[dataSource controller] _mainReceivedProgress:progress forResourceHandle:handle
- fromDataSource:dataSource complete:isComplete];
- }
-}
-
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
-{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
-
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
- [downloadProgressHandler receivedError:error forResourceHandle:handle
- partialProgress:progress fromDataSource:dataSource];
- } else {
- [[dataSource controller] _mainReceivedError:error forResourceHandle:handle
- partialProgress:progress fromDataSource:dataSource];
- }
-}
-
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
-
- [self didStartLoadingWithURL:[handle url]];
-}
-
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
-{
- IFError *error;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
-
- // FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
- [self receivedError:error forHandle:handle];
- [error release];
-
- [downloadHandler release];
- downloadHandler = nil;
-
- [self didStopLoading];
-}
-
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
-
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
- WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
-
- // Don't retain data for downloaded files
- if([dataSource contentPolicy] != IFContentPolicySave &&
- [dataSource contentPolicy] != IFContentPolicySaveAndOpenExternally){
- [dataSource _setResourceData:data];
- }
-
- if([dataSource contentPolicy] == IFContentPolicyShow)
- [[dataSource representation] finishedLoadingWithDataSource:dataSource];
-
- // Either send a final error message or a final progress message.
- IFError *nonTerminalError = [handle error];
- if (nonTerminalError){
- [self receivedError:nonTerminalError forHandle:handle];
- }
- else {
- [self receivedProgressWithHandle:handle complete:YES];
- }
-
- [downloadHandler finishedLoading];
- [downloadHandler release];
- downloadHandler = nil;
-
- [self didStopLoading];
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
-{
- IFWebController *controller = [dataSource controller];
- NSString *contentType = [handle contentType];
- IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame webView];
-
- NSData *data = nil;
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, data = %p, length %d\n", DEBUG_OBJECT([handle url]), incomingData, [incomingData length]);
-
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-
- // Check the mime type and ask the client for the content policy.
- if(isFirstChunk){
-
- // Make assumption that if the contentType is the default
- // and there is no extension, this is text/html
- if([contentType isEqualToString:IFDefaultMIMEType] && [[[currentURL path] pathExtension] isEqualToString:@""])
- contentType = @"text/html";
-
- [dataSource _setContentType:contentType];
- [dataSource _setEncoding:[handle characterSet]];
-
- // retain the downloadProgressHandler just in case this is a download.
- // Alexander releases the IFWebController if no window is created for it.
- // This happens in the cases mentioned in 2981866 and 2965312.
- downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
-
- [[controller policyHandler] requestContentPolicyForMIMEType:contentType dataSource:dataSource];
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
- }
-
- IFContentPolicy contentPolicy = [dataSource contentPolicy];
-
- if(contentPolicy != IFContentPolicyNone){
- if(!processedBufferedData){
- // Process all data that has been received now that we have a content policy
- // and don't call resourceData if this is the first chunk since resourceData is a copy
- if(isFirstChunk){
- data = incomingData;
- }else{
- data = [handle resourceData];
- }
- processedBufferedData = YES;
- }else{
- data = incomingData;
- }
- }
-
- if(contentPolicy == IFContentPolicyShow){
- [[dataSource representation] receivedData:data withDataSource:dataSource];
- [[view documentView] dataSourceUpdated:dataSource];
- }
- else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
- if(!downloadHandler){
- [frame _setProvisionalDataSource:nil];
- [[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
- downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
- }
- [downloadHandler receivedData:data];
- }
- else if(contentPolicy == IFContentPolicyIgnore){
- [handle cancelLoadInBackground];
- [frame _setProvisionalDataSource:nil];
- [[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
- }
- else{
- [NSException raise:NSInvalidArgumentException format:
- @"haveContentPolicy: andPath:path forDataSource: set an invalid content policy."];
- }
-
- [self receivedProgressWithHandle:handle complete:NO];
-
- WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "%d of %d", [handle contentLengthReceived], [handle contentLength]);
- isFirstChunk = NO;
-}
-
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
-
- WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
-
- [self receivedError:result forHandle:handle];
-
- [downloadHandler cancel];
- [downloadHandler release];
- downloadHandler = nil;
-
- [self didStopLoading];
-}
-
-
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
-{
- WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "url = %s\n", DEBUG_OBJECT(URL));
-
- WEBKIT_ASSERT(currentURL != nil);
- WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
-
- [[dataSource _bridge] setURL:URL];
-
- [dataSource _setFinalURL:URL];
-
- [[dataSource _locationChangeHandler] serverRedirectTo:URL forDataSource:dataSource];
-
- [self didStopLoading];
- [self didStartLoadingWithURL:URL];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFPreferences.h b/WebKit/WebView.subproj/IFPreferences.h
deleted file mode 100644
index 961396b..0000000
--- a/WebKit/WebView.subproj/IFPreferences.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- IFPreferences.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at interface IFPreferences: NSObject
-
-+ (IFPreferences *)standardPreferences;
-
-- (NSString *)standardFontFamily;
-- (void)setStandardFontFamily:(NSString *)family;
-
-- (NSString *)fixedFontFamily;
-- (void)setFixedFontFamily:(NSString *)family;
-
-- (NSString *)serifFontFamily;
-- (void)setSerifFontFamily:(NSString *)family;
-
-- (NSString *)sansSerifFontFamily;
-- (void)setSansSerifFontFamily:(NSString *)family;
-
-- (NSString *)cursiveFontFamily;
-- (void)setCursiveFontFamily:(NSString *)family;
-
-- (NSString *)fantasyFontFamily;
-- (void)setFantasyFontFamily:(NSString *)family;
-
-- (int)mediumFontSize;
-- (void)setMediumFontSize:(int)size;
-
-- (int)minimumFontSize;
-- (void)setMinimumFontSize:(int)size;
-
-- (BOOL)javaEnabled;
-- (void)setJavaEnabled:(BOOL)flag;
-
-- (BOOL)javaScriptEnabled;
-- (void)setJavaScriptEnabled:(BOOL)flag;
-
-- (BOOL)javaScriptCanOpenWindowsAutomatically;
-- (void)setJavaScriptCanOpenWindowsAutomatically:(BOOL)flag;
-
-- (BOOL)pluginsEnabled;
-- (void)setPluginsEnabled:(BOOL)flag;
-
-- (BOOL)allowAnimatedImages;
-- (void)setAllowAnimatedImages:(BOOL)flag;
-
-- (BOOL)allowAnimatedImageLooping;
-- (void)setAllowAnimatedImageLooping: (BOOL)flag;
-
- at end
-
-#ifdef READY_FOR_PRIMETIME
-
-/*
- =============================================================================
-
- Here is some not-yet-implemented API that we might want to get around to.
- Someday we might have preferences on a per-URL basis.
-*/
-
-+ getPreferencesForURL: (NSURL *)url;
-
-// Encoding that will be used in none specified on page? or in header?
-+ setEncoding: (NSString *)encoding;
-+ (NSString *)encoding;
-
-// Document refreshes allowed
-- setRefreshEnabled: (BOOL)flag;
-- (BOOL)refreshEnabled;
-
-// Should images be loaded.
-- (void)setAutoloadImages: (BOOL)flag;
-- (BOOL)autoloadImages;
-
-/*
- Specify whether only local references ( stylesheets, images, scripts, subdocuments )
- should be loaded. ( default false - everything is loaded, if the more specific
- options allow )
- This is carried over from KDE.
-*/
-- (void)setOnlyLocalReferences: (BOOL)flag;
-- (BOOL)onlyLocalReferences;
-
-#endif
diff --git a/WebKit/WebView.subproj/IFPreferences.mm b/WebKit/WebView.subproj/IFPreferences.mm
deleted file mode 100644
index f60c4e9..0000000
--- a/WebKit/WebView.subproj/IFPreferences.mm
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- IFPreferences.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-#import "IFPreferences.h"
-
-#import <WebKit/WebKitDebug.h>
-
-// These are private because callers should be using the cover methods
-#define WebKitLogLevelPreferenceKey @"WebKitLogLevel"
-#define WebKitStandardFontPreferenceKey @"WebKitStandardFont"
-#define WebKitFixedFontPreferenceKey @"WebKitFixedFont"
-#define WebKitSerifFontPreferenceKey @"WebKitSerifFont"
-#define WebKitSansSerifFontPreferenceKey @"WebKitSansSerifFont"
-#define WebKitCursiveFontPreferenceKey @"WebKitCursiveFont"
-#define WebKitFantasyFontPreferenceKey @"WebKitFantasyFont"
-#define WebKitMinimumFontSizePreferenceKey @"WebKitMinimumFontSize"
-#define WebKitMediumFontSizePreferenceKey @"WebKitMediumFontSize"
-#define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
-#define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
-#define WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey @"WebKitJavaScriptCanOpenWindowsAutomatically"
-#define WebKitPluginsEnabledPreferenceKey @"WebKitPluginsEnabled"
-#define WebKitInitialTimedLayoutDelayPreferenceKey @"WebKitInitialTimedLayoutDelay"
-#define WebKitInitialTimedLayoutSizePreferenceKey @"WebKitInitialTimedLayoutSize"
-#define WebKitInitialTimedLayoutEnabledPreferenceKey @"WebKitInitialTimedLayoutEnabled"
-#define WebKitResourceTimedLayoutEnabledPreferenceKey @"WebKitResourceTimedLayoutEnabled"
-#define WebKitResourceTimedLayoutDelayPreferenceKey @"WebKitResourceTimedLayoutDelay"
-#define WebKitAllowAnimatedImagesPreferenceKey @"WebKitAllowAnimatedImagesPreferenceKey"
-#define WebKitAllowAnimatedImageLoopingPreferenceKey @"WebKitAllowAnimatedImageLoopingPreferenceKey"
-
- at implementation IFPreferences
-
-static IFPreferences *_standardPreferences = nil;
-
-+ (IFPreferences *)standardPreferences
-{
- if (_standardPreferences == nil) {
- _standardPreferences = [[IFPreferences alloc] init];
- }
-
- return _standardPreferences;
-}
-
-// if we ever have more than one IFPreferences object, this would move to init
-+ (void)load
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- NSNumber *pluginsEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *javaEnabled = [NSNumber numberWithBool:FALSE];
- NSNumber *javaScriptEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *javaScriptCanOpenWindows = [NSNumber numberWithBool:FALSE];
- NSNumber *timedLayoutEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *resourceTimedLayoutEnabled = [NSNumber numberWithBool:TRUE];
- NSNumber *allowAnimatedImages = [NSNumber numberWithBool:TRUE];
- NSNumber *allowAnimatedImageLooping = [NSNumber numberWithBool:TRUE];
-
- NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
- @"0x0", WebKitLogLevelPreferenceKey,
- @"Times New Roman", WebKitStandardFontPreferenceKey,
- @"Monaco", WebKitFixedFontPreferenceKey,
- @"Times New Roman", WebKitSerifFontPreferenceKey,
- @"Arial", WebKitSansSerifFontPreferenceKey,
- @"Apple Chancery", WebKitCursiveFontPreferenceKey,
- @"Papyrus", WebKitFantasyFontPreferenceKey,
- @"6", WebKitMinimumFontSizePreferenceKey,
- @"11", WebKitMediumFontSizePreferenceKey,
- @"1.85", WebKitInitialTimedLayoutDelayPreferenceKey,
- @"4096", WebKitInitialTimedLayoutSizePreferenceKey,
- @"1.85", WebKitResourceTimedLayoutDelayPreferenceKey,
- timedLayoutEnabled, WebKitInitialTimedLayoutEnabledPreferenceKey,
- resourceTimedLayoutEnabled, WebKitResourceTimedLayoutEnabledPreferenceKey,
- javaEnabled, WebKitJavaEnabledPreferenceKey,
- javaScriptEnabled, WebKitJavaScriptEnabledPreferenceKey,
- javaScriptCanOpenWindows, WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey,
- pluginsEnabled, WebKitPluginsEnabledPreferenceKey,
- allowAnimatedImages, WebKitAllowAnimatedImagesPreferenceKey,
- allowAnimatedImageLooping, WebKitAllowAnimatedImageLoopingPreferenceKey,
- nil];
-
- [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
-
- [pool release];
-}
-
-- (NSString *)standardFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitStandardFontPreferenceKey];
-}
-
-- (void)setStandardFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitStandardFontPreferenceKey];
-}
-
-- (NSString *)fixedFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitFixedFontPreferenceKey];
-}
-
-- (void)setFixedFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitFixedFontPreferenceKey];
-}
-
-- (NSString *)serifFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitSerifFontPreferenceKey];
-}
-
-- (void)setSerifFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitSerifFontPreferenceKey];
-}
-
-- (NSString *)sansSerifFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitSansSerifFontPreferenceKey];
-}
-
-- (void)setSansSerifFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitSansSerifFontPreferenceKey];
-}
-
-- (NSString *)cursiveFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitCursiveFontPreferenceKey];
-}
-
-- (void)setCursiveFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitCursiveFontPreferenceKey];
-}
-
-- (NSString *)fantasyFontFamily
-{
- return [[NSUserDefaults standardUserDefaults] stringForKey:WebKitFantasyFontPreferenceKey];
-}
-
-- (void)setFantasyFontFamily:(NSString *)family
-{
- [[NSUserDefaults standardUserDefaults] setObject:family forKey:WebKitFantasyFontPreferenceKey];
-}
-
-- (int)mediumFontSize
-{
- return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitMediumFontSizePreferenceKey];
-}
-
-- (void)setMediumFontSize:(int)size
-{
- [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitMediumFontSizePreferenceKey];
-}
-
-- (int)minimumFontSize
-{
- return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitMinimumFontSizePreferenceKey];
-}
-
-- (void)setMinimumFontSize:(int)size
-{
- [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitMinimumFontSizePreferenceKey];
-}
-
-
-- (BOOL)javaEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJavaEnabledPreferenceKey];
-}
-
-- (void)setJavaEnabled:(BOOL)flag
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitJavaEnabledPreferenceKey];
-}
-
-- (BOOL)javaScriptEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJavaScriptEnabledPreferenceKey];
-}
-
-- (void)setJavaScriptEnabled:(BOOL)flag
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitJavaScriptEnabledPreferenceKey];
-}
-
-- (BOOL)javaScriptCanOpenWindowsAutomatically
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey];
-}
-
-- (void)setJavaScriptCanOpenWindowsAutomatically:(BOOL)flag
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey];
-}
-
-- (BOOL)pluginsEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitPluginsEnabledPreferenceKey];
-}
-
-- (void)setPluginsEnabled:(BOOL)flag
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitPluginsEnabledPreferenceKey];
-}
-
-
-- (NSTimeInterval)_initialTimedLayoutDelay
-{
- return (NSTimeInterval)[[NSUserDefaults standardUserDefaults] floatForKey:WebKitInitialTimedLayoutDelayPreferenceKey];
-}
-
-- (int)_initialTimedLayoutSize
-{
- int size = [[NSUserDefaults standardUserDefaults] integerForKey:WebKitInitialTimedLayoutDelayPreferenceKey];
- return size;
-}
-
-- (BOOL)_initialTimedLayoutEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitInitialTimedLayoutEnabledPreferenceKey];
-}
-
-
-- (NSTimeInterval)_resourceTimedLayoutDelay
-{
- return [[NSUserDefaults standardUserDefaults] floatForKey:WebKitResourceTimedLayoutDelayPreferenceKey];
-}
-
-- (BOOL)_resourceTimedLayoutEnabled
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitResourceTimedLayoutEnabledPreferenceKey];
-}
-
-
-- (BOOL)allowAnimatedImages
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitAllowAnimatedImagesPreferenceKey];
-}
-
-- (void)setAllowAnimatedImages:(BOOL)flag;
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitAllowAnimatedImagesPreferenceKey];
-}
-
-- (BOOL)allowAnimatedImageLooping
-{
- return [[NSUserDefaults standardUserDefaults] boolForKey:WebKitAllowAnimatedImageLoopingPreferenceKey];
-}
-
-- (void)setAllowAnimatedImageLooping: (BOOL)flag
-{
- [[NSUserDefaults standardUserDefaults] setBool:flag forKey:WebKitAllowAnimatedImageLoopingPreferenceKey];
-}
-
-
-
- at end
diff --git a/WebKit/WebView.subproj/IFPreferencesPrivate.h b/WebKit/WebView.subproj/IFPreferencesPrivate.h
deleted file mode 100644
index bd14bce..0000000
--- a/WebKit/WebView.subproj/IFPreferencesPrivate.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- IFPreferences.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <WebKit/IFPreferences.h>
-
- at interface IFPreferences (IFPrivate)
-
-- (NSTimeInterval)_initialTimedLayoutDelay;
-- (int)_initialTimedLayoutSize;
-- (BOOL)_initialTimedLayoutEnabled;
-- (BOOL)_resourceTimedLayoutEnabled;
-- (NSTimeInterval)_resourceTimedLayoutDelay;
-
- at end
diff --git a/WebKit/WebView.subproj/IFRenderNode.h b/WebKit/WebView.subproj/IFRenderNode.h
deleted file mode 100644
index d1f22f4..0000000
--- a/WebKit/WebView.subproj/IFRenderNode.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// IFRenderNode.h
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
- at class IFWebView;
-
- at interface IFRenderNode : NSObject
-{
- NSArray *children;
- NSString *name;
- NSRect rect;
-}
-
-- initWithWebView:(IFWebView *)view;
-
-- (NSArray *)children;
-
-- (NSString *)name;
-- (NSString *)positionString;
-- (NSString *)widthString;
-- (NSString *)heightString;
-
- at end
diff --git a/WebKit/WebView.subproj/IFRenderNode.mm b/WebKit/WebView.subproj/IFRenderNode.mm
deleted file mode 100644
index 7f89e5d..0000000
--- a/WebKit/WebView.subproj/IFRenderNode.mm
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// IFRenderNode.m
-// WebKit
-//
-// Created by Darin Adler on Tue Jun 11 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "IFRenderNode.h"
-
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-
- at interface WebKitRenderTreeCopier : NSObject <WebCoreRenderTreeCopier>
- at end
-
- at implementation IFRenderNode
-
-- initWithName:(NSString *)n rect:(NSRect)r view:(NSView *)view children:(NSArray *)c
-{
- NSMutableArray *collectChildren;
-
- [super init];
-
- collectChildren = [c mutableCopy];
-
- name = [n retain];
- rect = r;
-
- if ([view isKindOfClass:[NSScrollView class]]) {
- NSScrollView *scrollView = (NSScrollView *)view;
- view = [scrollView superview];
- }
- if ([view isKindOfClass:[IFWebView class]]) {
- IFWebView *webView = (IFWebView *)view;
- [collectChildren addObject:[[[IFRenderNode alloc] initWithWebView:webView] autorelease]];
- }
-
- children = [collectChildren copy];
- [collectChildren release];
-
- return self;
-}
-
-- initWithWebView:(IFWebView *)view
-{
- WebKitRenderTreeCopier *copier;
-
- [self dealloc];
-
- if (![[view documentView] isMemberOfClass:[IFHTMLView class]]) {
- return nil;
- }
-
- copier = [[WebKitRenderTreeCopier alloc] init];
- IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
- self = [[[htmlView _bridge] copyRenderTree:copier] retain];
- [copier release];
-
- return self;
-}
-
-- (void)dealloc
-{
- [children release];
- [name release];
- [super dealloc];
-}
-
-- (NSArray *)children
-{
- return children;
-}
-
-- (NSString *)name
-{
- return name;
-}
-
-- (NSString *)positionString
-{
- return [NSString stringWithFormat:@"(%.0f, %.0f)", rect.origin.x, rect.origin.y];
-}
-
-- (NSString *)widthString
-{
- return [NSString stringWithFormat:@"%.0f", rect.size.width];
-}
-
-- (NSString *)heightString
-{
- return [NSString stringWithFormat:@"%.0f", rect.size.height];
-}
-
- at end
-
- at implementation WebKitRenderTreeCopier
-
-- (NSObject *)nodeWithName:(NSString *)name rect:(NSRect)rect view:(NSView *)view children:(NSArray *)children
-{
- return [[[IFRenderNode alloc] initWithName:name rect:rect view:view children:children] autorelease];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFTextRepresentation.h b/WebKit/WebView.subproj/IFTextRepresentation.h
deleted file mode 100644
index 4b4bcd1..0000000
--- a/WebKit/WebView.subproj/IFTextRepresentation.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- IFTextRepresentation.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFError;
- at class IFWebDataSource;
- at protocol IFDocumentRepresentation;
-
- at interface IFTextRepresentation : NSObject <IFDocumentRepresentation>
-{
-
-}
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
- at end
diff --git a/WebKit/WebView.subproj/IFTextRepresentation.m b/WebKit/WebView.subproj/IFTextRepresentation.m
deleted file mode 100644
index 2274206..0000000
--- a/WebKit/WebView.subproj/IFTextRepresentation.m
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- IFTextRepresentation.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "IFTextRepresentation.h"
-
-
- at implementation IFTextRepresentation
-
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
-{
-
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFTextView.h b/WebKit/WebView.subproj/IFTextView.h
deleted file mode 100644
index 418c8b0..0000000
--- a/WebKit/WebView.subproj/IFTextView.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- IFTextView.h
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Cocoa/Cocoa.h>
-
- at class IFWebDataSource;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
- at protocol IFDocumentSearching;
-
- at interface IFTextView : NSTextView <IFDocumentLoading, IFDocumentDragSettings, IFDocumentSearching>
-{
- BOOL canDragFrom;
- BOOL canDragTo;
-}
-
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
-- (void)layout;
-
-- (void)setCanDragFrom: (BOOL)flag;
-- (BOOL)canDragFrom;
-- (void)setCanDragTo: (BOOL)flag;
-- (BOOL)canDragTo;
-
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
-
- at end
diff --git a/WebKit/WebView.subproj/IFTextView.m b/WebKit/WebView.subproj/IFTextView.m
deleted file mode 100644
index 64f7635..0000000
--- a/WebKit/WebView.subproj/IFTextView.m
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- IFTextView.m
- Copyright 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFTextView.h>
-
-#import <WebKit/IFWebDataSource.h>
-
- at implementation IFTextView
-
-- (id)initWithFrame:(NSRect)frame
-{
- self = [super initWithFrame:frame];
- if (self) {
- canDragFrom = YES;
- canDragTo = YES;
- [[self textContainer] setWidthTracksTextView:YES];
- [self setAutoresizingMask:NSViewWidthSizable];
- [self setEditable:NO];
- }
- return self;
-}
-
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
-{
-}
-
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
-{
-}
-
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
-{
- NSString *string;
-
- // FIXME: This needs to be more efficient for progressively loading documents.
-
- if ([[dataSource contentType] isEqualToString:@"text/rtf"]) {
- [self setRichText:YES];
- [self replaceCharactersInRange:NSMakeRange(0,0) withRTF:[dataSource data]];
- } else {
- [self setRichText:NO];
-
- // FIXME: This needs to use the correct encoding, but the list of names of encodings
- // is currently inside WebCore where we can't share it.
- string = [[NSString alloc] initWithData:[dataSource data] encoding:NSASCIIStringEncoding];
- [self setString:string];
- [string release];
- }
-}
-
-- (void)layout
-{
- NSRect superFrame = [[self superview] frame];
- NSRect frame = [self frame];
-
- [self setFrame:NSMakeRect(frame.origin.x, frame.origin.y, superFrame.size.width, frame.size.height)];
-}
-
-- (void)setCanDragFrom: (BOOL)flag
-{
- canDragFrom = flag;
-}
-
-- (BOOL)canDragFrom
-{
- return canDragFrom;
-}
-
-- (void)setCanDragTo: (BOOL)flag
-{
- canDragTo = flag;
-}
-
-- (BOOL)canDragTo
-{
- return canDragTo;
-}
-
-- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
-{
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
deleted file mode 100644
index 3740dd5..0000000
--- a/WebKit/WebView.subproj/IFWebController.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- IFWebController.h
- Copyright 2001, 2002, Apple Computer, Inc.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Foundation/Foundation.h>
-
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-
-/*
- =============================================================================
-
- IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
-
- The IFWebController implements required behavior. IFWebView and IFWebDataSource
- cannot function without a controller.
-
- It it expected that alternate implementations of IFWebController will be written for
- alternate views of the web pages described by IFWebDataSources. For example, a web
- crawler may implement a IFWebController with no corresponding view.
-
- IFWebController may be subclassed to modify the behavior of the standard
- IFWebView and IFWebDataSource.
-
- =============================================================================
-*/
-
- at class IFDownloadHandler;
- at class IFError;
- at class IFLoadProgress;
- at class IFURLHandle;
- at class IFWebController;
- at class IFWebControllerPrivate;
- at class IFWebDataSource;
- at class IFWebFrame;
- at class IFWebView;
-
- at protocol IFDocumentLoading;
-
-/*
- =============================================================================
-
- Implementors of this protocol will receive messages indicating
- data has been received.
-
- The methods in this protocol will be called even if the data source
- is initialized with something other than a URL.
-
- =============================================================================
-*/
-
- at protocol IFResourceProgressHandler <NSObject>
-
-/*
- A new chunk of data has been received. This could be a partial load
- of a url. It may be useful to do incremental layout, although
- typically for non-base URLs this should be done after a URL (i.e. image)
- has been completely downloaded.
-*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
-
-- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-
- at end
-
-
-/*
- =============================================================================
-
- A class that implements IFWindowContext provides window-related methods
- that may be used by Javascript, plugins and other aspects of web pages.
-
- =============================================================================
-*/
- at protocol IFWindowContext <NSObject>
-
-- (IFWebController *)openNewWindowWithURL:(NSURL *)URL;
-
-- (void)setStatusText: (NSString *)text;
-- (NSString *)statusText;
-
-- (BOOL)areToolbarsVisible;
-- (void)setToolbarsVisible:(BOOL)visible;
-
-- (BOOL)isStatusBarVisible;
-- (void)setStatusBarVisible:(BOOL)visible;
-
-// Even though a caller could set the frame directly using the NSWindow,
-// this method is provided so implementors of this protocol can do special
-// things on programmatic move/resize, like avoiding autosaving of the size.
-- (void)setFrame:(NSRect)frame;
-
-- (NSWindow *)window;
-
-// FIXME: This is temporary. It's used to tell the client to "go back"
-// when the delete key is pressed. But we are going to move back/forward
-// handling into WebKit, and then this can be removed.
-- (void)goBack;
-
- at end
-
-
-#ifdef READY_FOR_PRIME_TIME
-/*
- =============================================================================
-*/
- at protocol IFContextMenuHandler
-// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
-// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
- at end
-#endif
-
-
-/*
- =============================================================================
-
- IFWebController implements all the behavior that ties together IFWebView
- and IFWebDataSource. See each inherited protocol for a more complete
- description.
-
- =============================================================================
-*/
-
- at interface IFWebController : NSObject
-{
- at private
- IFWebControllerPrivate *_private;
-}
-
-// Calls designated initializer with nil arguments.
-- init;
-
-// Designated initializer.
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource;
-
-- (void)setWindowContext: (id<IFWindowContext>)context;
-- (id<IFWindowContext>)windowContext;
-
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)resourceProgressHandler;
-
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)downloadProgressHandler;
-
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
-
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler;
-- (id<IFWebControllerPolicyHandler>)policyHandler;
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
-- (BOOL)directsAllLinksToSystemBrowser;
-
-// FIXME: Should this method be private?
-// Called when a data source needs to create a frame. This method encapsulates the
-// specifics of creating and initializing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
-
-// Look for a frame named name, recursively.
-- (IFWebFrame *)frameNamed: (NSString *)name;
-
-// Return the top level frame. Note that even document that are not framesets will have a
-// mainFrame.
-- (IFWebFrame *)mainFrame;
-
-// Return the frame associated with the data source. Traverses the
-// frame tree to find the data source.
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource;
-
-// Return the frame associated with the view. Traverses the
-// frame tree to find the view.
-- (IFWebFrame *)frameForView: (IFWebView *)aView;
-
-// Typically called after requestContentPolicyForContentMIMEType: is sent to a
-// locationChangeHander. The content policy of HTML URLs should always be IFContentPolicyShow.
-// Setting the policy to IFContentPolicyIgnore will cancel the load of the URL if it is still
-// pending. The path argument is only used when the policy is either IFContentPolicySave or
-// IFContentPolicySaveAndOpenExternally.
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource;
-
-// API to manage animated images.
-- (void)stopAnimatedImages;
-- (void)startAnimatedImages;
-
-- (void)stopAnimatedImageLooping;
-- (void)startAnimatedImageLooping;
-
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType;
-+ (BOOL)canShowFile:(NSString *)path;
- at end
diff --git a/WebKit/WebView.subproj/IFWebController.mm b/WebKit/WebView.subproj/IFWebController.mm
deleted file mode 100644
index 3d2a138..0000000
--- a/WebKit/WebView.subproj/IFWebController.mm
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- IFWebController.mm
- Copyright 2001, 2002 Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebKitErrors.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/WebFoundation.h>
-
- at implementation IFWebController
-
-- init
-{
- return [self initWithView: nil provisionalDataSource: nil];
-}
-
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource
-{
- [super init];
-
- _private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
-}
-
-- (BOOL)directsAllLinksToSystemBrowser
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::directsAllLinksToSystemBrowser is not implemented"];
- return NO;
-}
-
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
-{
- IFWebView *childView;
- IFWebFrame *newFrame;
-
- childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
-
- newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
-
- [parentDataSource addFrame: newFrame];
-
- [childView _setController: self];
- [childDataSource _setController: self];
-
- [childView setAllowsScrolling: allowsScrolling];
-
- return newFrame;
-}
-
-
-- (void)setWindowContext: (id<IFWindowContext>)context
-{
- [_private->windowContext autorelease];
- _private->windowContext = [context retain];
-}
-
-- (id<IFWindowContext>)windowContext
-{
- return _private->windowContext;
-}
-
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler
-{
- [_private->resourceProgressHandler autorelease];
- _private->resourceProgressHandler = [handler retain];
-}
-
-
-- (id<IFResourceProgressHandler>)resourceProgressHandler
-{
- return _private->resourceProgressHandler;
-}
-
-
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler
-{
- [_private->downloadProgressHandler autorelease];
- _private->downloadProgressHandler = [handler retain];
-}
-
-
-- (id<IFResourceProgressHandler>)downloadProgressHandler
-{
- return _private->downloadProgressHandler;
-}
-
-
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler
-{
- [_private->policyHandler autorelease];
- _private->policyHandler = [handler retain];
-}
-
-- (id<IFWebControllerPolicyHandler>)policyHandler
-{
- return _private->policyHandler;
-}
-
-
-- (IFWebFrame *)_frameForDataSource: (IFWebDataSource *)dataSource fromFrame: (IFWebFrame *)frame
-{
- NSArray *frames;
- int i, count;
- IFWebFrame *result, *aFrame;
-
- if ([frame dataSource] == dataSource)
- return frame;
-
- if ([frame provisionalDataSource] == dataSource)
- return frame;
-
- frames = [[frame dataSource] children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForDataSource: dataSource fromFrame: aFrame];
- if (result)
- return result;
- }
-
- frames = [[frame provisionalDataSource] children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForDataSource: dataSource fromFrame: aFrame];
- if (result)
- return result;
- }
-
- return nil;
-}
-
-
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource
-{
- IFWebFrame *frame = [self mainFrame];
-
- return [self _frameForDataSource: dataSource fromFrame: frame];
-}
-
-
-- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
-{
- NSArray *frames;
- int i, count;
- IFWebFrame *result, *aFrame;
-
- if ([frame webView] == aView)
- return frame;
-
- frames = [[frame dataSource] children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForView: aView fromFrame: aFrame];
- if (result)
- return result;
- }
-
- frames = [[frame provisionalDataSource] children];
- count = [frames count];
- for (i = 0; i < count; i++){
- aFrame = [frames objectAtIndex: i];
- result = [self _frameForView: aView fromFrame: aFrame];
- if (result)
- return result;
- }
-
- return nil;
-}
-
-
-- (IFWebFrame *)frameForView: (IFWebView *)aView
-{
- IFWebFrame *frame = [self mainFrame];
-
- return [self _frameForView: aView fromFrame: frame];
-}
-
-
-- (IFWebFrame *)frameNamed: (NSString *)name
-{
- return [[self mainFrame] frameNamed: name];
-}
-
-- (IFWebFrame *)mainFrame
-{
- return _private->mainFrame;
-}
-
-
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url
-{
- if([IFURLHandle canInitWithURL:url]){
- return IFURLPolicyUseContentPolicy;
- }else{
- return IFURLPolicyOpenExternally;
- }
-}
-
-
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource
-{
- NSString *MIMEType;
-
- if(policy == IFContentPolicyNone)
- [NSException raise:NSInvalidArgumentException format:@"Can't set policy of IFContentPolicyNone. Use IFContentPolicyIgnore instead"];
-
- if([dataSource contentPolicy] != IFContentPolicyNone){
- [NSException raise:NSGenericException format:@"Content policy can only be set once on for a dataSource."];
- }else{
- [dataSource _setContentPolicy:policy];
- [dataSource _setDownloadPath:path];
-
- if(policy == IFContentPolicyShow){
- MIMEType = [dataSource contentType];
- if([[self class] canShowMIMEType:MIMEType]){
- id documentView;
- IFWebView *webView;
- id <IFDocumentRepresentation> dataRepresentation, oldRepresentation;
-
- // Check if the data source was already bound?
- oldRepresentation = [dataSource representation];
- dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
- if (!oldRepresentation || ![oldRepresentation isKindOfClass: [dataRepresentation class]])
- [dataSource _setRepresentation:dataRepresentation];
- webView = [[dataSource webFrame] webView];
- documentView = [IFWebView createViewForMIMEType:MIMEType];
- [webView _setDocumentView: documentView];
- [documentView provisionalDataSourceChanged: dataSource];
- }else{
- IFError *error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowMIMEType
- inDomain:IFErrorCodeDomainWebKit failingURL: [dataSource inputURL]];
- [[self policyHandler] unableToImplementContentPolicy:error forDataSource:dataSource];
- }
- }
- }
-}
-
-- (void)stopAnimatedImages
-{
-}
-
-- (void)startAnimatedImages
-{
-}
-
-- (void)stopAnimatedImageLooping
-{
-}
-
-- (void)startAnimatedImageLooping
-{
-}
-
-+ (BOOL)canShowMIMEType:(NSString *)MIMEType
-{
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType]){
- return YES;
- }else{
- // Have the plug-ins register views and representations
- [IFPluginDatabase installedPlugins];
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType])
- return YES;
- }
- return NO;
-}
-
-+ (BOOL)canShowFile:(NSString *)path
-{
- NSString *MIMEType;
-
- MIMEType = [[self class] _MIMETypeForFile:path];
- return [[self class] canShowMIMEType:MIMEType];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h b/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h
deleted file mode 100644
index 705276d..0000000
--- a/WebKit/WebView.subproj/IFWebControllerPolicyHandler.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- IFWebControllerPolicyHandler.h
- Copyright 2002, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-/*
- =============================================================================
-
- =============================================================================
-*/
-
-typedef enum {
- IFURLPolicyUseContentPolicy,
- IFURLPolicyOpenExternally,
- IFURLPolicyIgnore
-} IFURLPolicy;
-
-typedef enum {
- IFFileURLPolicyUseContentPolicy,
- IFFileURLPolicyOpenExternally,
- IFFileURLPolicyReveal,
- IFFileURLPolicyIgnore
-} IFFileURLPolicy;
-
-typedef enum {
- IFContentPolicyNone,
- IFContentPolicyShow,
- IFContentPolicySave,
- IFContentPolicySaveAndOpenExternally,
- IFContentPolicyIgnore
-} IFContentPolicy;
-
- at protocol IFWebControllerPolicyHandler <NSObject>
-
-- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (IFWebDataSource *)dataSource;
-
-// URLPolicyForURL: is used to determine what to do BEFORE a URL is loaded, i.e.
-// before it is clicked or loaded via a URL bar. Clients can choose to handle the
-// URL normally, hand the URL off to launch services, or
-// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (IFURLPolicy)URLPolicyForURL: (NSURL *)url;
-
-// We may have different errors that cause the the policy to be un-implementable, i.e.
-// launch services failure, etc.
-- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (IFError *)error;
-
-// Called when the response to URLPolicyForURL is IFURLPolicyUseContentPolicy and the URL is
-// a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-- (IFFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
-
-// Called when a IFFileURLPolicy could not be completed. This is usually caused by files not
-// existing or not readable.
-- (void)unableToImplementFileURLPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-
-// Sent after locationChangeStarted.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
-// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource;
-
-// Sent when errors are encountered with an un-implementable policy, i.e.
-// file i/o failure, launch services failure, type mismatches, etc.
-- (void)unableToImplementContentPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
-
-// Called when a plug-in for a certain mime type is not installed
-- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
-
- at end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.h b/WebKit/WebView.subproj/IFWebControllerPrivate.h
deleted file mode 100644
index b229ce9..0000000
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- IFWebController.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFWebController.h>
-
- at class IFError;
- at class IFLoadProgress;
- at class IFWebFrame;
-
- at interface IFWebControllerPrivate : NSObject
-{
- at public
- IFWebFrame *mainFrame;
- id<IFWindowContext> windowContext;
- id<IFResourceProgressHandler> resourceProgressHandler;
- id<IFResourceProgressHandler> downloadProgressHandler;
- id<IFWebControllerPolicyHandler> policyHandler;
- BOOL openedByScript;
-}
- at end
-
- at interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_didStartLoading: (NSURL *)url;
-- (void)_didStopLoading: (NSURL *)url;
-+ (NSString *)_MIMETypeForFile: (NSString *)path;
-- (BOOL)_openedByScript;
-- (void)_setOpenedByScript:(BOOL)openedByScript;
- at end
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
deleted file mode 100644
index 9ea390b..0000000
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- IFWebControllerPrivate.mm
- Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLCacheLoaderConstants.h>
-#import <WebFoundation/IFURLHandle.h>
-
- at implementation IFWebControllerPrivate
-
-- init
-{
- mainFrame = nil;
- return self;
-}
-
-- (void)_clearControllerReferences: (IFWebFrame *)aFrame
-{
- NSArray *frames;
- IFWebFrame *nextFrame;
- int i, count;
-
- [[aFrame dataSource] _setController: nil];
- [[aFrame webView] _setController: nil];
- [aFrame _setController: nil];
-
- // Walk the frame tree, niling the controller.
- frames = [[aFrame dataSource] children];
- count = [frames count];
- for (i = 0; i < count; i++){
- nextFrame = [frames objectAtIndex: i];
- [self _clearControllerReferences: nextFrame];
- }
-}
-
-- (void)dealloc
-{
- [self _clearControllerReferences: mainFrame];
-
- [mainFrame reset];
- [mainFrame autorelease];
- [windowContext autorelease];
- [resourceProgressHandler autorelease];
- [policyHandler autorelease];
-
- [super dealloc];
-}
-
- at end
-
-
- at implementation IFWebController (IFPrivate)
-
-- (void)_receivedProgress:(IFLoadProgress *)progress forResourceHandle:(IFURLHandle *)resourceHandle fromDataSource:(IFWebDataSource *)dataSource complete:(BOOL)isComplete
-{
- IFWebFrame *frame = [dataSource webFrame];
-
- WEBKIT_ASSERT (dataSource != nil);
-
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
- fromDataSource: dataSource complete:isComplete];
-
- // This resource has completed, so check if the load is complete for all frames.
- if (isComplete) {
- if (frame != nil) {
- [frame _transitionProvisionalToLayoutAcceptable];
- [frame _checkLoadComplete];
- }
- }
-}
-
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
-{
- IFWebFrame *frame = [dataSource webFrame];
-
- WEBKIT_ASSERT (dataSource != nil);
-
- [[self resourceProgressHandler] receivedProgress: progress forResourceHandle: resourceHandle
- fromDataSource: dataSource complete:isComplete];
-
- // The frame may be nil if a previously cancelled load is still making progress callbacks.
- if (frame == nil)
- return;
-
- // Check to see if this is these are the first bits of a provisional data source,
- // if so we need to transition the data source from provisional to committed.
- // This transition is only done for the IFContentPolicyShow policy.
- if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == IFContentPolicyShow){
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committing resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
- [frame _transitionProvisionalToCommitted];
- }
-
- // This resouce has completed, so check if the load is complete for all frames.
- if (isComplete){
- // If the load is complete, mark the primary load as done. The primary load is the load
- // of the main document. Other resources may still be arriving.
- [dataSource _setPrimaryLoadComplete: YES];
- [frame _checkLoadComplete];
- }
- else {
- // If the frame isn't complete it might be ready for a layout. Perform that check here.
- // Note that transitioning a frame to this state doesn't guarantee a layout, rather it
- // just indicates that an early layout can be performed.
- int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
- if ([progress bytesSoFar] > timedLayoutSize)
- [frame _transitionProvisionalToLayoutAcceptable];
- }
-}
-
-
-
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
-{
- IFWebFrame *frame = [dataSource webFrame];
-
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
-
- [dataSource _addError: error forResource:
- (resourceHandle != nil ? [[resourceHandle url] absoluteString] : [[error failingURL] absoluteString])];
-
- [frame _checkLoadComplete];
-}
-
-
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
-{
- IFWebFrame *frame = [dataSource webFrame];
-
- [[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
-
- [dataSource _setPrimaryLoadComplete: YES];
-
- [dataSource _setMainDocumentError: error];
- [frame _checkLoadComplete];
-}
-
-- (void)_didStartLoading: (NSURL *)url
-{
- [[IFStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
-}
-
-- (void)_didStopLoading: (NSURL *)url
-{
- [[IFStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
-}
-
-+ (NSString *)_MIMETypeForFile: (NSString *)path
-{
- NSString *extension = [path pathExtension];
-
- if([extension isEqualToString:@""])
- return @"text/html";
-
- return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
-}
-
-- (BOOL)_openedByScript
-{
- return _private->openedByScript;
-}
-
-- (void)_setOpenedByScript:(BOOL)openedByScript
-{
- _private->openedByScript = openedByScript;
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
deleted file mode 100644
index 666d252..0000000
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- IFWebDataSource.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/IFWebController.h>
-
-/*
- =============================================================================
-
- A IFWebDataSource represents the data associated with a web page.
-
- ============================================================================= */
-
- at class IFWebFrame;
- at class IFURLHandle;
- at class IFWebController;
-
-#ifdef TENTATIVE_API
- at class IFLoader;
-#endif
-
- at class IFWebDataSourcePrivate;
- at protocol IFDocumentRepresentation;
-
- at interface IFWebDataSource : NSObject
-{
- at private
- IFWebDataSourcePrivate *_private;
-}
-
-// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
--(id)initWithURL:(NSURL *)inputURL;
--(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes;
--(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
-
-#ifdef TENTATIVE_API
-- initWithData: (NSData *)data;
-- initNSURL _IF_URLWithString: (NSString *)string;
-- initWithLoader: (IFLoader *)loader;
-#endif
-
-- (NSData *)data;
-
-- (id <IFDocumentRepresentation>)representation;
-
-// Returns YES if this is the main document. The main document is the 'top'
-// document, typically either a frameset or a normal HTML document.
-- (BOOL)isMainDocument;
-
-// Returns nil if this data source represents the main document. Otherwise
-// returns the parent data source.
-- (IFWebDataSource *)parent;
-
-// Return the frame that represents this data source. Same as above.
-- (IFWebFrame *)webFrame;
-
-// Add a child frame. This should only be called by the data source's controller
-// as a result of a createFrame:inParent:.
-// [Should this be private?]
-- (void)addFrame: (IFWebFrame *)frame;
-
-// Returns an array of IFWebFrame. The frames in the array are
-// associated with a frame set or iframe.
-- (NSArray *)children;
-
-- (IFWebFrame *)frameNamed: (NSString *)frameName;
-
-// Returns an array of NSStrings or nil. The NSStrings corresponds to
-// frame names. If this data source is the main document and has no
-// frames then frameNames will return nil.
-- (NSArray *)frameNames;
-
-// findDataSourceForFrameNamed: returns the child data source associated with
-// the frame named 'name', or nil.
-- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
-
-- (BOOL)frameExists: (NSString *)name;
-
-- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName;
-
-// Set the controller for this data source. NOTE: The controller is not retained by the
-// data source. Perhaps setController: should be private? Perhaps the back pointers
-// can be managed externally, i.e. + controllerForDataSource: as a class method on
-// IFWebController?
-//- (void)setController: (IFWebController *)controller;
-- (IFWebController *)controller;
-
-// May return nil if not initialized with a URL.
-- (NSURL *)inputURL;
-
-// redirectedURL returns the URL that was actually used if there was a redirect.
-// The value of redirectedURL will change if more than one redirect occurs. If no
-// redirect occurs the value of redirectedURL will be nil. To monitor change in
-// the value of the redirected URL override the <IFLocationChangeHandler>
-// serverRedirectTo:forDataSource: method.
-- (NSURL *)redirectedURL;
-
-// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != finalURL.
-- (BOOL)wasRedirected;
-
-// Start actually getting (if initialized with a URL) and parsing data. If the data source
-// is still performing a previous load it will be stopped.
-// If forceRefresh is YES the document will load from the net, not the cache.
-- (void)startLoading: (BOOL)forceRefresh;
-
-// Cancels any pending loads. A data source is conceptually only ever loading
-// one document at a time, although one document may have many related
-// resources. stopLoading will stop all loads related to the data source.
-- (void)stopLoading;
-
-// Returns YES if there are any pending loads.
-- (BOOL)isLoading;
-
-
-
-#ifdef TENTATIVE_API
-// Get DOM access to the document.
-- (IFDOMDocument *)document;
-#endif
-
-- (BOOL)isDocumentHTML;
-
-// Get the source of the document by reconstructing it from the DOM.
-- (NSString *)documentTextFromDOM;
-
-
-// Get the actual source of the document.
-- (NSString *)documentSource;
-
-
-// URL reference point, these should probably not be public for 1.0.
-- (NSURL *)base;
-- (NSString *)baseTarget;
-
-- (NSString *)encoding;
-
-// Style sheet
-- (void)setUserStyleSheetFromURL: (NSURL *)url;
-- (void)setUserStyleSheetFromString: (NSString *)sheet;
-
-// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
-// This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
-// that WebCore also has dependencies on the appkit.
-- (NSImage *)icon;
-
-// Is page secure, e.g. https, ftps
-- (BOOL)isPageSecure;
-
-// Returns nil or the page title.
-- (NSString *)pageTitle;
-
-- (NSString *)frameName;
-
-- (IFContentPolicy)contentPolicy;
-
-// MIME type
-- (NSString *)contentType;
-
-// extension based on the MIME type
-- (NSString *)fileType;
-
-- (NSString *)downloadPath;
-
-- (NSDictionary *)errors;
-
-- (IFError *)mainDocumentError;
-
-+ (void) registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType;
-
-+ (id <IFDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType;
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
deleted file mode 100644
index 7a259bd..0000000
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- IFWebDataSource.mm
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/WebFoundation.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-
- at implementation IFWebDataSource
-
--(id)initWithURL:(NSURL *)theURL
-{
- return [self initWithURL:theURL attributes:nil flags:0];
-}
-
--(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes
-{
- return [self initWithURL:theURL attributes:theAttributes flags:0];
-}
-
--(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
-{
- [super init];
- _private = [[IFWebDataSourcePrivate alloc] init];
- _private->inputURL = [theURL retain];
- _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
- return self;
-}
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (NSData *)data
-{
- if(!_private->resourceData){
- return [_private->mainHandle resourceData];
- }else{
- return _private->resourceData;
- }
-}
-
-- (id <IFDocumentRepresentation>) representation
-{
- return _private->representation;
-}
-
-- (IFWebFrame *)webFrame
-{
- return [_private->controller frameForDataSource: self];
-}
-
-// Returns the name of the frame containing this data source, or nil
-// if the data source is not in a frame set.
-- (NSString *)frameName
-{
- return [[self webFrame] name];
-}
-
-// Returns YES if this is the main document. The main document is the 'top'
-// document, typically either a frameset or a normal HTML document.
-- (BOOL)isMainDocument
-{
- if (_private->parent == nil)
- return YES;
- return NO;
-}
-
-// Returns nil if this data source represents the main document. Otherwise
-// returns the parent data source.
-- (IFWebDataSource *)parent
-{
- return _private->parent;
-}
-
-
-// Returns an array of IFWebFrame. The frames in the array are
-// associated with a frame set or iframe.
-- (NSArray *)children
-{
- return [_private->frames allValues];
-}
-
-- (void)addFrame: (IFWebFrame *)frame
-{
- if (_private->frames == nil)
- _private->frames = [[NSMutableDictionary alloc] init];
- [[frame dataSource] _setParent: self];
- [_private->frames setObject: frame forKey: [frame name]];
-}
-
-
-- (IFWebFrame *)frameNamed: (NSString *)frameName
-{
- return (IFWebFrame *)[_private->frames objectForKey: frameName];
-}
-
-
-
-// Returns an array of NSStrings or nil. The NSStrings corresponds to
-// frame names. If this data source is the main document and has no
-// frames then frameNames will return nil.
-- (NSArray *)frameNames
-{
- return [_private->frames allKeys];
-}
-
-
-// findDataSourceForFrameNamed: returns the child data source associated with
-// the frame named 'name', or nil.
-- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
-{
- return [[self frameNamed: name] dataSource];
-}
-
-
-- (BOOL)frameExists: (NSString *)name
-{
- return [self frameNamed: name] == 0 ? NO : YES;
-}
-
-
-- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inFrameNamed: is not implemented"];
-}
-
-
-- (IFWebController *)controller
-{
- // All data sources used in a document share the same controller.
- // A single document may have many data sources corresponding to
- // frames or iframes.
- if (_private->parent != nil)
- return [_private->parent controller];
- return _private->controller;
-}
-
-
-// May return nil if not initialized with a URL.
-- (NSURL *)inputURL
-{
- return _private->inputURL;
-}
-
-
-// finalURL returns the URL that was actually used. The final URL
-// may be different than the inputURL if the server redirects.
-// <IFLocationChangedHandler> includes a message that is sent when
-// a redirect is processed
-- (NSURL *)redirectedURL
-{
- return _private->finalURL;
-}
-
-
-// Returns true if the inputURL has been redirected by the server,
-// i.e. inputURL != redirectedURL.
-- (BOOL)wasRedirected
-{
- return [self redirectedURL] != nil && ![_private->inputURL isEqual: [self redirectedURL]];
-}
-
-
-// Start actually getting (if initialized with a URL) and parsing data. If the data source
-// is still performing a previous load it will be stopped.
-// If forceRefresh is YES the document will load from the net, not the cache.
-- (void)startLoading: (BOOL)forceRefresh
-{
- [self _startLoading: forceRefresh];
-}
-
-
-// Cancels any pending loads. A data source is conceptually only ever loading
-// one document at a time, although one document may have many related
-// resources. stopLoading will stop all loads related to the data source. This
-// method will also stop loads that may be loading in child frames.
-- (void)stopLoading
-{
- // stop download here because we can't rely on IFURLHandleResourceDidCancelLoading
- // as it isn't sent when the app quits
- [[_private->mainURLHandleClient downloadHandler] cancel];
- [self _recursiveStopLoading];
-}
-
-
-// Returns YES if there are any pending loads.
-- (BOOL)isLoading
-{
- int i, count;
-
- // First check to see if the datasource's frame is in the complete state
- if ([[self webFrame] _state] == IFWEBFRAMESTATE_COMPLETE)
- return NO;
-
- //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
- if (_private->primaryLoadComplete == NO && _private->loading)
- return YES;
-
- if ([_private->urlHandles count])
- return YES;
-
- count = [[self children] count];
- for (i = 0; i < count; i++){
- IFWebFrame *childFrame;
-
- childFrame = [[self children] objectAtIndex: i];
- if ([[childFrame dataSource] isLoading])
- return YES;
- if ([[childFrame provisionalDataSource] isLoading])
- return YES;
- }
- return NO;
-}
-
-
-#ifdef TENTATIVE_API
-// Get DOM access to the document.
-- (IFDOMDocument *)document;
-#endif
-
-- (BOOL)isDocumentHTML
-{
- return [[self representation] isKindOfClass: [IFHTMLRepresentation class]];
-}
-
-// Get the actual source of the docment.
-// FIXME: Move to IFHTMLRepresentation
-- (NSString *)documentSource
-{
- // FIMXE: other encodings
- if([self isDocumentHTML]){
- return [[[NSString alloc] initWithData:[self data] encoding:NSASCIIStringEncoding] autorelease];
- }
- return nil;
-}
-
-// FIXME: Move to representation
-- (NSString *)documentTextFromDOM
-{
- return [[self _bridge] documentTextFromDOM];
-}
-
-
-// URL reference point, these should probably not be public for 1.0.
-- (NSURL *)base
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::base is not implemented"];
- return nil;
-}
-
-
-- (NSString *)baseTarget
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::baseTarget is not implemented"];
- return nil;
-}
-
-
-- (NSString *)encoding
-{
- return _private->encoding;
-}
-
-// Style sheet
-- (void)setUserStyleSheetFromURL: (NSURL *)url
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromURL: is not implemented"];
-}
-
-- (void)setUserStyleSheetFromString: (NSString *)sheet
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
-}
-
-// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
-// This method may be moved to a category to prevent unnecessary linkage to the AppKit. Note, however
-// that WebCore also has dependencies on the appkit.
-- (NSImage *)icon
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
- return nil;
-}
-
-// Is page secure, e.g. https, ftps
-- (BOOL)isPageSecure
-{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isPageSecure is not implemented"];
- return NO;
-}
-
-// Returns nil or the page title.
-- (NSString *)pageTitle
-{
- return _private->pageTitle;
-}
-
-- (IFContentPolicy) contentPolicy
-{
- return _private->contentPolicy;
-}
-
-- (NSString *)contentType
-{
- return _private->contentType;
-}
-
-- (NSString *)fileType
-{
- return [[IFFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[self contentType]];
-}
-
-- (NSString *)downloadPath
-{
- return _private->downloadPath;
-}
-
-- (NSDictionary *)errors
-{
- return _private->errors;
-}
-
-- (IFError *)mainDocumentError
-{
- return _private->mainDocumentError;
-}
-
-+ (void)registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType
-{
- // FIXME: OK to allow developers to override built-in reps?
- [[self _repTypes] setObject:repClass forKey:MIMEType];
-}
-
-+ (id <IFDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType
-{
- Class repClass = [[self _repTypes] _IF_objectForMIMEType:MIMEType];
- return repClass ? [[[repClass alloc] init] autorelease] : nil;
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h b/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
deleted file mode 100644
index 5449073..0000000
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* IFWebDataSourcePrivate.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageDataSource.
-*/
-
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFLocationChangeHandler.h>
-
-
- at class IFURLHandle;
- at class IFMainURLHandleClient;
- at protocol IFLocationChangeHandler;
- at protocol IFDocumentRepresentation;
-
- at interface IFWebDataSourcePrivate : NSObject
-{
- at public
- NSData *resourceData;
-
- id <IFDocumentRepresentation> representation;
-
- IFWebDataSource *parent;
-
- IFWebController *controller;
-
- // The original URL as requested during initialization.
- NSURL *inputURL;
-
- // The original URL we may have been redirected to.
- NSURL *finalURL;
-
- // Child frames of this frame.
- NSMutableDictionary *frames;
-
- // The main handle.
- IFURLHandle *mainHandle;
-
- // The handle client for the main document associated with the
- // datasource.
- IFMainURLHandleClient *mainURLHandleClient;
-
- // Active IFURLHandles for resources associated with the
- // datasource.
- NSMutableArray *urlHandles;
-
- // The time when the data source was told to start loading.
- double loadingStartedTime;
-
- BOOL primaryLoadComplete;
-
- BOOL stopping;
-
- NSString *pageTitle, *downloadPath, *encoding, *contentType;
-
- // Errors associated with resources.
- NSMutableDictionary *errors;
-
- // Error associated with main document.
- IFError *mainDocumentError;
-
- // The location change handler for this data source.
- id <IFLocationChangeHandler>locationChangeHandler;
-
- IFContentPolicy contentPolicy;
-
- BOOL loading; // self and controller are retained while loading
-}
-
- at end
-
- at interface IFWebDataSource (IFPrivate)
-- (void)_setResourceData:(NSData *)data;
-- (void)_setRepresentation:(id <IFDocumentRepresentation>)representation;
-- (void)_setController: (IFWebController *)controller;
-- (void)_setParent: (IFWebDataSource *)p;
-- (void)_startLoading: (BOOL)forceRefresh;
-- (void)_stopLoading;
-- (BOOL)_isStopping;
-- (void)_recursiveStopLoading;
-- (void)_addURLHandle: (IFURLHandle *)handle;
-- (void)_removeURLHandle: (IFURLHandle *)handle;
-- (void)_setPrimaryLoadComplete: (BOOL)flag;
-- (double)_loadingStartedTime;
-- (void)_setTitle: (NSString *)title;
-- (void)_setFinalURL: (NSURL *)url;
-- (id <IFLocationChangeHandler>)_locationChangeHandler;
-- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l;
-- (void)_setDownloadPath:(NSString *)path;
-- (void)_setContentPolicy:(IFContentPolicy)policy;
-- (void)_setContentType:(NSString *)type;
-- (void)_setEncoding:(NSString *)encoding;
-- (void)_layoutChildren;
-- (void)_clearErrors;
-- (void)_setMainDocumentError: (IFError *)error;
-- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription;
-+ (NSMutableDictionary *)_repTypes;
-+ (BOOL)_canShowMIMEType:(NSString *)MIMEType;
-- (void)_removeFromFrame;
- at end
diff --git a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm b/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
deleted file mode 100644
index 46c82e6..0000000
--- a/WebKit/WebView.subproj/IFWebDataSourcePrivate.mm
+++ /dev/null
@@ -1,399 +0,0 @@
-/* IFWebDataSourcePrivate.h
- Copyright 2001, 2002, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageDataSource.
-*/
-
-#import <WebKit/IFWebDataSourcePrivate.h>
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFImageRepresentation.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFTextRepresentation.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
-#import <WebFoundation/IFURLHandle.h>
-
- at implementation IFWebDataSourcePrivate
-
-- init
-{
- // Unnecessary, but I like to know that these ivars should be nil.
- parent = nil;
- frames = nil;
- controller = nil;
- inputURL = nil;
-
- primaryLoadComplete = NO;
-
- contentPolicy = IFContentPolicyNone;
-
- return self;
-}
-
-- (void)dealloc
-{
- // controller is only retained while loading, but this object is also
- // retained while loading, so no need to release here
- WEBKIT_ASSERT(!loading);
-
- NSEnumerator *e = [[frames allValues] objectEnumerator];
- IFWebFrame *frame;
- while ((frame = [e nextObject])) {
- [frame _parentDataSourceWillBeDeallocated];
- }
-
- [resourceData release];
- [representation release];
- [inputURL release];
- [finalURL release];
- [frames release];
- [mainHandle release];
- [mainURLHandleClient release];
- [urlHandles release];
- [pageTitle autorelease];
- [downloadPath autorelease];
- [encoding autorelease];
- [contentType autorelease];
- [errors release];
- [mainDocumentError release];
- [locationChangeHandler release];
-
- [super dealloc];
-}
-
- at end
-
- at implementation IFWebDataSource (IFPrivate)
-
-- (void)_setResourceData:(NSData *)data
-{
- [_private->resourceData release];
- _private->resourceData = [data retain];
-}
-
-- (void)_setRepresentation:(id <IFDocumentRepresentation>) representation
-{
- [_private->representation release];
- _private->representation = [representation retain];
-}
-
-- (void)_setLoading:(BOOL)loading
-{
- WEBKIT_ASSERT_VALID_ARG("loading", loading == NO || loading == YES);
-
- if (_private->loading == loading)
- return;
- _private->loading = loading;
-
- if (loading) {
- [self retain];
- [_private->controller retain];
- } else {
- [_private->controller release];
- [self release];
- }
-}
-
-- (void)_updateLoading
-{
- [self _setLoading: _private->mainHandle || [_private->urlHandles count]];
-}
-
-- (void)_setController: (IFWebController *)controller
-{
- if (_private->loading) {
- [controller retain];
- [_private->controller release];
- }
- _private->controller = controller;
-}
-
-- (void)_setParent: (IFWebDataSource *)p
-{
- // Non-retained.
- _private->parent = p;
-}
-
-- (void)_setPrimaryLoadComplete: (BOOL)flag
-{
- _private->primaryLoadComplete = flag;
- if (flag) {
- [_private->mainURLHandleClient release];
- _private->mainURLHandleClient = 0;
- [_private->mainHandle autorelease];
- _private->mainHandle = 0;
- [self _updateLoading];
- }
-}
-
-- (void)_startLoading: (BOOL)forceRefresh
-{
- WEBKIT_ASSERT ([self _isStopping] == NO);
-
- [self _setPrimaryLoadComplete: NO];
-
- WEBKIT_ASSERT ([self webFrame] != nil);
-
- [self _clearErrors];
-
- _private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
- [_private->mainHandle addClient: _private->mainURLHandleClient];
-
- // Mark the start loading time.
- _private->loadingStartedTime = CFAbsoluteTimeGetCurrent();
-
- [self _setLoading:YES];
-
- [[self _locationChangeHandler] locationChangeStartedForDataSource:self];
-
- // Fire this guy up.
- [_private->mainHandle loadInBackground];
-}
-
-- (void)_addURLHandle: (IFURLHandle *)handle
-{
- if (_private->urlHandles == nil)
- _private->urlHandles = [[NSMutableArray alloc] init];
- [_private->urlHandles addObject: handle];
- [self _setLoading:YES];
-}
-
-- (void)_removeURLHandle: (IFURLHandle *)handle
-{
- [_private->urlHandles removeObject: handle];
- [self _updateLoading];
-}
-
-- (BOOL)_isStopping
-{
- return _private->stopping;
-}
-
-- (void)_stopLoading
-{
- int i, count;
- IFURLHandle *handle;
-
- _private->stopping = YES;
-
- [_private->mainHandle cancelLoadInBackground];
-
- // Tell all handles to stop loading.
- count = [_private->urlHandles count];
- for (i = 0; i < count; i++) {
- handle = [_private->urlHandles objectAtIndex: i];
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "cancelling %s\n", [[[handle url] absoluteString] cString] );
- [[_private->urlHandles objectAtIndex: i] cancelLoadInBackground];
- }
-
- [[self _bridge] closeURL];
-}
-
-- (void)_recursiveStopLoading
-{
- NSArray *frames;
- IFWebFrame *nextFrame;
- int i, count;
- IFWebDataSource *childDataSource, *childProvisionalDataSource;
-
- [self _stopLoading];
-
- frames = [self children];
- count = [frames count];
- for (i = 0; i < count; i++){
- nextFrame = [frames objectAtIndex: i];
- childDataSource = [nextFrame dataSource];
- [childDataSource _recursiveStopLoading];
- childProvisionalDataSource = [nextFrame provisionalDataSource];
- [childProvisionalDataSource _recursiveStopLoading];
- }
-}
-
-- (double)_loadingStartedTime
-{
- return _private->loadingStartedTime;
-}
-
-- (void)_setTitle:(NSString *)title
-{
- NSString *trimmed;
- if (title == nil) {
- trimmed = nil;
- } else {
- trimmed = [title _IF_stringByTrimmingWhitespace];
- if ([trimmed length] == 0)
- trimmed = nil;
- }
- if (trimmed == nil) {
- if (_private->pageTitle == nil)
- return;
- } else {
- if ([_private->pageTitle isEqualToString:trimmed])
- return;
- }
-
- [_private->pageTitle autorelease];
- _private->pageTitle = [trimmed copy];
-
- // The title doesn't get communicated to the controller until
- // we reach the committed state for this data source's frame.
- if ([[self webFrame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
- [[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
-}
-
-- (void)_setFinalURL: (NSURL *)url
-{
- [url retain];
- [_private->finalURL release];
- _private->finalURL = url;
-}
-
-- (id <IFLocationChangeHandler>)_locationChangeHandler
-{
- return _private->locationChangeHandler;
-}
-
-- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
-{
- [l retain];
- [_private->locationChangeHandler release];
- _private->locationChangeHandler = l;
-}
-
-- (void)_setDownloadPath:(NSString *)path
-{
- [_private->downloadPath release];
- _private->downloadPath = [path retain];
-}
-
-- (void) _setContentPolicy:(IFContentPolicy)policy
-{
- _private->contentPolicy = policy;
-}
-
-- (void)_setContentType:(NSString *)type
-{
- [_private->contentType release];
- _private->contentType = [type retain];
-}
-
-- (void)_setEncoding:(NSString *)encoding
-{
- [_private->encoding release];
- _private->encoding = [encoding retain];
-}
-
-- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
-{
- IFWebDataSource *childProvisionalDataSource, *childDataSource, *dataSource;
- IFWebFrame *nextFrame;
- NSArray *frames;
- uint i;
-
- if(_private->locationChangeHandler == handler)
- return self;
-
- frames = [self children];
- for (i = 0; i < [frames count]; i++){
- nextFrame = [frames objectAtIndex: i];
- childDataSource = [nextFrame dataSource];
- dataSource = [childDataSource _recursiveDataSourceForLocationChangeHandler:handler];
- if(dataSource)
- return dataSource;
-
- childProvisionalDataSource = [nextFrame provisionalDataSource];
- dataSource = [childProvisionalDataSource _recursiveDataSourceForLocationChangeHandler:handler];
- if(dataSource)
- return dataSource;
- }
- return nil;
-}
-
-- (void)_setMainDocumentError: (IFError *)error
-{
- [error retain];
- [_private->mainDocumentError release];
- _private->mainDocumentError = error;
-}
-
-- (void)_clearErrors
-{
- [_private->errors release];
- _private->errors = nil;
- [_private->mainDocumentError release];
- _private->mainDocumentError = nil;
-}
-
-
-- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription
-{
- if (_private->errors == 0)
- _private->errors = [[NSMutableDictionary alloc] init];
-
- [_private->errors setObject: error forKey: resourceDescription];
-}
-
-
-- (void)_layoutChildren
-{
- if ([[self children] count] > 0){
- NSArray *subFrames = [self children];
- IFWebFrame *subFrame;
- unsigned int i;
- id dview;
- for (i = 0; i < [subFrames count]; i++){
- subFrame = [subFrames objectAtIndex: i];
- dview = [[subFrame webView] documentView];
- if ([[subFrame webView] isDocumentHTML])
- [dview _adjustFrames];
- [dview setNeedsDisplay: YES];
- [[subFrame dataSource] _layoutChildren];
- }
- }
-}
-
-+ (NSMutableDictionary *)_repTypes
-{
- static NSMutableDictionary *repTypes = nil;
-
- if (!repTypes) {
- repTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- [IFHTMLRepresentation class], @"text/html",
- [IFImageRepresentation class], @"image/jpeg",
- [IFImageRepresentation class], @"image/gif",
- [IFImageRepresentation class], @"image/png",
- [IFTextRepresentation class], @"text/",
- nil];
- }
-
- return repTypes;
-}
-
-+ (BOOL)_canShowMIMEType:(NSString *)MIMEType
-{
- return [[self _repTypes] _IF_objectForMIMEType:MIMEType] != nil;
-}
-
-- (void)_removeFromFrame
-{
- [[self _bridge] removeFromFrame];
- [self _setController:nil];
- [self _setLocationChangeHandler:nil];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebFrame.h b/WebKit/WebView.subproj/IFWebFrame.h
deleted file mode 100644
index 957c2d0..0000000
--- a/WebKit/WebView.subproj/IFWebFrame.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- IFWebFrame.h
-
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Foundation/Foundation.h>
-
- at class IFError;
- at class IFWebController;
- at class IFWebDataSource;
- at class IFWebView;
-
- at class IFWebFramePrivate;
-
- at interface IFWebFrame : NSObject
-{
- at private
- IFWebFramePrivate *_private;
-}
-
-- initWithName: (NSString *)name webView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
-- (NSString *)name;
-
-- (void)setController: (IFWebController *)controller;
-- (IFWebController *)controller;
-
-- (void)setWebView: (IFWebView *)view;
-- (IFWebView *)webView;
-
-/*
- Sets the frame's data source. Note that the data source will be
- considered 'provisional' until it has been loaded, and at least
- ~some~ data has been received.
-
- Will return NO and not set the provisional data source if the controller
- disallows by returning a IFURLPolicyIgnore.
-*/
-- (BOOL)setProvisionalDataSource: (IFWebDataSource *)ds;
-
-/*
- Returns the committed data source. Will return nil if the
- provisional data source hasn't yet been loaded.
-*/
-- (IFWebDataSource *)dataSource;
-
-/*
- Will return the provisional data source. The provisional data source will
- return nil if no data source has been set on the frame, or the data source
- has successfully transitioned to the committed data source.
-*/
-- (IFWebDataSource *)provisionalDataSource;
-
-
-/*
- If a frame has a provisional data source this method will begin
- loading data for that provisional data source. If the frame
- has no provisional data source this method will do nothing.
-
- To reload an existing data source call reload.
-*/
-- (void)startLoading;
-
-
-/*
- Stop any pending loads on the frame's data source,
- and it's children.
-*/
-- (void)stopLoading;
-
-
-/*
-*/
-- (void)reload: (BOOL)forceRefresh;
-
-
-/*
- This method removes references the underlying resources.
- FIXME: I think this should be private.
-*/
-- (void)reset;
-
-/*
- This method returns a frame with the given name. frameNamed returns self
- for _self and _current, the parent frame for _parent and the main frame for _top.
- frameNamed returns self for _parent and _top if the receiver it is the mainFrame.
- nil is returned if a frame with the given name is not found.
-*/
-- (IFWebFrame *)frameNamed:(NSString *)name;
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
deleted file mode 100644
index cb2e32f..0000000
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- IFWebFrame.m
- Copyright (c) 2001, Apple, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFWebFrame.h>
-
-#import <Cocoa/Cocoa.h>
-
-#import <WebKit/IFHTMLRepresentationPrivate.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFLocationChangeHandler.h>
-
-#import <WebFoundation/WebFoundation.h>
-
-#import <WebKit/WebKitDebug.h>
-
- at implementation IFWebFrame
-
-- init
-{
- return [self initWithName: nil webView: nil provisionalDataSource: nil controller: nil];
-}
-
-- initWithName: (NSString *)n webView: (IFWebView *)v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
-{
- [super init];
-
- _private = [[IFWebFramePrivate alloc] init];
- _private->frameBridge = [[IFWebCoreFrame alloc] initWithWebFrame:self];
-
- [self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
-
- [self setController: c];
-
- if (d == nil) {
- // set a dummy data source so that the main from for a
- // newly-created empty window has a KHTMLPart. JavaScript
- // always creates new windows initially empty, and then wants
- // to use the main frame's part to make the new window load
- // it's URL, so we need to make sure empty frames have a part.
- // However, we don't want to do the spinner, so we do this
- // weird thing:
-
- // FIXME: HACK ALERT!!!
- // We need to keep a shadow part for all frames, even in the case
- // of a non HTML representation. This is required khtml
- // can reference the frame (window.frames, targeting, etc.).
-
- IFWebDataSource *dummyDataSource = [[IFWebDataSource alloc] initWithURL:nil];
- IFHTMLRepresentation *dummyRep = [[IFHTMLRepresentation alloc] init];
- [[dummyRep _bridge] setDataSource: dummyDataSource];
- [dummyDataSource _setRepresentation: dummyRep];
- [dummyRep release];
-
- [dummyDataSource _setController: [self controller]];
- [_private setProvisionalDataSource: dummyDataSource];
- [dummyDataSource release];
-
- } else if ([self setProvisionalDataSource: d] == NO){
- [self autorelease];
- return nil;
- }
-
- [_private setName: n];
-
- if (v)
- [self setWebView: v];
-
- return self;
-}
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (NSString *)name
-{
- return [_private name];
-}
-
-
-- (void)setWebView: (IFWebView *)v
-{
- [_private setWebView: v];
- [v _setController: [self controller]];
-}
-
-- (IFWebView *)webView
-{
- return [_private webView];
-}
-
-- (IFWebController *)controller
-{
- return [_private controller];
-}
-
-
-- (void)setController: (IFWebController *)controller
-{
- [_private setController: controller];
-}
-
-
-- (IFWebDataSource *)provisionalDataSource
-{
- return [_private provisionalDataSource];
-}
-
-
-- (IFWebDataSource *)dataSource
-{
- return [_private dataSource];
-}
-
-
-// Will return NO and not set the provisional data source if the controller
-// disallows by returning a IFURLPolicyIgnore.
-- (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
-{
- id <IFLocationChangeHandler>locationChangeHandler;
- IFWebDataSource *oldDataSource;
-
- WEBKIT_ASSERT ([self controller] != nil);
-
- // Unfortunately the view must be non-nil, this is ultimately due
- // to KDE parser requiring a KHTMLView. Once we settle on a final
- // KDE drop we should fix this dependency.
- WEBKIT_ASSERT ([self webView] != nil);
-
- if ([self _state] != IFWEBFRAMESTATE_COMPLETE){
- [self stopLoading];
- }
-
- // _shouldShowDataSource asks the client for the URL policies and reports errors if there are any
- // returns YES if we should show the data source
- if([self _shouldShowDataSource:newDataSource]){
-
- locationChangeHandler = [[[self controller] policyHandler] provideLocationChangeHandlerForDataSource: newDataSource];
-
- [newDataSource _setLocationChangeHandler: locationChangeHandler];
-
- oldDataSource = [self dataSource];
-
- // Is this the top frame? If so set the data source's parent to nil.
- if (self == [[self controller] mainFrame])
- [newDataSource _setParent: nil];
-
- // Otherwise set the new data source's parent to the old data source's parent.
- else if (oldDataSource && oldDataSource != newDataSource)
- [newDataSource _setParent: [oldDataSource parent]];
-
- [newDataSource _setController: [self controller]];
-
- [_private setProvisionalDataSource: newDataSource];
-
- // We tell the documentView provisionalDataSourceChanged:
- // once it has been created by the controller.
-
- [self _setState: IFWEBFRAMESTATE_PROVISIONAL];
-
- return YES;
- }
-
- return NO;
-}
-
-
-- (void)startLoading
-{
- if (self == [[self controller] mainFrame])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "loading %s", [[[[self provisionalDataSource] inputURL] absoluteString] cString]);
-
- // Force refresh is irrelevant, as this will always be the first load.
- // The controller will transition the provisional data source to the
- // committed data source.
- [_private->provisionalDataSource startLoading: NO];
-}
-
-
-- (void)stopLoading
-{
- [_private->provisionalDataSource stopLoading];
- [_private->dataSource stopLoading];
-}
-
-
-- (void)reload: (BOOL)forceRefresh
-{
- [_private->dataSource _clearErrors];
-
- [_private->dataSource startLoading: forceRefresh];
-}
-
-
-- (void)reset
-{
- [_private setDataSource: nil];
- if ([[self webView] isDocumentHTML]) {
- IFHTMLView *htmlView = (IFHTMLView *)[[self webView] documentView];
- [htmlView _reset];
- }
- [_private setWebView: nil];
-}
-
-+ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
-{
- int i, count;
- IFWebFrame *foundFrame;
- NSArray *children;
-
- if ([[aFrame name] isEqualToString: name])
- return aFrame;
-
- children = [[aFrame dataSource] children];
- count = [children count];
- for (i = 0; i < count; i++){
- aFrame = [children objectAtIndex: i];
- foundFrame = [IFWebFrame _frameNamed: name fromFrame: aFrame];
- if (foundFrame)
- return foundFrame;
- }
-
- // FIXME: Need to look in other controller's frame namespaces.
-
- // FIXME: What do we do if a frame name isn't found? create a new window
-
- return nil;
-}
-
-- (IFWebFrame *)frameNamed:(NSString *)name
-{
- // First, deal with 'special' names.
- if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"]){
- return self;
- }
-
- else if([name isEqualToString:@"_top"]) {
- return [[self controller] mainFrame];
- }
-
- else if([name isEqualToString:@"_parent"]){
- IFWebDataSource *parent = [[self dataSource] parent];
- if(parent){
- return [parent webFrame];
- }
- else{
- return self;
- }
- }
-
- else if ([name isEqualToString:@"_blank"]){
- IFWebController *newController = [[[self controller] windowContext] openNewWindowWithURL: nil];
- [[[[newController windowContext] window] windowController] showWindow:nil];
-
- return [newController mainFrame];
- }
-
- // Now search the namespace associated with this frame's controller.
- return [IFWebFrame _frameNamed: name fromFrame: [[self controller] mainFrame]];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
deleted file mode 100644
index 32e9f57..0000000
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- IFWebFramePrivate.h
-
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file.
-*/
-
-#import <WebKit/IFWebFrame.h>
-
- at class IFWebCoreFrame;
- at class IFWebView;
- at protocol IFDocumentLoading;
-
-typedef enum {
- IFWEBFRAMESTATE_UNINITIALIZED = 1,
- IFWEBFRAMESTATE_PROVISIONAL = 2,
-
- // This state indicates we are ready to commit to a page,
- // that means the view will transition to use the new
- // datasource.
- IFWEBFRAMESTATE_COMMITTED_PAGE = 3,
-
- // This state indicates that it is reasonable to perform
- // a layout.
- IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE = 4,
-
- IFWEBFRAMESTATE_COMPLETE = 5
-} IFWebFrameState;
-
-#define IFFrameStateChangedNotification @"IFFrameStateChangedNotification"
-
-#define IFPreviousFrameState @"IFPreviousFrameState"
-#define IFCurrentFrameState @"IFCurrentFrameState"
-
- at interface IFWebFramePrivate : NSObject
-{
- at public
- NSString *name;
- IFWebView *webView;
- IFWebDataSource *dataSource;
- IFWebDataSource *provisionalDataSource;
- IFWebController *controller;
- IFWebFrameState state;
- BOOL scheduledLayoutPending;
- IFWebCoreFrame *frameBridge;
-}
-
-- (void)setName: (NSString *)n;
-- (NSString *)name;
-- (void)setController: (IFWebController *)c;
-- (IFWebController *)controller;
-- (void)setWebView: (IFWebView *)v;
-- (IFWebView *)webView;
-- (void)setDataSource: (IFWebDataSource *)d;
-- (IFWebDataSource *)dataSource;
-- (void)setProvisionalDataSource: (IFWebDataSource *)d;
-- (IFWebDataSource *)provisionalDataSource;
-
- at end
-
- at interface IFWebFrame (IFPrivate)
-- (void)_parentDataSourceWillBeDeallocated;
-- (void)_setController: (IFWebController *)controller;
-- (void)_setDataSource: (IFWebDataSource *)d;
-- (void)_transitionProvisionalToCommitted;
-- (void)_transitionProvisionalToLayoutAcceptable;
-- (IFWebFrameState)_state;
-- (void)_setState: (IFWebFrameState)newState;
-+ (void)_recursiveCheckCompleteFromFrame: (IFWebFrame *)fromFrame;
-- (void)_isLoadComplete;
-- (void)_checkLoadComplete;
-- (void)_timedLayout: userInfo;
-- (IFWebCoreFrame *)_frameBridge;
-- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
-- (void)_setProvisionalDataSource:(IFWebDataSource *)d;
- at end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
deleted file mode 100644
index 16c496d..0000000
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- IFWebFramePrivate.mm
-
- Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFWebFramePrivate.h>
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebKitErrors.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/WebKitDebug.h>
-
-#import <WebFoundation/WebFoundation.h>
-
-static const char * const stateNames[6] = {
- "zero state",
- "IFWEBFRAMESTATE_UNINITIALIZED",
- "IFWEBFRAMESTATE_PROVISIONAL",
- "IFWEBFRAMESTATE_COMMITTED_PAGE",
- "IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE",
- "IFWEBFRAMESTATE_COMPLETE"
-};
-
- at implementation IFWebFramePrivate
-
-- (void)dealloc
-{
- [webView _setController: nil];
- [dataSource _setController: nil];
- [dataSource _setLocationChangeHandler: nil];
- [provisionalDataSource _setController: nil];
- [provisionalDataSource _setLocationChangeHandler: nil];
-
- [name autorelease];
- [webView autorelease];
- [dataSource autorelease];
- [provisionalDataSource autorelease];
- [frameBridge release];
-
- [super dealloc];
-}
-
-- (NSString *)name { return name; }
-- (void)setName: (NSString *)n
-{
- [name autorelease];
- name = [n retain];
-}
-
-- (IFWebView *)webView { return webView; }
-- (void)setWebView: (IFWebView *)v
-{
- [webView autorelease];
- webView = [v retain];
-}
-
-- (IFWebDataSource *)dataSource { return dataSource; }
-- (void)setDataSource: (IFWebDataSource *)d
-{
- if (dataSource != d) {
- [dataSource _removeFromFrame];
- [dataSource autorelease];
- dataSource = [d retain];
- }
-}
-
-- (IFWebController *)controller { return controller; }
-- (void)setController: (IFWebController *)c
-{
- controller = c; // not retained (yet)
-}
-
-- (IFWebDataSource *)provisionalDataSource { return provisionalDataSource; }
-- (void)setProvisionalDataSource: (IFWebDataSource *)d
-{
- if (provisionalDataSource != d) {
- [provisionalDataSource autorelease];
- provisionalDataSource = [d retain];
- }
-}
-
- at end
-
- at implementation IFWebFrame (IFPrivate)
-
-- (void)_parentDataSourceWillBeDeallocated
-{
- [_private setController:nil];
- [_private->dataSource _setParent:nil];
- [_private->provisionalDataSource _setParent:nil];
-}
-
-- (void)_setController: (IFWebController *)controller
-{
- [_private setController: controller];
-}
-
-- (void)_setDataSource: (IFWebDataSource *)ds
-{
- [_private setDataSource: ds];
- [ds _setController: [self controller]];
-}
-
-- (void)_scheduleLayout: (NSTimeInterval)inSeconds
-{
- if (_private->scheduledLayoutPending == NO) {
- [NSTimer scheduledTimerWithTimeInterval:inSeconds target:self selector: @selector(_timedLayout:) userInfo: nil repeats:FALSE];
- _private->scheduledLayoutPending = YES;
- }
-}
-
-- (void)_timedLayout: (id)userInfo
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_private->state]);
-
- _private->scheduledLayoutPending = NO;
- if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- NSView <IFDocumentView> *documentView = [[self webView] documentView];
-
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
-
- if ([[self webView] isDocumentHTML]) {
- IFHTMLView *htmlView = (IFHTMLView *)documentView;
-
- [htmlView setNeedsLayout: YES];
-
- NSRect frame = [htmlView frame];
-
- if (frame.size.width == 0 || frame.size.height == 0){
- // We must do the layout now, rather than depend on
- // display to do a lazy layout because the view
- // may be recently initialized with a zero size
- // and the AppKit will optimize out any drawing.
-
- // Force a layout now. At this point we could
- // check to see if any CSS is pending and delay
- // the layout further to avoid the flash of unstyled
- // content.
- [htmlView layout];
- }
- }
-
- [documentView setNeedsDisplay: YES];
- }
- else {
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: NOT performing timed layout (not needed), %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- }
-}
-
-
-- (void)_transitionProvisionalToLayoutAcceptable
-{
- switch ([self _state]) {
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
- {
- [self _setState: IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE];
-
- // Start a timer to guarantee that we get an initial layout after
- // X interval, even if the document and resources are not completely
- // loaded.
- BOOL timedDelayEnabled = [[IFPreferences standardPreferences] _initialTimedLayoutEnabled];
- if (timedDelayEnabled) {
- NSTimeInterval defaultTimedDelay = [[IFPreferences standardPreferences] _initialTimedLayoutDelay];
- double timeSinceStart;
-
- // If the delay getting to the commited state exceeds the initial layout delay, go
- // ahead and schedule a layout.
- timeSinceStart = (CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
- if (timeSinceStart > (double)defaultTimedDelay) {
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "performing early layout because commit time, %f, exceeded initial layout interval %f\n", timeSinceStart, defaultTimedDelay);
- [self _timedLayout: nil];
- }
- else {
- NSTimeInterval timedDelay = defaultTimedDelay - timeSinceStart;
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "registering delayed layout after %f seconds, time since start %f\n", timedDelay, timeSinceStart);
- [self _scheduleLayout: timedDelay];
- }
- }
- break;
- }
-
- case IFWEBFRAMESTATE_PROVISIONAL:
- case IFWEBFRAMESTATE_COMPLETE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
- {
- break;
- }
-
- case IFWEBFRAMESTATE_UNINITIALIZED:
- default:
- {
- [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_private->state]] userInfo: nil] raise];
- return;
- }
- }
-}
-
-
-- (void)_transitionProvisionalToCommitted
-{
- WEBKIT_ASSERT ([self controller] != nil);
- NSView <IFDocumentView> *documentView = [[self webView] documentView];
-
- switch ([self _state]) {
- case IFWEBFRAMESTATE_PROVISIONAL:
- {
- WEBKIT_ASSERT (documentView != nil);
-
- // Set the committed data source on the frame.
- [self _setDataSource: _private->provisionalDataSource];
-
- // provisionalDataSourceCommitted: will reset the view and begin trying to
- // display the new new datasource.
- [documentView provisionalDataSourceCommitted: _private->provisionalDataSource];
-
- // Now that the provisional data source is committed, release it.
- [_private setProvisionalDataSource: nil];
-
- [self _setState: IFWEBFRAMESTATE_COMMITTED_PAGE];
-
- [[[self dataSource] _locationChangeHandler] locationChangeCommittedForDataSource:[self dataSource]];
-
- // If we have a title let the controller know about it.
- if ([[self dataSource] pageTitle])
- [[[self dataSource] _locationChangeHandler] receivedPageTitle:[[self dataSource] pageTitle] forDataSource:[self dataSource]];
-
- break;
- }
-
- case IFWEBFRAMESTATE_UNINITIALIZED:
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
- case IFWEBFRAMESTATE_COMPLETE:
- default:
- {
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED_PAGE from %s", stateNames[_private->state]] userInfo: nil] raise];
- return;
- }
- }
-}
-
-- (IFWebFrameState)_state
-{
- return _private->state;
-}
-
-- (void)_setState: (IFWebFrameState)newState
-{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_private->state], stateNames[newState]);
- if ([self controller])
- WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
-
- if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame]){
- WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
- }
-
- NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:_private->state], IFPreviousFrameState,
- [NSNumber numberWithInt:newState], IFCurrentFrameState, nil];
-
- [[NSNotificationCenter defaultCenter] postNotificationName:IFFrameStateChangedNotification object:self userInfo:userInfo];
-
- _private->state = newState;
-
- if (_private->state == IFWEBFRAMESTATE_PROVISIONAL){
- [[[self webView] frameScrollView] setDrawsBackground: NO];
- }
-
- if (_private->state == IFWEBFRAMESTATE_COMPLETE){
- NSScrollView *sv = [[self webView] frameScrollView];
- [sv setDrawsBackground: YES];
- [[sv contentView] setCopiesOnScroll: YES];
- }
-}
-
-- (void)_isLoadComplete
-{
- WEBKIT_ASSERT ([self controller] != nil);
-
- switch ([self _state]) {
- // Shouldn't ever be in this state.
- case IFWEBFRAMESTATE_UNINITIALIZED:
- {
- [[NSException exceptionWithName:NSGenericException reason:@"invalid state IFWEBFRAMESTATE_UNINITIALIZED during completion check with error" userInfo: nil] raise];
- return;
- }
-
- case IFWEBFRAMESTATE_PROVISIONAL:
- {
- IFWebDataSource *pd = [self provisionalDataSource];
-
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL\n", [[self name] cString]);
- // If we've received any errors we may be stuck in the provisional state and actually
- // complete.
- if ([[pd errors] count] != 0 || [pd mainDocumentError]) {
- // Check all children first.
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[pd errors] count]);
- if (![pd isLoading]) {
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
-
- [[pd _locationChangeHandler] locationChangeDone: [pd mainDocumentError] forDataSource:pd];
-
- // We now the provisional data source didn't cut the mustard, release it.
- [_private setProvisionalDataSource: nil];
-
- [self _setState: IFWEBFRAMESTATE_COMPLETE];
- return;
- }
- }
- return;
- }
-
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
- {
- IFWebDataSource *ds = [self dataSource];
-
- //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
- if (![ds isLoading]) {
- id thisView = [self webView];
- NSView <IFDocumentView> *thisDocumentView = [thisView documentView];
-
- [self _setState: IFWEBFRAMESTATE_COMPLETE];
-
- [[ds _bridge] end];
-
- // Unfortunately we have to get our parent to adjust the frames in this
- // frameset so this frame's geometry is set correctly. This should
- // be a reasonably inexpensive operation.
- id parentDS = [[[ds parent] webFrame] dataSource];
- if ([[parentDS _bridge] isFrameSet]){
- id parentWebView = [[[ds parent] webFrame] webView];
- if ([parentWebView isDocumentHTML])
- [[parentWebView documentView] _adjustFrames];
- }
-
- // Tell the just loaded document to layout. This may be necessary
- // for non-html content that needs a layout message.
- if ([thisView isDocumentHTML]){
- IFHTMLView *hview = (IFHTMLView *)thisDocumentView;
- [hview setNeedsLayout: YES];
- }
- [thisDocumentView layout];
-
- // Unfortunately if this frame has children we have to lay them
- // out too. This could be an expensive operation.
- // FIXME: If we can figure out how to avoid the layout of children,
- // (just need for iframe placement/sizing) we could get a few percent
- // speed improvement.
- [ds _layoutChildren];
-
- [thisDocumentView setNeedsDisplay: YES];
- //[thisDocumentView display];
-
- // Jump to anchor point, if necessary.
- [[ds _bridge] scrollToBaseAnchor];
-
- [[ds _locationChangeHandler] locationChangeDone: [ds mainDocumentError] forDataSource:ds];
-
- //if ([ds isDocumentHTML])
- // [[ds representation] part]->closeURL();
-
- return;
- }
- // A resource was loaded, but the entire frame isn't complete. Schedule a
- // layout.
- else {
- if ([self _state] == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- BOOL resourceTimedDelayEnabled = [[IFPreferences standardPreferences] _resourceTimedLayoutEnabled];
- if (resourceTimedDelayEnabled) {
- NSTimeInterval timedDelay = [[IFPreferences standardPreferences] _resourceTimedLayoutDelay];
- [self _scheduleLayout: timedDelay];
- }
- }
- }
- return;
- }
-
- case IFWEBFRAMESTATE_COMPLETE:
- {
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMPLETE\n", [[self name] cString]);
- return;
- }
-
- // Yikes! Serious horkage.
- default:
- {
- [[NSException exceptionWithName:NSGenericException reason:@"invalid state during completion check with error" userInfo: nil] raise];
- break;
- }
- }
-}
-
-+ (void)_recursiveCheckCompleteFromFrame: (IFWebFrame *)fromFrame
-{
- int i, count;
- NSArray *childFrames;
-
- childFrames = [[fromFrame dataSource] children];
- count = [childFrames count];
- for (i = 0; i < count; i++) {
- IFWebFrame *childFrame;
-
- childFrame = [childFrames objectAtIndex: i];
- [IFWebFrame _recursiveCheckCompleteFromFrame: childFrame];
- [childFrame _isLoadComplete];
- }
- [fromFrame _isLoadComplete];
-}
-
-// Called every time a resource is completely loaded, or an error is received.
-- (void)_checkLoadComplete
-{
-
- WEBKIT_ASSERT ([self controller] != nil);
-
- // Now walk the frame tree to see if any frame that may have initiated a load is done.
- [IFWebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
-}
-
-- (IFWebCoreFrame *)_frameBridge
-{
- return _private->frameBridge;
-}
-
-- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource
-{
- id <IFWebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
- NSFileManager *fileManager = [NSFileManager defaultManager];
- NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
- NSURL *url = [dataSource inputURL];
- IFFileURLPolicy fileURLPolicy;
- NSString *path = [url path];
- BOOL isDirectory, fileExists;
- IFError *error;
-
- IFURLPolicy urlPolicy = [policyHandler URLPolicyForURL:url];
-
- if(urlPolicy == IFURLPolicyUseContentPolicy){
-
- if([url isFileURL]){
-
- fileExists = [fileManager fileExistsAtPath:path isDirectory:&isDirectory];
-
- NSString *type = [IFWebController _MIMETypeForFile: path];
-
- if(isDirectory){
- fileURLPolicy = [policyHandler fileURLPolicyForMIMEType: nil dataSource: dataSource isDirectory:YES];
- }else{
- fileURLPolicy = [policyHandler fileURLPolicyForMIMEType: type dataSource: dataSource isDirectory:NO];
- }
-
- if(fileURLPolicy == IFFileURLPolicyIgnore)
- return NO;
-
- if(!fileExists){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFileDoesntExist
- inDomain:IFErrorCodeDomainWebKit failingURL:url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- return NO;
- }
-
- if(![fileManager isReadableFileAtPath:path]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFileNotReadable
- inDomain:IFErrorCodeDomainWebKit failingURL:url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- return NO;
- }
-
- if(fileURLPolicy == IFFileURLPolicyUseContentPolicy){
- if(isDirectory){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowDirectory
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- return NO;
- }
- else if(![IFWebController canShowMIMEType: type]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowMIMEType
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- return NO;
- }else{
- // File exists, its readable, we can show it
- return YES;
- }
- }else if(fileURLPolicy == IFFileURLPolicyOpenExternally){
- if(![workspace openFile:path]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- }
- return NO;
- }else if(fileURLPolicy == IFFileURLPolicyReveal){
- if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFinderCouldntOpenDirectory
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
- }
- return NO;
- }else{
- [NSException raise:NSInvalidArgumentException format:
- @"fileURLPolicyForMIMEType:dataSource:isDirectory: returned an invalid IFFileURLPolicy"];
- return NO;
- }
- }else{
- if(![IFURLHandle canInitWithURL:url]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowURL
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementURLPolicyForURL: url error: error];
- return NO;
- }
- // we can handle this URL
- return YES;
- }
- }
- else if(urlPolicy == IFURLPolicyOpenExternally){
- if(![workspace openURL:url]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForURL
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
- [policyHandler unableToImplementURLPolicyForURL: url error: error];
- }
- return NO;
- }
- else if(urlPolicy == IFURLPolicyIgnore){
- return NO;
- }
- else{
- [NSException raise:NSInvalidArgumentException format:@"URLPolicyForURL: returned an invalid IFURLPolicy"];
- return NO;
- }
-}
-
-- (void)_setProvisionalDataSource:(IFWebDataSource *)d
-{
- [_private setProvisionalDataSource:d];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebView.h b/WebKit/WebView.subproj/IFWebView.h
deleted file mode 100644
index 294de24..0000000
--- a/WebKit/WebView.subproj/IFWebView.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- IFWebView.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <Cocoa/Cocoa.h>
-
-/*
- =============================================================================
-*/
-
- at class IFWebDataSource;
- at class IFWebController;
- at class IFWebViewPrivate;
- at protocol IFDocumentLoading;
- at protocol IFDocumentView;
-
- at interface IFWebView : NSView
-{
- at private
- IFWebViewPrivate *_private;
-}
-
-- initWithFrame: (NSRect) frame;
-
-// Note that the controller is not retained.
-- (IFWebController *)controller;
-
-- frameScrollView;
-- (NSView <IFDocumentView> *)documentView;
-
-- (BOOL)isDocumentHTML;
-
-- (void)setAllowsScrolling: (BOOL)flag;
-- (BOOL)allowsScrolling;
-
-// Extends the views that WebKit supports
-// The view must conform to the IFDocumentLoading protocol
-+ (void)registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType;
-
-// Called when the contentPolicy is set to IFContentPolicyShow
-+ (id <IFDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType;
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
deleted file mode 100644
index 1ac1d04..0000000
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ /dev/null
@@ -1,315 +0,0 @@
-/* IFWebView.mm
- Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
-*/
-
-#import <WebKit/IFWebView.h>
-
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFImageView.h>
-#import <WebKit/IFTextView.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreViewFactory.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebKitErrors.h>
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRendererFactory.h>
-#import <WebKit/IFCookieAdapter.h>
-
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
-#import <WebFoundation/WebFoundation.h>
-
-enum {
- SpaceKey = 0x0020
-};
-
- at implementation IFWebView
-
-+ (void)initialize
-{
- NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-
- IFErrorDescriptionCantShowMIMEType, [NSNumber numberWithInt: IFErrorCodeCantShowMIMEType],
- IFErrorDescriptionCouldntFindApplicationForFile, [NSNumber numberWithInt: IFErrorCodeCouldntFindApplicationForFile],
- IFErrorDescriptionCouldntFindApplicationForURL, [NSNumber numberWithInt: IFErrorCodeCouldntFindApplicationForURL],
- IFErrorDescriptionFileDoesntExist, [NSNumber numberWithInt: IFErrorCodeFileDoesntExist],
- IFErrorDescriptionFileNotReadable, [NSNumber numberWithInt: IFErrorCodeFileNotReadable],
- IFErrorDescriptionFinderCouldntOpenDirectory, [NSNumber numberWithInt: IFErrorCodeFinderCouldntOpenDirectory],
- IFErrorDescriptionCantShowDirectory, [NSNumber numberWithInt: IFErrorCodeCantShowDirectory],
- IFErrorDescriptionCantShowURL, [NSNumber numberWithInt: IFErrorCodeCantShowURL],
- nil];
-
- [IFError addErrorsFromDictionary:dict];
-}
-
-- initWithFrame: (NSRect) frame
-{
- [super initWithFrame: frame];
-
- [IFWebCoreViewFactory createSharedFactory];
- [IFTextRendererFactory createSharedFactory];
- [IFImageRendererFactory createSharedFactory];
- [IFCookieAdapter createSharedAdapter];
-
- _private = [[IFWebViewPrivate alloc] init];
-
- IFDynamicScrollBarsView *scrollView = [[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,frame.size.width,frame.size.height)];
- _private->frameScrollView = scrollView;
- [scrollView setDrawsBackground: NO];
- [scrollView setHasVerticalScroller: NO];
- [scrollView setHasHorizontalScroller: NO];
- [scrollView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
- [self addSubview: scrollView];
-
- _private->draggingTypes = [[NSArray arrayWithObjects:@"NSFilenamesPboardType",
- @"NSURLPboardType", @"NSStringPboardType", nil] retain];
- [self registerForDraggedTypes:_private->draggingTypes];
-
- return self;
-}
-
-
-- (void)dealloc
-{
- [_private release];
- [super dealloc];
-}
-
-- (void)setFrame: (NSRect)f
-{
- if ([self isDocumentHTML] && !NSEqualRects(f, [self frame]))
- [(IFHTMLView *)[self documentView] setNeedsLayout: YES];
- [super setFrame: f];
-}
-
-
-- (void)viewWillStartLiveResize
-{
-}
-
-- (void)viewDidEndLiveResize
-{
- [self display];
-}
-
-- (void)setAllowsScrolling: (BOOL)flag
-{
- [[self frameScrollView] setAllowsScrolling: flag];
-}
-
-- (BOOL)allowsScrolling
-{
- return [[self frameScrollView] allowsScrolling];
-}
-
-- frameScrollView
-{
- return _private->frameScrollView;
-}
-
-- documentView
-{
- return [[self frameScrollView] documentView];
-}
-
-// Note that the controller is not retained.
-- (IFWebController *)controller
-{
- return _private->controller;
-}
-
-
-- (BOOL) isDocumentHTML
-{
- return [[[self documentView] className] isEqualToString:@"IFHTMLView"];
-}
-
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
- NSString *dragType, *file, *URLString;
- NSArray *files;
-
- dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
- if([dragType isEqualToString:@"NSFilenamesPboardType"]){
- files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
- file = [files objectAtIndex:0];
-
- if([files count] == 1 && [IFWebController canShowFile:file])
- return NSDragOperationCopy;
-
- }else if([dragType isEqualToString:@"NSURLPboardType"]){
- return NSDragOperationCopy;
- }else if([dragType isEqualToString:@"NSStringPboardType"]){
- URLString = [[sender draggingPasteboard] stringForType:@"NSStringPboardType"];
- if([URLString _IF_looksLikeAbsoluteURL])
- return NSDragOperationCopy;
- }
- return NSDragOperationNone;
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
- return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
- return YES;
-}
-
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
-{
- IFWebDataSource *dataSource;
- IFWebFrame *frame;
- NSArray *files;
- NSString *file, *dragType;
- NSURL *URL=nil;
-
- dragType = [[sender draggingPasteboard] availableTypeFromArray:_private->draggingTypes];
- if([dragType isEqualToString:@"NSFilenamesPboardType"]){
- files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
- file = [files objectAtIndex:0];
- URL = [NSURL fileURLWithPath:file];
- }else if([dragType isEqualToString:@"NSURLPboardType"]){
- URL = [NSURL URLFromPasteboard:[sender draggingPasteboard]];
- }else if([dragType isEqualToString:@"NSStringPboardType"]){
- URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
- }
-
- if(!URL){
- return;
- }
-
- dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
- frame = nil;
- frame = [[self controller] mainFrame];
- if([frame setProvisionalDataSource:dataSource])
- [frame startLoading];
-}
-
-+ (void) registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType
-{
- // FIXME: OK to allow developers to override built-in views?
- [[self _viewTypes] setObject:viewClass forKey:MIMEType];
-}
-
-+ (id <IFDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType
-{
- Class viewClass = [[self _viewTypes] _IF_objectForMIMEType:MIMEType];
- return viewClass ? [[[viewClass alloc] init] autorelease] : nil;
-}
-
--(BOOL)acceptsFirstResponder
-{
- return YES;
-}
-
-- (BOOL)isOpaque
-{
- return YES;
-}
-
-- (void)drawRect:(NSRect)rect
-{
- if ([self documentView] == nil) {
- // Need to paint ourselves if there's no documentView to do it instead.
- [[NSColor whiteColor] set];
- NSRectFill(rect);
- }
-}
-
-- (NSWindow *)window
-{
- NSWindow *window = [super window];
-
- if (window == nil) {
- window = [[[self controller] windowContext] window];
- }
-
- return window;
-}
-
-- (void)keyDown:(NSEvent *)event
-{
- NSString *characters = [event characters];
- int index, count;
- BOOL callSuper = YES;
-
- count = [characters length];
- for (index = 0; index < count; ++index) {
- switch ([characters characterAtIndex:index]) {
- case NSDeleteCharacter:
- [self _goBack];
- callSuper = NO;
- break;
- case SpaceKey:
- if ([event modifierFlags] & NSShiftKeyMask) {
- [self _pageUp];
- } else {
- [self _pageDown];
- }
- callSuper = NO;
- break;
- case NSPageUpFunctionKey:
- [self _pageUp];
- callSuper = NO;
- break;
- case NSPageDownFunctionKey:
- [self _pageDown];
- callSuper = NO;
- break;
- case NSHomeFunctionKey:
- [self _scrollToTopLeft];
- callSuper = NO;
- break;
- case NSEndFunctionKey:
- [self _scrollToBottomLeft];
- callSuper = NO;
- break;
- case NSUpArrowFunctionKey:
- if ([event modifierFlags] & NSAlternateKeyMask) {
- [self _pageUp];
- } else {
- [self _lineUp];
- }
- callSuper = NO;
- break;
- case NSDownArrowFunctionKey:
- if ([event modifierFlags] & NSAlternateKeyMask) {
- [self _pageDown];
- } else {
- [self _lineDown];
- }
- callSuper = NO;
- break;
- case NSLeftArrowFunctionKey:
- if ([event modifierFlags] & NSAlternateKeyMask) {
- [self _pageLeft];
- } else {
- [self _lineLeft];
- }
- callSuper = NO;
- break;
- case NSRightArrowFunctionKey:
- if ([event modifierFlags] & NSAlternateKeyMask) {
- [self _pageRight];
- } else {
- [self _lineRight];
- }
- callSuper = NO;
- break;
- }
- }
-
- if (callSuper) {
- [super keyDown:event];
- }
-}
-
- at end
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.h b/WebKit/WebView.subproj/IFWebViewPrivate.h
deleted file mode 100644
index 2eebefd..0000000
--- a/WebKit/WebView.subproj/IFWebViewPrivate.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* IFWebViewPrivate.h
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
-*/
-
-#import <WebKit/IFWebView.h>
-
- at class IFDynamicScrollBarsView;
-
- at interface IFWebViewPrivate : NSObject
-{
- at public
- IFWebController *controller;
- IFDynamicScrollBarsView *frameScrollView;
-
- // These margin values are used to temporarily hold
- // the margins of a frame until we have the appropriate
- // document view type.
- int marginWidth;
- int marginHeight;
-
- NSArray *draggingTypes;
-}
-
- at end
-
- at interface IFWebView (IFPrivate)
-- (void)_setDocumentView:(id <IFDocumentLoading>)view;
-- (void)_setController:(IFWebController *)controller;
-- (IFWebController *)_controller;
-- (int)_marginWidth;
-- (int)_marginHeight;
-- (void)_setMarginWidth:(int)w;
-- (void)_setMarginHeight:(int)h;
-- (NSClipView *)_contentView;
-- (void)_scrollLineVertically: (BOOL)up;
-- (void)_scrollLineHorizontally: (BOOL)left;
-- (void)_pageDown;
-- (void)_pageUp;
-- (void)_pageLeft;
-- (void)_pageRight;
-- (void)_scrollToTopLeft;
-- (void)_scrollToBottomLeft;
-- (void)_lineDown;
-- (void)_lineUp;
-- (void)_lineLeft;
-- (void)_lineRight;
-- (void)_goBack;
-+ (NSMutableDictionary *)_viewTypes;
-+ (BOOL)_canShowMIMEType:(NSString *)MIMEType;
- at end
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
deleted file mode 100644
index 4605fc9..0000000
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ /dev/null
@@ -1,233 +0,0 @@
-/* IFWebViewPrivate.mm
- Copyright 2001, Apple, Inc. All rights reserved.
-
- Private header file. This file may reference classes (both ObjectiveC and C++)
- in WebCore. Instances of this class are referenced by _private in
- NSWebPageView.
-*/
-
-#import <WebKit/IFWebViewPrivate.h>
-
-#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFImageView.h>
-#import <WebKit/IFTextView.h>
-
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-
- at implementation IFWebViewPrivate
-
-- init
-{
- [super init];
-
- marginWidth = -1;
- marginHeight = -1;
-
- return self;
-}
-
-- (void)dealloc
-{
- [frameScrollView release];
- [draggingTypes release];
- [super dealloc];
-}
-
- at end
-
- at implementation IFWebView (IFPrivate)
-
-- (void)_setMarginWidth: (int)w
-{
- _private->marginWidth = w;
-}
-
-- (int)_marginWidth
-{
- return _private->marginWidth;
-}
-
-- (void)_setMarginHeight: (int)h
-{
- _private->marginHeight = h;
-}
-
-- (int)_marginHeight
-{
- return _private->marginHeight;
-}
-
-- (void)_setDocumentView:(id)view
-{
- [[self frameScrollView] setDocumentView: view];
-}
-
-
-- (void)_setController: (IFWebController *)controller
-{
- // Not retained; the controller owns the view.
- _private->controller = controller;
-}
-
-- (IFWebController *)_controller
-{
- return _private->controller;
-}
-
-- (NSClipView *)_contentView
-{
- return [[self frameScrollView] contentView];
-}
-
-- (void)_scrollVerticallyBy: (float)delta
-{
- NSPoint point;
-
- point = [[self _contentView] bounds].origin;
- point.y += delta;
- [[self _contentView] scrollPoint: point];
-}
-
-- (void)_scrollHorizontallyBy: (float)delta
-{
- NSPoint point;
-
- point = [[self _contentView] bounds].origin;
- point.x += delta;
- [[self _contentView] scrollPoint: point];
-}
-
-- (void)_pageVertically: (BOOL)up
-{
- float pageOverlap = [[self frameScrollView] verticalPageScroll];
- float delta = [[self _contentView] bounds].size.height;
-
- delta = (delta < pageOverlap) ? delta / 2.0 : delta - pageOverlap;
-
- if (up) {
- delta = -delta;
- }
-
- [self _scrollVerticallyBy: delta];
-}
-
-- (void)_pageHorizontally: (BOOL)left
-{
- float pageOverlap = [[self frameScrollView] horizontalPageScroll];
- float delta = [[self _contentView] bounds].size.width;
-
- delta = (delta < pageOverlap) ? delta / 2.0 : delta - pageOverlap;
-
- if (left) {
- delta = -delta;
- }
-
- [self _scrollHorizontallyBy: delta];
-}
-
-- (void)_scrollLineVertically: (BOOL)up
-{
- // verticalLineScroll is quite small, to make scrolling from the scroll bar
- // arrows relatively smooth. But this seemed too small for scrolling with
- // the arrow keys, so we bump up the number here. Cheating? Perhaps.
- float delta = [[self frameScrollView] verticalLineScroll] * 4;
-
- if (up) {
- delta = -delta;
- }
-
- [self _scrollVerticallyBy: delta];
-}
-
-- (void)_scrollLineHorizontally: (BOOL)left
-{
- float delta = [[self frameScrollView] horizontalLineScroll] * 4;
-
- if (left) {
- delta = -delta;
- }
-
- [self _scrollHorizontallyBy: delta];
-}
-
-- (void)_pageDown
-{
- [self _pageVertically: NO];
-}
-
-- (void)_pageUp
-{
- [self _pageVertically: YES];
-}
-
-- (void)_pageLeft
-{
- [self _pageHorizontally: YES];
-}
-
-- (void)_pageRight
-{
- [self _pageHorizontally: NO];
-}
-
-- (void)_scrollToTopLeft
-{
- [[self _contentView] scrollPoint: NSMakePoint(0, 0)];
-}
-
-- (void)_scrollToBottomLeft
-{
- [[self _contentView] scrollPoint: NSMakePoint(0, [[[self frameScrollView] documentView] bounds].size.height)];
-}
-
-- (void)_lineDown
-{
- [self _scrollLineVertically: NO];
-}
-
-- (void)_lineUp
-{
- [self _scrollLineVertically: YES];
-}
-
-- (void)_lineLeft
-{
- [self _scrollLineHorizontally: YES];
-}
-
-- (void)_lineRight
-{
- [self _scrollLineHorizontally: NO];
-}
-
-+ (NSMutableDictionary *)_viewTypes
-{
- static NSMutableDictionary *viewTypes;
-
- if (!viewTypes) {
- viewTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- [IFHTMLView class], @"text/html",
- [IFTextView class], @"text/",
- [IFImageView class], @"image/jpeg",
- [IFImageView class], @"image/gif",
- [IFImageView class], @"image/png",
- nil];
- }
-
- return viewTypes;
-}
-
-+ (BOOL)_canShowMIMEType:(NSString *)MIMEType
-{
- return [[self _viewTypes] _IF_objectForMIMEType:MIMEType] != nil;
-}
-
-- (void)_goBack
-{
- [[[self _controller] windowContext] goBack];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 3740dd5..64e3eaa 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -1,5 +1,5 @@
/*
- IFWebController.h
+ WebController.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -8,38 +8,38 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebControllerPolicyHandler.h>
/*
=============================================================================
- IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
+ WebController manages the interaction between WebView(s) and WebDataSource(s).
- The IFWebController implements required behavior. IFWebView and IFWebDataSource
+ The WebController implements required behavior. WebView and WebDataSource
cannot function without a controller.
- It it expected that alternate implementations of IFWebController will be written for
- alternate views of the web pages described by IFWebDataSources. For example, a web
- crawler may implement a IFWebController with no corresponding view.
+ It it expected that alternate implementations of WebController will be written for
+ alternate views of the web pages described by WebDataSources. For example, a web
+ crawler may implement a WebController with no corresponding view.
- IFWebController may be subclassed to modify the behavior of the standard
- IFWebView and IFWebDataSource.
+ WebController may be subclassed to modify the behavior of the standard
+ WebView and WebDataSource.
=============================================================================
*/
- at class IFDownloadHandler;
- at class IFError;
- at class IFLoadProgress;
- at class IFURLHandle;
- at class IFWebController;
- at class IFWebControllerPrivate;
- at class IFWebDataSource;
- at class IFWebFrame;
- at class IFWebView;
+ at class WebDownloadHandler;
+ at class WebError;
+ at class WebLoadProgress;
+ at class WebResourceHandle;
+ at class WebController;
+ at class WebControllerPrivate;
+ at class WebDataSource;
+ at class WebFrame;
+ at class WebView;
- at protocol IFDocumentLoading;
+ at protocol WebDocumentLoading;
/*
=============================================================================
@@ -53,7 +53,7 @@
=============================================================================
*/
- at protocol IFResourceProgressHandler <NSObject>
+ at protocol WebResourceProgressHandler <NSObject>
/*
A new chunk of data has been received. This could be a partial load
@@ -61,9 +61,9 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
+- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
-- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
@end
@@ -71,14 +71,14 @@
/*
=============================================================================
- A class that implements IFWindowContext provides window-related methods
+ A class that implements WebWindowContext provides window-related methods
that may be used by Javascript, plugins and other aspects of web pages.
=============================================================================
*/
- at protocol IFWindowContext <NSObject>
+ at protocol WebWindowContext <NSObject>
-- (IFWebController *)openNewWindowWithURL:(NSURL *)URL;
+- (WebController *)openNewWindowWithURL:(NSURL *)URL;
- (void)setStatusText: (NSString *)text;
- (NSString *)statusText;
@@ -108,11 +108,11 @@
/*
=============================================================================
*/
- at protocol IFContextMenuHandler
+ at protocol WebContextMenuHandler
// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
+// Typically this would be implemented by returning the results of WebView defaultContextMenuItemsForNode:
// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
+- (NSArray *)contextMenuItemsForNode: (WebDOMNode *);
@end
#endif
@@ -120,38 +120,38 @@
/*
=============================================================================
- IFWebController implements all the behavior that ties together IFWebView
- and IFWebDataSource. See each inherited protocol for a more complete
+ WebController implements all the behavior that ties together WebView
+ and WebDataSource. See each inherited protocol for a more complete
description.
=============================================================================
*/
- at interface IFWebController : NSObject
+ at interface WebController : NSObject
{
@private
- IFWebControllerPrivate *_private;
+ WebControllerPrivate *_private;
}
// Calls designated initializer with nil arguments.
- init;
// Designated initializer.
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource;
+- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource;
-- (void)setWindowContext: (id<IFWindowContext>)context;
-- (id<IFWindowContext>)windowContext;
+- (void)setWindowContext: (id<WebWindowContext>)context;
+- (id<WebWindowContext>)windowContext;
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)resourceProgressHandler;
+- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (id<WebResourceProgressHandler>)resourceProgressHandler;
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)downloadProgressHandler;
+- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (id<WebResourceProgressHandler>)downloadProgressHandler;
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
++ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler;
-- (id<IFWebControllerPolicyHandler>)policyHandler;
+- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
+- (id<WebControllerPolicyHandler>)policyHandler;
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
- (BOOL)directsAllLinksToSystemBrowser;
@@ -159,29 +159,29 @@
// FIXME: Should this method be private?
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
// Look for a frame named name, recursively.
-- (IFWebFrame *)frameNamed: (NSString *)name;
+- (WebFrame *)frameNamed: (NSString *)name;
// Return the top level frame. Note that even document that are not framesets will have a
// mainFrame.
-- (IFWebFrame *)mainFrame;
+- (WebFrame *)mainFrame;
// Return the frame associated with the data source. Traverses the
// frame tree to find the data source.
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource;
+- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource;
// Return the frame associated with the view. Traverses the
// frame tree to find the view.
-- (IFWebFrame *)frameForView: (IFWebView *)aView;
+- (WebFrame *)frameForView: (WebView *)aView;
// Typically called after requestContentPolicyForContentMIMEType: is sent to a
-// locationChangeHander. The content policy of HTML URLs should always be IFContentPolicyShow.
-// Setting the policy to IFContentPolicyIgnore will cancel the load of the URL if it is still
-// pending. The path argument is only used when the policy is either IFContentPolicySave or
-// IFContentPolicySaveAndOpenExternally.
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource;
+// locationChangeHander. The content policy of HTML URLs should always be WebContentPolicyShow.
+// Setting the policy to WebContentPolicyIgnore will cancel the load of the URL if it is still
+// pending. The path argument is only used when the policy is either WebContentPolicySave or
+// WebContentPolicySaveAndOpenExternally.
+- (void)haveContentPolicy: (WebContentPolicy)policy andPath: (NSString *)path forDataSource: (WebDataSource *)dataSource;
// API to manage animated images.
- (void)stopAnimatedImages;
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index 3d2a138..23f2b50 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -1,38 +1,38 @@
/*
- IFWebController.mm
+ WebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebKitErrors.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
- at implementation IFWebController
+ at implementation WebController
- init
{
return [self initWithView: nil provisionalDataSource: nil];
}
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource
+- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource
{
[super init];
- _private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
+ _private = [[WebControllerPrivate alloc] init];
+ _private->mainFrame = [[WebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
return self;
}
@@ -45,23 +45,23 @@
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
}
- (BOOL)directsAllLinksToSystemBrowser
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::directsAllLinksToSystemBrowser is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebController::directsAllLinksToSystemBrowser is not implemented"];
return NO;
}
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
{
- IFWebView *childView;
- IFWebFrame *newFrame;
+ WebView *childView;
+ WebFrame *newFrame;
- childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
+ childView = [[[WebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
- newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
[parentDataSource addFrame: newFrame];
@@ -74,60 +74,60 @@
}
-- (void)setWindowContext: (id<IFWindowContext>)context
+- (void)setWindowContext: (id<WebWindowContext>)context
{
[_private->windowContext autorelease];
_private->windowContext = [context retain];
}
-- (id<IFWindowContext>)windowContext
+- (id<WebWindowContext>)windowContext
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler
+- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler
{
[_private->resourceProgressHandler autorelease];
_private->resourceProgressHandler = [handler retain];
}
-- (id<IFResourceProgressHandler>)resourceProgressHandler
+- (id<WebResourceProgressHandler>)resourceProgressHandler
{
return _private->resourceProgressHandler;
}
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler
+- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
{
[_private->downloadProgressHandler autorelease];
_private->downloadProgressHandler = [handler retain];
}
-- (id<IFResourceProgressHandler>)downloadProgressHandler
+- (id<WebResourceProgressHandler>)downloadProgressHandler
{
return _private->downloadProgressHandler;
}
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler
+- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler
{
[_private->policyHandler autorelease];
_private->policyHandler = [handler retain];
}
-- (id<IFWebControllerPolicyHandler>)policyHandler
+- (id<WebControllerPolicyHandler>)policyHandler
{
return _private->policyHandler;
}
-- (IFWebFrame *)_frameForDataSource: (IFWebDataSource *)dataSource fromFrame: (IFWebFrame *)frame
+- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
- IFWebFrame *result, *aFrame;
+ WebFrame *result, *aFrame;
if ([frame dataSource] == dataSource)
return frame;
@@ -157,19 +157,19 @@
}
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource
+- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [self mainFrame];
+ WebFrame *frame = [self mainFrame];
return [self _frameForDataSource: dataSource fromFrame: frame];
}
-- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
+- (WebFrame *)_frameForView: (WebView *)aView fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
- IFWebFrame *result, *aFrame;
+ WebFrame *result, *aFrame;
if ([frame webView] == aView)
return frame;
@@ -196,67 +196,67 @@
}
-- (IFWebFrame *)frameForView: (IFWebView *)aView
+- (WebFrame *)frameForView: (WebView *)aView
{
- IFWebFrame *frame = [self mainFrame];
+ WebFrame *frame = [self mainFrame];
return [self _frameForView: aView fromFrame: frame];
}
-- (IFWebFrame *)frameNamed: (NSString *)name
+- (WebFrame *)frameNamed: (NSString *)name
{
return [[self mainFrame] frameNamed: name];
}
-- (IFWebFrame *)mainFrame
+- (WebFrame *)mainFrame
{
return _private->mainFrame;
}
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url
++ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url
{
- if([IFURLHandle canInitWithURL:url]){
- return IFURLPolicyUseContentPolicy;
+ if([WebResourceHandle canInitWithURL:url]){
+ return WebURLPolicyUseContentPolicy;
}else{
- return IFURLPolicyOpenExternally;
+ return WebURLPolicyOpenExternally;
}
}
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource
+- (void)haveContentPolicy: (WebContentPolicy)policy andPath: (NSString *)path forDataSource: (WebDataSource *)dataSource
{
NSString *MIMEType;
- if(policy == IFContentPolicyNone)
- [NSException raise:NSInvalidArgumentException format:@"Can't set policy of IFContentPolicyNone. Use IFContentPolicyIgnore instead"];
+ if(policy == WebContentPolicyNone)
+ [NSException raise:NSInvalidArgumentException format:@"Can't set policy of WebContentPolicyNone. Use WebContentPolicyIgnore instead"];
- if([dataSource contentPolicy] != IFContentPolicyNone){
+ if([dataSource contentPolicy] != WebContentPolicyNone){
[NSException raise:NSGenericException format:@"Content policy can only be set once on for a dataSource."];
}else{
[dataSource _setContentPolicy:policy];
[dataSource _setDownloadPath:path];
- if(policy == IFContentPolicyShow){
+ if(policy == WebContentPolicyShow){
MIMEType = [dataSource contentType];
if([[self class] canShowMIMEType:MIMEType]){
id documentView;
- IFWebView *webView;
- id <IFDocumentRepresentation> dataRepresentation, oldRepresentation;
+ WebView *webView;
+ id <WebDocumentRepresentation> dataRepresentation, oldRepresentation;
// Check if the data source was already bound?
oldRepresentation = [dataSource representation];
- dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
+ dataRepresentation = [WebDataSource createRepresentationForMIMEType:MIMEType];
if (!oldRepresentation || ![oldRepresentation isKindOfClass: [dataRepresentation class]])
[dataSource _setRepresentation:dataRepresentation];
webView = [[dataSource webFrame] webView];
- documentView = [IFWebView createViewForMIMEType:MIMEType];
+ documentView = [WebView createViewForMIMEType:MIMEType];
[webView _setDocumentView: documentView];
[documentView provisionalDataSourceChanged: dataSource];
}else{
- IFError *error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowMIMEType
- inDomain:IFErrorCodeDomainWebKit failingURL: [dataSource inputURL]];
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowMIMEType
+ inDomain:WebErrorDomainWebKit failingURL: [dataSource inputURL]];
[[self policyHandler] unableToImplementContentPolicy:error forDataSource:dataSource];
}
}
@@ -281,12 +281,12 @@
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType]){
+ if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
return YES;
}else{
// Have the plug-ins register views and representations
- [IFPluginDatabase installedPlugins];
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType])
+ [WebPluginDatabase installedPlugins];
+ if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
return NO;
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 705276d..73e79ad 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -1,5 +1,5 @@
/*
- IFWebControllerPolicyHandler.h
+ WebControllerPolicyHandler.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -14,56 +14,56 @@
*/
typedef enum {
- IFURLPolicyUseContentPolicy,
- IFURLPolicyOpenExternally,
- IFURLPolicyIgnore
-} IFURLPolicy;
+ WebURLPolicyUseContentPolicy,
+ WebURLPolicyOpenExternally,
+ WebURLPolicyIgnore
+} WebURLPolicy;
typedef enum {
- IFFileURLPolicyUseContentPolicy,
- IFFileURLPolicyOpenExternally,
- IFFileURLPolicyReveal,
- IFFileURLPolicyIgnore
-} IFFileURLPolicy;
+ WebFileURLPolicyUseContentPolicy,
+ WebFileURLPolicyOpenExternally,
+ WebFileURLPolicyReveal,
+ WebFileURLPolicyIgnore
+} WebFileURLPolicy;
typedef enum {
- IFContentPolicyNone,
- IFContentPolicyShow,
- IFContentPolicySave,
- IFContentPolicySaveAndOpenExternally,
- IFContentPolicyIgnore
-} IFContentPolicy;
+ WebContentPolicyNone,
+ WebContentPolicyShow,
+ WebContentPolicySave,
+ WebContentPolicySaveAndOpenExternally,
+ WebContentPolicyIgnore
+} WebContentPolicy;
- at protocol IFWebControllerPolicyHandler <NSObject>
+ at protocol WebControllerPolicyHandler <NSObject>
-- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (IFWebDataSource *)dataSource;
+- (id <WebLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (WebDataSource *)dataSource;
// URLPolicyForURL: is used to determine what to do BEFORE a URL is loaded, i.e.
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (IFURLPolicy)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy)URLPolicyForURL: (NSURL *)url;
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (IFError *)error;
+- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (WebError *)error;
-// Called when the response to URLPolicyForURL is IFURLPolicyUseContentPolicy and the URL is
+// Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
// a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-- (IFFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
+- (WebFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
-// Called when a IFFileURLPolicy could not be completed. This is usually caused by files not
+// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
-- (void)unableToImplementFileURLPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementFileURLPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Sent after locationChangeStarted.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource;
+- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource;
// Sent when errors are encountered with an un-implementable policy, i.e.
// file i/o failure, launch services failure, type mismatches, etc.
-- (void)unableToImplementContentPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementContentPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
diff --git a/WebKit/WebView.subproj/WebControllerPolicyHandler.h b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
index 705276d..73e79ad 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyHandler.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyHandler.h
@@ -1,5 +1,5 @@
/*
- IFWebControllerPolicyHandler.h
+ WebControllerPolicyHandler.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -14,56 +14,56 @@
*/
typedef enum {
- IFURLPolicyUseContentPolicy,
- IFURLPolicyOpenExternally,
- IFURLPolicyIgnore
-} IFURLPolicy;
+ WebURLPolicyUseContentPolicy,
+ WebURLPolicyOpenExternally,
+ WebURLPolicyIgnore
+} WebURLPolicy;
typedef enum {
- IFFileURLPolicyUseContentPolicy,
- IFFileURLPolicyOpenExternally,
- IFFileURLPolicyReveal,
- IFFileURLPolicyIgnore
-} IFFileURLPolicy;
+ WebFileURLPolicyUseContentPolicy,
+ WebFileURLPolicyOpenExternally,
+ WebFileURLPolicyReveal,
+ WebFileURLPolicyIgnore
+} WebFileURLPolicy;
typedef enum {
- IFContentPolicyNone,
- IFContentPolicyShow,
- IFContentPolicySave,
- IFContentPolicySaveAndOpenExternally,
- IFContentPolicyIgnore
-} IFContentPolicy;
+ WebContentPolicyNone,
+ WebContentPolicyShow,
+ WebContentPolicySave,
+ WebContentPolicySaveAndOpenExternally,
+ WebContentPolicyIgnore
+} WebContentPolicy;
- at protocol IFWebControllerPolicyHandler <NSObject>
+ at protocol WebControllerPolicyHandler <NSObject>
-- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (IFWebDataSource *)dataSource;
+- (id <WebLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (WebDataSource *)dataSource;
// URLPolicyForURL: is used to determine what to do BEFORE a URL is loaded, i.e.
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (IFURLPolicy)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy)URLPolicyForURL: (NSURL *)url;
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (IFError *)error;
+- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (WebError *)error;
-// Called when the response to URLPolicyForURL is IFURLPolicyUseContentPolicy and the URL is
+// Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
// a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-- (IFFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
+- (WebFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
-// Called when a IFFileURLPolicy could not be completed. This is usually caused by files not
+// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
-- (void)unableToImplementFileURLPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementFileURLPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Sent after locationChangeStarted.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource;
+- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource;
// Sent when errors are encountered with an un-implementable policy, i.e.
// file i/o failure, launch services failure, type mismatches, etc.
-- (void)unableToImplementContentPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementContentPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index b229ce9..e92f8a0 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -1,31 +1,31 @@
/*
- IFWebController.mm
+ WebController.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFWebController.h>
+#import <WebKit/WebController.h>
- at class IFError;
- at class IFLoadProgress;
- at class IFWebFrame;
+ at class WebError;
+ at class WebLoadProgress;
+ at class WebFrame;
- at interface IFWebControllerPrivate : NSObject
+ at interface WebControllerPrivate : NSObject
{
@public
- IFWebFrame *mainFrame;
- id<IFWindowContext> windowContext;
- id<IFResourceProgressHandler> resourceProgressHandler;
- id<IFResourceProgressHandler> downloadProgressHandler;
- id<IFWebControllerPolicyHandler> policyHandler;
+ WebFrame *mainFrame;
+ id<WebWindowContext> windowContext;
+ id<WebResourceProgressHandler> resourceProgressHandler;
+ id<WebResourceProgressHandler> downloadProgressHandler;
+ id<WebControllerPolicyHandler> policyHandler;
BOOL openedByScript;
}
@end
- at interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+ at interface WebController (WebPrivate);
+- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
+- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_didStartLoading: (NSURL *)url;
- (void)_didStopLoading: (NSURL *)url;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 9ea390b..a47cd0b 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -1,24 +1,24 @@
/*
- IFWebControllerPrivate.mm
+ WebControllerPrivate.mm
Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLCacheLoaderConstants.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebCacheLoaderConstants.h>
+#import <WebFoundation/WebResourceHandle.h>
- at implementation IFWebControllerPrivate
+ at implementation WebControllerPrivate
- init
{
@@ -26,10 +26,10 @@
return self;
}
-- (void)_clearControllerReferences: (IFWebFrame *)aFrame
+- (void)_clearControllerReferences: (WebFrame *)aFrame
{
NSArray *frames;
- IFWebFrame *nextFrame;
+ WebFrame *nextFrame;
int i, count;
[[aFrame dataSource] _setController: nil];
@@ -61,11 +61,11 @@
@end
- at implementation IFWebController (IFPrivate)
+ at implementation WebController (WebPrivate)
-- (void)_receivedProgress:(IFLoadProgress *)progress forResourceHandle:(IFURLHandle *)resourceHandle fromDataSource:(IFWebDataSource *)dataSource complete:(BOOL)isComplete
+- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -81,9 +81,9 @@
}
}
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
+- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -96,8 +96,8 @@
// Check to see if this is these are the first bits of a provisional data source,
// if so we need to transition the data source from provisional to committed.
- // This transition is only done for the IFContentPolicyShow policy.
- if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == IFContentPolicyShow){
+ // This transition is only done for the WebContentPolicyShow policy.
+ if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == WebContentPolicyShow){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committing resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[frame _transitionProvisionalToCommitted];
}
@@ -113,7 +113,7 @@
// If the frame isn't complete it might be ready for a layout. Perform that check here.
// Note that transitioning a frame to this state doesn't guarantee a layout, rather it
// just indicates that an early layout can be performed.
- int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
+ int timedLayoutSize = [[WebPreferences standardPreferences] _initialTimedLayoutSize];
if ([progress bytesSoFar] > timedLayoutSize)
[frame _transitionProvisionalToLayoutAcceptable];
}
@@ -121,9 +121,9 @@
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
+- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
@@ -134,9 +134,9 @@
}
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
+- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
@@ -148,12 +148,12 @@
- (void)_didStartLoading: (NSURL *)url
{
- [[IFStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
}
- (void)_didStopLoading: (NSURL *)url
{
- [[IFStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
}
+ (NSString *)_MIMETypeForFile: (NSString *)path
@@ -163,7 +163,7 @@
if([extension isEqualToString:@""])
return @"text/html";
- return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
+ return [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
- (BOOL)_openedByScript
diff --git a/WebKit/WebView.subproj/WebDOMNode.h b/WebKit/WebView.subproj/WebDOMNode.h
index fb0cee4..37ed2e9 100644
--- a/WebKit/WebView.subproj/WebDOMNode.h
+++ b/WebKit/WebView.subproj/WebDOMNode.h
@@ -1,5 +1,5 @@
//
-// IFDOMNode.h
+// WebDOMNode.h
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
@@ -8,9 +8,9 @@
#import <Foundation/Foundation.h>
- at class IFWebView;
+ at class WebView;
- at interface IFDOMNode : NSObject
+ at interface WebDOMNode : NSObject
{
NSArray *children;
NSString *name;
@@ -18,7 +18,7 @@
NSString *source;
}
-- initWithWebView:(IFWebView *)view;
+- initWithWebView:(WebView *)view;
- (NSArray *)children;
- (NSString *)name;
diff --git a/WebKit/WebView.subproj/WebDOMNode.m b/WebKit/WebView.subproj/WebDOMNode.m
index 73d412b..7e15450 100644
--- a/WebKit/WebView.subproj/WebDOMNode.m
+++ b/WebKit/WebView.subproj/WebDOMNode.m
@@ -1,21 +1,21 @@
//
-// IFDOMNode.m
+// WebDOMNode.m
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFDOMNode.h"
+#import "WebDOMNode.h"
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebHTMLViewPrivate.h>
@interface WebKitDOMTreeCopier : NSObject <WebCoreDOMTreeCopier>
@end
- at implementation IFDOMNode
+ at implementation WebDOMNode
- initWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
{
@@ -29,18 +29,18 @@
return self;
}
-- initWithWebView:(IFWebView *)view
+- initWithWebView:(WebView *)view
{
WebKitDOMTreeCopier *copier;
[self dealloc];
- if (![[view documentView] isMemberOfClass:[IFHTMLView class]]) {
+ if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
return nil;
}
copier = [[WebKitDOMTreeCopier alloc] init];
- IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+ WebHTMLView *htmlView = (WebHTMLView *)[view documentView];
self = [[[htmlView _bridge] copyDOMTree:copier] retain];
[copier release];
@@ -83,7 +83,7 @@
- (NSObject *)nodeWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
{
- return [[[IFDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
+ return [[[WebDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 666d252..d4d20d0 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -1,5 +1,5 @@
/*
- IFWebDataSource.h
+ WebDataSource.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -7,30 +7,30 @@
#import <Cocoa/Cocoa.h>
-#import <WebKit/IFWebController.h>
+#import <WebKit/WebController.h>
/*
=============================================================================
- A IFWebDataSource represents the data associated with a web page.
+ A WebDataSource represents the data associated with a web page.
============================================================================= */
- at class IFWebFrame;
- at class IFURLHandle;
- at class IFWebController;
+ at class WebFrame;
+ at class WebResourceHandle;
+ at class WebController;
#ifdef TENTATIVE_API
- at class IFLoader;
+ at class WebLoader;
#endif
- at class IFWebDataSourcePrivate;
- at protocol IFDocumentRepresentation;
+ at class WebDataSourcePrivate;
+ at protocol WebDocumentRepresentation;
- at interface IFWebDataSource : NSObject
+ at interface WebDataSource : NSObject
{
@private
- IFWebDataSourcePrivate *_private;
+ WebDataSourcePrivate *_private;
}
// Returns nil if object cannot be initialized due to a malformed URL (RFC 1808).
@@ -40,13 +40,13 @@
#ifdef TENTATIVE_API
- initWithData: (NSData *)data;
-- initNSURL _IF_URLWithString: (NSString *)string;
-- initWithLoader: (IFLoader *)loader;
+- initNSURL _web_URLWithString: (NSString *)string;
+- initWithLoader: (WebLoader *)loader;
#endif
- (NSData *)data;
-- (id <IFDocumentRepresentation>)representation;
+- (id <WebDocumentRepresentation>)representation;
// Returns YES if this is the main document. The main document is the 'top'
// document, typically either a frameset or a normal HTML document.
@@ -54,21 +54,21 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (IFWebDataSource *)parent;
+- (WebDataSource *)parent;
// Return the frame that represents this data source. Same as above.
-- (IFWebFrame *)webFrame;
+- (WebFrame *)webFrame;
// Add a child frame. This should only be called by the data source's controller
// as a result of a createFrame:inParent:.
// [Should this be private?]
-- (void)addFrame: (IFWebFrame *)frame;
+- (void)addFrame: (WebFrame *)frame;
-// Returns an array of IFWebFrame. The frames in the array are
+// Returns an array of WebFrame. The frames in the array are
// associated with a frame set or iframe.
- (NSArray *)children;
-- (IFWebFrame *)frameNamed: (NSString *)frameName;
+- (WebFrame *)frameNamed: (NSString *)frameName;
// Returns an array of NSStrings or nil. The NSStrings corresponds to
// frame names. If this data source is the main document and has no
@@ -77,7 +77,7 @@
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
+- (WebDataSource *) findDataSourceForFrameNamed: (NSString *)name;
- (BOOL)frameExists: (NSString *)name;
@@ -86,9 +86,9 @@
// Set the controller for this data source. NOTE: The controller is not retained by the
// data source. Perhaps setController: should be private? Perhaps the back pointers
// can be managed externally, i.e. + controllerForDataSource: as a class method on
-// IFWebController?
-//- (void)setController: (IFWebController *)controller;
-- (IFWebController *)controller;
+// WebController?
+//- (void)setController: (WebController *)controller;
+- (WebController *)controller;
// May return nil if not initialized with a URL.
- (NSURL *)inputURL;
@@ -96,7 +96,7 @@
// redirectedURL returns the URL that was actually used if there was a redirect.
// The value of redirectedURL will change if more than one redirect occurs. If no
// redirect occurs the value of redirectedURL will be nil. To monitor change in
-// the value of the redirected URL override the <IFLocationChangeHandler>
+// the value of the redirected URL override the <WebLocationChangeHandler>
// serverRedirectTo:forDataSource: method.
- (NSURL *)redirectedURL;
@@ -121,7 +121,7 @@
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (IFDOMDocument *)document;
+- (WebDOMDocument *)document;
#endif
- (BOOL)isDocumentHTML;
@@ -157,7 +157,7 @@
- (NSString *)frameName;
-- (IFContentPolicy)contentPolicy;
+- (WebContentPolicy)contentPolicy;
// MIME type
- (NSString *)contentType;
@@ -169,10 +169,10 @@
- (NSDictionary *)errors;
-- (IFError *)mainDocumentError;
+- (WebError *)mainDocumentError;
+ (void) registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType;
-+ (id <IFDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType;
++ (id <WebDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 7a259bd..ec090c6 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -1,24 +1,24 @@
/*
- IFWebDataSource.mm
+ WebDataSource.mm
Copyright 2001, 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebFramePrivate.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownloadHandler.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebHTMLRepresentation.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
- at implementation IFWebDataSource
+ at implementation WebDataSource
-(id)initWithURL:(NSURL *)theURL
{
@@ -33,9 +33,9 @@
-(id)initWithURL:(NSURL *)theURL attributes:(NSDictionary *)theAttributes flags:(unsigned)theFlags;
{
[super init];
- _private = [[IFWebDataSourcePrivate alloc] init];
+ _private = [[WebDataSourcePrivate alloc] init];
_private->inputURL = [theURL retain];
- _private->mainHandle = [[IFURLHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
+ _private->mainHandle = [[WebResourceHandle alloc] initWithURL: _private->inputURL attributes:theAttributes flags:theFlags];
return self;
}
@@ -54,12 +54,12 @@
}
}
-- (id <IFDocumentRepresentation>) representation
+- (id <WebDocumentRepresentation>) representation
{
return _private->representation;
}
-- (IFWebFrame *)webFrame
+- (WebFrame *)webFrame
{
return [_private->controller frameForDataSource: self];
}
@@ -82,20 +82,20 @@
// Returns nil if this data source represents the main document. Otherwise
// returns the parent data source.
-- (IFWebDataSource *)parent
+- (WebDataSource *)parent
{
return _private->parent;
}
-// Returns an array of IFWebFrame. The frames in the array are
+// Returns an array of WebFrame. The frames in the array are
// associated with a frame set or iframe.
- (NSArray *)children
{
return [_private->frames allValues];
}
-- (void)addFrame: (IFWebFrame *)frame
+- (void)addFrame: (WebFrame *)frame
{
if (_private->frames == nil)
_private->frames = [[NSMutableDictionary alloc] init];
@@ -104,9 +104,9 @@
}
-- (IFWebFrame *)frameNamed: (NSString *)frameName
+- (WebFrame *)frameNamed: (NSString *)frameName
{
- return (IFWebFrame *)[_private->frames objectForKey: frameName];
+ return (WebFrame *)[_private->frames objectForKey: frameName];
}
@@ -122,7 +122,7 @@
// findDataSourceForFrameNamed: returns the child data source associated with
// the frame named 'name', or nil.
-- (IFWebDataSource *) findDataSourceForFrameNamed: (NSString *)name
+- (WebDataSource *) findDataSourceForFrameNamed: (NSString *)name
{
return [[self frameNamed: name] dataSource];
}
@@ -136,11 +136,11 @@
- (void)openURL: (NSURL *)url inFrameNamed: (NSString *)frameName
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::openURL:inFrameNamed: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::openURL:inFrameNamed: is not implemented"];
}
-- (IFWebController *)controller
+- (WebController *)controller
{
// All data sources used in a document share the same controller.
// A single document may have many data sources corresponding to
@@ -160,7 +160,7 @@
// finalURL returns the URL that was actually used. The final URL
// may be different than the inputURL if the server redirects.
-// <IFLocationChangedHandler> includes a message that is sent when
+// <WebLocationChangedHandler> includes a message that is sent when
// a redirect is processed
- (NSURL *)redirectedURL
{
@@ -191,7 +191,7 @@
// method will also stop loads that may be loading in child frames.
- (void)stopLoading
{
- // stop download here because we can't rely on IFURLHandleResourceDidCancelLoading
+ // stop download here because we can't rely on WebResourceHandleDidCancelLoading
// as it isn't sent when the app quits
[[_private->mainURLHandleClient downloadHandler] cancel];
[self _recursiveStopLoading];
@@ -204,7 +204,7 @@
int i, count;
// First check to see if the datasource's frame is in the complete state
- if ([[self webFrame] _state] == IFWEBFRAMESTATE_COMPLETE)
+ if ([[self webFrame] _state] == WebFrameStateComplete)
return NO;
//WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "frame %s: primaryLoadComplete %d, [data->urlHandles count] = %d, URL = %s\n", [[[self webFrame] name] cString], (int)_private->primaryLoadComplete, [_private->urlHandles count], [[[self inputURL] absoluteString] cString]);
@@ -216,7 +216,7 @@
count = [[self children] count];
for (i = 0; i < count; i++){
- IFWebFrame *childFrame;
+ WebFrame *childFrame;
childFrame = [[self children] objectAtIndex: i];
if ([[childFrame dataSource] isLoading])
@@ -230,16 +230,16 @@
#ifdef TENTATIVE_API
// Get DOM access to the document.
-- (IFDOMDocument *)document;
+- (WebDOMDocument *)document;
#endif
- (BOOL)isDocumentHTML
{
- return [[self representation] isKindOfClass: [IFHTMLRepresentation class]];
+ return [[self representation] isKindOfClass: [WebHTMLRepresentation class]];
}
// Get the actual source of the docment.
-// FIXME: Move to IFHTMLRepresentation
+// FIXME: Move to WebHTMLRepresentation
- (NSString *)documentSource
{
// FIMXE: other encodings
@@ -259,14 +259,14 @@
// URL reference point, these should probably not be public for 1.0.
- (NSURL *)base
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::base is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::base is not implemented"];
return nil;
}
- (NSString *)baseTarget
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::baseTarget is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::baseTarget is not implemented"];
return nil;
}
@@ -279,12 +279,12 @@
// Style sheet
- (void)setUserStyleSheetFromURL: (NSURL *)url
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromURL: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromURL: is not implemented"];
}
- (void)setUserStyleSheetFromString: (NSString *)sheet
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromString: is not implemented"];
}
// a.k.a shortcut icons, http://msdn.microsoft.com/workshop/Author/dhtml/howto/ShortcutIcon.asp.
@@ -292,14 +292,14 @@
// that WebCore also has dependencies on the appkit.
- (NSImage *)icon
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::setUserStyleSheetFromString: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::setUserStyleSheetFromString: is not implemented"];
return nil;
}
// Is page secure, e.g. https, ftps
- (BOOL)isPageSecure
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebDataSource::isPageSecure is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebDataSource::isPageSecure is not implemented"];
return NO;
}
@@ -309,7 +309,7 @@
return _private->pageTitle;
}
-- (IFContentPolicy) contentPolicy
+- (WebContentPolicy) contentPolicy
{
return _private->contentPolicy;
}
@@ -321,7 +321,7 @@
- (NSString *)fileType
{
- return [[IFFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[self contentType]];
+ return [[WebFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[self contentType]];
}
- (NSString *)downloadPath
@@ -334,7 +334,7 @@
return _private->errors;
}
-- (IFError *)mainDocumentError
+- (WebError *)mainDocumentError
{
return _private->mainDocumentError;
}
@@ -345,9 +345,9 @@
[[self _repTypes] setObject:repClass forKey:MIMEType];
}
-+ (id <IFDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType
++ (id <WebDocumentRepresentation>) createRepresentationForMIMEType:(NSString *)MIMEType
{
- Class repClass = [[self _repTypes] _IF_objectForMIMEType:MIMEType];
+ Class repClass = [[self _repTypes] _web_objectForMIMEType:MIMEType];
return repClass ? [[[repClass alloc] init] autorelease] : nil;
}
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 5449073..4626962 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -1,4 +1,4 @@
-/* IFWebDataSourcePrivate.h
+/* WebDataSourcePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,25 +6,25 @@
NSWebPageDataSource.
*/
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFLocationChangeHandler.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebLocationChangeHandler.h>
- at class IFURLHandle;
- at class IFMainURLHandleClient;
- at protocol IFLocationChangeHandler;
- at protocol IFDocumentRepresentation;
+ at class WebResourceHandle;
+ at class WebMainResourceClient;
+ at protocol WebLocationChangeHandler;
+ at protocol WebDocumentRepresentation;
- at interface IFWebDataSourcePrivate : NSObject
+ at interface WebDataSourcePrivate : NSObject
{
@public
NSData *resourceData;
- id <IFDocumentRepresentation> representation;
+ id <WebDocumentRepresentation> representation;
- IFWebDataSource *parent;
+ WebDataSource *parent;
- IFWebController *controller;
+ WebController *controller;
// The original URL as requested during initialization.
NSURL *inputURL;
@@ -36,13 +36,13 @@
NSMutableDictionary *frames;
// The main handle.
- IFURLHandle *mainHandle;
+ WebResourceHandle *mainHandle;
// The handle client for the main document associated with the
// datasource.
- IFMainURLHandleClient *mainURLHandleClient;
+ WebMainResourceClient *mainURLHandleClient;
- // Active IFURLHandles for resources associated with the
+ // Active WebResourceHandles for resources associated with the
// datasource.
NSMutableArray *urlHandles;
@@ -59,43 +59,43 @@
NSMutableDictionary *errors;
// Error associated with main document.
- IFError *mainDocumentError;
+ WebError *mainDocumentError;
// The location change handler for this data source.
- id <IFLocationChangeHandler>locationChangeHandler;
+ id <WebLocationChangeHandler>locationChangeHandler;
- IFContentPolicy contentPolicy;
+ WebContentPolicy contentPolicy;
BOOL loading; // self and controller are retained while loading
}
@end
- at interface IFWebDataSource (IFPrivate)
+ at interface WebDataSource (WebPrivate)
- (void)_setResourceData:(NSData *)data;
-- (void)_setRepresentation:(id <IFDocumentRepresentation>)representation;
-- (void)_setController: (IFWebController *)controller;
-- (void)_setParent: (IFWebDataSource *)p;
+- (void)_setRepresentation:(id <WebDocumentRepresentation>)representation;
+- (void)_setController: (WebController *)controller;
+- (void)_setParent: (WebDataSource *)p;
- (void)_startLoading: (BOOL)forceRefresh;
- (void)_stopLoading;
- (BOOL)_isStopping;
- (void)_recursiveStopLoading;
-- (void)_addURLHandle: (IFURLHandle *)handle;
-- (void)_removeURLHandle: (IFURLHandle *)handle;
+- (void)_addURLHandle: (WebResourceHandle *)handle;
+- (void)_removeURLHandle: (WebResourceHandle *)handle;
- (void)_setPrimaryLoadComplete: (BOOL)flag;
- (double)_loadingStartedTime;
- (void)_setTitle: (NSString *)title;
- (void)_setFinalURL: (NSURL *)url;
-- (id <IFLocationChangeHandler>)_locationChangeHandler;
-- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l;
+- (id <WebLocationChangeHandler>)_locationChangeHandler;
+- (void)_setLocationChangeHandler: (id <WebLocationChangeHandler>)l;
- (void)_setDownloadPath:(NSString *)path;
-- (void)_setContentPolicy:(IFContentPolicy)policy;
+- (void)_setContentPolicy:(WebContentPolicy)policy;
- (void)_setContentType:(NSString *)type;
- (void)_setEncoding:(NSString *)encoding;
- (void)_layoutChildren;
- (void)_clearErrors;
-- (void)_setMainDocumentError: (IFError *)error;
-- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription;
+- (void)_setMainDocumentError: (WebError *)error;
+- (void)_addError: (WebError *)error forResource: (NSString *)resourceDescription;
+ (NSMutableDictionary *)_repTypes;
+ (BOOL)_canShowMIMEType:(NSString *)MIMEType;
- (void)_removeFromFrame;
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 46c82e6..feb7791 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -1,4 +1,4 @@
-/* IFWebDataSourcePrivate.h
+/* WebDataSourcePrivate.h
Copyright 2001, 2002, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,29 +6,29 @@
NSWebPageDataSource.
*/
-#import <WebKit/IFWebDataSourcePrivate.h>
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFImageRepresentation.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFTextRepresentation.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebView.h>
+#import <WebKit/WebDataSourcePrivate.h>
+
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebHTMLRepresentation.h>
+#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebImageRepresentation.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebTextRepresentation.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebView.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/WebNSURLExtras.h>
+#import <WebFoundation/WebResourceHandle.h>
- at implementation IFWebDataSourcePrivate
+ at implementation WebDataSourcePrivate
- init
{
@@ -40,7 +40,7 @@
primaryLoadComplete = NO;
- contentPolicy = IFContentPolicyNone;
+ contentPolicy = WebContentPolicyNone;
return self;
}
@@ -52,7 +52,7 @@
WEBKIT_ASSERT(!loading);
NSEnumerator *e = [[frames allValues] objectEnumerator];
- IFWebFrame *frame;
+ WebFrame *frame;
while ((frame = [e nextObject])) {
[frame _parentDataSourceWillBeDeallocated];
}
@@ -78,7 +78,7 @@
@end
- at implementation IFWebDataSource (IFPrivate)
+ at implementation WebDataSource (WebPrivate)
- (void)_setResourceData:(NSData *)data
{
@@ -86,7 +86,7 @@
_private->resourceData = [data retain];
}
-- (void)_setRepresentation:(id <IFDocumentRepresentation>) representation
+- (void)_setRepresentation:(id <WebDocumentRepresentation>) representation
{
[_private->representation release];
_private->representation = [representation retain];
@@ -114,7 +114,7 @@
[self _setLoading: _private->mainHandle || [_private->urlHandles count]];
}
-- (void)_setController: (IFWebController *)controller
+- (void)_setController: (WebController *)controller
{
if (_private->loading) {
[controller retain];
@@ -123,7 +123,7 @@
_private->controller = controller;
}
-- (void)_setParent: (IFWebDataSource *)p
+- (void)_setParent: (WebDataSource *)p
{
// Non-retained.
_private->parent = p;
@@ -151,7 +151,7 @@
[self _clearErrors];
- _private->mainURLHandleClient = [[IFMainURLHandleClient alloc] initWithDataSource: self];
+ _private->mainURLHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
[_private->mainHandle addClient: _private->mainURLHandleClient];
// Mark the start loading time.
@@ -165,7 +165,7 @@
[_private->mainHandle loadInBackground];
}
-- (void)_addURLHandle: (IFURLHandle *)handle
+- (void)_addURLHandle: (WebResourceHandle *)handle
{
if (_private->urlHandles == nil)
_private->urlHandles = [[NSMutableArray alloc] init];
@@ -173,7 +173,7 @@
[self _setLoading:YES];
}
-- (void)_removeURLHandle: (IFURLHandle *)handle
+- (void)_removeURLHandle: (WebResourceHandle *)handle
{
[_private->urlHandles removeObject: handle];
[self _updateLoading];
@@ -187,7 +187,7 @@
- (void)_stopLoading
{
int i, count;
- IFURLHandle *handle;
+ WebResourceHandle *handle;
_private->stopping = YES;
@@ -207,9 +207,9 @@
- (void)_recursiveStopLoading
{
NSArray *frames;
- IFWebFrame *nextFrame;
+ WebFrame *nextFrame;
int i, count;
- IFWebDataSource *childDataSource, *childProvisionalDataSource;
+ WebDataSource *childDataSource, *childProvisionalDataSource;
[self _stopLoading];
@@ -235,7 +235,7 @@
if (title == nil) {
trimmed = nil;
} else {
- trimmed = [title _IF_stringByTrimmingWhitespace];
+ trimmed = [title _web_stringByTrimmingWhitespace];
if ([trimmed length] == 0)
trimmed = nil;
}
@@ -252,7 +252,7 @@
// The title doesn't get communicated to the controller until
// we reach the committed state for this data source's frame.
- if ([[self webFrame] _state] >= IFWEBFRAMESTATE_COMMITTED_PAGE)
+ if ([[self webFrame] _state] >= WebFrameStateCommittedPage)
[[self _locationChangeHandler] receivedPageTitle:_private->pageTitle forDataSource:self];
}
@@ -263,12 +263,12 @@
_private->finalURL = url;
}
-- (id <IFLocationChangeHandler>)_locationChangeHandler
+- (id <WebLocationChangeHandler>)_locationChangeHandler
{
return _private->locationChangeHandler;
}
-- (void)_setLocationChangeHandler: (id <IFLocationChangeHandler>)l
+- (void)_setLocationChangeHandler: (id <WebLocationChangeHandler>)l
{
[l retain];
[_private->locationChangeHandler release];
@@ -281,7 +281,7 @@
_private->downloadPath = [path retain];
}
-- (void) _setContentPolicy:(IFContentPolicy)policy
+- (void) _setContentPolicy:(WebContentPolicy)policy
{
_private->contentPolicy = policy;
}
@@ -298,10 +298,10 @@
_private->encoding = [encoding retain];
}
-- (IFWebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <IFLocationChangeHandler>)handler;
+- (WebDataSource *) _recursiveDataSourceForLocationChangeHandler:(id <WebLocationChangeHandler>)handler;
{
- IFWebDataSource *childProvisionalDataSource, *childDataSource, *dataSource;
- IFWebFrame *nextFrame;
+ WebDataSource *childProvisionalDataSource, *childDataSource, *dataSource;
+ WebFrame *nextFrame;
NSArray *frames;
uint i;
@@ -324,7 +324,7 @@
return nil;
}
-- (void)_setMainDocumentError: (IFError *)error
+- (void)_setMainDocumentError: (WebError *)error
{
[error retain];
[_private->mainDocumentError release];
@@ -340,7 +340,7 @@
}
-- (void)_addError: (IFError *)error forResource: (NSString *)resourceDescription
+- (void)_addError: (WebError *)error forResource: (NSString *)resourceDescription
{
if (_private->errors == 0)
_private->errors = [[NSMutableDictionary alloc] init];
@@ -353,7 +353,7 @@
{
if ([[self children] count] > 0){
NSArray *subFrames = [self children];
- IFWebFrame *subFrame;
+ WebFrame *subFrame;
unsigned int i;
id dview;
for (i = 0; i < [subFrames count]; i++){
@@ -373,11 +373,11 @@
if (!repTypes) {
repTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- [IFHTMLRepresentation class], @"text/html",
- [IFImageRepresentation class], @"image/jpeg",
- [IFImageRepresentation class], @"image/gif",
- [IFImageRepresentation class], @"image/png",
- [IFTextRepresentation class], @"text/",
+ [WebHTMLRepresentation class], @"text/html",
+ [WebImageRepresentation class], @"image/jpeg",
+ [WebImageRepresentation class], @"image/gif",
+ [WebImageRepresentation class], @"image/png",
+ [WebTextRepresentation class], @"text/",
nil];
}
@@ -386,7 +386,7 @@
+ (BOOL)_canShowMIMEType:(NSString *)MIMEType
{
- return [[self _repTypes] _IF_objectForMIMEType:MIMEType] != nil;
+ return [[self _repTypes] _web_objectForMIMEType:MIMEType] != nil;
}
- (void)_removeFromFrame
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.h b/WebKit/WebView.subproj/WebDebugDOMNode.h
index fb0cee4..37ed2e9 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.h
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.h
@@ -1,5 +1,5 @@
//
-// IFDOMNode.h
+// WebDOMNode.h
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
@@ -8,9 +8,9 @@
#import <Foundation/Foundation.h>
- at class IFWebView;
+ at class WebView;
- at interface IFDOMNode : NSObject
+ at interface WebDOMNode : NSObject
{
NSArray *children;
NSString *name;
@@ -18,7 +18,7 @@
NSString *source;
}
-- initWithWebView:(IFWebView *)view;
+- initWithWebView:(WebView *)view;
- (NSArray *)children;
- (NSString *)name;
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.m b/WebKit/WebView.subproj/WebDebugDOMNode.m
index 73d412b..7e15450 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.m
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.m
@@ -1,21 +1,21 @@
//
-// IFDOMNode.m
+// WebDOMNode.m
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFDOMNode.h"
+#import "WebDOMNode.h"
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebHTMLViewPrivate.h>
@interface WebKitDOMTreeCopier : NSObject <WebCoreDOMTreeCopier>
@end
- at implementation IFDOMNode
+ at implementation WebDOMNode
- initWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
{
@@ -29,18 +29,18 @@
return self;
}
-- initWithWebView:(IFWebView *)view
+- initWithWebView:(WebView *)view
{
WebKitDOMTreeCopier *copier;
[self dealloc];
- if (![[view documentView] isMemberOfClass:[IFHTMLView class]]) {
+ if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
return nil;
}
copier = [[WebKitDOMTreeCopier alloc] init];
- IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+ WebHTMLView *htmlView = (WebHTMLView *)[view documentView];
self = [[[htmlView _bridge] copyDOMTree:copier] retain];
[copier release];
@@ -83,7 +83,7 @@
- (NSObject *)nodeWithName:(NSString *)n value:(NSString *)v source:(NSString *)s children:(NSArray *)c
{
- return [[[IFDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
+ return [[[WebDOMNode alloc] initWithName:n value:v source:s children:c] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 5a2c3df..232a685 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -1,33 +1,33 @@
/*
- IFDocument.h
+ WebDocument.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
- at class IFWebDataSource;
- at class IFError;
+ at class WebDataSource;
+ at class WebError;
- at protocol IFDocumentView <NSObject>
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
+ at protocol WebDocumentView <NSObject>
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
+- (void)dataSourceUpdated:(WebDataSource *)dataSource;
- (void)layout;
@end
- at protocol IFDocumentDragSettings
+ at protocol WebDocumentDragSettings
- (void)setCanDragFrom: (BOOL)flag;
- (BOOL)canDragFrom;
- (void)setCanDragTo: (BOOL)flag;
- (BOOL)canDragTo;
@end
- at protocol IFDocumentSearching
+ at protocol WebDocumentSearching
- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag;
@end
- at protocol IFDocumentRepresentation <NSObject>
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
+ at protocol WebDocumentRepresentation <NSObject>
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
\ No newline at end of file
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
index 7266e5a..2cf0888 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.h
@@ -1,5 +1,5 @@
//
-// IFDynamicScrollBarsView.h
+// WebDynamicScrollBarsView.h
// WebKit
//
// Created by John Sullivan on Tue Jan 22 2002.
@@ -13,7 +13,7 @@
// FIXME 2980779: This has grown to be more than just a dynamic scroll bar view,
// and it no longer works outside of WebKit.
- at interface IFDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
+ at interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
{
NSCursor *cursor;
BOOL disallowsScrolling;
diff --git a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
index f733c69..57a9a8a 100644
--- a/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
+++ b/WebKit/WebView.subproj/WebDynamicScrollBarsView.m
@@ -1,14 +1,14 @@
//
-// IFDynamicScrollBarsView.m
+// WebDynamicScrollBarsView.m
// WebKit
//
// Created by John Sullivan on Tue Jan 22 2002.
// Copyright (c) 2001, 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFDynamicScrollBarsView.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
- at implementation IFDynamicScrollBarsView
+ at implementation WebDynamicScrollBarsView
- (void)updateScrollers
{
diff --git a/WebKit/WebView.subproj/WebFrame.h b/WebKit/WebView.subproj/WebFrame.h
index 957c2d0..67acda0 100644
--- a/WebKit/WebView.subproj/WebFrame.h
+++ b/WebKit/WebView.subproj/WebFrame.h
@@ -1,5 +1,5 @@
/*
- IFWebFrame.h
+ WebFrame.h
Copyright 2001, Apple, Inc. All rights reserved.
@@ -8,27 +8,27 @@
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebController;
- at class IFWebDataSource;
- at class IFWebView;
+ at class WebError;
+ at class WebController;
+ at class WebDataSource;
+ at class WebView;
- at class IFWebFramePrivate;
+ at class WebFramePrivate;
- at interface IFWebFrame : NSObject
+ at interface WebFrame : NSObject
{
@private
- IFWebFramePrivate *_private;
+ WebFramePrivate *_private;
}
-- initWithName: (NSString *)name webView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource controller: (IFWebController *)controller;
+- initWithName: (NSString *)name webView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource controller: (WebController *)controller;
- (NSString *)name;
-- (void)setController: (IFWebController *)controller;
-- (IFWebController *)controller;
+- (void)setController: (WebController *)controller;
+- (WebController *)controller;
-- (void)setWebView: (IFWebView *)view;
-- (IFWebView *)webView;
+- (void)setWebView: (WebView *)view;
+- (WebView *)webView;
/*
Sets the frame's data source. Note that the data source will be
@@ -36,22 +36,22 @@
~some~ data has been received.
Will return NO and not set the provisional data source if the controller
- disallows by returning a IFURLPolicyIgnore.
+ disallows by returning a WebURLPolicyIgnore.
*/
-- (BOOL)setProvisionalDataSource: (IFWebDataSource *)ds;
+- (BOOL)setProvisionalDataSource: (WebDataSource *)ds;
/*
Returns the committed data source. Will return nil if the
provisional data source hasn't yet been loaded.
*/
-- (IFWebDataSource *)dataSource;
+- (WebDataSource *)dataSource;
/*
Will return the provisional data source. The provisional data source will
return nil if no data source has been set on the frame, or the data source
has successfully transitioned to the committed data source.
*/
-- (IFWebDataSource *)provisionalDataSource;
+- (WebDataSource *)provisionalDataSource;
/*
@@ -88,6 +88,6 @@
frameNamed returns self for _parent and _top if the receiver it is the mainFrame.
nil is returned if a frame with the given name is not found.
*/
-- (IFWebFrame *)frameNamed:(NSString *)name;
+- (WebFrame *)frameNamed:(NSString *)name;
@end
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index cb2e32f..e810931 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1,41 +1,41 @@
/*
- IFWebFrame.m
+ WebFrame.m
Copyright (c) 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFWebFrame.h>
+#import <WebKit/WebFrame.h>
#import <Cocoa/Cocoa.h>
-#import <WebKit/IFHTMLRepresentationPrivate.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFLocationChangeHandler.h>
+#import <WebKit/WebHTMLRepresentationPrivate.h>
+#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebLocationChangeHandler.h>
#import <WebFoundation/WebFoundation.h>
#import <WebKit/WebKitDebug.h>
- at implementation IFWebFrame
+ at implementation WebFrame
- init
{
return [self initWithName: nil webView: nil provisionalDataSource: nil controller: nil];
}
-- initWithName: (NSString *)n webView: (IFWebView *)v provisionalDataSource: (IFWebDataSource *)d controller: (IFWebController *)c
+- initWithName: (NSString *)n webView: (WebView *)v provisionalDataSource: (WebDataSource *)d controller: (WebController *)c
{
[super init];
- _private = [[IFWebFramePrivate alloc] init];
- _private->frameBridge = [[IFWebCoreFrame alloc] initWithWebFrame:self];
+ _private = [[WebFramePrivate alloc] init];
+ _private->frameBridge = [[WebFrameBridge alloc] initWithWebFrame:self];
- [self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
+ [self _setState: WebFrameStateUninitialized];
[self setController: c];
@@ -53,8 +53,8 @@
// of a non HTML representation. This is required khtml
// can reference the frame (window.frames, targeting, etc.).
- IFWebDataSource *dummyDataSource = [[IFWebDataSource alloc] initWithURL:nil];
- IFHTMLRepresentation *dummyRep = [[IFHTMLRepresentation alloc] init];
+ WebDataSource *dummyDataSource = [[WebDataSource alloc] initWithURL:nil];
+ WebHTMLRepresentation *dummyRep = [[WebHTMLRepresentation alloc] init];
[[dummyRep _bridge] setDataSource: dummyDataSource];
[dummyDataSource _setRepresentation: dummyRep];
[dummyRep release];
@@ -88,47 +88,47 @@
}
-- (void)setWebView: (IFWebView *)v
+- (void)setWebView: (WebView *)v
{
[_private setWebView: v];
[v _setController: [self controller]];
}
-- (IFWebView *)webView
+- (WebView *)webView
{
return [_private webView];
}
-- (IFWebController *)controller
+- (WebController *)controller
{
return [_private controller];
}
-- (void)setController: (IFWebController *)controller
+- (void)setController: (WebController *)controller
{
[_private setController: controller];
}
-- (IFWebDataSource *)provisionalDataSource
+- (WebDataSource *)provisionalDataSource
{
return [_private provisionalDataSource];
}
-- (IFWebDataSource *)dataSource
+- (WebDataSource *)dataSource
{
return [_private dataSource];
}
// Will return NO and not set the provisional data source if the controller
-// disallows by returning a IFURLPolicyIgnore.
-- (BOOL)setProvisionalDataSource: (IFWebDataSource *)newDataSource
+// disallows by returning a WebURLPolicyIgnore.
+- (BOOL)setProvisionalDataSource: (WebDataSource *)newDataSource
{
- id <IFLocationChangeHandler>locationChangeHandler;
- IFWebDataSource *oldDataSource;
+ id <WebLocationChangeHandler>locationChangeHandler;
+ WebDataSource *oldDataSource;
WEBKIT_ASSERT ([self controller] != nil);
@@ -137,7 +137,7 @@
// KDE drop we should fix this dependency.
WEBKIT_ASSERT ([self webView] != nil);
- if ([self _state] != IFWEBFRAMESTATE_COMPLETE){
+ if ([self _state] != WebFrameStateComplete){
[self stopLoading];
}
@@ -166,7 +166,7 @@
// We tell the documentView provisionalDataSourceChanged:
// once it has been created by the controller.
- [self _setState: IFWEBFRAMESTATE_PROVISIONAL];
+ [self _setState: WebFrameStateProvisional];
return YES;
}
@@ -206,16 +206,16 @@
{
[_private setDataSource: nil];
if ([[self webView] isDocumentHTML]) {
- IFHTMLView *htmlView = (IFHTMLView *)[[self webView] documentView];
+ WebHTMLView *htmlView = (WebHTMLView *)[[self webView] documentView];
[htmlView _reset];
}
[_private setWebView: nil];
}
-+ _frameNamed:(NSString *)name fromFrame: (IFWebFrame *)aFrame
++ _frameNamed:(NSString *)name fromFrame: (WebFrame *)aFrame
{
int i, count;
- IFWebFrame *foundFrame;
+ WebFrame *foundFrame;
NSArray *children;
if ([[aFrame name] isEqualToString: name])
@@ -225,7 +225,7 @@
count = [children count];
for (i = 0; i < count; i++){
aFrame = [children objectAtIndex: i];
- foundFrame = [IFWebFrame _frameNamed: name fromFrame: aFrame];
+ foundFrame = [WebFrame _frameNamed: name fromFrame: aFrame];
if (foundFrame)
return foundFrame;
}
@@ -237,7 +237,7 @@
return nil;
}
-- (IFWebFrame *)frameNamed:(NSString *)name
+- (WebFrame *)frameNamed:(NSString *)name
{
// First, deal with 'special' names.
if([name isEqualToString:@"_self"] || [name isEqualToString:@"_current"]){
@@ -249,7 +249,7 @@
}
else if([name isEqualToString:@"_parent"]){
- IFWebDataSource *parent = [[self dataSource] parent];
+ WebDataSource *parent = [[self dataSource] parent];
if(parent){
return [parent webFrame];
}
@@ -259,14 +259,14 @@
}
else if ([name isEqualToString:@"_blank"]){
- IFWebController *newController = [[[self controller] windowContext] openNewWindowWithURL: nil];
+ WebController *newController = [[[self controller] windowContext] openNewWindowWithURL: nil];
[[[[newController windowContext] window] windowController] showWindow:nil];
return [newController mainFrame];
}
// Now search the namespace associated with this frame's controller.
- return [IFWebFrame _frameNamed: name fromFrame: [[self controller] mainFrame]];
+ return [WebFrame _frameNamed: name fromFrame: [[self controller] mainFrame]];
}
@end
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index c7d5b4c..f98a2a0 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -1,5 +1,5 @@
/*
- IFLocationChangeHandler.h
+ WebLocationChangeHandler.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -7,42 +7,42 @@
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebDataSource;
+ at class WebError;
+ at class WebDataSource;
/*
=============================================================================
- IFLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frames location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
- Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
+ Handlers are created by WebController's provideLocationChangeHandlerForFrame:andURL:
method.
A location change that results in changing a frame's document will trigger the
following messages, sent in order:
- (void)locationChangeStarted;
- - (void)locationChangeCommitted; // Only sent for the IFContentPolicyShow policy.
- - (void)locationChangeDone: (IFError *)error;
+ - (void)locationChangeCommitted; // Only sent for the WebContentPolicyShow policy.
+ - (void)locationChangeDone: (WebError *)error;
- None of the IFLocationChangeHandler methods should block for any extended period
+ None of the WebLocationChangeHandler methods should block for any extended period
of time.
=============================================================================
*/
- at protocol IFLocationChangeHandler <NSObject>
+ at protocol WebLocationChangeHandler <NSObject>
-- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeCommittedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeCommittedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (WebError *)error forDataSource: (WebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (WebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 32e9f57..5e8b8a2 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -1,77 +1,77 @@
/*
- IFWebFramePrivate.h
+ WebFramePrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file.
*/
-#import <WebKit/IFWebFrame.h>
+#import <WebKit/WebFrame.h>
- at class IFWebCoreFrame;
- at class IFWebView;
- at protocol IFDocumentLoading;
+ at class WebFrameBridge;
+ at class WebView;
+ at protocol WebDocumentLoading;
typedef enum {
- IFWEBFRAMESTATE_UNINITIALIZED = 1,
- IFWEBFRAMESTATE_PROVISIONAL = 2,
+ WebFrameStateUninitialized = 1,
+ WebFrameStateProvisional = 2,
// This state indicates we are ready to commit to a page,
// that means the view will transition to use the new
// datasource.
- IFWEBFRAMESTATE_COMMITTED_PAGE = 3,
+ WebFrameStateCommittedPage = 3,
// This state indicates that it is reasonable to perform
// a layout.
- IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE = 4,
+ WebFrameStateLayoutAcceptable = 4,
- IFWEBFRAMESTATE_COMPLETE = 5
-} IFWebFrameState;
+ WebFrameStateComplete = 5
+} WebFrameState;
-#define IFFrameStateChangedNotification @"IFFrameStateChangedNotification"
+#define WebFrameStateChangedNotification @"WebFrameStateChangedNotification"
-#define IFPreviousFrameState @"IFPreviousFrameState"
-#define IFCurrentFrameState @"IFCurrentFrameState"
+#define WebPreviousFrameState @"WebPreviousFrameState"
+#define WebCurrentFrameState @"WebCurrentFrameState"
- at interface IFWebFramePrivate : NSObject
+ at interface WebFramePrivate : NSObject
{
@public
NSString *name;
- IFWebView *webView;
- IFWebDataSource *dataSource;
- IFWebDataSource *provisionalDataSource;
- IFWebController *controller;
- IFWebFrameState state;
+ WebView *webView;
+ WebDataSource *dataSource;
+ WebDataSource *provisionalDataSource;
+ WebController *controller;
+ WebFrameState state;
BOOL scheduledLayoutPending;
- IFWebCoreFrame *frameBridge;
+ WebFrameBridge *frameBridge;
}
- (void)setName: (NSString *)n;
- (NSString *)name;
-- (void)setController: (IFWebController *)c;
-- (IFWebController *)controller;
-- (void)setWebView: (IFWebView *)v;
-- (IFWebView *)webView;
-- (void)setDataSource: (IFWebDataSource *)d;
-- (IFWebDataSource *)dataSource;
-- (void)setProvisionalDataSource: (IFWebDataSource *)d;
-- (IFWebDataSource *)provisionalDataSource;
+- (void)setController: (WebController *)c;
+- (WebController *)controller;
+- (void)setWebView: (WebView *)v;
+- (WebView *)webView;
+- (void)setDataSource: (WebDataSource *)d;
+- (WebDataSource *)dataSource;
+- (void)setProvisionalDataSource: (WebDataSource *)d;
+- (WebDataSource *)provisionalDataSource;
@end
- at interface IFWebFrame (IFPrivate)
+ at interface WebFrame (WebPrivate)
- (void)_parentDataSourceWillBeDeallocated;
-- (void)_setController: (IFWebController *)controller;
-- (void)_setDataSource: (IFWebDataSource *)d;
+- (void)_setController: (WebController *)controller;
+- (void)_setDataSource: (WebDataSource *)d;
- (void)_transitionProvisionalToCommitted;
- (void)_transitionProvisionalToLayoutAcceptable;
-- (IFWebFrameState)_state;
-- (void)_setState: (IFWebFrameState)newState;
-+ (void)_recursiveCheckCompleteFromFrame: (IFWebFrame *)fromFrame;
+- (WebFrameState)_state;
+- (void)_setState: (WebFrameState)newState;
++ (void)_recursiveCheckCompleteFromFrame: (WebFrame *)fromFrame;
- (void)_isLoadComplete;
- (void)_checkLoadComplete;
- (void)_timedLayout: userInfo;
-- (IFWebCoreFrame *)_frameBridge;
-- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
-- (void)_setProvisionalDataSource:(IFWebDataSource *)d;
+- (WebFrameBridge *)_frameBridge;
+- (BOOL)_shouldShowDataSource:(WebDataSource *)dataSource;
+- (void)_setProvisionalDataSource:(WebDataSource *)d;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 16c496d..465b3d4 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1,39 +1,39 @@
/*
- IFWebFramePrivate.mm
+ WebFramePrivate.mm
Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/IFWebFramePrivate.h>
-
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebKitErrors.h>
-#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/WebFramePrivate.h>
+
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebHTMLView.h>
+#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
static const char * const stateNames[6] = {
"zero state",
- "IFWEBFRAMESTATE_UNINITIALIZED",
- "IFWEBFRAMESTATE_PROVISIONAL",
- "IFWEBFRAMESTATE_COMMITTED_PAGE",
- "IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE",
- "IFWEBFRAMESTATE_COMPLETE"
+ "WebFrameStateUninitialized",
+ "WebFrameStateProvisional",
+ "WebFrameStateCommittedPage",
+ "WebFrameStateLayoutAcceptable",
+ "WebFrameStateComplete"
};
- at implementation IFWebFramePrivate
+ at implementation WebFramePrivate
- (void)dealloc
{
@@ -59,15 +59,15 @@ static const char * const stateNames[6] = {
name = [n retain];
}
-- (IFWebView *)webView { return webView; }
-- (void)setWebView: (IFWebView *)v
+- (WebView *)webView { return webView; }
+- (void)setWebView: (WebView *)v
{
[webView autorelease];
webView = [v retain];
}
-- (IFWebDataSource *)dataSource { return dataSource; }
-- (void)setDataSource: (IFWebDataSource *)d
+- (WebDataSource *)dataSource { return dataSource; }
+- (void)setDataSource: (WebDataSource *)d
{
if (dataSource != d) {
[dataSource _removeFromFrame];
@@ -76,14 +76,14 @@ static const char * const stateNames[6] = {
}
}
-- (IFWebController *)controller { return controller; }
-- (void)setController: (IFWebController *)c
+- (WebController *)controller { return controller; }
+- (void)setController: (WebController *)c
{
controller = c; // not retained (yet)
}
-- (IFWebDataSource *)provisionalDataSource { return provisionalDataSource; }
-- (void)setProvisionalDataSource: (IFWebDataSource *)d
+- (WebDataSource *)provisionalDataSource { return provisionalDataSource; }
+- (void)setProvisionalDataSource: (WebDataSource *)d
{
if (provisionalDataSource != d) {
[provisionalDataSource autorelease];
@@ -93,7 +93,7 @@ static const char * const stateNames[6] = {
@end
- at implementation IFWebFrame (IFPrivate)
+ at implementation WebFrame (WebPrivate)
- (void)_parentDataSourceWillBeDeallocated
{
@@ -102,12 +102,12 @@ static const char * const stateNames[6] = {
[_private->provisionalDataSource _setParent:nil];
}
-- (void)_setController: (IFWebController *)controller
+- (void)_setController: (WebController *)controller
{
[_private setController: controller];
}
-- (void)_setDataSource: (IFWebDataSource *)ds
+- (void)_setDataSource: (WebDataSource *)ds
{
[_private setDataSource: ds];
[ds _setController: [self controller]];
@@ -126,14 +126,14 @@ static const char * const stateNames[6] = {
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: state = %s\n", [[self name] cString], stateNames[_private->state]);
_private->scheduledLayoutPending = NO;
- if (_private->state == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- NSView <IFDocumentView> *documentView = [[self webView] documentView];
+ if (_private->state == WebFrameStateLayoutAcceptable) {
+ NSView <WebDocumentView> *documentView = [[self webView] documentView];
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: performing timed layout, %f seconds since start of document load\n", [[self name] cString], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
if ([[self webView] isDocumentHTML]) {
- IFHTMLView *htmlView = (IFHTMLView *)documentView;
+ WebHTMLView *htmlView = (WebHTMLView *)documentView;
[htmlView setNeedsLayout: YES];
@@ -165,16 +165,16 @@ static const char * const stateNames[6] = {
- (void)_transitionProvisionalToLayoutAcceptable
{
switch ([self _state]) {
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
+ case WebFrameStateCommittedPage:
{
- [self _setState: IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE];
+ [self _setState: WebFrameStateLayoutAcceptable];
// Start a timer to guarantee that we get an initial layout after
// X interval, even if the document and resources are not completely
// loaded.
- BOOL timedDelayEnabled = [[IFPreferences standardPreferences] _initialTimedLayoutEnabled];
+ BOOL timedDelayEnabled = [[WebPreferences standardPreferences] _initialTimedLayoutEnabled];
if (timedDelayEnabled) {
- NSTimeInterval defaultTimedDelay = [[IFPreferences standardPreferences] _initialTimedLayoutDelay];
+ NSTimeInterval defaultTimedDelay = [[WebPreferences standardPreferences] _initialTimedLayoutDelay];
double timeSinceStart;
// If the delay getting to the commited state exceeds the initial layout delay, go
@@ -194,17 +194,17 @@ static const char * const stateNames[6] = {
break;
}
- case IFWEBFRAMESTATE_PROVISIONAL:
- case IFWEBFRAMESTATE_COMPLETE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
+ case WebFrameStateProvisional:
+ case WebFrameStateComplete:
+ case WebFrameStateLayoutAcceptable:
{
break;
}
- case IFWEBFRAMESTATE_UNINITIALIZED:
+ case WebFrameStateUninitialized:
default:
{
- [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE from %s", stateNames[_private->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason: [NSString stringWithFormat: @"invalid state attempting to transition to WebFrameStateLayoutAcceptable from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -214,10 +214,10 @@ static const char * const stateNames[6] = {
- (void)_transitionProvisionalToCommitted
{
WEBKIT_ASSERT ([self controller] != nil);
- NSView <IFDocumentView> *documentView = [[self webView] documentView];
+ NSView <WebDocumentView> *documentView = [[self webView] documentView];
switch ([self _state]) {
- case IFWEBFRAMESTATE_PROVISIONAL:
+ case WebFrameStateProvisional:
{
WEBKIT_ASSERT (documentView != nil);
@@ -231,7 +231,7 @@ static const char * const stateNames[6] = {
// Now that the provisional data source is committed, release it.
[_private setProvisionalDataSource: nil];
- [self _setState: IFWEBFRAMESTATE_COMMITTED_PAGE];
+ [self _setState: WebFrameStateCommittedPage];
[[[self dataSource] _locationChangeHandler] locationChangeCommittedForDataSource:[self dataSource]];
@@ -242,46 +242,46 @@ static const char * const stateNames[6] = {
break;
}
- case IFWEBFRAMESTATE_UNINITIALIZED:
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
- case IFWEBFRAMESTATE_COMPLETE:
+ case WebFrameStateUninitialized:
+ case WebFrameStateCommittedPage:
+ case WebFrameStateLayoutAcceptable:
+ case WebFrameStateComplete:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED_PAGE from %s", stateNames[_private->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to WebFrameStateCommittedPage from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
}
-- (IFWebFrameState)_state
+- (WebFrameState)_state
{
return _private->state;
}
-- (void)_setState: (IFWebFrameState)newState
+- (void)_setState: (WebFrameState)newState
{
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: transition from %s to %s\n", [[self name] cString], stateNames[_private->state], stateNames[newState]);
if ([self controller])
WEBKITDEBUGLEVEL (WEBKIT_LOG_TIMING, "%s: transition from %s to %s, %f seconds since start of document load\n", [[self name] cString], stateNames[_private->state], stateNames[newState], CFAbsoluteTimeGetCurrent() - [[[[self controller] mainFrame] dataSource] _loadingStartedTime]);
- if (newState == IFWEBFRAMESTATE_COMPLETE && self == [[self controller] mainFrame]){
+ if (newState == WebFrameStateComplete && self == [[self controller] mainFrame]){
WEBKITDEBUGLEVEL (WEBKIT_LOG_DOCUMENTLOAD, "completed %s (%f seconds)", [[[[self dataSource] inputURL] absoluteString] cString], CFAbsoluteTimeGetCurrent() - [[self dataSource] _loadingStartedTime]);
}
NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:_private->state], IFPreviousFrameState,
- [NSNumber numberWithInt:newState], IFCurrentFrameState, nil];
+ [NSNumber numberWithInt:_private->state], WebPreviousFrameState,
+ [NSNumber numberWithInt:newState], WebCurrentFrameState, nil];
- [[NSNotificationCenter defaultCenter] postNotificationName:IFFrameStateChangedNotification object:self userInfo:userInfo];
+ [[NSNotificationCenter defaultCenter] postNotificationName:WebFrameStateChangedNotification object:self userInfo:userInfo];
_private->state = newState;
- if (_private->state == IFWEBFRAMESTATE_PROVISIONAL){
+ if (_private->state == WebFrameStateProvisional){
[[[self webView] frameScrollView] setDrawsBackground: NO];
}
- if (_private->state == IFWEBFRAMESTATE_COMPLETE){
+ if (_private->state == WebFrameStateComplete){
NSScrollView *sv = [[self webView] frameScrollView];
[sv setDrawsBackground: YES];
[[sv contentView] setCopiesOnScroll: YES];
@@ -294,48 +294,48 @@ static const char * const stateNames[6] = {
switch ([self _state]) {
// Shouldn't ever be in this state.
- case IFWEBFRAMESTATE_UNINITIALIZED:
+ case WebFrameStateUninitialized:
{
- [[NSException exceptionWithName:NSGenericException reason:@"invalid state IFWEBFRAMESTATE_UNINITIALIZED during completion check with error" userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:@"invalid state WebFrameStateUninitialized during completion check with error" userInfo: nil] raise];
return;
}
- case IFWEBFRAMESTATE_PROVISIONAL:
+ case WebFrameStateProvisional:
{
- IFWebDataSource *pd = [self provisionalDataSource];
+ WebDataSource *pd = [self provisionalDataSource];
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in WebFrameStateProvisional\n", [[self name] cString]);
// If we've received any errors we may be stuck in the provisional state and actually
// complete.
if ([[pd errors] count] != 0 || [pd mainDocumentError]) {
// Check all children first.
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_PROVISIONAL, %d errors\n", [[self name] cString], [[pd errors] count]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state WebFrameStateProvisional, %d errors\n", [[self name] cString], [[pd errors] count]);
if (![pd isLoading]) {
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in IFWEBFRAMESTATE_PROVISIONAL, load done\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete in WebFrameStateProvisional, load done\n", [[self name] cString]);
[[pd _locationChangeHandler] locationChangeDone: [pd mainDocumentError] forDataSource:pd];
// We now the provisional data source didn't cut the mustard, release it.
[_private setProvisionalDataSource: nil];
- [self _setState: IFWEBFRAMESTATE_COMPLETE];
+ [self _setState: WebFrameStateComplete];
return;
}
}
return;
}
- case IFWEBFRAMESTATE_COMMITTED_PAGE:
- case IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE:
+ case WebFrameStateCommittedPage:
+ case WebFrameStateLayoutAcceptable:
{
- IFWebDataSource *ds = [self dataSource];
+ WebDataSource *ds = [self dataSource];
- //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
+ //WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state WEBFRAMESTATE_COMMITTED\n", [[self name] cString]);
if (![ds isLoading]) {
id thisView = [self webView];
- NSView <IFDocumentView> *thisDocumentView = [thisView documentView];
+ NSView <WebDocumentView> *thisDocumentView = [thisView documentView];
- [self _setState: IFWEBFRAMESTATE_COMPLETE];
+ [self _setState: WebFrameStateComplete];
[[ds _bridge] end];
@@ -352,7 +352,7 @@ static const char * const stateNames[6] = {
// Tell the just loaded document to layout. This may be necessary
// for non-html content that needs a layout message.
if ([thisView isDocumentHTML]){
- IFHTMLView *hview = (IFHTMLView *)thisDocumentView;
+ WebHTMLView *hview = (WebHTMLView *)thisDocumentView;
[hview setNeedsLayout: YES];
}
[thisDocumentView layout];
@@ -380,10 +380,10 @@ static const char * const stateNames[6] = {
// A resource was loaded, but the entire frame isn't complete. Schedule a
// layout.
else {
- if ([self _state] == IFWEBFRAMESTATE_LAYOUT_ACCEPTABLE) {
- BOOL resourceTimedDelayEnabled = [[IFPreferences standardPreferences] _resourceTimedLayoutEnabled];
+ if ([self _state] == WebFrameStateLayoutAcceptable) {
+ BOOL resourceTimedDelayEnabled = [[WebPreferences standardPreferences] _resourceTimedLayoutEnabled];
if (resourceTimedDelayEnabled) {
- NSTimeInterval timedDelay = [[IFPreferences standardPreferences] _resourceTimedLayoutDelay];
+ NSTimeInterval timedDelay = [[WebPreferences standardPreferences] _resourceTimedLayoutDelay];
[self _scheduleLayout: timedDelay];
}
}
@@ -391,9 +391,9 @@ static const char * const stateNames[6] = {
return;
}
- case IFWEBFRAMESTATE_COMPLETE:
+ case WebFrameStateComplete:
{
- WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state IFWEBFRAMESTATE_COMPLETE\n", [[self name] cString]);
+ WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "%s: checking complete, current state WebFrameStateComplete\n", [[self name] cString]);
return;
}
@@ -406,7 +406,7 @@ static const char * const stateNames[6] = {
}
}
-+ (void)_recursiveCheckCompleteFromFrame: (IFWebFrame *)fromFrame
++ (void)_recursiveCheckCompleteFromFrame: (WebFrame *)fromFrame
{
int i, count;
NSArray *childFrames;
@@ -414,10 +414,10 @@ static const char * const stateNames[6] = {
childFrames = [[fromFrame dataSource] children];
count = [childFrames count];
for (i = 0; i < count; i++) {
- IFWebFrame *childFrame;
+ WebFrame *childFrame;
childFrame = [childFrames objectAtIndex: i];
- [IFWebFrame _recursiveCheckCompleteFromFrame: childFrame];
+ [WebFrame _recursiveCheckCompleteFromFrame: childFrame];
[childFrame _isLoadComplete];
}
[fromFrame _isLoadComplete];
@@ -430,34 +430,34 @@ static const char * const stateNames[6] = {
WEBKIT_ASSERT ([self controller] != nil);
// Now walk the frame tree to see if any frame that may have initiated a load is done.
- [IFWebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
+ [WebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
}
-- (IFWebCoreFrame *)_frameBridge
+- (WebFrameBridge *)_frameBridge
{
return _private->frameBridge;
}
-- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource
+- (BOOL)_shouldShowDataSource:(WebDataSource *)dataSource
{
- id <IFWebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
+ id <WebControllerPolicyHandler> policyHandler = [[self controller] policyHandler];
NSFileManager *fileManager = [NSFileManager defaultManager];
NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
NSURL *url = [dataSource inputURL];
- IFFileURLPolicy fileURLPolicy;
+ WebFileURLPolicy fileURLPolicy;
NSString *path = [url path];
BOOL isDirectory, fileExists;
- IFError *error;
+ WebError *error;
- IFURLPolicy urlPolicy = [policyHandler URLPolicyForURL:url];
+ WebURLPolicy urlPolicy = [policyHandler URLPolicyForURL:url];
- if(urlPolicy == IFURLPolicyUseContentPolicy){
+ if(urlPolicy == WebURLPolicyUseContentPolicy){
if([url isFileURL]){
fileExists = [fileManager fileExistsAtPath:path isDirectory:&isDirectory];
- NSString *type = [IFWebController _MIMETypeForFile: path];
+ NSString *type = [WebController _MIMETypeForFile: path];
if(isDirectory){
fileURLPolicy = [policyHandler fileURLPolicyForMIMEType: nil dataSource: dataSource isDirectory:YES];
@@ -465,62 +465,62 @@ static const char * const stateNames[6] = {
fileURLPolicy = [policyHandler fileURLPolicyForMIMEType: type dataSource: dataSource isDirectory:NO];
}
- if(fileURLPolicy == IFFileURLPolicyIgnore)
+ if(fileURLPolicy == WebFileURLPolicyIgnore)
return NO;
if(!fileExists){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFileDoesntExist
- inDomain:IFErrorCodeDomainWebKit failingURL:url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorFileDoesNotExist
+ inDomain:WebErrorDomainWebKit failingURL:url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
return NO;
}
if(![fileManager isReadableFileAtPath:path]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFileNotReadable
- inDomain:IFErrorCodeDomainWebKit failingURL:url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorFileNotReadable
+ inDomain:WebErrorDomainWebKit failingURL:url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
return NO;
}
- if(fileURLPolicy == IFFileURLPolicyUseContentPolicy){
+ if(fileURLPolicy == WebFileURLPolicyUseContentPolicy){
if(isDirectory){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowDirectory
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowDirectory
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
return NO;
}
- else if(![IFWebController canShowMIMEType: type]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowMIMEType
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ else if(![WebController canShowMIMEType: type]){
+ error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowMIMEType
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
return NO;
}else{
// File exists, its readable, we can show it
return YES;
}
- }else if(fileURLPolicy == IFFileURLPolicyOpenExternally){
+ }else if(fileURLPolicy == WebFileURLPolicyOpenExternally){
if(![workspace openFile:path]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForFile
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorCouldNotFindApplicationForFile
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
}
return NO;
- }else if(fileURLPolicy == IFFileURLPolicyReveal){
+ }else if(fileURLPolicy == WebFileURLPolicyReveal){
if(![workspace selectFile:path inFileViewerRootedAtPath:@""]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeFinderCouldntOpenDirectory
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorFinderCouldNotOpenDirectory
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementFileURLPolicy: error forDataSource: dataSource];
}
return NO;
}else{
[NSException raise:NSInvalidArgumentException format:
- @"fileURLPolicyForMIMEType:dataSource:isDirectory: returned an invalid IFFileURLPolicy"];
+ @"fileURLPolicyForMIMEType:dataSource:isDirectory: returned an invalid WebFileURLPolicy"];
return NO;
}
}else{
- if(![IFURLHandle canInitWithURL:url]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowURL
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ if(![WebResourceHandle canInitWithURL:url]){
+ error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowURL
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementURLPolicyForURL: url error: error];
return NO;
}
@@ -528,24 +528,24 @@ static const char * const stateNames[6] = {
return YES;
}
}
- else if(urlPolicy == IFURLPolicyOpenExternally){
+ else if(urlPolicy == WebURLPolicyOpenExternally){
if(![workspace openURL:url]){
- error = [[IFError alloc] initWithErrorCode:IFErrorCodeCouldntFindApplicationForURL
- inDomain:IFErrorCodeDomainWebKit failingURL: url];
+ error = [[WebError alloc] initWithErrorCode:WebErrorCouldNotFindApplicationForURL
+ inDomain:WebErrorDomainWebKit failingURL: url];
[policyHandler unableToImplementURLPolicyForURL: url error: error];
}
return NO;
}
- else if(urlPolicy == IFURLPolicyIgnore){
+ else if(urlPolicy == WebURLPolicyIgnore){
return NO;
}
else{
- [NSException raise:NSInvalidArgumentException format:@"URLPolicyForURL: returned an invalid IFURLPolicy"];
+ [NSException raise:NSInvalidArgumentException format:@"URLPolicyForURL: returned an invalid WebURLPolicy"];
return NO;
}
}
-- (void)_setProvisionalDataSource:(IFWebDataSource *)d
+- (void)_setProvisionalDataSource:(WebDataSource *)d
{
[_private setProvisionalDataSource:d];
}
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 294de24..95f60c5 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -1,5 +1,5 @@
/*
- IFWebView.h
+ WebView.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -11,25 +11,25 @@
=============================================================================
*/
- at class IFWebDataSource;
- at class IFWebController;
- at class IFWebViewPrivate;
- at protocol IFDocumentLoading;
- at protocol IFDocumentView;
+ at class WebDataSource;
+ at class WebController;
+ at class WebViewPrivate;
+ at protocol WebDocumentLoading;
+ at protocol WebDocumentView;
- at interface IFWebView : NSView
+ at interface WebView : NSView
{
@private
- IFWebViewPrivate *_private;
+ WebViewPrivate *_private;
}
- initWithFrame: (NSRect) frame;
// Note that the controller is not retained.
-- (IFWebController *)controller;
+- (WebController *)controller;
- frameScrollView;
-- (NSView <IFDocumentView> *)documentView;
+- (NSView <WebDocumentView> *)documentView;
- (BOOL)isDocumentHTML;
@@ -37,10 +37,10 @@
- (BOOL)allowsScrolling;
// Extends the views that WebKit supports
-// The view must conform to the IFDocumentLoading protocol
+// The view must conform to the WebDocumentLoading protocol
+ (void)registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType;
-// Called when the contentPolicy is set to IFContentPolicyShow
-+ (id <IFDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType;
+// Called when the contentPolicy is set to WebContentPolicyShow
++ (id <WebDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType;
@end
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 1ac1d04..3265f75 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -1,64 +1,64 @@
-/* IFWebView.mm
+/* WebView.mm
Copyright 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/IFWebView.h>
-
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFImageView.h>
-#import <WebKit/IFTextView.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreViewFactory.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebKitErrors.h>
-#import <WebKit/IFTextRendererFactory.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRendererFactory.h>
-#import <WebKit/IFCookieAdapter.h>
-
-#import <WebFoundation/IFNSDictionaryExtensions.h>
-#import <WebFoundation/IFNSStringExtensions.h>
-#import <WebFoundation/IFNSURLExtensions.h>
+#import <WebKit/WebView.h>
+
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebHTMLView.h>
+#import <WebKit/WebImageView.h>
+#import <WebKit/WebTextView.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebViewFactory.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebTextRendererFactory.h>
+#import <WebKit/WebImageRenderer.h>
+#import <WebKit/WebImageRendererFactory.h>
+#import <WebKit/WebCookieAdapter.h>
+
+#import <WebFoundation/WebNSDictionaryExtras.h>
+#import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebFoundation.h>
enum {
SpaceKey = 0x0020
};
- at implementation IFWebView
+ at implementation WebView
+ (void)initialize
{
NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
- IFErrorDescriptionCantShowMIMEType, [NSNumber numberWithInt: IFErrorCodeCantShowMIMEType],
- IFErrorDescriptionCouldntFindApplicationForFile, [NSNumber numberWithInt: IFErrorCodeCouldntFindApplicationForFile],
- IFErrorDescriptionCouldntFindApplicationForURL, [NSNumber numberWithInt: IFErrorCodeCouldntFindApplicationForURL],
- IFErrorDescriptionFileDoesntExist, [NSNumber numberWithInt: IFErrorCodeFileDoesntExist],
- IFErrorDescriptionFileNotReadable, [NSNumber numberWithInt: IFErrorCodeFileNotReadable],
- IFErrorDescriptionFinderCouldntOpenDirectory, [NSNumber numberWithInt: IFErrorCodeFinderCouldntOpenDirectory],
- IFErrorDescriptionCantShowDirectory, [NSNumber numberWithInt: IFErrorCodeCantShowDirectory],
- IFErrorDescriptionCantShowURL, [NSNumber numberWithInt: IFErrorCodeCantShowURL],
+ WebErrorDescriptionCannotShowMIMEType, [NSNumber numberWithInt: WebErrorCannotShowMIMEType],
+ WebErrorDescriptionCouldNotFindApplicationForFile, [NSNumber numberWithInt: WebErrorCouldNotFindApplicationForFile],
+ WebErrorDescriptionCouldNotFindApplicationForURL, [NSNumber numberWithInt: WebErrorCouldNotFindApplicationForURL],
+ WebErrorDescriptionFileDoesNotExist, [NSNumber numberWithInt: WebErrorFileDoesNotExist],
+ WebErrorDescriptionFileNotReadable, [NSNumber numberWithInt: WebErrorFileNotReadable],
+ WebErrorDescriptionFinderCouldNotOpenDirectory, [NSNumber numberWithInt: WebErrorFinderCouldNotOpenDirectory],
+ WebErrorDescriptionCannotShowDirectory, [NSNumber numberWithInt: WebErrorCannotShowDirectory],
+ WebErrorDescriptionCannotShowURL, [NSNumber numberWithInt: WebErrorCannotShowURL],
nil];
- [IFError addErrorsFromDictionary:dict];
+ [WebError addErrorsFromDictionary:dict];
}
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
- [IFWebCoreViewFactory createSharedFactory];
- [IFTextRendererFactory createSharedFactory];
- [IFImageRendererFactory createSharedFactory];
- [IFCookieAdapter createSharedAdapter];
+ [WebViewFactory createSharedFactory];
+ [WebTextRendererFactory createSharedFactory];
+ [WebImageRendererFactory createSharedFactory];
+ [WebCookieAdapter createSharedAdapter];
- _private = [[IFWebViewPrivate alloc] init];
+ _private = [[WebViewPrivate alloc] init];
- IFDynamicScrollBarsView *scrollView = [[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,frame.size.width,frame.size.height)];
+ WebDynamicScrollBarsView *scrollView = [[WebDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,frame.size.width,frame.size.height)];
_private->frameScrollView = scrollView;
[scrollView setDrawsBackground: NO];
[scrollView setHasVerticalScroller: NO];
@@ -83,7 +83,7 @@ enum {
- (void)setFrame: (NSRect)f
{
if ([self isDocumentHTML] && !NSEqualRects(f, [self frame]))
- [(IFHTMLView *)[self documentView] setNeedsLayout: YES];
+ [(WebHTMLView *)[self documentView] setNeedsLayout: YES];
[super setFrame: f];
}
@@ -118,7 +118,7 @@ enum {
}
// Note that the controller is not retained.
-- (IFWebController *)controller
+- (WebController *)controller
{
return _private->controller;
}
@@ -126,7 +126,7 @@ enum {
- (BOOL) isDocumentHTML
{
- return [[[self documentView] className] isEqualToString:@"IFHTMLView"];
+ return [[[self documentView] className] isEqualToString:@"WebHTMLView"];
}
@@ -140,14 +140,14 @@ enum {
files = [[sender draggingPasteboard] propertyListForType:@"NSFilenamesPboardType"];
file = [files objectAtIndex:0];
- if([files count] == 1 && [IFWebController canShowFile:file])
+ if([files count] == 1 && [WebController canShowFile:file])
return NSDragOperationCopy;
}else if([dragType isEqualToString:@"NSURLPboardType"]){
return NSDragOperationCopy;
}else if([dragType isEqualToString:@"NSStringPboardType"]){
URLString = [[sender draggingPasteboard] stringForType:@"NSStringPboardType"];
- if([URLString _IF_looksLikeAbsoluteURL])
+ if([URLString _web_looksLikeAbsoluteURL])
return NSDragOperationCopy;
}
return NSDragOperationNone;
@@ -165,8 +165,8 @@ enum {
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
- IFWebDataSource *dataSource;
- IFWebFrame *frame;
+ WebDataSource *dataSource;
+ WebFrame *frame;
NSArray *files;
NSString *file, *dragType;
NSURL *URL=nil;
@@ -179,14 +179,14 @@ enum {
}else if([dragType isEqualToString:@"NSURLPboardType"]){
URL = [NSURL URLFromPasteboard:[sender draggingPasteboard]];
}else if([dragType isEqualToString:@"NSStringPboardType"]){
- URL = [NSURL _IF_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
+ URL = [NSURL _web_URLWithString:[[sender draggingPasteboard] stringForType:@"NSStringPboardType"]];
}
if(!URL){
return;
}
- dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
+ dataSource = [[[WebDataSource alloc] initWithURL:URL] autorelease];
frame = nil;
frame = [[self controller] mainFrame];
if([frame setProvisionalDataSource:dataSource])
@@ -199,9 +199,9 @@ enum {
[[self _viewTypes] setObject:viewClass forKey:MIMEType];
}
-+ (id <IFDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType
++ (id <WebDocumentLoading>) createViewForMIMEType:(NSString *)MIMEType
{
- Class viewClass = [[self _viewTypes] _IF_objectForMIMEType:MIMEType];
+ Class viewClass = [[self _viewTypes] _web_objectForMIMEType:MIMEType];
return viewClass ? [[[viewClass alloc] init] autorelease] : nil;
}
diff --git a/WebKit/WebView.subproj/WebFrameViewInternal.h b/WebKit/WebView.subproj/WebFrameViewInternal.h
index 2eebefd..3f68e21 100644
--- a/WebKit/WebView.subproj/WebFrameViewInternal.h
+++ b/WebKit/WebView.subproj/WebFrameViewInternal.h
@@ -1,4 +1,4 @@
-/* IFWebViewPrivate.h
+/* WebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,15 +6,15 @@
NSWebPageView.
*/
-#import <WebKit/IFWebView.h>
+#import <WebKit/WebView.h>
- at class IFDynamicScrollBarsView;
+ at class WebDynamicScrollBarsView;
- at interface IFWebViewPrivate : NSObject
+ at interface WebViewPrivate : NSObject
{
@public
- IFWebController *controller;
- IFDynamicScrollBarsView *frameScrollView;
+ WebController *controller;
+ WebDynamicScrollBarsView *frameScrollView;
// These margin values are used to temporarily hold
// the margins of a frame until we have the appropriate
@@ -27,10 +27,10 @@
@end
- at interface IFWebView (IFPrivate)
-- (void)_setDocumentView:(id <IFDocumentLoading>)view;
-- (void)_setController:(IFWebController *)controller;
-- (IFWebController *)_controller;
+ at interface WebView (WebPrivate)
+- (void)_setDocumentView:(id <WebDocumentLoading>)view;
+- (void)_setController:(WebController *)controller;
+- (WebController *)_controller;
- (int)_marginWidth;
- (int)_marginHeight;
- (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.h b/WebKit/WebView.subproj/WebFrameViewPrivate.h
index 2eebefd..3f68e21 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.h
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.h
@@ -1,4 +1,4 @@
-/* IFWebViewPrivate.h
+/* WebViewPrivate.h
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,15 +6,15 @@
NSWebPageView.
*/
-#import <WebKit/IFWebView.h>
+#import <WebKit/WebView.h>
- at class IFDynamicScrollBarsView;
+ at class WebDynamicScrollBarsView;
- at interface IFWebViewPrivate : NSObject
+ at interface WebViewPrivate : NSObject
{
@public
- IFWebController *controller;
- IFDynamicScrollBarsView *frameScrollView;
+ WebController *controller;
+ WebDynamicScrollBarsView *frameScrollView;
// These margin values are used to temporarily hold
// the margins of a frame until we have the appropriate
@@ -27,10 +27,10 @@
@end
- at interface IFWebView (IFPrivate)
-- (void)_setDocumentView:(id <IFDocumentLoading>)view;
-- (void)_setController:(IFWebController *)controller;
-- (IFWebController *)_controller;
+ at interface WebView (WebPrivate)
+- (void)_setDocumentView:(id <WebDocumentLoading>)view;
+- (void)_setController:(WebController *)controller;
+- (WebController *)_controller;
- (int)_marginWidth;
- (int)_marginHeight;
- (void)_setMarginWidth:(int)w;
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 4605fc9..eb594ba 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -1,4 +1,4 @@
-/* IFWebViewPrivate.mm
+/* WebViewPrivate.mm
Copyright 2001, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,18 +6,18 @@
NSWebPageView.
*/
-#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFHTMLView.h>
-#import <WebKit/IFImageView.h>
-#import <WebKit/IFTextView.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebHTMLView.h>
+#import <WebKit/WebImageView.h>
+#import <WebKit/WebTextView.h>
-#import <WebFoundation/IFNSDictionaryExtensions.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
- at implementation IFWebViewPrivate
+ at implementation WebViewPrivate
- init
{
@@ -38,7 +38,7 @@
@end
- at implementation IFWebView (IFPrivate)
+ at implementation WebView (WebPrivate)
- (void)_setMarginWidth: (int)w
{
@@ -66,13 +66,13 @@
}
-- (void)_setController: (IFWebController *)controller
+- (void)_setController: (WebController *)controller
{
// Not retained; the controller owns the view.
_private->controller = controller;
}
-- (IFWebController *)_controller
+- (WebController *)_controller
{
return _private->controller;
}
@@ -209,11 +209,11 @@
if (!viewTypes) {
viewTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
- [IFHTMLView class], @"text/html",
- [IFTextView class], @"text/",
- [IFImageView class], @"image/jpeg",
- [IFImageView class], @"image/gif",
- [IFImageView class], @"image/png",
+ [WebHTMLView class], @"text/html",
+ [WebTextView class], @"text/",
+ [WebImageView class], @"image/jpeg",
+ [WebImageView class], @"image/gif",
+ [WebImageView class], @"image/png",
nil];
}
@@ -222,7 +222,7 @@
+ (BOOL)_canShowMIMEType:(NSString *)MIMEType
{
- return [[self _viewTypes] _IF_objectForMIMEType:MIMEType] != nil;
+ return [[self _viewTypes] _web_objectForMIMEType:MIMEType] != nil;
}
- (void)_goBack
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.h b/WebKit/WebView.subproj/WebHTMLRepresentation.h
index fe40df8..1a97b58 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.h
@@ -1,23 +1,23 @@
/*
- IFHTMLRepresentation.h
+ WebHTMLRepresentation.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebDataSource;
+ at class WebError;
+ at class WebDataSource;
- at protocol IFDocumentRepresentation;
+ at protocol WebDocumentRepresentation;
- at class IFHTMLRepresentationPrivate;
+ at class WebHTMLRepresentationPrivate;
- at interface IFHTMLRepresentation : NSObject <IFDocumentRepresentation>
+ at interface WebHTMLRepresentation : NSObject <WebDocumentRepresentation>
{
- IFHTMLRepresentationPrivate *_private;
+ WebHTMLRepresentationPrivate *_private;
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 5479b3f..8292aa0 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -1,30 +1,30 @@
/*
- IFHTMLRepresentation.mm
+ WebHTMLRepresentation.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFHTMLRepresentation.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/WebHTMLRepresentation.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebBridge.h>
- at interface IFHTMLRepresentationPrivate : NSObject
+ at interface WebHTMLRepresentationPrivate : NSObject
{
@public
- IFWebCoreBridge *bridge;
+ WebBridge *bridge;
}
@end
- at implementation IFHTMLRepresentationPrivate
+ at implementation WebHTMLRepresentationPrivate
@end
- at implementation IFHTMLRepresentation
+ at implementation WebHTMLRepresentation
- init
{
[super init];
- _private = [[IFHTMLRepresentationPrivate alloc] init];
- _private->bridge = [[IFWebCoreBridge alloc] init];
+ _private = [[WebHTMLRepresentationPrivate alloc] init];
+ _private->bridge = [[WebBridge alloc] init];
return self;
}
@@ -37,22 +37,22 @@
[super dealloc];
}
-- (IFWebCoreBridge *)_bridge
+- (WebBridge *)_bridge
{
return _private->bridge;
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
{
[_private->bridge receivedData:data withDataSource:dataSource];
}
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
}
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h b/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
index ff9d874..3f4a09d 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLRepresentationPrivate.h
@@ -1,12 +1,12 @@
/*
- IFHTMLRepresentationPrivate.h
+ WebHTMLRepresentationPrivate.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFHTMLRepresentation.h>
+#import <WebKit/WebHTMLRepresentation.h>
- at class IFWebCoreBridge;
+ at class WebBridge;
- at interface IFHTMLRepresentation (IFPrivate)
-- (IFWebCoreBridge *)_bridge;
+ at interface WebHTMLRepresentation (WebPrivate)
+- (WebBridge *)_bridge;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLView.h b/WebKit/WebView.subproj/WebHTMLView.h
index ddf0dc5..3a10a83 100644
--- a/WebKit/WebView.subproj/WebHTMLView.h
+++ b/WebKit/WebView.subproj/WebHTMLView.h
@@ -1,5 +1,5 @@
/*
- IFHTMLView.h
+ WebHTMLView.h
Copyright 2002, Apple, Inc. All rights reserved.
Private header file.
@@ -11,31 +11,31 @@
=============================================================================
*/
- at class IFWebDataSource;
- at class IFWebController;
- at class IFHTMLViewPrivate;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
- at protocol IFDocumentSearching;
+ at class WebDataSource;
+ at class WebController;
+ at class WebHTMLViewPrivate;
+ at protocol WebDocumentLoading;
+ at protocol WebDocumentDragSettings;
+ at protocol WebDocumentSearching;
- at interface IFHTMLView : NSView <IFDocumentLoading, IFDocumentDragSettings, IFDocumentSearching>
+ at interface WebHTMLView : NSView <WebDocumentLoading, WebDocumentDragSettings, WebDocumentSearching>
{
@private
- IFHTMLViewPrivate *_private;
+ WebHTMLViewPrivate *_private;
}
- initWithFrame: (NSRect)frame;
// These methods is typically called by the view's controller when
// the data source is changed.
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
+- (void)dataSourceUpdated:(WebDataSource *)dataSource;
- (void)setNeedsLayout: (bool)flag;
// This method should not be public until we have a more completely
-// understood way to subclass IFWebView.
+// understood way to subclass WebView.
- (void)layout;
// Set needsToApplyStyles if you change anything that might impact styles, like
@@ -56,9 +56,9 @@
- (BOOL)canDragTo;
// Returns an array of built-in context menu items for this node.
-// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by WebContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *);
+- (NSArray *)defaultContextMenuItemsForNode: (WebDOMNode *);
#endif
- (void)setContextMenusEnabled: (BOOL)flag;
- (BOOL)contextMenusEnabled;
@@ -89,5 +89,5 @@
Selection on data source is reflected in view.
Does the view also need a cover selection API?
- subclassing of IFWebView
+ subclassing of WebView
*/
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 37bd00d..caf904d 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1,32 +1,32 @@
/*
- IFHTMLView.mm
+ WebHTMLView.mm
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFHTMLView.h>
-
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebCoreFrame.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/WebHTMLView.h>
+
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebFrameBridge.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebKitDebug.h>
// Needed for the mouse moved notification.
#import <AppKit/NSResponder_Private.h>
- at implementation IFHTMLView
+ at implementation WebHTMLView
- initWithFrame: (NSRect) frame
{
[super initWithFrame: frame];
- _private = [[IFHTMLViewPrivate alloc] init];
+ _private = [[WebHTMLViewPrivate alloc] init];
_private->needsLayout = YES;
@@ -56,7 +56,7 @@
- (void)copy:(id)sender
{
- IFWebCoreBridge *bridge = [self _bridge];
+ WebBridge *bridge = [self _bridge];
NSPasteboard *pboard = [NSPasteboard generalPasteboard];
[pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
@@ -66,7 +66,7 @@
- (void)selectAll: sender
{
- IFWebCoreBridge *bridge = [self _bridge];
+ WebBridge *bridge = [self _bridge];
[bridge selectAll];
}
@@ -115,7 +115,7 @@
// This method is typically called by the view's controller when
// the data source is changed.
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
[[dataSource _bridge]
createKHTMLViewWithNSView:[[[dataSource webFrame] webView] documentView]
@@ -124,12 +124,12 @@
marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
}
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
- [[self _bridge] installInFrame:[[self _IF_parentWebView] frameScrollView]];
+ [[self _bridge] installInFrame:[[self _web_parentWebView] frameScrollView]];
}
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
+- (void)dataSourceUpdated:(WebDataSource *)dataSource
{
}
@@ -155,7 +155,7 @@
// This method should not be public until we have more completely
-// understood how IFWebView will be subclassed.
+// understood how WebView will be subclassed.
- (void)layout
{
// Ensure that we will receive mouse move events. Is this the best place to put this?
@@ -184,7 +184,7 @@
// Stop animating animated GIFs, etc.
- (void)stopAnimations
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::stopAnimations is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::stopAnimations is not implemented"];
}
@@ -210,18 +210,18 @@
}
// Returns an array of built-in context menu items for this node.
-// Generally called by IFContextMenuHandlers from contextMenuItemsForNode:
+// Generally called by WebContextMenuHandlers from contextMenuItemsForNode:
#ifdef TENTATIVE_API
-- (NSArray *)defaultContextMenuItemsForNode: (IFDOMNode *)
+- (NSArray *)defaultContextMenuItemsForNode: (WebDOMNode *)
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::defaultContextMenuItemsForNode: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::defaultContextMenuItemsForNode: is not implemented"];
return nil;
}
#endif
- (void)setContextMenusEnabled: (BOOL)flag
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::setContextMenusEnabled: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::setContextMenusEnabled: is not implemented"];
}
@@ -234,7 +234,7 @@
// Remove the selection.
- (void)deselectText
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::deselectText: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::deselectText: is not implemented"];
}
@@ -243,14 +243,14 @@
// is selected.
- (void)searchFor: (NSString *)string direction: (BOOL)forward caseSensitive: (BOOL)caseFlag
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::searchFor:direction:caseSensitive: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::searchFor:direction:caseSensitive: is not implemented"];
}
// Get an attributed string that represents the current selection.
- (NSAttributedString *)selectedText
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebView::selectedText is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebView::selectedText is not implemented"];
return nil;
}
@@ -378,7 +378,7 @@
// Because we currently don't benefit from any of the code in there.
// It implements its own version of keyboard scrolling, but we have our
-// version in IFWebView. It implements some keyboard access to individual
+// version in WebView. It implements some keyboard access to individual
// nodes, but we are probably going to handle that on the NSView side.
// We already handle normal typing through the responder chain.
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index 1ec8d1b..a5e8473 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -1,19 +1,19 @@
-/* IFHTMLViewPrivate.h
+/* WebHTMLViewPrivate.h
Copyright 2002, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
in WebCore. Instances of this class are referenced by _private in
- IFHTMLView.
+ WebHTMLView.
*/
-#import <WebKit/IFHTMLView.h>
+#import <WebKit/WebHTMLView.h>
- at class IFWebCoreBridge;
+ at class WebBridge;
- at interface IFHTMLViewPrivate : NSObject
+ at interface WebHTMLViewPrivate : NSObject
{
@public
- IFWebController *controller;
+ WebController *controller;
BOOL needsLayout;
BOOL needsToApplyStyles;
BOOL canDragTo;
@@ -24,9 +24,9 @@
}
@end
- at interface IFHTMLView (IFPrivate)
+ at interface WebHTMLView (WebPrivate)
- (void)_reset;
-- (void)_setController: (IFWebController *)controller;
-- (IFWebCoreBridge *)_bridge;
+- (void)_setController: (WebController *)controller;
+- (WebBridge *)_bridge;
- (void)_adjustFrames;
@end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 8a6561b..4671d0a 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -1,4 +1,4 @@
-/* IFHTMLViewPrivate.mm
+/* WebHTMLViewPrivate.mm
Copyright 2002, Apple, Inc. All rights reserved.
Private header file. This file may reference classes (both ObjectiveC and C++)
@@ -6,32 +6,32 @@
NSWebPageView.
*/
-#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/WebHTMLViewPrivate.h>
#import <WebKit/WebKitDebug.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFNSViewExtras.h>
-#import <WebKit/IFPluginView.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-
- at interface NSView (IFHTMLViewPrivate)
-- (void)_IF_stopIfPluginView;
+#import <WebKit/WebImageRenderer.h>
+#import <WebKit/WebNSViewExtras.h>
+#import <WebKit/WebPluginView.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebViewPrivate.h>
+
+ at interface NSView (WebHTMLViewPrivate)
+- (void)_web_stopIfPluginView;
@end
- at implementation NSView (IFHTMLViewPrivate)
-- (void)_IF_stopIfPluginView
+ at implementation NSView (WebHTMLViewPrivate)
+- (void)_web_stopIfPluginView
{
- if ([self isKindOfClass:[IFPluginView class]]) {
- IFPluginView *pluginView = (IFPluginView *)self;
+ if ([self isKindOfClass:[WebPluginView class]]) {
+ WebPluginView *pluginView = (WebPluginView *)self;
[pluginView stop];
}
}
@end
- at implementation IFHTMLViewPrivate
+ at implementation WebHTMLViewPrivate
- (void)dealloc
{
@@ -42,7 +42,7 @@
@end
- at implementation IFHTMLView (IFPrivate)
+ at implementation WebHTMLView (WebPrivate)
- (void)_adjustFrames
{
@@ -57,23 +57,23 @@
- (void)_reset
{
NSArray *subviews = [[self subviews] copy];
- [subviews makeObjectsPerformSelector:@selector(_IF_stopIfPluginView)];
+ [subviews makeObjectsPerformSelector:@selector(_web_stopIfPluginView)];
[subviews release];
- [IFImageRenderer stopAnimationsInView:self];
+ [WebImageRenderer stopAnimationsInView:self];
}
-- (void)_setController:(IFWebController *)controller
+- (void)_setController:(WebController *)controller
{
// Not retained; the controller owns the view.
_private->controller = controller;
}
// Required so view can access the part's selection.
-- (IFWebCoreBridge *)_bridge
+- (WebBridge *)_bridge
{
- IFWebView *webView = [self _IF_parentWebView];
- IFWebFrame *webFrame = [[webView _controller] frameForView:webView];
+ WebView *webView = [self _web_parentWebView];
+ WebFrame *webFrame = [[webView _controller] frameForView:webView];
return [[webFrame dataSource] _bridge];
}
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.h b/WebKit/WebView.subproj/WebImageRepresentation.h
index 0507b43..cd0df6d 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.h
+++ b/WebKit/WebView.subproj/WebImageRepresentation.h
@@ -1,22 +1,22 @@
/*
- IFImageRepresentation.h
+ WebImageRepresentation.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
- at class IFError;
- at class IFWebDataSource;
- at class IFImageRenderer;
- at protocol IFDocumentRepresentation;
+ at class WebError;
+ at class WebDataSource;
+ at class WebImageRenderer;
+ at protocol WebDocumentRepresentation;
- at interface IFImageRepresentation : NSObject <IFDocumentRepresentation>
+ at interface WebImageRepresentation : NSObject <WebDocumentRepresentation>
{
- IFImageRenderer *image;
+ WebImageRenderer *image;
}
-- (IFImageRenderer *)image;
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
+- (WebImageRenderer *)image;
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index 79fcc8b..d1c7c33 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -1,20 +1,20 @@
/*
- IFImageRepresentation.m
+ WebImageRepresentation.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import "IFImageRepresentation.h"
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRendererFactory.h>
+#import "WebImageRepresentation.h"
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebImageRenderer.h>
+#import <WebKit/WebImageRendererFactory.h>
- at implementation IFImageRepresentation
+ at implementation WebImageRepresentation
- init
{
self = [super init];
if (self) {
- //image = [[IFImageRenderer alloc] init];
+ //image = [[WebImageRenderer alloc] init];
}
return self;
}
@@ -26,25 +26,25 @@
[super dealloc];
}
-- (IFImageRenderer *)image
+- (WebImageRenderer *)image
{
return image;
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
{
//[image incrementalLoadWithBytes:[data bytes] length:[data length] complete:isComplete];
}
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
}
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
{
NSData *resourceData = [dataSource data];
- image = [[[IFImageRendererFactory sharedFactory] imageRendererWithBytes:[resourceData bytes]
+ image = [[[WebImageRendererFactory sharedFactory] imageRendererWithBytes:[resourceData bytes]
length:[resourceData length]] retain];
}
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index e1f78b7..e559f69 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -1,17 +1,17 @@
/*
- IFImageView.h
+ WebImageView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
- at class IFImageRepresentation;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
+ at class WebImageRepresentation;
+ at protocol WebDocumentLoading;
+ at protocol WebDocumentDragSettings;
- at interface IFImageView : NSView <IFDocumentLoading, IFDocumentDragSettings>
+ at interface WebImageView : NSView <WebDocumentLoading, WebDocumentDragSettings>
{
- IFImageRepresentation *representation;
+ WebImageRepresentation *representation;
BOOL canDragFrom;
BOOL canDragTo;
BOOL didSetFrame;
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index c0fefd8..190a40c 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -1,16 +1,16 @@
/*
- IFImageView.m
+ WebImageView.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFImageView.h>
+#import <WebKit/WebImageView.h>
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFImageRenderer.h>
-#import <WebKit/IFImageRepresentation.h>
-#import <WebKit/IFWebDataSource.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebImageRenderer.h>
+#import <WebKit/WebImageRepresentation.h>
+#import <WebKit/WebDataSource.h>
- at implementation IFImageView
+ at implementation WebImageView
- (id)initWithFrame:(NSRect)frame
{
@@ -40,22 +40,22 @@
[[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
}
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
}
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
representation = [[dataSource representation] retain];
}
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
+- (void)dataSourceUpdated:(WebDataSource *)dataSource
{
}
- (void)layout
{
- IFImageRenderer *image = [representation image];
+ WebImageRenderer *image = [representation image];
if (image) {
[self setFrameSize:[image size]];
[image setFlipped:YES];
diff --git a/WebKit/WebView.subproj/WebLoadProgress.h b/WebKit/WebView.subproj/WebLoadProgress.h
index af6596e..aca1728 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.h
+++ b/WebKit/WebView.subproj/WebLoadProgress.h
@@ -1,5 +1,5 @@
/*
- IFLoadProgress.h
+ WebLoadProgress.h
Copyright 2001, 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
- at class IFURLHandle;
+ at class WebResourceHandle;
- at interface IFLoadProgress : NSObject
+ at interface WebLoadProgress : NSObject
{
int bytesSoFar; // 0 if this is the start of load
int totalToLoad; // -1 if this is not known.
@@ -18,11 +18,11 @@
- (id)init; // both -1
- (id)initWithBytesSoFar:(int)bytes totalToLoad:(int)total;
-- (id)initWithURLHandle:(IFURLHandle *)handle;
+- (id)initWithResourceHandle:(WebResourceHandle *)handle;
-+ (IFLoadProgress *)progress; // both -1
-+ (IFLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total;
-+ (IFLoadProgress *)progressWithURLHandle:(IFURLHandle *)handle;
++ (WebLoadProgress *)progress; // both -1
++ (WebLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total;
++ (WebLoadProgress *)progressWithResourceHandle:(WebResourceHandle *)handle;
- (int)bytesSoFar;
- (int)totalToLoad;
diff --git a/WebKit/WebView.subproj/WebLoadProgress.m b/WebKit/WebView.subproj/WebLoadProgress.m
index 7649ec8..4748dcd 100644
--- a/WebKit/WebView.subproj/WebLoadProgress.m
+++ b/WebKit/WebView.subproj/WebLoadProgress.m
@@ -1,13 +1,13 @@
-/* IFLoadProgress.mm
+/* WebLoadProgress.mm
Copyright 2001, 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFLoadProgress.h>
+#import <WebKit/WebLoadProgress.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebResourceHandle.h>
- at implementation IFLoadProgress
+ at implementation WebLoadProgress
- (id)init
{
@@ -26,26 +26,26 @@
return self;
}
-- (id)initWithURLHandle:(IFURLHandle *)handle
+- (id)initWithResourceHandle:(WebResourceHandle *)handle
{
int b = [handle contentLengthReceived];
- int t = [handle statusCode] == IFURLHandleStatusLoadComplete ? b : [handle contentLength];
+ int t = [handle statusCode] == WebResourceHandleStatusLoadComplete ? b : [handle contentLength];
return [self initWithBytesSoFar:b totalToLoad:t];
}
-+ (IFLoadProgress *)progress
++ (WebLoadProgress *)progress
{
- return [[[IFLoadProgress alloc] init] autorelease];
+ return [[[WebLoadProgress alloc] init] autorelease];
}
-+ (IFLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total
++ (WebLoadProgress *)progressWithBytesSoFar:(int)bytes totalToLoad:(int)total
{
- return [[[IFLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:total] autorelease];
+ return [[[WebLoadProgress alloc] initWithBytesSoFar:bytes totalToLoad:total] autorelease];
}
-+ (IFLoadProgress *)progressWithURLHandle:(IFURLHandle *)handle
++ (WebLoadProgress *)progressWithResourceHandle:(WebResourceHandle *)handle
{
- return [[[IFLoadProgress alloc] initWithURLHandle:handle] autorelease];
+ return [[[WebLoadProgress alloc] initWithResourceHandle:handle] autorelease];
}
- (int)bytesSoFar
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index c7d5b4c..f98a2a0 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -1,5 +1,5 @@
/*
- IFLocationChangeHandler.h
+ WebLocationChangeHandler.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -7,42 +7,42 @@
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebDataSource;
+ at class WebError;
+ at class WebDataSource;
/*
=============================================================================
- IFLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frames location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
- Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
+ Handlers are created by WebController's provideLocationChangeHandlerForFrame:andURL:
method.
A location change that results in changing a frame's document will trigger the
following messages, sent in order:
- (void)locationChangeStarted;
- - (void)locationChangeCommitted; // Only sent for the IFContentPolicyShow policy.
- - (void)locationChangeDone: (IFError *)error;
+ - (void)locationChangeCommitted; // Only sent for the WebContentPolicyShow policy.
+ - (void)locationChangeDone: (WebError *)error;
- None of the IFLocationChangeHandler methods should block for any extended period
+ None of the WebLocationChangeHandler methods should block for any extended period
of time.
=============================================================================
*/
- at protocol IFLocationChangeHandler <NSObject>
+ at protocol WebLocationChangeHandler <NSObject>
-- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeCommittedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeCommittedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (WebError *)error forDataSource: (WebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (WebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index c7d5b4c..f98a2a0 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -1,5 +1,5 @@
/*
- IFLocationChangeHandler.h
+ WebLocationChangeHandler.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -7,42 +7,42 @@
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebDataSource;
+ at class WebError;
+ at class WebDataSource;
/*
=============================================================================
- IFLocationChangeHandlers track changes to a frames location. This includes
+ WebLocationChangeHandlers track changes to a frames location. This includes
changes that may result in a download, or a resource being opened externally.
rather than a change to the frame document.
- Handlers are created by IFWebController's provideLocationChangeHandlerForFrame:andURL:
+ Handlers are created by WebController's provideLocationChangeHandlerForFrame:andURL:
method.
A location change that results in changing a frame's document will trigger the
following messages, sent in order:
- (void)locationChangeStarted;
- - (void)locationChangeCommitted; // Only sent for the IFContentPolicyShow policy.
- - (void)locationChangeDone: (IFError *)error;
+ - (void)locationChangeCommitted; // Only sent for the WebContentPolicyShow policy.
+ - (void)locationChangeDone: (WebError *)error;
- None of the IFLocationChangeHandler methods should block for any extended period
+ None of the WebLocationChangeHandler methods should block for any extended period
of time.
=============================================================================
*/
- at protocol IFLocationChangeHandler <NSObject>
+ at protocol WebLocationChangeHandler <NSObject>
-- (void)locationChangeStartedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeStartedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeCommittedForDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeCommittedForDataSource: (WebDataSource *)dataSource;
-- (void)locationChangeDone: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)locationChangeDone: (WebError *)error forDataSource: (WebDataSource *)dataSource;
-- (void)receivedPageTitle: (NSString *)title forDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedPageTitle: (NSString *)title forDataSource: (WebDataSource *)dataSource;
-- (void)serverRedirectTo: (NSURL *)url forDataSource: (IFWebDataSource *)dataSource;
+- (void)serverRedirectTo: (NSURL *)url forDataSource: (WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 6ee6adf..911db59 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -1,5 +1,5 @@
/*
- IFMainURLHandleClient.h
+ WebMainResourceClient.h
Private header.
@@ -8,20 +8,20 @@
#import <Foundation/Foundation.h>
- at class IFDownloadHandler;
- at class IFWebDataSource;
- at protocol IFURLHandleClient;
- at protocol IFResourceProgressHandler;
+ at class WebDownloadHandler;
+ at class WebDataSource;
+ at protocol WebResourceClient;
+ at protocol WebResourceProgressHandler;
- at interface IFMainURLHandleClient : NSObject <IFURLHandleClient>
+ at interface WebMainResourceClient : NSObject <WebResourceClient>
{
NSURL *currentURL;
- IFWebDataSource *dataSource;
+ WebDataSource *dataSource;
BOOL processedBufferedData;
BOOL isFirstChunk;
- IFDownloadHandler *downloadHandler;
- id <IFResourceProgressHandler> downloadProgressHandler;
+ WebDownloadHandler *downloadHandler;
+ id <WebResourceProgressHandler> downloadProgressHandler;
}
-- initWithDataSource:(IFWebDataSource *)dataSource;
-- (IFDownloadHandler *)downloadHandler;
+- initWithDataSource:(WebDataSource *)dataSource;
+- (WebDownloadHandler *)downloadHandler;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 3037599..09f99fd 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -1,33 +1,33 @@
/*
- IFMainURLHandleClient.mm
+ WebMainResourceClient.mm
Copyright (c) 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownloadHandler.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebBridge.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebResourceHandle.h>
-// FIXME: This is quite similar IFResourceURLHandleClient; they should share code.
+// FIXME: This is quite similar WebSubresourceClient; they should share code.
- at implementation IFMainURLHandleClient
+ at implementation WebMainResourceClient
-- initWithDataSource: (IFWebDataSource *)ds
+- initWithDataSource: (WebDataSource *)ds
{
self = [super init];
@@ -65,16 +65,16 @@
[super dealloc];
}
-- (IFDownloadHandler *)downloadHandler
+- (WebDownloadHandler *)downloadHandler
{
return downloadHandler;
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
+- (void)receivedProgressWithHandle:(WebResourceHandle *)handle complete:(BOOL)isComplete
{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
+ WebLoadProgress *progress = [WebLoadProgress progressWithResourceHandle:handle];
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
+ if ([dataSource contentPolicy] == WebContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == WebContentPolicySave) {
if (isComplete) {
[dataSource _setPrimaryLoadComplete:YES];
}
@@ -86,11 +86,11 @@
}
}
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
+- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
+ WebLoadProgress *progress = [WebLoadProgress progressWithResourceHandle:handle];
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
+ if ([dataSource contentPolicy] == WebContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == WebContentPolicySave) {
[downloadProgressHandler receivedError:error forResourceHandle:handle
partialProgress:progress fromDataSource:dataSource];
} else {
@@ -99,22 +99,22 @@
}
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
[self didStartLoadingWithURL:[handle url]];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
- IFError *error;
+ WebError *error;
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
+ error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[dataSource inputURL]];
[self receivedError:error forHandle:handle];
[error release];
@@ -124,25 +124,25 @@
[self didStopLoading];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
+- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data: (NSData *)data
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
+ WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
// Don't retain data for downloaded files
- if([dataSource contentPolicy] != IFContentPolicySave &&
- [dataSource contentPolicy] != IFContentPolicySaveAndOpenExternally){
+ if([dataSource contentPolicy] != WebContentPolicySave &&
+ [dataSource contentPolicy] != WebContentPolicySaveAndOpenExternally){
[dataSource _setResourceData:data];
}
- if([dataSource contentPolicy] == IFContentPolicyShow)
+ if([dataSource contentPolicy] == WebContentPolicyShow)
[[dataSource representation] finishedLoadingWithDataSource:dataSource];
// Either send a final error message or a final progress message.
- IFError *nonTerminalError = [handle error];
+ WebError *nonTerminalError = [handle error];
if (nonTerminalError){
[self receivedError:nonTerminalError forHandle:handle];
}
@@ -157,12 +157,12 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
{
- IFWebController *controller = [dataSource controller];
+ WebController *controller = [dataSource controller];
NSString *contentType = [handle contentType];
- IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame webView];
+ WebFrame *frame = [dataSource webFrame];
+ WebView *view = [frame webView];
NSData *data = nil;
@@ -175,14 +175,14 @@
// Make assumption that if the contentType is the default
// and there is no extension, this is text/html
- if([contentType isEqualToString:IFDefaultMIMEType] && [[[currentURL path] pathExtension] isEqualToString:@""])
+ if([contentType isEqualToString:WebDefaultMIMEType] && [[[currentURL path] pathExtension] isEqualToString:@""])
contentType = @"text/html";
[dataSource _setContentType:contentType];
[dataSource _setEncoding:[handle characterSet]];
// retain the downloadProgressHandler just in case this is a download.
- // Alexander releases the IFWebController if no window is created for it.
+ // Alexander releases the WebController if no window is created for it.
// This happens in the cases mentioned in 2981866 and 2965312.
downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
@@ -191,9 +191,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
}
- IFContentPolicy contentPolicy = [dataSource contentPolicy];
+ WebContentPolicy contentPolicy = [dataSource contentPolicy];
- if(contentPolicy != IFContentPolicyNone){
+ if(contentPolicy != WebContentPolicyNone){
if(!processedBufferedData){
// Process all data that has been received now that we have a content policy
// and don't call resourceData if this is the first chunk since resourceData is a copy
@@ -208,19 +208,19 @@
}
}
- if(contentPolicy == IFContentPolicyShow){
+ if(contentPolicy == WebContentPolicyShow){
[[dataSource representation] receivedData:data withDataSource:dataSource];
[[view documentView] dataSourceUpdated:dataSource];
}
- else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
+ else if(contentPolicy == WebContentPolicySave || contentPolicy == WebContentPolicySaveAndOpenExternally){
if(!downloadHandler){
[frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
- downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
+ downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
}
[downloadHandler receivedData:data];
}
- else if(contentPolicy == IFContentPolicyIgnore){
+ else if(contentPolicy == WebContentPolicyIgnore){
[handle cancelLoadInBackground];
[frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
@@ -236,7 +236,7 @@
isFirstChunk = NO;
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
@@ -252,7 +252,7 @@
}
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
+- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "url = %s\n", DEBUG_OBJECT(URL));
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 6ee6adf..911db59 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -1,5 +1,5 @@
/*
- IFMainURLHandleClient.h
+ WebMainResourceClient.h
Private header.
@@ -8,20 +8,20 @@
#import <Foundation/Foundation.h>
- at class IFDownloadHandler;
- at class IFWebDataSource;
- at protocol IFURLHandleClient;
- at protocol IFResourceProgressHandler;
+ at class WebDownloadHandler;
+ at class WebDataSource;
+ at protocol WebResourceClient;
+ at protocol WebResourceProgressHandler;
- at interface IFMainURLHandleClient : NSObject <IFURLHandleClient>
+ at interface WebMainResourceClient : NSObject <WebResourceClient>
{
NSURL *currentURL;
- IFWebDataSource *dataSource;
+ WebDataSource *dataSource;
BOOL processedBufferedData;
BOOL isFirstChunk;
- IFDownloadHandler *downloadHandler;
- id <IFResourceProgressHandler> downloadProgressHandler;
+ WebDownloadHandler *downloadHandler;
+ id <WebResourceProgressHandler> downloadProgressHandler;
}
-- initWithDataSource:(IFWebDataSource *)dataSource;
-- (IFDownloadHandler *)downloadHandler;
+- initWithDataSource:(WebDataSource *)dataSource;
+- (WebDownloadHandler *)downloadHandler;
@end
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 3037599..09f99fd 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -1,33 +1,33 @@
/*
- IFMainURLHandleClient.mm
+ WebMainResourceClient.mm
Copyright (c) 2001, 2002, Apple Computer, Inc. All rights reserved.
*/
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDownloadHandler.h>
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFMainURLHandleClient.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSource.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDownloadHandler.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebBridge.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebResourceHandle.h>
-// FIXME: This is quite similar IFResourceURLHandleClient; they should share code.
+// FIXME: This is quite similar WebSubresourceClient; they should share code.
- at implementation IFMainURLHandleClient
+ at implementation WebMainResourceClient
-- initWithDataSource: (IFWebDataSource *)ds
+- initWithDataSource: (WebDataSource *)ds
{
self = [super init];
@@ -65,16 +65,16 @@
[super dealloc];
}
-- (IFDownloadHandler *)downloadHandler
+- (WebDownloadHandler *)downloadHandler
{
return downloadHandler;
}
-- (void)receivedProgressWithHandle:(IFURLHandle *)handle complete:(BOOL)isComplete
+- (void)receivedProgressWithHandle:(WebResourceHandle *)handle complete:(BOOL)isComplete
{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
+ WebLoadProgress *progress = [WebLoadProgress progressWithResourceHandle:handle];
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
+ if ([dataSource contentPolicy] == WebContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == WebContentPolicySave) {
if (isComplete) {
[dataSource _setPrimaryLoadComplete:YES];
}
@@ -86,11 +86,11 @@
}
}
-- (void)receivedError:(IFError *)error forHandle:(IFURLHandle *)handle
+- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
{
- IFLoadProgress *progress = [IFLoadProgress progressWithURLHandle:handle];
+ WebLoadProgress *progress = [WebLoadProgress progressWithResourceHandle:handle];
- if ([dataSource contentPolicy] == IFContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == IFContentPolicySave) {
+ if ([dataSource contentPolicy] == WebContentPolicySaveAndOpenExternally || [dataSource contentPolicy] == WebContentPolicySave) {
[downloadProgressHandler receivedError:error forResourceHandle:handle
partialProgress:progress fromDataSource:dataSource];
} else {
@@ -99,22 +99,22 @@
}
}
-- (void)IFURLHandleResourceDidBeginLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
[self didStartLoadingWithURL:[handle url]];
}
-- (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)handle
+- (void)WebResourceHandleDidCancelLoading:(WebResourceHandle *)handle
{
- IFError *error;
+ WebError *error;
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
// FIXME: Maybe we should be passing the URL from the handle here, not from the dataSource.
- error = [[IFError alloc] initWithErrorCode:IFURLHandleResultCancelled
- inDomain:IFErrorCodeDomainWebFoundation failingURL:[dataSource inputURL]];
+ error = [[WebError alloc] initWithErrorCode:WebResultCancelled
+ inDomain:WebErrorDomainWebFoundation failingURL:[dataSource inputURL]];
[self receivedError:error forHandle:handle];
[error release];
@@ -124,25 +124,25 @@
[self didStopLoading];
}
-- (void)IFURLHandleResourceDidFinishLoading:(IFURLHandle *)handle data: (NSData *)data
+- (void)WebResourceHandleDidFinishLoading:(WebResourceHandle *)handle data: (NSData *)data
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s\n", DEBUG_OBJECT([handle url]));
WEBKIT_ASSERT([currentURL isEqual:[handle redirectedURL] ? [handle redirectedURL] : [handle url]]);
- WEBKIT_ASSERT([handle statusCode] == IFURLHandleStatusLoadComplete);
+ WEBKIT_ASSERT([handle statusCode] == WebResourceHandleStatusLoadComplete);
WEBKIT_ASSERT((int)[data length] == [handle contentLengthReceived]);
// Don't retain data for downloaded files
- if([dataSource contentPolicy] != IFContentPolicySave &&
- [dataSource contentPolicy] != IFContentPolicySaveAndOpenExternally){
+ if([dataSource contentPolicy] != WebContentPolicySave &&
+ [dataSource contentPolicy] != WebContentPolicySaveAndOpenExternally){
[dataSource _setResourceData:data];
}
- if([dataSource contentPolicy] == IFContentPolicyShow)
+ if([dataSource contentPolicy] == WebContentPolicyShow)
[[dataSource representation] finishedLoadingWithDataSource:dataSource];
// Either send a final error message or a final progress message.
- IFError *nonTerminalError = [handle error];
+ WebError *nonTerminalError = [handle error];
if (nonTerminalError){
[self receivedError:nonTerminalError forHandle:handle];
}
@@ -157,12 +157,12 @@
[self didStopLoading];
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDataDidBecomeAvailable:(NSData *)incomingData
{
- IFWebController *controller = [dataSource controller];
+ WebController *controller = [dataSource controller];
NSString *contentType = [handle contentType];
- IFWebFrame *frame = [dataSource webFrame];
- IFWebView *view = [frame webView];
+ WebFrame *frame = [dataSource webFrame];
+ WebView *view = [frame webView];
NSData *data = nil;
@@ -175,14 +175,14 @@
// Make assumption that if the contentType is the default
// and there is no extension, this is text/html
- if([contentType isEqualToString:IFDefaultMIMEType] && [[[currentURL path] pathExtension] isEqualToString:@""])
+ if([contentType isEqualToString:WebDefaultMIMEType] && [[[currentURL path] pathExtension] isEqualToString:@""])
contentType = @"text/html";
[dataSource _setContentType:contentType];
[dataSource _setEncoding:[handle characterSet]];
// retain the downloadProgressHandler just in case this is a download.
- // Alexander releases the IFWebController if no window is created for it.
+ // Alexander releases the WebController if no window is created for it.
// This happens in the cases mentioned in 2981866 and 2965312.
downloadProgressHandler = [[[dataSource controller] downloadProgressHandler] retain];
@@ -191,9 +191,9 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_DOWNLOAD, "main content type: %s", DEBUG_OBJECT(contentType));
}
- IFContentPolicy contentPolicy = [dataSource contentPolicy];
+ WebContentPolicy contentPolicy = [dataSource contentPolicy];
- if(contentPolicy != IFContentPolicyNone){
+ if(contentPolicy != WebContentPolicyNone){
if(!processedBufferedData){
// Process all data that has been received now that we have a content policy
// and don't call resourceData if this is the first chunk since resourceData is a copy
@@ -208,19 +208,19 @@
}
}
- if(contentPolicy == IFContentPolicyShow){
+ if(contentPolicy == WebContentPolicyShow){
[[dataSource representation] receivedData:data withDataSource:dataSource];
[[view documentView] dataSourceUpdated:dataSource];
}
- else if(contentPolicy == IFContentPolicySave || contentPolicy == IFContentPolicySaveAndOpenExternally){
+ else if(contentPolicy == WebContentPolicySave || contentPolicy == WebContentPolicySaveAndOpenExternally){
if(!downloadHandler){
[frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
- downloadHandler = [[IFDownloadHandler alloc] initWithDataSource:dataSource];
+ downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
}
[downloadHandler receivedData:data];
}
- else if(contentPolicy == IFContentPolicyIgnore){
+ else if(contentPolicy == WebContentPolicyIgnore){
[handle cancelLoadInBackground];
[frame _setProvisionalDataSource:nil];
[[dataSource _locationChangeHandler] locationChangeDone:nil forDataSource:dataSource];
@@ -236,7 +236,7 @@
isFirstChunk = NO;
}
-- (void)IFURLHandle:(IFURLHandle *)handle resourceDidFailLoadingWithResult:(IFError *)result
+- (void)WebResourceHandle:(WebResourceHandle *)handle resourceDidFailLoadingWithResult:(WebError *)result
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_LOADING, "url = %s, result = %s\n", DEBUG_OBJECT([handle url]), DEBUG_OBJECT([result errorDescription]));
@@ -252,7 +252,7 @@
}
-- (void)IFURLHandle:(IFURLHandle *)handle didRedirectToURL:(NSURL *)URL
+- (void)WebResourceHandle:(WebResourceHandle *)handle didRedirectToURL:(NSURL *)URL
{
WEBKITDEBUGLEVEL(WEBKIT_LOG_REDIRECT, "url = %s\n", DEBUG_OBJECT(URL));
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 705276d..73e79ad 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -1,5 +1,5 @@
/*
- IFWebControllerPolicyHandler.h
+ WebControllerPolicyHandler.h
Copyright 2002, Apple, Inc. All rights reserved.
Public header file.
@@ -14,56 +14,56 @@
*/
typedef enum {
- IFURLPolicyUseContentPolicy,
- IFURLPolicyOpenExternally,
- IFURLPolicyIgnore
-} IFURLPolicy;
+ WebURLPolicyUseContentPolicy,
+ WebURLPolicyOpenExternally,
+ WebURLPolicyIgnore
+} WebURLPolicy;
typedef enum {
- IFFileURLPolicyUseContentPolicy,
- IFFileURLPolicyOpenExternally,
- IFFileURLPolicyReveal,
- IFFileURLPolicyIgnore
-} IFFileURLPolicy;
+ WebFileURLPolicyUseContentPolicy,
+ WebFileURLPolicyOpenExternally,
+ WebFileURLPolicyReveal,
+ WebFileURLPolicyIgnore
+} WebFileURLPolicy;
typedef enum {
- IFContentPolicyNone,
- IFContentPolicyShow,
- IFContentPolicySave,
- IFContentPolicySaveAndOpenExternally,
- IFContentPolicyIgnore
-} IFContentPolicy;
+ WebContentPolicyNone,
+ WebContentPolicyShow,
+ WebContentPolicySave,
+ WebContentPolicySaveAndOpenExternally,
+ WebContentPolicyIgnore
+} WebContentPolicy;
- at protocol IFWebControllerPolicyHandler <NSObject>
+ at protocol WebControllerPolicyHandler <NSObject>
-- (id <IFLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (IFWebDataSource *)dataSource;
+- (id <WebLocationChangeHandler>)provideLocationChangeHandlerForDataSource: (WebDataSource *)dataSource;
// URLPolicyForURL: is used to determine what to do BEFORE a URL is loaded, i.e.
// before it is clicked or loaded via a URL bar. Clients can choose to handle the
// URL normally, hand the URL off to launch services, or
// ignore the URL. The default implementation could return +defaultURLPolicyForURL:.
-- (IFURLPolicy)URLPolicyForURL: (NSURL *)url;
+- (WebURLPolicy)URLPolicyForURL: (NSURL *)url;
// We may have different errors that cause the the policy to be un-implementable, i.e.
// launch services failure, etc.
-- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (IFError *)error;
+- (void)unableToImplementURLPolicyForURL: (NSURL *)url error: (WebError *)error;
-// Called when the response to URLPolicyForURL is IFURLPolicyUseContentPolicy and the URL is
+// Called when the response to URLPolicyForURL is WebURLPolicyUseContentPolicy and the URL is
// a file URL. This allows clients to special-case WebKit's behavior for file URLs.
-- (IFFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
+- (WebFileURLPolicy)fileURLPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource isDirectory: (BOOL)isDirectory;
-// Called when a IFFileURLPolicy could not be completed. This is usually caused by files not
+// Called when a WebFileURLPolicy could not be completed. This is usually caused by files not
// existing or not readable.
-- (void)unableToImplementFileURLPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementFileURLPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Sent after locationChangeStarted.
-// Implementations typically call haveContentPolicy:forLocationChangeHandler: on IFWebController
+// Implementations typically call haveContentPolicy:forLocationChangeHandler: on WebController
// after determining the appropriate policy, perhaps by presenting a non-blocking dialog to the user.
-- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (IFWebDataSource *)dataSource;
+- (void)requestContentPolicyForMIMEType: (NSString *)type dataSource: (WebDataSource *)dataSource;
// Sent when errors are encountered with an un-implementable policy, i.e.
// file i/o failure, launch services failure, type mismatches, etc.
-- (void)unableToImplementContentPolicy: (IFError *)error forDataSource: (IFWebDataSource *)dataSource;
+- (void)unableToImplementContentPolicy: (WebError *)error forDataSource: (WebDataSource *)dataSource;
// Called when a plug-in for a certain mime type is not installed
- (void)pluginNotFoundForMIMEType:(NSString *)mime pluginPageURL:(NSURL *)url;
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 961396b..d961d95 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -1,5 +1,5 @@
/*
- IFPreferences.h
+ WebPreferences.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
@@ -7,9 +7,9 @@
#import <Foundation/Foundation.h>
- at interface IFPreferences: NSObject
+ at interface WebPreferences: NSObject
-+ (IFPreferences *)standardPreferences;
++ (WebPreferences *)standardPreferences;
- (NSString *)standardFontFamily;
- (void)setStandardFontFamily:(NSString *)family;
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index f60c4e9..bed3b14 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -1,8 +1,8 @@
/*
- IFPreferences.mm
+ WebPreferences.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import "IFPreferences.h"
+#import "WebPreferences.h"
#import <WebKit/WebKitDebug.h>
@@ -28,20 +28,20 @@
#define WebKitAllowAnimatedImagesPreferenceKey @"WebKitAllowAnimatedImagesPreferenceKey"
#define WebKitAllowAnimatedImageLoopingPreferenceKey @"WebKitAllowAnimatedImageLoopingPreferenceKey"
- at implementation IFPreferences
+ at implementation WebPreferences
-static IFPreferences *_standardPreferences = nil;
+static WebPreferences *_standardPreferences = nil;
-+ (IFPreferences *)standardPreferences
++ (WebPreferences *)standardPreferences
{
if (_standardPreferences == nil) {
- _standardPreferences = [[IFPreferences alloc] init];
+ _standardPreferences = [[WebPreferences alloc] init];
}
return _standardPreferences;
}
-// if we ever have more than one IFPreferences object, this would move to init
+// if we ever have more than one WebPreferences object, this would move to init
+ (void)load
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
diff --git a/WebKit/WebView.subproj/WebPreferencesPrivate.h b/WebKit/WebView.subproj/WebPreferencesPrivate.h
index bd14bce..c15cf51 100644
--- a/WebKit/WebView.subproj/WebPreferencesPrivate.h
+++ b/WebKit/WebView.subproj/WebPreferencesPrivate.h
@@ -1,13 +1,13 @@
/*
- IFPreferences.h
+ WebPreferences.h
Copyright 2001, Apple, Inc. All rights reserved.
Public header file.
*/
-#import <WebKit/IFPreferences.h>
+#import <WebKit/WebPreferences.h>
- at interface IFPreferences (IFPrivate)
+ at interface WebPreferences (WebPrivate)
- (NSTimeInterval)_initialTimedLayoutDelay;
- (int)_initialTimedLayoutSize;
diff --git a/WebKit/WebView.subproj/WebRenderNode.h b/WebKit/WebView.subproj/WebRenderNode.h
index d1f22f4..b620288 100644
--- a/WebKit/WebView.subproj/WebRenderNode.h
+++ b/WebKit/WebView.subproj/WebRenderNode.h
@@ -1,5 +1,5 @@
//
-// IFRenderNode.h
+// WebRenderNode.h
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
@@ -8,16 +8,16 @@
#import <Foundation/Foundation.h>
- at class IFWebView;
+ at class WebView;
- at interface IFRenderNode : NSObject
+ at interface WebRenderNode : NSObject
{
NSArray *children;
NSString *name;
NSRect rect;
}
-- initWithWebView:(IFWebView *)view;
+- initWithWebView:(WebView *)view;
- (NSArray *)children;
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index 7f89e5d..f235d44 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -1,21 +1,21 @@
//
-// IFRenderNode.m
+// WebRenderNode.m
// WebKit
//
// Created by Darin Adler on Tue Jun 11 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFRenderNode.h"
+#import "WebRenderNode.h"
-#import <WebKit/IFWebCoreBridge.h>
-#import <WebKit/IFWebView.h>
-#import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebView.h>
+#import <WebKit/WebHTMLViewPrivate.h>
@interface WebKitRenderTreeCopier : NSObject <WebCoreRenderTreeCopier>
@end
- at implementation IFRenderNode
+ at implementation WebRenderNode
- initWithName:(NSString *)n rect:(NSRect)r view:(NSView *)view children:(NSArray *)c
{
@@ -32,9 +32,9 @@
NSScrollView *scrollView = (NSScrollView *)view;
view = [scrollView superview];
}
- if ([view isKindOfClass:[IFWebView class]]) {
- IFWebView *webView = (IFWebView *)view;
- [collectChildren addObject:[[[IFRenderNode alloc] initWithWebView:webView] autorelease]];
+ if ([view isKindOfClass:[WebView class]]) {
+ WebView *webView = (WebView *)view;
+ [collectChildren addObject:[[[WebRenderNode alloc] initWithWebView:webView] autorelease]];
}
children = [collectChildren copy];
@@ -43,18 +43,18 @@
return self;
}
-- initWithWebView:(IFWebView *)view
+- initWithWebView:(WebView *)view
{
WebKitRenderTreeCopier *copier;
[self dealloc];
- if (![[view documentView] isMemberOfClass:[IFHTMLView class]]) {
+ if (![[view documentView] isMemberOfClass:[WebHTMLView class]]) {
return nil;
}
copier = [[WebKitRenderTreeCopier alloc] init];
- IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+ WebHTMLView *htmlView = (WebHTMLView *)[view documentView];
self = [[[htmlView _bridge] copyRenderTree:copier] retain];
[copier release];
@@ -99,7 +99,7 @@
- (NSObject *)nodeWithName:(NSString *)name rect:(NSRect)rect view:(NSView *)view children:(NSArray *)children
{
- return [[[IFRenderNode alloc] initWithName:name rect:rect view:view children:children] autorelease];
+ return [[[WebRenderNode alloc] initWithName:name rect:rect view:view children:children] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.h b/WebKit/WebView.subproj/WebTextRepresentation.h
index 4b4bcd1..bc1875c 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.h
+++ b/WebKit/WebView.subproj/WebTextRepresentation.h
@@ -1,20 +1,20 @@
/*
- IFTextRepresentation.h
+ WebTextRepresentation.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Foundation/Foundation.h>
- at class IFError;
- at class IFWebDataSource;
- at protocol IFDocumentRepresentation;
+ at class WebError;
+ at class WebDataSource;
+ at protocol WebDocumentRepresentation;
- at interface IFTextRepresentation : NSObject <IFDocumentRepresentation>
+ at interface WebTextRepresentation : NSObject <WebDocumentRepresentation>
{
}
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource;
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource;
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource;
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource;
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource;
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 2274206..0a8fedd 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -1,24 +1,24 @@
/*
- IFTextRepresentation.h
+ WebTextRepresentation.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import "IFTextRepresentation.h"
+#import "WebTextRepresentation.h"
- at implementation IFTextRepresentation
+ at implementation WebTextRepresentation
-- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
{
}
-- (void)receivedError:(IFError *)error withDataSource:(IFWebDataSource *)dataSource
+- (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource
{
}
-- (void)finishedLoadingWithDataSource:(IFWebDataSource *)dataSource
+- (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
{
}
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 418c8b0..5c7b436 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -1,24 +1,24 @@
/*
- IFTextView.h
+ WebTextView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
#import <Cocoa/Cocoa.h>
- at class IFWebDataSource;
- at protocol IFDocumentLoading;
- at protocol IFDocumentDragSettings;
- at protocol IFDocumentSearching;
+ at class WebDataSource;
+ at protocol WebDocumentLoading;
+ at protocol WebDocumentDragSettings;
+ at protocol WebDocumentSearching;
- at interface IFTextView : NSTextView <IFDocumentLoading, IFDocumentDragSettings, IFDocumentSearching>
+ at interface WebTextView : NSTextView <WebDocumentLoading, WebDocumentDragSettings, WebDocumentSearching>
{
BOOL canDragFrom;
BOOL canDragTo;
}
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource;
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource;
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource;
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource;
+- (void)dataSourceUpdated:(WebDataSource *)dataSource;
- (void)layout;
- (void)setCanDragFrom: (BOOL)flag;
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 64f7635..c7d36f5 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -1,13 +1,13 @@
/*
- IFTextView.m
+ WebTextView.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFTextView.h>
+#import <WebKit/WebTextView.h>
-#import <WebKit/IFWebDataSource.h>
+#import <WebKit/WebDataSource.h>
- at implementation IFTextView
+ at implementation WebTextView
- (id)initWithFrame:(NSRect)frame
{
@@ -22,15 +22,15 @@
return self;
}
-- (void)provisionalDataSourceChanged:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
{
}
-- (void)provisionalDataSourceCommitted:(IFWebDataSource *)dataSource
+- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
{
}
-- (void)dataSourceUpdated:(IFWebDataSource *)dataSource
+- (void)dataSourceUpdated:(WebDataSource *)dataSource
{
NSString *string;
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 3740dd5..64e3eaa 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -1,5 +1,5 @@
/*
- IFWebController.h
+ WebController.h
Copyright 2001, 2002, Apple Computer, Inc.
Public header file.
@@ -8,38 +8,38 @@
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
-#import <WebKit/IFLocationChangeHandler.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
+#import <WebKit/WebLocationChangeHandler.h>
+#import <WebKit/WebControllerPolicyHandler.h>
/*
=============================================================================
- IFWebController manages the interaction between IFWebView(s) and IFWebDataSource(s).
+ WebController manages the interaction between WebView(s) and WebDataSource(s).
- The IFWebController implements required behavior. IFWebView and IFWebDataSource
+ The WebController implements required behavior. WebView and WebDataSource
cannot function without a controller.
- It it expected that alternate implementations of IFWebController will be written for
- alternate views of the web pages described by IFWebDataSources. For example, a web
- crawler may implement a IFWebController with no corresponding view.
+ It it expected that alternate implementations of WebController will be written for
+ alternate views of the web pages described by WebDataSources. For example, a web
+ crawler may implement a WebController with no corresponding view.
- IFWebController may be subclassed to modify the behavior of the standard
- IFWebView and IFWebDataSource.
+ WebController may be subclassed to modify the behavior of the standard
+ WebView and WebDataSource.
=============================================================================
*/
- at class IFDownloadHandler;
- at class IFError;
- at class IFLoadProgress;
- at class IFURLHandle;
- at class IFWebController;
- at class IFWebControllerPrivate;
- at class IFWebDataSource;
- at class IFWebFrame;
- at class IFWebView;
+ at class WebDownloadHandler;
+ at class WebError;
+ at class WebLoadProgress;
+ at class WebResourceHandle;
+ at class WebController;
+ at class WebControllerPrivate;
+ at class WebDataSource;
+ at class WebFrame;
+ at class WebView;
- at protocol IFDocumentLoading;
+ at protocol WebDocumentLoading;
/*
=============================================================================
@@ -53,7 +53,7 @@
=============================================================================
*/
- at protocol IFResourceProgressHandler <NSObject>
+ at protocol WebResourceProgressHandler <NSObject>
/*
A new chunk of data has been received. This could be a partial load
@@ -61,9 +61,9 @@
typically for non-base URLs this should be done after a URL (i.e. image)
has been completely downloaded.
*/
-- (void)receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete;
+- (void)receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete;
-- (void)receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+- (void)receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
@end
@@ -71,14 +71,14 @@
/*
=============================================================================
- A class that implements IFWindowContext provides window-related methods
+ A class that implements WebWindowContext provides window-related methods
that may be used by Javascript, plugins and other aspects of web pages.
=============================================================================
*/
- at protocol IFWindowContext <NSObject>
+ at protocol WebWindowContext <NSObject>
-- (IFWebController *)openNewWindowWithURL:(NSURL *)URL;
+- (WebController *)openNewWindowWithURL:(NSURL *)URL;
- (void)setStatusText: (NSString *)text;
- (NSString *)statusText;
@@ -108,11 +108,11 @@
/*
=============================================================================
*/
- at protocol IFContextMenuHandler
+ at protocol WebContextMenuHandler
// Returns the array of menu items for this node that will be displayed in the context menu.
-// Typically this would be implemented by returning the results of IFWebView defaultContextMenuItemsForNode:
+// Typically this would be implemented by returning the results of WebView defaultContextMenuItemsForNode:
// after making any desired changes or additions.
-- (NSArray *)contextMenuItemsForNode: (IFDOMNode *);
+- (NSArray *)contextMenuItemsForNode: (WebDOMNode *);
@end
#endif
@@ -120,38 +120,38 @@
/*
=============================================================================
- IFWebController implements all the behavior that ties together IFWebView
- and IFWebDataSource. See each inherited protocol for a more complete
+ WebController implements all the behavior that ties together WebView
+ and WebDataSource. See each inherited protocol for a more complete
description.
=============================================================================
*/
- at interface IFWebController : NSObject
+ at interface WebController : NSObject
{
@private
- IFWebControllerPrivate *_private;
+ WebControllerPrivate *_private;
}
// Calls designated initializer with nil arguments.
- init;
// Designated initializer.
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource;
+- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource;
-- (void)setWindowContext: (id<IFWindowContext>)context;
-- (id<IFWindowContext>)windowContext;
+- (void)setWindowContext: (id<WebWindowContext>)context;
+- (id<WebWindowContext>)windowContext;
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)resourceProgressHandler;
+- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (id<WebResourceProgressHandler>)resourceProgressHandler;
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler;
-- (id<IFResourceProgressHandler>)downloadProgressHandler;
+- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler;
+- (id<WebResourceProgressHandler>)downloadProgressHandler;
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
++ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url;
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler;
-- (id<IFWebControllerPolicyHandler>)policyHandler;
+- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler;
+- (id<WebControllerPolicyHandler>)policyHandler;
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag;
- (BOOL)directsAllLinksToSystemBrowser;
@@ -159,29 +159,29 @@
// FIXME: Should this method be private?
// Called when a data source needs to create a frame. This method encapsulates the
// specifics of creating and initializing a view of the appropriate class.
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)child inParent: (IFWebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)child inParent: (WebDataSource *)parent allowsScrolling: (BOOL)allowsScrolling;
// Look for a frame named name, recursively.
-- (IFWebFrame *)frameNamed: (NSString *)name;
+- (WebFrame *)frameNamed: (NSString *)name;
// Return the top level frame. Note that even document that are not framesets will have a
// mainFrame.
-- (IFWebFrame *)mainFrame;
+- (WebFrame *)mainFrame;
// Return the frame associated with the data source. Traverses the
// frame tree to find the data source.
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource;
+- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource;
// Return the frame associated with the view. Traverses the
// frame tree to find the view.
-- (IFWebFrame *)frameForView: (IFWebView *)aView;
+- (WebFrame *)frameForView: (WebView *)aView;
// Typically called after requestContentPolicyForContentMIMEType: is sent to a
-// locationChangeHander. The content policy of HTML URLs should always be IFContentPolicyShow.
-// Setting the policy to IFContentPolicyIgnore will cancel the load of the URL if it is still
-// pending. The path argument is only used when the policy is either IFContentPolicySave or
-// IFContentPolicySaveAndOpenExternally.
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource;
+// locationChangeHander. The content policy of HTML URLs should always be WebContentPolicyShow.
+// Setting the policy to WebContentPolicyIgnore will cancel the load of the URL if it is still
+// pending. The path argument is only used when the policy is either WebContentPolicySave or
+// WebContentPolicySaveAndOpenExternally.
+- (void)haveContentPolicy: (WebContentPolicy)policy andPath: (NSString *)path forDataSource: (WebDataSource *)dataSource;
// API to manage animated images.
- (void)stopAnimatedImages;
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 3d2a138..23f2b50 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -1,38 +1,38 @@
/*
- IFWebController.mm
+ WebController.mm
Copyright 2001, 2002 Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFDocument.h>
-#import <WebKit/IFDynamicScrollBarsView.h>
-#import <WebKit/IFException.h>
-#import <WebKit/IFPluginDatabase.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFrame.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebController.h>
-#import <WebKit/IFWebControllerPolicyHandler.h>
-#import <WebKit/IFWebKitErrors.h>
+#import <WebKit/WebDocument.h>
+#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebException.h>
+#import <WebKit/WebPluginDatabase.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebViewPrivate.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebController.h>
+#import <WebKit/WebControllerPolicyHandler.h>
+#import <WebKit/WebKitErrors.h>
#import <WebKit/WebKitDebug.h>
#import <WebFoundation/WebFoundation.h>
- at implementation IFWebController
+ at implementation WebController
- init
{
return [self initWithView: nil provisionalDataSource: nil];
}
-- initWithView: (IFWebView *)view provisionalDataSource: (IFWebDataSource *)dataSource
+- initWithView: (WebView *)view provisionalDataSource: (WebDataSource *)dataSource
{
[super init];
- _private = [[IFWebControllerPrivate alloc] init];
- _private->mainFrame = [[IFWebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
+ _private = [[WebControllerPrivate alloc] init];
+ _private->mainFrame = [[WebFrame alloc] initWithName: @"_top" webView: view provisionalDataSource: dataSource controller: self];
return self;
}
@@ -45,23 +45,23 @@
- (void)setDirectsAllLinksToSystemBrowser: (BOOL)flag
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebController::setDirectsAllLinksToSystemBrowser: is not implemented"];
}
- (BOOL)directsAllLinksToSystemBrowser
{
- [NSException raise:IFMethodNotYetImplemented format:@"IFWebController::directsAllLinksToSystemBrowser is not implemented"];
+ [NSException raise:WebMethodNotYetImplemented format:@"WebController::directsAllLinksToSystemBrowser is not implemented"];
return NO;
}
-- (IFWebFrame *)createFrameNamed: (NSString *)fname for: (IFWebDataSource *)childDataSource inParent: (IFWebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
+- (WebFrame *)createFrameNamed: (NSString *)fname for: (WebDataSource *)childDataSource inParent: (WebDataSource *)parentDataSource allowsScrolling: (BOOL)allowsScrolling
{
- IFWebView *childView;
- IFWebFrame *newFrame;
+ WebView *childView;
+ WebFrame *newFrame;
- childView = [[[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
+ childView = [[[WebView alloc] initWithFrame: NSMakeRect (0,0,0,0)] autorelease];
- newFrame = [[[IFWebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
+ newFrame = [[[WebFrame alloc] initWithName: fname webView: childView provisionalDataSource: childDataSource controller: self] autorelease];
[parentDataSource addFrame: newFrame];
@@ -74,60 +74,60 @@
}
-- (void)setWindowContext: (id<IFWindowContext>)context
+- (void)setWindowContext: (id<WebWindowContext>)context
{
[_private->windowContext autorelease];
_private->windowContext = [context retain];
}
-- (id<IFWindowContext>)windowContext
+- (id<WebWindowContext>)windowContext
{
return _private->windowContext;
}
-- (void)setResourceProgressHandler: (id<IFResourceProgressHandler>)handler
+- (void)setResourceProgressHandler: (id<WebResourceProgressHandler>)handler
{
[_private->resourceProgressHandler autorelease];
_private->resourceProgressHandler = [handler retain];
}
-- (id<IFResourceProgressHandler>)resourceProgressHandler
+- (id<WebResourceProgressHandler>)resourceProgressHandler
{
return _private->resourceProgressHandler;
}
-- (void)setDownloadProgressHandler: (id<IFResourceProgressHandler>)handler
+- (void)setDownloadProgressHandler: (id<WebResourceProgressHandler>)handler
{
[_private->downloadProgressHandler autorelease];
_private->downloadProgressHandler = [handler retain];
}
-- (id<IFResourceProgressHandler>)downloadProgressHandler
+- (id<WebResourceProgressHandler>)downloadProgressHandler
{
return _private->downloadProgressHandler;
}
-- (void)setPolicyHandler: (id<IFWebControllerPolicyHandler>)handler
+- (void)setPolicyHandler: (id<WebControllerPolicyHandler>)handler
{
[_private->policyHandler autorelease];
_private->policyHandler = [handler retain];
}
-- (id<IFWebControllerPolicyHandler>)policyHandler
+- (id<WebControllerPolicyHandler>)policyHandler
{
return _private->policyHandler;
}
-- (IFWebFrame *)_frameForDataSource: (IFWebDataSource *)dataSource fromFrame: (IFWebFrame *)frame
+- (WebFrame *)_frameForDataSource: (WebDataSource *)dataSource fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
- IFWebFrame *result, *aFrame;
+ WebFrame *result, *aFrame;
if ([frame dataSource] == dataSource)
return frame;
@@ -157,19 +157,19 @@
}
-- (IFWebFrame *)frameForDataSource: (IFWebDataSource *)dataSource
+- (WebFrame *)frameForDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [self mainFrame];
+ WebFrame *frame = [self mainFrame];
return [self _frameForDataSource: dataSource fromFrame: frame];
}
-- (IFWebFrame *)_frameForView: (IFWebView *)aView fromFrame: (IFWebFrame *)frame
+- (WebFrame *)_frameForView: (WebView *)aView fromFrame: (WebFrame *)frame
{
NSArray *frames;
int i, count;
- IFWebFrame *result, *aFrame;
+ WebFrame *result, *aFrame;
if ([frame webView] == aView)
return frame;
@@ -196,67 +196,67 @@
}
-- (IFWebFrame *)frameForView: (IFWebView *)aView
+- (WebFrame *)frameForView: (WebView *)aView
{
- IFWebFrame *frame = [self mainFrame];
+ WebFrame *frame = [self mainFrame];
return [self _frameForView: aView fromFrame: frame];
}
-- (IFWebFrame *)frameNamed: (NSString *)name
+- (WebFrame *)frameNamed: (NSString *)name
{
return [[self mainFrame] frameNamed: name];
}
-- (IFWebFrame *)mainFrame
+- (WebFrame *)mainFrame
{
return _private->mainFrame;
}
-+ (IFURLPolicy)defaultURLPolicyForURL: (NSURL *)url
++ (WebURLPolicy)defaultURLPolicyForURL: (NSURL *)url
{
- if([IFURLHandle canInitWithURL:url]){
- return IFURLPolicyUseContentPolicy;
+ if([WebResourceHandle canInitWithURL:url]){
+ return WebURLPolicyUseContentPolicy;
}else{
- return IFURLPolicyOpenExternally;
+ return WebURLPolicyOpenExternally;
}
}
-- (void)haveContentPolicy: (IFContentPolicy)policy andPath: (NSString *)path forDataSource: (IFWebDataSource *)dataSource
+- (void)haveContentPolicy: (WebContentPolicy)policy andPath: (NSString *)path forDataSource: (WebDataSource *)dataSource
{
NSString *MIMEType;
- if(policy == IFContentPolicyNone)
- [NSException raise:NSInvalidArgumentException format:@"Can't set policy of IFContentPolicyNone. Use IFContentPolicyIgnore instead"];
+ if(policy == WebContentPolicyNone)
+ [NSException raise:NSInvalidArgumentException format:@"Can't set policy of WebContentPolicyNone. Use WebContentPolicyIgnore instead"];
- if([dataSource contentPolicy] != IFContentPolicyNone){
+ if([dataSource contentPolicy] != WebContentPolicyNone){
[NSException raise:NSGenericException format:@"Content policy can only be set once on for a dataSource."];
}else{
[dataSource _setContentPolicy:policy];
[dataSource _setDownloadPath:path];
- if(policy == IFContentPolicyShow){
+ if(policy == WebContentPolicyShow){
MIMEType = [dataSource contentType];
if([[self class] canShowMIMEType:MIMEType]){
id documentView;
- IFWebView *webView;
- id <IFDocumentRepresentation> dataRepresentation, oldRepresentation;
+ WebView *webView;
+ id <WebDocumentRepresentation> dataRepresentation, oldRepresentation;
// Check if the data source was already bound?
oldRepresentation = [dataSource representation];
- dataRepresentation = [IFWebDataSource createRepresentationForMIMEType:MIMEType];
+ dataRepresentation = [WebDataSource createRepresentationForMIMEType:MIMEType];
if (!oldRepresentation || ![oldRepresentation isKindOfClass: [dataRepresentation class]])
[dataSource _setRepresentation:dataRepresentation];
webView = [[dataSource webFrame] webView];
- documentView = [IFWebView createViewForMIMEType:MIMEType];
+ documentView = [WebView createViewForMIMEType:MIMEType];
[webView _setDocumentView: documentView];
[documentView provisionalDataSourceChanged: dataSource];
}else{
- IFError *error = [[IFError alloc] initWithErrorCode:IFErrorCodeCantShowMIMEType
- inDomain:IFErrorCodeDomainWebKit failingURL: [dataSource inputURL]];
+ WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowMIMEType
+ inDomain:WebErrorDomainWebKit failingURL: [dataSource inputURL]];
[[self policyHandler] unableToImplementContentPolicy:error forDataSource:dataSource];
}
}
@@ -281,12 +281,12 @@
+ (BOOL)canShowMIMEType:(NSString *)MIMEType
{
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType]){
+ if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType]){
return YES;
}else{
// Have the plug-ins register views and representations
- [IFPluginDatabase installedPlugins];
- if([IFWebView _canShowMIMEType:MIMEType] && [IFWebDataSource _canShowMIMEType:MIMEType])
+ [WebPluginDatabase installedPlugins];
+ if([WebView _canShowMIMEType:MIMEType] && [WebDataSource _canShowMIMEType:MIMEType])
return YES;
}
return NO;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index b229ce9..e92f8a0 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -1,31 +1,31 @@
/*
- IFWebController.mm
+ WebController.mm
Copyright 2001, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFWebController.h>
+#import <WebKit/WebController.h>
- at class IFError;
- at class IFLoadProgress;
- at class IFWebFrame;
+ at class WebError;
+ at class WebLoadProgress;
+ at class WebFrame;
- at interface IFWebControllerPrivate : NSObject
+ at interface WebControllerPrivate : NSObject
{
@public
- IFWebFrame *mainFrame;
- id<IFWindowContext> windowContext;
- id<IFResourceProgressHandler> resourceProgressHandler;
- id<IFResourceProgressHandler> downloadProgressHandler;
- id<IFWebControllerPolicyHandler> policyHandler;
+ WebFrame *mainFrame;
+ id<WebWindowContext> windowContext;
+ id<WebResourceProgressHandler> resourceProgressHandler;
+ id<WebResourceProgressHandler> downloadProgressHandler;
+ id<WebControllerPolicyHandler> policyHandler;
BOOL openedByScript;
}
@end
- at interface IFWebController (IFPrivate);
-- (void)_receivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete:(BOOL)isComplete;
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource;
+ at interface WebController (WebPrivate);
+- (void)_receivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
+- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete:(BOOL)isComplete;
+- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource;
- (void)_didStartLoading: (NSURL *)url;
- (void)_didStopLoading: (NSURL *)url;
+ (NSString *)_MIMETypeForFile: (NSString *)path;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 9ea390b..a47cd0b 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -1,24 +1,24 @@
/*
- IFWebControllerPrivate.mm
+ WebControllerPrivate.mm
Copyright (c) 2001, 2002, Apple, Inc. All rights reserved.
*/
-#import <WebKit/IFLoadProgress.h>
-#import <WebKit/IFPreferencesPrivate.h>
-#import <WebKit/IFStandardPanelsPrivate.h>
-#import <WebKit/IFWebControllerPrivate.h>
-#import <WebKit/IFWebDataSourcePrivate.h>
-#import <WebKit/IFWebFramePrivate.h>
-#import <WebKit/IFWebViewPrivate.h>
+#import <WebKit/WebLoadProgress.h>
+#import <WebKit/WebPreferencesPrivate.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
+#import <WebKit/WebControllerPrivate.h>
+#import <WebKit/WebDataSourcePrivate.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebKitDebug.h>
-#import <WebFoundation/IFError.h>
-#import <WebFoundation/IFFileTypeMappings.h>
-#import <WebFoundation/IFURLCacheLoaderConstants.h>
-#import <WebFoundation/IFURLHandle.h>
+#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+#import <WebFoundation/WebCacheLoaderConstants.h>
+#import <WebFoundation/WebResourceHandle.h>
- at implementation IFWebControllerPrivate
+ at implementation WebControllerPrivate
- init
{
@@ -26,10 +26,10 @@
return self;
}
-- (void)_clearControllerReferences: (IFWebFrame *)aFrame
+- (void)_clearControllerReferences: (WebFrame *)aFrame
{
NSArray *frames;
- IFWebFrame *nextFrame;
+ WebFrame *nextFrame;
int i, count;
[[aFrame dataSource] _setController: nil];
@@ -61,11 +61,11 @@
@end
- at implementation IFWebController (IFPrivate)
+ at implementation WebController (WebPrivate)
-- (void)_receivedProgress:(IFLoadProgress *)progress forResourceHandle:(IFURLHandle *)resourceHandle fromDataSource:(IFWebDataSource *)dataSource complete:(BOOL)isComplete
+- (void)_receivedProgress:(WebLoadProgress *)progress forResourceHandle:(WebResourceHandle *)resourceHandle fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -81,9 +81,9 @@
}
}
-- (void)_mainReceivedProgress: (IFLoadProgress *)progress forResourceHandle: (IFURLHandle *)resourceHandle fromDataSource: (IFWebDataSource *)dataSource complete: (BOOL)isComplete
+- (void)_mainReceivedProgress: (WebLoadProgress *)progress forResourceHandle: (WebResourceHandle *)resourceHandle fromDataSource: (WebDataSource *)dataSource complete: (BOOL)isComplete
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
WEBKIT_ASSERT (dataSource != nil);
@@ -96,8 +96,8 @@
// Check to see if this is these are the first bits of a provisional data source,
// if so we need to transition the data source from provisional to committed.
- // This transition is only done for the IFContentPolicyShow policy.
- if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == IFContentPolicyShow){
+ // This transition is only done for the WebContentPolicyShow policy.
+ if([frame provisionalDataSource] == dataSource && [dataSource contentPolicy] == WebContentPolicyShow){
WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committing resource = %s\n", [[[dataSource inputURL] absoluteString] cString]);
[frame _transitionProvisionalToCommitted];
}
@@ -113,7 +113,7 @@
// If the frame isn't complete it might be ready for a layout. Perform that check here.
// Note that transitioning a frame to this state doesn't guarantee a layout, rather it
// just indicates that an early layout can be performed.
- int timedLayoutSize = [[IFPreferences standardPreferences] _initialTimedLayoutSize];
+ int timedLayoutSize = [[WebPreferences standardPreferences] _initialTimedLayoutSize];
if ([progress bytesSoFar] > timedLayoutSize)
[frame _transitionProvisionalToLayoutAcceptable];
}
@@ -121,9 +121,9 @@
-- (void)_receivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
+- (void)_receivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
@@ -134,9 +134,9 @@
}
-- (void)_mainReceivedError: (IFError *)error forResourceHandle: (IFURLHandle *)resourceHandle partialProgress: (IFLoadProgress *)progress fromDataSource: (IFWebDataSource *)dataSource
+- (void)_mainReceivedError: (WebError *)error forResourceHandle: (WebResourceHandle *)resourceHandle partialProgress: (WebLoadProgress *)progress fromDataSource: (WebDataSource *)dataSource
{
- IFWebFrame *frame = [dataSource webFrame];
+ WebFrame *frame = [dataSource webFrame];
[[self resourceProgressHandler] receivedError: error forResourceHandle: resourceHandle partialProgress: progress fromDataSource: dataSource];
@@ -148,12 +148,12 @@
- (void)_didStartLoading: (NSURL *)url
{
- [[IFStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStartLoadingURL:url inController:self];
}
- (void)_didStopLoading: (NSURL *)url
{
- [[IFStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
+ [[WebStandardPanels sharedStandardPanels] _didStopLoadingURL:url inController:self];
}
+ (NSString *)_MIMETypeForFile: (NSString *)path
@@ -163,7 +163,7 @@
if([extension isEqualToString:@""])
return @"text/html";
- return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
+ return [[WebFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
}
- (BOOL)_openedByScript
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list