[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:34:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ff1416804d324c432efebf5b727e66a6f8fac28c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 26 20:50:14 2002 +0000
WebBrowser:
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
(+[WebHistory webHistoryWithFile:]):
Stage 1, set the shared history instance. This'll move to
WebKit soon.
* WebView.subproj/WebView.m:
(-[WebView setFrame:]):
Only force display if in live resize.
WebKit
Fixed for 2883623 (visited links only). Will change
w/ stage 2 of history move to webkit.
* GlobalHistory.m:
(-[GlobalHistory awakeFromNib]):
WebCore:
* WebCore.exp:
Added WebCoreHistory
* WebCore.pbproj/project.pbxproj:
Added WebCoreHistory
* kwq/KWQKHistoryProvider.mm:
Use WebCoreHistory to determine visited link.
* kwq/WebCoreHistory.h: Added.
* kwq/WebCoreHistory.m: Added.
Stage 1. Use WebKit's WebHistory. Writing
of history and initialization still handled
by Alex until stage 2.
(+[WebCoreHistory setSharedHistory:]):
(+[WebCoreHistory sharedHistory]):
(-[WebCoreHistory containsURL:]):
* kwq/KWQString.mm:
(QString::compare):
Optimization, use strcmp when both src and dst have valid ascii.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1915 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 9b1288d..33305f1 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,33 @@
+2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+
+ * WebCore.exp:
+
+ Added WebCoreHistory
+
+ * WebCore.pbproj/project.pbxproj:
+
+ Added WebCoreHistory
+
+ * kwq/KWQKHistoryProvider.mm:
+ Use WebCoreHistory to determine visited link.
+
+ * kwq/WebCoreHistory.h: Added.
+ * kwq/WebCoreHistory.m: Added.
+
+ Stage 1. Use WebKit's WebHistory. Writing
+ of history and initialization still handled
+ by Alex until stage 2.
+
+ (+[WebCoreHistory setSharedHistory:]):
+ (+[WebCoreHistory sharedHistory]):
+ (-[WebCoreHistory containsURL:]):
+
+ * kwq/KWQString.mm:
+ (QString::compare):
+
+ Optimization, use strcmp when both src and dst have valid ascii.
+
+
2002-08-26 David Hyatt <hyatt at apple.com>
- Patch drawText to understand right-aligned drawing.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 9b1288d..33305f1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,33 @@
+2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+
+ * WebCore.exp:
+
+ Added WebCoreHistory
+
+ * WebCore.pbproj/project.pbxproj:
+
+ Added WebCoreHistory
+
+ * kwq/KWQKHistoryProvider.mm:
+ Use WebCoreHistory to determine visited link.
+
+ * kwq/WebCoreHistory.h: Added.
+ * kwq/WebCoreHistory.m: Added.
+
+ Stage 1. Use WebKit's WebHistory. Writing
+ of history and initialization still handled
+ by Alex until stage 2.
+
+ (+[WebCoreHistory setSharedHistory:]):
+ (+[WebCoreHistory sharedHistory]):
+ (-[WebCoreHistory containsURL:]):
+
+ * kwq/KWQString.mm:
+ (QString::compare):
+
+ Optimization, use strcmp when both src and dst have valid ascii.
+
+
2002-08-26 David Hyatt <hyatt at apple.com>
- Patch drawText to understand right-aligned drawing.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9b1288d..33305f1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,33 @@
+2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+
+ * WebCore.exp:
+
+ Added WebCoreHistory
+
+ * WebCore.pbproj/project.pbxproj:
+
+ Added WebCoreHistory
+
+ * kwq/KWQKHistoryProvider.mm:
+ Use WebCoreHistory to determine visited link.
+
+ * kwq/WebCoreHistory.h: Added.
+ * kwq/WebCoreHistory.m: Added.
+
+ Stage 1. Use WebKit's WebHistory. Writing
+ of history and initialization still handled
+ by Alex until stage 2.
+
+ (+[WebCoreHistory setSharedHistory:]):
+ (+[WebCoreHistory sharedHistory]):
+ (-[WebCoreHistory containsURL:]):
+
+ * kwq/KWQString.mm:
+ (QString::compare):
+
+ Optimization, use strcmp when both src and dst have valid ascii.
+
+
2002-08-26 David Hyatt <hyatt at apple.com>
- Patch drawText to understand right-aligned drawing.
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index d1267ec..b126db8 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -2,6 +2,7 @@
.objc_class_name_WebCoreCache
.objc_class_name_WebCoreCookieAdapter
.objc_class_name_WebCoreEncodings
+.objc_class_name_WebCoreHistory
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreTestController
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index e4d78a0..0469e3e 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -491,6 +491,7 @@
F56234E103026D7301629B47,
F593F87D0302BE00018635CE,
F583D50303140623018635CE,
+ F5517DC4031AB56301A80180,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -719,6 +720,7 @@
F56234E203026D7301629B47,
F593F87E0302BE00018635CE,
F583D50403140623018635CE,
+ F5517DC5031AB56301A80180,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -3691,6 +3693,33 @@
settings = {
};
};
+ F5517DC2031AB56301A80180 = {
+ isa = PBXFileReference;
+ name = WebCoreHistory.h;
+ path = kwq/WebCoreHistory.h;
+ refType = 2;
+ };
+ F5517DC3031AB56301A80180 = {
+ isa = PBXFileReference;
+ name = WebCoreHistory.m;
+ path = kwq/WebCoreHistory.m;
+ refType = 2;
+ };
+ F5517DC4031AB56301A80180 = {
+ fileRef = F5517DC2031AB56301A80180;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ F5517DC5031AB56301A80180 = {
+ fileRef = F5517DC3031AB56301A80180;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F56234DF03026D7301629B47 = {
isa = PBXFileReference;
path = WebCoreEncodings.h;
@@ -5385,6 +5414,8 @@
F587855502DE375901EA4122,
F58EF58E02DFDFB7018635CA,
F58EF58D02DFDFB7018635CA,
+ F5517DC2031AB56301A80180,
+ F5517DC3031AB56301A80180,
);
isa = PBXGroup;
name = "WebCore SPI";
diff --git a/WebCore/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQKHistoryProvider.mm
index 6d532aa..3ecd27e 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -22,9 +22,12 @@
* (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 <historyprovider.h>
+#import <WebCoreHistory.h>
+
namespace KParts {
HistoryProvider *HistoryProvider::self()
@@ -33,15 +36,14 @@ HistoryProvider *HistoryProvider::self()
return &instance;
}
-void HistoryProvider::insert(const QString &)
+void HistoryProvider::insert(const QString &s)
{
- // FIXME: implement real history?
+ // Currently handled at the browser level.
}
bool HistoryProvider::contains(const QString &s) const
{
- // FIXME: implement real history?
- return false;
+ return [[WebCoreHistory sharedHistory] containsURL: [NSURL URLWithString: [NSString stringWithCString: s.ascii()]]];
}
} // namespace KParts
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 6737daa..7207998 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -998,6 +998,8 @@ const QChar *QString::unicode() const
int QString::compare( const QString& s ) const
{
+ if (dataHandle[0]->_isAsciiValid && s.dataHandle[0]->_isAsciiValid)
+ return strcmp (ascii(), s.ascii());
return ucstrcmp(*this,s);
}
diff --git a/WebCore/kwq/WebCoreEncodings.h b/WebCore/kwq/WebCoreHistory.h
similarity index 89%
copy from WebCore/kwq/WebCoreEncodings.h
copy to WebCore/kwq/WebCoreHistory.h
index 0005bfa..5c151fc 100644
--- a/WebCore/kwq/WebCoreEncodings.h
+++ b/WebCore/kwq/WebCoreHistory.h
@@ -25,8 +25,13 @@
#import <Foundation/Foundation.h>
+ at interface WebCoreHistory : NSObject
+{
+}
+
++ (void)setSharedHistory: (WebCoreHistory *)h;
++ (WebCoreHistory *)sharedHistory;
+
+- (BOOL)containsURL: (NSURL *)url;
- at interface WebCoreEncodings : NSObject
-+ (NSString *)charsetNameForEncoding:(CFStringEncoding)encoding;
-+ (CFStringEncoding)encodingForCharsetName:(NSString *)charsetName;
@end
diff --git a/WebCore/kwq/WebCoreJavaScript.h b/WebCore/kwq/WebCoreHistory.m
similarity index 77%
copy from WebCore/kwq/WebCoreJavaScript.h
copy to WebCore/kwq/WebCoreHistory.m
index 7379678..5c967eb 100644
--- a/WebCore/kwq/WebCoreJavaScript.h
+++ b/WebCore/kwq/WebCoreHistory.m
@@ -25,17 +25,31 @@
#import <Foundation/Foundation.h>
- at interface WebCoreJavaScript : NSObject
+#import <WebCoreHistory.h>
+
+#import <kwqdebug.h>
+
+ at implementation WebCoreHistory
+
+static WebCoreHistory *_sharedHistory = nil;
+
++ (void)setSharedHistory: (WebCoreHistory *)h
{
+ if (_sharedHistory != h && _sharedHistory != nil)
+ [_sharedHistory release];
+ _sharedHistory = [h retain];
+}
+
++ (WebCoreHistory *)sharedHistory
+{
+ return _sharedHistory;
}
-+ (int)interpreterCount;
-+ (int)objectCount;
-+ (int)noGCAllowedObjectCount;
-+ (int)referencedObjectCount;
-+ (NSSet *)liveObjectClasses;
+- (BOOL)containsURL: (NSURL *)url
+{
+ return false;
+}
-+ (void)garbageCollect;
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9d661d2..197082f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ (+[WebHistory webHistoryWithFile:]):
+ Stage 1, set the shared history instance. This'll move to
+ WebKit soon.
+
+ * WebView.subproj/WebView.m:
+ (-[WebView setFrame:]):
+ Only force display if in live resize.
+
2002-08-26 John Sullivan <sullivan at apple.com>
- fixed bug where dragging a separator in the Bookmarks window
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9d661d2..197082f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-08-26 Richard Williamson (Home) <rjw at apple.com>
+
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ (+[WebHistory webHistoryWithFile:]):
+ Stage 1, set the shared history instance. This'll move to
+ WebKit soon.
+
+ * WebView.subproj/WebView.m:
+ (-[WebView setFrame:]):
+ Only force display if in live resize.
+
2002-08-26 John Sullivan <sullivan at apple.com>
- fixed bug where dragging a separator in the Bookmarks window
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index efa8d3c..3b7df7b 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -8,13 +8,15 @@
#import <Foundation/Foundation.h>
+#import <WebCore/WebCoreHistory.h>
+
@class WebHistoryItem;
@class WebHistoryPrivate;
// notification sent when history is modified
#define WebHistoryEntriesChangedNotification @"WebHistoryEntriesChangedNotification"
- at interface WebHistory : NSObject {
+ at interface WebHistory : WebCoreHistory {
@private
WebHistoryPrivate *_historyPrivate;
}
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index affe068..c75a1c2 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -9,11 +9,21 @@
#import "WebHistory.h"
#import "WebHistoryPrivate.h"
+#import "WebKitDebug.h"
+
@implementation WebHistory
+ (WebHistory *)webHistoryWithFile: (NSString*)file
{
- return [[[self alloc] initWithFile:file] autorelease];
+ // Should only be called once. Need to rationalize usage
+ // of history.
+ WEBKIT_ASSERT ([[self class] sharedHistory] == nil);
+
+ WebHistory *h = [[self alloc] initWithFile:file];
+ [[self class] setSharedHistory: h];
+ [h release];
+
+ return h;
}
- (id)initWithFile: (NSString *)file;
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 2eecb8c..59677f4 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -99,7 +99,8 @@ enum {
// We have to force a display now, rather than depend on
// setNeedsDisplay: or we will get drawing turds under the
// scrollbar frames.
- [[self frameScrollView] display];
+ if ([self inLiveResize])
+ [[self frameScrollView] display];
}
- (void)viewDidEndLiveResize
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list