[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:45:22 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit baa288b2266ea1615f0d773e281e64437b4e7c69
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 27 20:50:31 2002 +0000
WebBrowser no longer responsible for setting page title in history.
* LocationChangeHandler.m:
(-[LocationChangeHandler receivedPageTitle:forDataSource:]):
Fixed 3060158: REGRESSION: iframes added to session history
Also moved setting title in history to WebKit.
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
(+[WebHistory sharedHistory]):
(+[WebHistory webHistoryWithFile:]):
(-[WebHistory addEntryForURL:]):
(-[WebHistory addEntries:]):
* History.subproj/WebHistoryPrivate.h:
* History.subproj/WebHistoryPrivate.m:
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge requestedURL]):
* WebView.subproj/WebDataSourcePrivate.m:
(-[WebDataSource _setTitle:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _transitionToCommitted]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView mouseDragged:]):
Fixed 3059237: Visited links do not appear in a different color on yahoo.com
Fixed 3051288: visited links are not colored in local files
Fixed 3060158: REGRESSION: iframes added to session history
Always use the canonical originally requested URL as the URL entered in history.
* khtml/khtml_part.cpp:
(KHTMLPart::begin):
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::requestedURLString):
* kwq/KWQKHistoryProvider.mm:
* kwq/WebCoreBridge.h:
* kwq/WebCoreHistory.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2189 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a692f12..2e8f13e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-09-27 Richard Williamson <rjw at apple.com>
+
+ Fixed 3059237: Visited links do not appear in a different color on yahoo.com
+ Fixed 3051288: visited links are not colored in local files
+ Fixed 3060158: REGRESSION: iframes added to session history
+ Always use the canonical originally requested URL as the URL entered in history.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::requestedURLString):
+ * kwq/KWQKHistoryProvider.mm:
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreHistory.h:
+
2002-09-28 David Hyatt <hyatt at apple.com>
Fix for 3058119, doctype of HTML docs should be null.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a692f12..2e8f13e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-09-27 Richard Williamson <rjw at apple.com>
+
+ Fixed 3059237: Visited links do not appear in a different color on yahoo.com
+ Fixed 3051288: visited links are not colored in local files
+ Fixed 3060158: REGRESSION: iframes added to session history
+ Always use the canonical originally requested URL as the URL entered in history.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::requestedURLString):
+ * kwq/KWQKHistoryProvider.mm:
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreHistory.h:
+
2002-09-28 David Hyatt <hyatt at apple.com>
Fix for 3058119, doctype of HTML docs should be null.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a692f12..2e8f13e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-09-27 Richard Williamson <rjw at apple.com>
+
+ Fixed 3059237: Visited links do not appear in a different color on yahoo.com
+ Fixed 3051288: visited links are not colored in local files
+ Fixed 3060158: REGRESSION: iframes added to session history
+ Always use the canonical originally requested URL as the URL entered in history.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin):
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::requestedURLString):
+ * kwq/KWQKHistoryProvider.mm:
+ * kwq/WebCoreBridge.h:
+ * kwq/WebCoreHistory.h:
+
2002-09-28 David Hyatt <hyatt at apple.com>
Fix for 3058119, doctype of HTML docs should be null.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 6d3c2fa..02a3c9c 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1302,12 +1302,16 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_bLoadEventEmitted = false;
if(url.isValid()) {
+#ifdef APPLE_CHANGES
+ KHTMLFactory::vLinks()->insert( impl->requestedURLString() );
+#else
QString urlString = url.url();
KHTMLFactory::vLinks()->insert( urlString );
QString urlString2 = url.prettyURL();
if ( urlString != urlString2 ) {
KHTMLFactory::vLinks()->insert( urlString2 );
}
+#endif
}
// ###
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 325f3d4..528a271 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -130,6 +130,8 @@ public:
static const QPtrList<KWQKHTMLPartImpl> &instances() { return mutableInstances(); }
+ QString requestedURLString() const;
+
private:
void setPolicyBaseURL(const DOM::DOMString &);
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 994a6db..cc67ab2 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -564,3 +564,9 @@ void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
static_cast<KHTMLPart *>(subpart)->impl->setPolicyBaseURL(s);
}
}
+
+QString KWQKHTMLPartImpl::requestedURLString() const
+{
+ return QString::fromNSString([[_bridge requestedURL] absoluteString]);
+}
+
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index 325f3d4..528a271 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -130,6 +130,8 @@ public:
static const QPtrList<KWQKHTMLPartImpl> &instances() { return mutableInstances(); }
+ QString requestedURLString() const;
+
private:
void setPolicyBaseURL(const DOM::DOMString &);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 994a6db..cc67ab2 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -564,3 +564,9 @@ void KWQKHTMLPartImpl::setPolicyBaseURL(const DOM::DOMString &s)
static_cast<KHTMLPart *>(subpart)->impl->setPolicyBaseURL(s);
}
}
+
+QString KWQKHTMLPartImpl::requestedURLString() const
+{
+ return QString::fromNSString([[_bridge requestedURL] absoluteString]);
+}
+
diff --git a/WebCore/kwq/KWQKHistoryProvider.mm b/WebCore/kwq/KWQKHistoryProvider.mm
index 79cb7a1..9ec9317 100644
--- a/WebCore/kwq/KWQKHistoryProvider.mm
+++ b/WebCore/kwq/KWQKHistoryProvider.mm
@@ -40,6 +40,7 @@ HistoryProvider *HistoryProvider::self()
void HistoryProvider::insert(const QString &s)
{
+ // Insertion handled by WebKit.
return [[WebCoreHistory sharedHistory] addEntryForURLString: KURL(s).canonicalURL().getNSString()];
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 50e5489..36b313f 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -193,6 +193,8 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (void)setNeedsReapplyStyles;
+- (NSURL *)requestedURL;
+
@end
// This interface definition allows those who hold a WebCoreBridge * to call all the methods
diff --git a/WebCore/kwq/WebCoreHistory.h b/WebCore/kwq/WebCoreHistory.h
index d181e6c..a3920f5 100644
--- a/WebCore/kwq/WebCoreHistory.h
+++ b/WebCore/kwq/WebCoreHistory.h
@@ -32,7 +32,6 @@
+ (void)setSharedHistory: (WebCoreHistory *)h;
+ (WebCoreHistory *)sharedHistory;
-- (void)addEntryForURLString: (NSString *)urlString;
- (BOOL)containsEntryForURLString: (NSString *)urlString;
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2275b7a..d2eceef 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,33 @@
+2002-09-27 Richard Williamson <rjw at apple.com>
+
+ Fixed 3060158: REGRESSION: iframes added to session history
+ Also moved setting title in history to WebKit.
+
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ (+[WebHistory sharedHistory]):
+ (+[WebHistory webHistoryWithFile:]):
+ (-[WebHistory addEntryForURL:]):
+ (-[WebHistory addEntries:]):
+ * History.subproj/WebHistoryPrivate.h:
+ * History.subproj/WebHistoryPrivate.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge requestedURL]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setTitle:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDragged:]):
+
+2002-09-26 Richard Williamson <rjw at apple.com>
+
+ More twiddling. Changed the color of the drag labels to
+ match the favorites bar.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDragged:]):
+
2002-09-27 Chris Blumenberg <cblu at apple.com>
Added support for dragging links the the dock.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2275b7a..d2eceef 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,33 @@
+2002-09-27 Richard Williamson <rjw at apple.com>
+
+ Fixed 3060158: REGRESSION: iframes added to session history
+ Also moved setting title in history to WebKit.
+
+ * History.subproj/WebHistory.h:
+ * History.subproj/WebHistory.m:
+ (+[WebHistory sharedHistory]):
+ (+[WebHistory webHistoryWithFile:]):
+ (-[WebHistory addEntryForURL:]):
+ (-[WebHistory addEntries:]):
+ * History.subproj/WebHistoryPrivate.h:
+ * History.subproj/WebHistoryPrivate.m:
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge requestedURL]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (-[WebDataSource _setTitle:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _transitionToCommitted]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDragged:]):
+
+2002-09-26 Richard Williamson <rjw at apple.com>
+
+ More twiddling. Changed the color of the drag labels to
+ match the favorites bar.
+
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView mouseDragged:]):
+
2002-09-27 Chris Blumenberg <cblu at apple.com>
Added support for dragging links the the dock.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 2e5104b..caa47c6 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -27,6 +27,8 @@ extern NSString *WebHistoryEntriesChangedNotification;
WebHistoryPrivate *_historyPrivate;
}
++ (WebHistory *)sharedHistory;
+
/*!
@method webHistoryWithFile:
@param file The file to use to initialize the WebHistory.
@@ -48,6 +50,13 @@ extern NSString *WebHistoryEntriesChangedNotification;
- (void)addEntry: (WebHistoryItem *)entry;
/*!
+ @method addEntryForURLString:
+ @param URL
+ @result Newly created WebHistoryItem
+*/
+- (WebHistoryItem *)addEntryForURL: (NSURL *)URL;
+
+/*!
@method addEntries:
@param newEntries
*/
@@ -71,19 +80,6 @@ extern NSString *WebHistoryEntriesChangedNotification;
- (void)removeAllEntries;
/*!
- @method updateURL:title:displayTitle:forURL:
- @discussion Update an entry in place. Any nil "new" parameters aren't updated.
- @param newURLString
- @param newTitle
- @param newDisplayTitle
- @param oldURLString
-*/
-- (void)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString;
-
-/*!
@method orderedLastVisitedDays
@discussion Get an array of NSCalendarDate, each one representing a unique day that contains one
or more history entries, ordered from most recent to oldest.
diff --git a/WebKit/History.subproj/WebHistory.m b/WebKit/History.subproj/WebHistory.m
index b767ede..6b822be 100644
--- a/WebKit/History.subproj/WebHistory.m
+++ b/WebKit/History.subproj/WebHistory.m
@@ -16,12 +16,16 @@ NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotif
@implementation WebHistory
++ (WebHistory *)sharedHistory
+{
+ return (WebHistory *)[super sharedHistory];
+}
+
+
+ (WebHistory *)webHistoryWithFile: (NSString*)file
{
// Should only be called once. Need to rationalize usage
- // of history.
- ASSERT([[self class] sharedHistory] == nil);
-
+ // of history.
WebHistory *h = [[self alloc] initWithFile:file];
[[self class] setSharedHistory: h];
[h release];
@@ -53,11 +57,12 @@ NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotif
object: self];
}
-- (void)addEntryForURLString: (NSString *)string
+- (WebHistoryItem *)addEntryForURL: (NSURL *)URL
{
- WebHistoryItem *entry = [[WebHistoryItem alloc] initWithURL:[NSURL _web_URLWithString: string] title:nil];
+ WebHistoryItem *entry = [[WebHistoryItem alloc] initWithURL:URL title:nil];
[self addEntry: entry];
[entry release];
+ return entry;
}
@@ -94,21 +99,6 @@ NSString *WebHistoryEntriesChangedNotification = @"WebHistoryEntriesChangedNotif
[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
diff --git a/WebKit/History.subproj/WebHistoryPrivate.h b/WebKit/History.subproj/WebHistoryPrivate.h
index 8ca5ca9..460dd4e 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.h
+++ b/WebKit/History.subproj/WebHistoryPrivate.h
@@ -25,10 +25,6 @@
- (BOOL)removeEntry: (WebHistoryItem *)entry;
- (BOOL)removeEntries: (NSArray *)entries;
- (BOOL)removeAllEntries;
-- (WebHistoryItem *)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString;
- (NSArray *)orderedLastVisitedDays;
- (NSArray *)orderedEntriesLastVisitedOnDay: (NSCalendarDate *)calendarDate;
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 5df4325..be1d9bd 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -233,35 +233,6 @@
}
}
-- (WebHistoryItem *)updateURL:(NSString *)newURLString
- title:(NSString *)newTitle
- displayTitle:(NSString *)newDisplayTitle
- forURL:(NSString *)oldURLString
-{
- WebHistoryItem *entry;
-
- ASSERT(oldURLString != nil);
-
- entry = [self _entryForURLString:oldURLString];
- if (entry == nil) {
- return nil;
- }
-
- if (newURLString != nil) {
- [entry setURL:[NSURL _web_URLWithString:newURLString]];
- }
-
- if (newTitle != nil) {
- [entry setTitle:newTitle];
- }
-
- if (newDisplayTitle != nil) {
- [entry setDisplayTitle:newDisplayTitle];
- }
-
- return entry;
-}
-
#pragma mark DATE-BASED RETRIEVAL
- (NSArray *)orderedLastVisitedDays
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 6a18efb..038c469 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -387,4 +387,9 @@
}
}
+- (NSURL *)requestedURL
+{
+ return [[[self dataSource] request] URL];
+}
+
@end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 33ca2f1..ce6da65 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -1,34 +1,32 @@
/* WebDataSourcePrivate.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/WebDataSourcePrivate.h>
+#import <WebKit/WebBridge.h>
+#import <WebKit/WebController.h>
#import <WebKit/WebControllerPolicyDelegate.h>
+#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDownloadHandler.h>
#import <WebKit/WebException.h>
+#import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebHistory.h>
+#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHTMLRepresentation.h>
#import <WebKit/WebHTMLViewPrivate.h>
-#import <WebKit/WebPreferences.h>
#import <WebKit/WebIconDatabase.h>
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebImageRepresentation.h>
+#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
+#import <WebKit/WebPreferences.h>
#import <WebKit/WebSubresourceClient.h>
#import <WebKit/WebTextRepresentation.h>
-#import <WebKit/WebController.h>
-#import <WebKit/WebControllerPrivate.h>
-#import <WebKit/WebBridge.h>
-#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebViewPrivate.h>
-#import <WebKit/WebKitLogging.h>
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
@@ -279,8 +277,12 @@
_private->pageTitle = [trimmed copy];
// The title doesn't get communicated to the controller until we are committed.
- if (_private->committed)
+ if (_private->committed) {
+ WebHistoryItem *entry;
+ entry = [[WebHistory sharedHistory] entryForURL: [[[self request] URL] _web_canonicalize]];
+ [entry setTitle: _private->pageTitle];
[[_private->controller locationChangeDelegate] receivedPageTitle:_private->pageTitle forDataSource:self];
+ }
}
- (void)_setURL:(NSURL *)URL
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 92c0e6e..98eddeb 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -15,6 +15,7 @@
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDocument.h>
#import <WebKit/WebDynamicScrollBarsView.h>
+#import <WebKit/WebHistory.h>
#import <WebKit/WebHistoryItem.h>
#import <WebKit/WebHTMLView.h>
#import <WebKit/WebHTMLViewPrivate.h>
@@ -282,6 +283,10 @@ static const char * const stateNames[] = {
[self _setState: WebFrameStateCommittedPage];
// Handle adding the URL to the back/forward list.
+ WebDataSource *ds = [self dataSource];
+ WebHistoryItem *entry = nil;
+ NSString *ptitle = [ds pageTitle];
+
if ([[self controller] useBackForwardList]){
switch ([self _loadType]) {
case WebFrameLoadTypeForward:
@@ -302,6 +307,12 @@ static const char * const stateNames[] = {
break;
case WebFrameLoadTypeStandard:
+ // Add item to history.
+ entry = [[WebHistory sharedHistory] addEntryForURL: [[[ds request] URL] _web_canonicalize]];
+ if (ptitle)
+ [entry setTitle: ptitle];
+
+ // Add item to back/forward list.
parentFrame = [[self controller] frameForDataSource: [[self dataSource] parent]];
backForwardItem = [[WebHistoryItem alloc] initWithURL:[[[self dataSource] request] URL]
target:[self name]
@@ -323,13 +334,15 @@ static const char * const stateNames[] = {
ASSERT_NOT_REACHED();
}
}
-
+
// Tell the client we've committed this URL.
- [[[self controller] locationChangeDelegate] locationChangeCommittedForDataSource:[self dataSource]];
+ [[[self controller] locationChangeDelegate] locationChangeCommittedForDataSource:ds];
// If we have a title let the controller know about it.
- if ([[self dataSource] pageTitle])
- [[[self controller] locationChangeDelegate] receivedPageTitle:[[self dataSource] pageTitle] forDataSource:[self dataSource]];
+ if (ptitle){
+ [entry setTitle: ptitle];
+ [[[self controller] locationChangeDelegate] receivedPageTitle:ptitle forDataSource:ds];
+ }
break;
}
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 65ed411..4c4d1cb 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -547,8 +547,8 @@
NSFont *labelFont = [NSFont systemFontOfSize: 12.0];
NSFont *urlFont = [NSFont systemFontOfSize: 8.0];
- NSDictionary *labelAttributes = [NSDictionary dictionaryWithObject:labelFont forKey: NSFontAttributeName];
- NSDictionary *urlAttributes = [NSDictionary dictionaryWithObject:urlFont forKey: NSFontAttributeName];
+ NSDictionary *labelAttributes = [NSDictionary dictionaryWithObjectsAndKeys: labelFont, NSFontAttributeName, [NSColor whiteColor], NSForegroundColorAttributeName, nil];
+ NSDictionary *urlAttributes = [NSDictionary dictionaryWithObjectsAndKeys: urlFont, NSFontAttributeName, [NSColor whiteColor], NSForegroundColorAttributeName, nil];
NSSize labelSize = [label sizeWithAttributes: labelAttributes];
NSSize imageSize, urlStringSize;
imageSize.width += labelSize.width + DRAG_LABEL_BORDER_X * 2;
@@ -567,7 +567,7 @@
NSImage *dragImage = [[[NSImage alloc] initWithSize: imageSize] autorelease];
[dragImage lockFocus];
- [[NSColor colorWithCalibratedRed: 0.75 green: 0.75 blue: 1.0 alpha: 0.75] set];
+ [[NSColor colorWithCalibratedRed: 0.5 green: 0.5 blue: 0.5 alpha: 0.8] set];
// Drag a rectangle with rounded corners/
NSBezierPath *path = [NSBezierPath bezierPath];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list