[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:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ccc93e401c6e78ab9c7e72ecdcf733ef12765491
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jul 14 04:27:11 2002 +0000
top level:
* Site/Internal/Design/IFRenamings.txt: Update with new proposals.
WebFoundation:
* AuthenticationManager.subproj/IFAuthenticationManagerCallback.h:
* AuthenticationManager.subproj/IFAuthenticationManagerPrivate.h:
* Misc.subproj/IFCFRunLoopExtensions.m:
Changed to use #import instead of #include.
* Database.subproj/IFURLFileDatabase.m: Renamed private struct IFFileAccessTime
to FileAccessTime
(PointerEqual): Renamed from IFPtrEqual.
(FileAccessTimeRelease): Renamed from IFFileAccessTimeRelease.
* Misc.subproj/IFNSThreadExtensions.m: Renamed IFNSJoinableThreadContext to
IFJoinableThreadContext for clarity, since there is no NSJoinableThread.
(InitJoinableThreads):
WebCore:
* WebCore.pbproj/project.pbxproj: Add a few files that are sources
although they should not be compiled for any target.
* kwq/qt/qpushbutton.h: Simplified.
* kwq/KWQPushButton.mm: (QPushButton::QPushButton): Implemented text parameter.
WebKit:
* Misc.subproj/IFNSEventExtras.h: Removed.
* Misc.subproj/IFNSEventExtras.m: Removed.
* WebKit.pbproj/project.pbxproj: Removed IFNSEventExtras.*.
* WebCoreSupport.subproj/IFWebCoreBridge.mm:
* WebView.subproj/IFWebFrame.mm:
* WebView.subproj/IFWebFramePrivate.h:
* WebView.subproj/IFWebFramePrivate.mm:
Renamed all bridgeFrame to frameBridge for greater clarity.
* WebView.subproj/IFHTMLView.mm: Updated comments and commented-out code.
* WebView.subproj/IFWebDataSource.h: Fix comment that mentioned IFDefaultWebController.
* WebView.subproj/IFWebFramePrivate.mm:
(-[IFWebFrame _transitionProvisionalToCommitted]): Fix exception string that cited
the wrong state name.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1552 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3a2cf6d..402e9e9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
2002-07-13 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Add a few files that are sources
+ although they should not be compiled for any target.
+
+ * kwq/qt/qpushbutton.h: Simplified.
+ * kwq/KWQPushButton.mm: (QPushButton::QPushButton): Implemented text parameter.
+
+2002-07-13 Darin Adler <darin at apple.com>
+
* ForwardingHeaders/*: Added. New approach to headers to try to
make Project Builder's header dependency support work even for
includes like #include <render/render_object.h>.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3a2cf6d..402e9e9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
2002-07-13 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Add a few files that are sources
+ although they should not be compiled for any target.
+
+ * kwq/qt/qpushbutton.h: Simplified.
+ * kwq/KWQPushButton.mm: (QPushButton::QPushButton): Implemented text parameter.
+
+2002-07-13 Darin Adler <darin at apple.com>
+
* ForwardingHeaders/*: Added. New approach to headers to try to
make Project Builder's header dependency support work even for
includes like #include <render/render_object.h>.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3a2cf6d..402e9e9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
2002-07-13 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Add a few files that are sources
+ although they should not be compiled for any target.
+
+ * kwq/qt/qpushbutton.h: Simplified.
+ * kwq/KWQPushButton.mm: (QPushButton::QPushButton): Implemented text parameter.
+
+2002-07-13 Darin Adler <darin at apple.com>
+
* ForwardingHeaders/*: Added. New approach to headers to try to
make Project Builder's header dependency support work even for
includes like #include <render/render_object.h>.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index cce86a4..8f1fa8a 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -582,7 +582,6 @@
F58785B502DE375901EA4122,
F58785B602DE375901EA4122,
F58785B802DE375901EA4122,
- F58785B902DE375901EA4122,
F58785BA02DE375901EA4122,
F58785BB02DE375901EA4122,
F58785BD02DE375901EA4122,
@@ -708,6 +707,7 @@
F523D31F02DE4476018635CA,
F523D32102DE4476018635CA,
F52CA71002DFACBD018635CA,
+ F550D71002E132BB018635CA,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -3779,6 +3779,42 @@
settings = {
};
};
+ F550D70902E13281018635CA = {
+ isa = PBXFileReference;
+ name = KWQCharsetData.c;
+ path = kwq/KWQCharsetData.c;
+ refType = 4;
+ };
+ F550D70A02E13281018635CA = {
+ isa = PBXFileReference;
+ name = KWQPushButton.mm;
+ path = kwq/KWQPushButton.mm;
+ refType = 4;
+ };
+ F550D70B02E13281018635CA = {
+ isa = PBXFileReference;
+ name = "mac-encodings.txt";
+ path = "kwq/mac-encodings.txt";
+ refType = 4;
+ };
+ F550D70C02E13281018635CA = {
+ isa = PBXExecutableFileReference;
+ name = "make-charset-table.pl";
+ path = "kwq/make-charset-table.pl";
+ refType = 4;
+ };
+ F550D70E02E13281018635CA = {
+ isa = PBXFileReference;
+ name = "make-mac-encodings.c";
+ path = "kwq/make-mac-encodings.c";
+ refType = 4;
+ };
+ F550D71002E132BB018635CA = {
+ fileRef = F550D70A02E13281018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F58784C402DE375801EA4122 = {
isa = PBXFileReference;
name = KWQApplication.mm;
@@ -4355,12 +4391,6 @@
path = kwq/KWQPtrDictImpl.mm;
refType = 4;
};
- F587852702DE375901EA4122 = {
- isa = PBXFileReference;
- name = KWQPushButton.mm;
- path = kwq/KWQPushButton.mm;
- refType = 4;
- };
F587852802DE375901EA4122 = {
isa = PBXFileReference;
name = KWQRadioButton.mm;
@@ -5213,12 +5243,6 @@
settings = {
};
};
- F58785B902DE375901EA4122 = {
- fileRef = F587852702DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58785BA02DE375901EA4122 = {
fileRef = F587852802DE375901EA4122;
isa = PBXBuildFile;
@@ -5868,6 +5892,10 @@
F58785F002DE382001EA4122,
F58784C402DE375801EA4122,
F58785F102DE382001EA4122,
+ F550D70902E13281018635CA,
+ F550D70B02E13281018635CA,
+ F550D70C02E13281018635CA,
+ F550D70E02E13281018635CA,
F58784EB02DE375901EA4122,
F58785F202DE382001EA4122,
F58785F302DE382001EA4122,
@@ -7596,7 +7624,7 @@
F58786AE02DE3B8601EA4122,
F58786AF02DE3B8601EA4122,
F58786B002DE3B8601EA4122,
- F587852702DE375901EA4122,
+ F550D70A02E13281018635CA,
F58786B102DE3B8601EA4122,
F587852802DE375901EA4122,
F58786B202DE3B8601EA4122,
diff --git a/WebCore/kwq/KWQPushButton.h b/WebCore/kwq/KWQPushButton.h
index b0f5f76..621d327 100644
--- a/WebCore/kwq/KWQPushButton.h
+++ b/WebCore/kwq/KWQPushButton.h
@@ -26,42 +26,14 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <qbutton.h>
-
-#include "qwidget.h"
-#include "qstring.h"
-
-// class QPushButton ===========================================================
+#include <qwidget.h>
+#include <qstring.h>
class QPushButton : public QButton {
public:
-
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
- QPushButton(QWidget *);
- QPushButton(const QString &text, QWidget *parent, const char* name=0);
- ~QPushButton();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QPushButton(const QPushButton &);
- QPushButton &operator=(const QPushButton &);
-
-}; // class QPushButton ========================================================
+ QPushButton(QWidget *w) : QButton(w) { }
+ QPushButton(const QString &text, QWidget *parent);
+};
#endif
diff --git a/WebCore/kwq/KWQPushButton.mm b/WebCore/kwq/KWQPushButton.mm
index bd6c817..f9f7cf4 100644
--- a/WebCore/kwq/KWQPushButton.mm
+++ b/WebCore/kwq/KWQPushButton.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * 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
@@ -22,24 +22,10 @@
* (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 <qpushbutton.h>
-
-#import <KWQView.h>
-
-#import <kwqdebug.h>
-
-// Should require no additional code over KWQButton
-
-QPushButton::QPushButton(QWidget *w) : QButton (w)
-{
-}
-
-
-QPushButton::QPushButton(const QString &text, QWidget *parent, const char* name)
-{
-}
+#import <qpushbutton.h>
-QPushButton::~QPushButton()
+QPushButton::QPushButton(const QString &text, QWidget *parent) : QButton(parent)
{
+ setText(text);
}
diff --git a/WebCore/kwq/qt/qpushbutton.h b/WebCore/kwq/qt/qpushbutton.h
index b0f5f76..621d327 100644
--- a/WebCore/kwq/qt/qpushbutton.h
+++ b/WebCore/kwq/qt/qpushbutton.h
@@ -26,42 +26,14 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <qbutton.h>
-
-#include "qwidget.h"
-#include "qstring.h"
-
-// class QPushButton ===========================================================
+#include <qwidget.h>
+#include <qstring.h>
class QPushButton : public QButton {
public:
-
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
- QPushButton(QWidget *);
- QPushButton(const QString &text, QWidget *parent, const char* name=0);
- ~QPushButton();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QPushButton(const QPushButton &);
- QPushButton &operator=(const QPushButton &);
-
-}; // class QPushButton ========================================================
+ QPushButton(QWidget *w) : QButton(w) { }
+ QPushButton(const QString &text, QWidget *parent);
+};
#endif
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0e2f47a..04fb9e2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,25 @@
2002-07-13 Darin Adler <darin at apple.com>
+ * Misc.subproj/IFNSEventExtras.h: Removed.
+ * Misc.subproj/IFNSEventExtras.m: Removed.
+ * WebKit.pbproj/project.pbxproj: Removed IFNSEventExtras.*.
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ Renamed all bridgeFrame to frameBridge for greater clarity.
+
+ * WebView.subproj/IFHTMLView.mm: Updated comments and commented-out code.
+
+ * WebView.subproj/IFWebDataSource.h: Fix comment that mentioned IFDefaultWebController.
+
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _transitionProvisionalToCommitted]): Fix exception string that cited
+ the wrong state name.
+
+2002-07-13 Darin Adler <darin at apple.com>
+
* History.subproj/IFURIEntry.m: (-[IFURIEntry image]):
Use [IFURIEntry class] instead of [self class] so we get the
icon from the WebKit bundle even if someone subclasses IFURIEntry.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0e2f47a..04fb9e2 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,25 @@
2002-07-13 Darin Adler <darin at apple.com>
+ * Misc.subproj/IFNSEventExtras.h: Removed.
+ * Misc.subproj/IFNSEventExtras.m: Removed.
+ * WebKit.pbproj/project.pbxproj: Removed IFNSEventExtras.*.
+
+ * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+ * WebView.subproj/IFWebFrame.mm:
+ * WebView.subproj/IFWebFramePrivate.h:
+ * WebView.subproj/IFWebFramePrivate.mm:
+ Renamed all bridgeFrame to frameBridge for greater clarity.
+
+ * WebView.subproj/IFHTMLView.mm: Updated comments and commented-out code.
+
+ * WebView.subproj/IFWebDataSource.h: Fix comment that mentioned IFDefaultWebController.
+
+ * WebView.subproj/IFWebFramePrivate.mm:
+ (-[IFWebFrame _transitionProvisionalToCommitted]): Fix exception string that cited
+ the wrong state name.
+
+2002-07-13 Darin Adler <darin at apple.com>
+
* History.subproj/IFURIEntry.m: (-[IFURIEntry image]):
Use [IFURIEntry class] instead of [self class] so we get the
icon from the WebKit bundle even if someone subclasses IFURIEntry.
diff --git a/WebKit/Misc.subproj/IFNSEventExtras.h b/WebKit/Misc.subproj/IFNSEventExtras.h
deleted file mode 100644
index 9beac55..0000000
--- a/WebKit/Misc.subproj/IFNSEventExtras.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- IFNSEventExtras.h
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import <Foundation/Foundation.h>
-
-
- at interface NSEvent (IFExtensions)
-
-- (BOOL) _IF_isScrollEvent;
-
- at end
diff --git a/WebKit/Misc.subproj/IFNSEventExtras.m b/WebKit/Misc.subproj/IFNSEventExtras.m
deleted file mode 100644
index 8d106b6..0000000
--- a/WebKit/Misc.subproj/IFNSEventExtras.m
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- IFNSEventExtras.m
- Copyright (c) 2002, Apple, Inc. All rights reserved.
-*/
-
-#import "IFNSEventExtras.h"
-
-
- at implementation NSEvent (IFExtensions)
-
-- (BOOL) _IF_isScrollEvent
-{
- NSEventType eventType = [self type];
-
- if (eventType == NSKeyDown || eventType == NSKeyUp) {
- NSString *characters = [self characters];
- int index, count;
-
- count = [characters length];
- for (index = 0; index < count; ++index) {
- switch ([characters characterAtIndex:index]) {
- case NSPageUpFunctionKey:
- case NSPageDownFunctionKey:
- case NSHomeFunctionKey:
- case NSEndFunctionKey:
- case NSUpArrowFunctionKey:
- case NSDownArrowFunctionKey:
- case NSLeftArrowFunctionKey:
- case NSRightArrowFunctionKey:
- return YES;
- default: break;
- }
- }
- }
-
- return NO;
-}
-
- at end
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index d7fd442..0449a6d 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -36,44 +36,45 @@ enum
// support for expiring cache files using file system access times --------------------------------------------
-typedef struct IFFileAccessTime IFFileAccessTime;
-
-struct IFFileAccessTime
+typedef struct
{
NSString *path;
time_t time;
-};
+} FileAccessTime;
static CFComparisonResult compare_atimes(const void *val1, const void *val2, void *context)
{
- int t1 = ((IFFileAccessTime *)val1)->time;
- int t2 = ((IFFileAccessTime *)val2)->time;
+ int t1 = ((FileAccessTime *)val1)->time;
+ int t2 = ((FileAccessTime *)val2)->time;
if (t1 > t2) return kCFCompareGreaterThan;
if (t1 < t2) return kCFCompareLessThan;
return kCFCompareEqualTo;
}
-static Boolean IFPtrEqual(const void *p1, const void *p2) {
+static Boolean PointerEqual(const void *p1, const void *p2)
+{
return p1 == p2;
}
-static void IFFileAccessTimeRelease(CFAllocatorRef allocator, const void *value) {
- IFFileAccessTime *spec;
+static void FileAccessTimeRelease(CFAllocatorRef allocator, const void *value)
+{
+ FileAccessTime *spec;
- spec = (IFFileAccessTime *)value;
+ spec = (FileAccessTime *)value;
[spec->path release];
- free(spec);
+ free(spec);
}
-static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path) {
+static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path)
+{
FTS *fts;
FTSENT *ent;
CFMutableArrayRef atimeArray;
char *paths[2];
NSFileManager *defaultManager;
- CFArrayCallBacks callBacks = {0, NULL, IFFileAccessTimeRelease, NULL, IFPtrEqual};
+ CFArrayCallBacks callBacks = {0, NULL, FileAccessTimeRelease, NULL, PointerEqual};
defaultManager = [NSFileManager defaultManager];
paths[0] = (char *)path;
@@ -85,7 +86,7 @@ static CFArrayRef CreateArrayListingFilesSortedByAccessTime(const char *path) {
ent = fts_read(fts);
while (ent) {
if (ent->fts_statp->st_mode & S_IFREG && strcmp(ent->fts_name, SIZE_FILE_NAME_CSTRING) != 0) {
- IFFileAccessTime *spec = malloc(sizeof(IFFileAccessTime));
+ FileAccessTime *spec = malloc(sizeof(FileAccessTime));
spec->path = [[defaultManager stringWithFileSystemRepresentation:ent->fts_accpath length:strlen(ent->fts_accpath)] retain];
spec->time = ent->fts_statp->st_atimespec.tv_sec;
CFArrayAppendValue(atimeArray, spec);
@@ -412,7 +413,7 @@ static void URLFileReaderInit(void)
CFArrayRef atimeArray;
unsigned aTimeArrayCount;
unsigned i;
- IFFileAccessTime *spec;
+ FileAccessTime *spec;
if (size > usage) {
return;
@@ -427,7 +428,7 @@ static void URLFileReaderInit(void)
atimeArray = CreateArrayListingFilesSortedByAccessTime([defaultManager fileSystemRepresentationWithPath:path]);
aTimeArrayCount = CFArrayGetCount(atimeArray);
for (i = 0; i < aTimeArrayCount && usage > size; i++) {
- spec = (IFFileAccessTime *)CFArrayGetValueAtIndex(atimeArray, i);
+ spec = (FileAccessTime *)CFArrayGetValueAtIndex(atimeArray, i);
attributes = [defaultManager fileAttributesAtPath:spec->path traverseLink:YES];
if (attributes) {
fileSize = [attributes objectForKey:NSFileSize];
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index acf5a89..bc63c55 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -36,7 +36,7 @@
- (WebCoreFrame *)frame
{
- return [[dataSource webFrame] _bridgeFrame];
+ return [[dataSource webFrame] _frameBridge];
}
- (WebCoreBridge *)parent
@@ -50,14 +50,14 @@
WEBKIT_ASSERT(dataSource);
NSArray *frames = [dataSource children];
NSEnumerator *e = [frames objectEnumerator];
- NSMutableArray *bridgeFrames = [NSMutableArray arrayWithCapacity:[frames count]];
+ NSMutableArray *frameBridges = [NSMutableArray arrayWithCapacity:[frames count]];
IFWebFrame *frame;
while ((frame = [e nextObject])) {
- id bridgeFrame = [frame _bridgeFrame];
- if (bridgeFrame)
- [bridgeFrames addObject:bridgeFrame];
+ id frameBridge = [frame _frameBridge];
+ if (frameBridge)
+ [frameBridges addObject:frameBridge];
}
- return bridgeFrames;
+ return frameBridges;
}
- (WebCoreFrame *)childFrameNamed:(NSString *)name
@@ -66,14 +66,14 @@
pd = [[dataSource webFrame] provisionalDataSource];
if (pd)
- return [[pd frameNamed: name] _bridgeFrame];
+ return [[pd frameNamed: name] _frameBridge];
- return [[dataSource frameNamed:name] _bridgeFrame];
+ return [[dataSource frameNamed:name] _frameBridge];
}
- (WebCoreFrame *)descendantFrameNamed:(NSString *)name
{
- return [[[dataSource webFrame] frameNamed:name] _bridgeFrame];
+ return [[[dataSource webFrame] frameNamed:name] _frameBridge];
}
- (BOOL)createChildFrameNamed:(NSString *)frameName
@@ -87,12 +87,12 @@
return NO;
}
- [[frame _bridgeFrame] setRenderPart:renderPart];
+ [[frame _frameBridge] setRenderPart:renderPart];
[[frame webView] _setMarginWidth:width];
[[frame webView] _setMarginHeight:height];
- [[frame _bridgeFrame] loadURL:URL attributes:nil flags:0 withParent:dataSource];
+ [[frame _frameBridge] loadURL:URL attributes:nil flags:0 withParent:dataSource];
return YES;
}
@@ -164,12 +164,12 @@
- (WebCoreFrame *)mainFrame
{
- return [[[dataSource controller] mainFrame] _bridgeFrame];
+ return [[[dataSource controller] mainFrame] _frameBridge];
}
- (WebCoreFrame *)frameNamed:(NSString *)name
{
- return [[[dataSource controller] frameNamed:name] _bridgeFrame];
+ return [[[dataSource controller] frameNamed:name] _frameBridge];
}
- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)withDataSource
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index acf5a89..bc63c55 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -36,7 +36,7 @@
- (WebCoreFrame *)frame
{
- return [[dataSource webFrame] _bridgeFrame];
+ return [[dataSource webFrame] _frameBridge];
}
- (WebCoreBridge *)parent
@@ -50,14 +50,14 @@
WEBKIT_ASSERT(dataSource);
NSArray *frames = [dataSource children];
NSEnumerator *e = [frames objectEnumerator];
- NSMutableArray *bridgeFrames = [NSMutableArray arrayWithCapacity:[frames count]];
+ NSMutableArray *frameBridges = [NSMutableArray arrayWithCapacity:[frames count]];
IFWebFrame *frame;
while ((frame = [e nextObject])) {
- id bridgeFrame = [frame _bridgeFrame];
- if (bridgeFrame)
- [bridgeFrames addObject:bridgeFrame];
+ id frameBridge = [frame _frameBridge];
+ if (frameBridge)
+ [frameBridges addObject:frameBridge];
}
- return bridgeFrames;
+ return frameBridges;
}
- (WebCoreFrame *)childFrameNamed:(NSString *)name
@@ -66,14 +66,14 @@
pd = [[dataSource webFrame] provisionalDataSource];
if (pd)
- return [[pd frameNamed: name] _bridgeFrame];
+ return [[pd frameNamed: name] _frameBridge];
- return [[dataSource frameNamed:name] _bridgeFrame];
+ return [[dataSource frameNamed:name] _frameBridge];
}
- (WebCoreFrame *)descendantFrameNamed:(NSString *)name
{
- return [[[dataSource webFrame] frameNamed:name] _bridgeFrame];
+ return [[[dataSource webFrame] frameNamed:name] _frameBridge];
}
- (BOOL)createChildFrameNamed:(NSString *)frameName
@@ -87,12 +87,12 @@
return NO;
}
- [[frame _bridgeFrame] setRenderPart:renderPart];
+ [[frame _frameBridge] setRenderPart:renderPart];
[[frame webView] _setMarginWidth:width];
[[frame webView] _setMarginHeight:height];
- [[frame _bridgeFrame] loadURL:URL attributes:nil flags:0 withParent:dataSource];
+ [[frame _frameBridge] loadURL:URL attributes:nil flags:0 withParent:dataSource];
return YES;
}
@@ -164,12 +164,12 @@
- (WebCoreFrame *)mainFrame
{
- return [[[dataSource controller] mainFrame] _bridgeFrame];
+ return [[[dataSource controller] mainFrame] _frameBridge];
}
- (WebCoreFrame *)frameNamed:(NSString *)name
{
- return [[[dataSource controller] frameNamed:name] _bridgeFrame];
+ return [[[dataSource controller] frameNamed:name] _frameBridge];
}
- (void)receivedData:(NSData *)data withDataSource:(IFWebDataSource *)withDataSource
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 2ba0faa..1fe859c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -259,7 +259,6 @@
F5488CF602CB04EE01FF6274,
F5927D4B02D253C401CA2DBB,
F5927D4F02D26C5E01CA2DBB,
- F558FF8402DA308B01CA2DBB,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -337,7 +336,6 @@
F5E0E10B02BC45F8018635CA,
F5A7B11C02BC8413018635CA,
F5488CF702CB04EE01FF6274,
- F558FF8502DA308B01CA2DBB,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -404,8 +402,6 @@
F5FBAB9002B88CBF01FF6074,
3944607A020F50ED0ECA1767,
3944607B020F50ED0ECA1767,
- F558FF8202DA308B01CA2DBB,
- F558FF8302DA308B01CA2DBB,
F508946902B71D59018A9CD4,
F508946A02B71D59018A9CD4,
F59668C802AD2923018635CA,
@@ -1473,30 +1469,6 @@
settings = {
};
};
- F558FF8202DA308B01CA2DBB = {
- isa = PBXFileReference;
- name = IFNSEventExtras.h;
- path = Misc.subproj/IFNSEventExtras.h;
- refType = 4;
- };
- F558FF8302DA308B01CA2DBB = {
- isa = PBXFileReference;
- name = IFNSEventExtras.m;
- path = Misc.subproj/IFNSEventExtras.m;
- refType = 4;
- };
- F558FF8402DA308B01CA2DBB = {
- fileRef = F558FF8202DA308B01CA2DBB;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F558FF8502DA308B01CA2DBB = {
- fileRef = F558FF8302DA308B01CA2DBB;
- isa = PBXBuildFile;
- settings = {
- };
- };
F567433E026B5B7B01A80181 = {
isa = PBXFileReference;
name = IFLocationChangeHandler.h;
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index ac5e0c7..49679dd 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -6,7 +6,6 @@
#import <WebKit/IFDynamicScrollBarsView.h>
#import <WebKit/IFException.h>
#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFNSEventExtras.h>
#import <WebKit/IFNSViewExtras.h>
#import <WebKit/IFWebController.h>
#import <WebKit/IFWebCoreBridge.h>
@@ -500,25 +499,28 @@
// 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 _IF_isScrollEvent function at all.
+// 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;
- // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
- if ([event _IF_isScrollEvent]) {
+ // 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];
- return;
}
-
- [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);
}
- (void)keyUp: (NSEvent *)event
@@ -526,18 +528,18 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
- if ([event _IF_isScrollEvent]) {
+ // 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];
- return;
}
-
- [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);
}
#endif
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index ba208ef..666d252 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -86,7 +86,7 @@
// 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
-// IFDefaultWebController?
+// IFWebController?
//- (void)setController: (IFWebController *)controller;
- (IFWebController *)controller;
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index dbdd497..96a5f32 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -33,7 +33,7 @@
[super init];
_private = [[IFWebFramePrivate alloc] init];
- _private->bridgeFrame = [[IFWebCoreFrame alloc] initWithWebFrame:self];
+ _private->frameBridge = [[IFWebCoreFrame alloc] initWithWebFrame:self];
[self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.h b/WebKit/WebView.subproj/IFWebFramePrivate.h
index a4aff8e..b082067 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.h
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.h
@@ -42,7 +42,7 @@ typedef enum {
IFWebController *controller;
IFWebFrameState state;
BOOL scheduledLayoutPending;
- IFWebCoreFrame *bridgeFrame;
+ IFWebCoreFrame *frameBridge;
}
- (void)setName: (NSString *)n;
@@ -70,6 +70,6 @@ typedef enum {
- (void)_isLoadComplete;
- (void)_checkLoadComplete;
- (void)_timedLayout: userInfo;
-- (IFWebCoreFrame *)_bridgeFrame;
+- (IFWebCoreFrame *)_frameBridge;
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/IFWebFramePrivate.mm b/WebKit/WebView.subproj/IFWebFramePrivate.mm
index fe5d415..ec6333d 100644
--- a/WebKit/WebView.subproj/IFWebFramePrivate.mm
+++ b/WebKit/WebView.subproj/IFWebFramePrivate.mm
@@ -47,7 +47,7 @@ static const char * const stateNames[6] = {
[webView autorelease];
[dataSource autorelease];
[provisionalDataSource autorelease];
- [bridgeFrame release];
+ [frameBridge release];
[super dealloc];
}
@@ -249,7 +249,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_COMPLETE:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_private->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED_PAGE from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -428,9 +428,9 @@ static const char * const stateNames[6] = {
[IFWebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
}
-- (IFWebCoreFrame *)_bridgeFrame
+- (IFWebCoreFrame *)_frameBridge
{
- return _private->bridgeFrame;
+ return _private->frameBridge;
}
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index ba208ef..666d252 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -86,7 +86,7 @@
// 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
-// IFDefaultWebController?
+// IFWebController?
//- (void)setController: (IFWebController *)controller;
- (IFWebController *)controller;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index dbdd497..96a5f32 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -33,7 +33,7 @@
[super init];
_private = [[IFWebFramePrivate alloc] init];
- _private->bridgeFrame = [[IFWebCoreFrame alloc] initWithWebFrame:self];
+ _private->frameBridge = [[IFWebCoreFrame alloc] initWithWebFrame:self];
[self _setState: IFWEBFRAMESTATE_UNINITIALIZED];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index a4aff8e..b082067 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -42,7 +42,7 @@ typedef enum {
IFWebController *controller;
IFWebFrameState state;
BOOL scheduledLayoutPending;
- IFWebCoreFrame *bridgeFrame;
+ IFWebCoreFrame *frameBridge;
}
- (void)setName: (NSString *)n;
@@ -70,6 +70,6 @@ typedef enum {
- (void)_isLoadComplete;
- (void)_checkLoadComplete;
- (void)_timedLayout: userInfo;
-- (IFWebCoreFrame *)_bridgeFrame;
+- (IFWebCoreFrame *)_frameBridge;
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index fe5d415..ec6333d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -47,7 +47,7 @@ static const char * const stateNames[6] = {
[webView autorelease];
[dataSource autorelease];
[provisionalDataSource autorelease];
- [bridgeFrame release];
+ [frameBridge release];
[super dealloc];
}
@@ -249,7 +249,7 @@ static const char * const stateNames[6] = {
case IFWEBFRAMESTATE_COMPLETE:
default:
{
- [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED from %s", stateNames[_private->state]] userInfo: nil] raise];
+ [[NSException exceptionWithName:NSGenericException reason:[NSString stringWithFormat: @"invalid state attempting to transition to IFWEBFRAMESTATE_COMMITTED_PAGE from %s", stateNames[_private->state]] userInfo: nil] raise];
return;
}
}
@@ -428,9 +428,9 @@ static const char * const stateNames[6] = {
[IFWebFrame _recursiveCheckCompleteFromFrame: [[self controller] mainFrame]];
}
-- (IFWebCoreFrame *)_bridgeFrame
+- (IFWebCoreFrame *)_frameBridge
{
- return _private->bridgeFrame;
+ return _private->frameBridge;
}
- (BOOL)_shouldShowDataSource:(IFWebDataSource *)dataSource
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index ac5e0c7..49679dd 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -6,7 +6,6 @@
#import <WebKit/IFDynamicScrollBarsView.h>
#import <WebKit/IFException.h>
#import <WebKit/IFHTMLViewPrivate.h>
-#import <WebKit/IFNSEventExtras.h>
#import <WebKit/IFNSViewExtras.h>
#import <WebKit/IFWebController.h>
#import <WebKit/IFWebCoreBridge.h>
@@ -500,25 +499,28 @@
// 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 _IF_isScrollEvent function at all.
+// 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;
- // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
- if ([event _IF_isScrollEvent]) {
+ // 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];
- return;
}
-
- [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);
}
- (void)keyUp: (NSEvent *)event
@@ -526,18 +528,18 @@
WEBKITDEBUGLEVEL(WEBKIT_LOG_EVENTS, "keyUp: %s\n", DEBUG_OBJECT(event));
int state = 0;
- // If this is a scroll event, let IFWebView handle it instead of the KHTMLView.
- if ([event _IF_isScrollEvent]) {
+ // 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];
- return;
}
-
- [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);
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list