[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 07:31:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 8787c56aa53ab92e99ee6013d75052e722bc8779
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 27 03:05:55 2003 +0000
WebKit:
WebPreferences API changes:
JavaScriptCanOpenWindowsAutomatically -> javaScriptCanOpenWindowsAutomatically
setJavaScriptCanOpenWindowsAutomatically -> setJavaScriptCanOpenWindowsAutomatically
willLoadImagesAutomatically -> loadsImagesAutomatically
setWillLoadImagesAutomatically -> setLoadsImagesAutomatically
JavaEnabled -> isJavaEnabled
setJavaEnabled -> setIsJavaEnabled
JavaScriptEnabled -> isJavaScriptEnabled
setJavaScriptEnabled -> setIsJavaScriptEnabled
pluginsEnabled -> arePlugInsEnabled
setPluginsEnabled -> setArePlugInsEnabled
allowAnimatedImageLooping -> allowsAnimatedImageLooping
setAllowAnimatedImageLooping -> setAllowsAnimatedImageLooping
allowAnimatedImages -> allowsAnimatedImages
setAllowAnimatedImages -> setAllowsAnimatedImages
Made WebHistoryItem's ivars private.
WebPluginError API changes:
pluginPageURL -> plugInPageURLString
contentURL -> contentURLString
Reviewed by cblu.
* API-Issues.rtf:
* History.subproj/WebHistoryItem.h:
* History.subproj/WebHistoryItem.m:
(-[WebHistoryItemPrivate dealloc]):
(-[WebHistoryItem init]):
(-[WebHistoryItem dealloc]):
(-[WebHistoryItem URLString]):
(-[WebHistoryItem originalURLString]):
(-[WebHistoryItem title]):
(-[WebHistoryItem setDisplayTitle:]):
(-[WebHistoryItem icon]):
(-[WebHistoryItem lastVisitedDate]):
(-[WebHistoryItem hash]):
(-[WebHistoryItem anchor]):
(-[WebHistoryItem isEqual:]):
(-[WebHistoryItem description]):
(-[WebHistoryItem _retainIconInDatabase:]):
(-[WebHistoryItem initWithURL:target:parent:title:]):
(-[WebHistoryItem URL]):
(-[WebHistoryItem target]):
(-[WebHistoryItem parent]):
(-[WebHistoryItem setURL:]):
(-[WebHistoryItem setOriginalURLString:]):
(-[WebHistoryItem setTitle:]):
(-[WebHistoryItem setTarget:]):
(-[WebHistoryItem setParent:]):
(-[WebHistoryItem setLastVisitedDate:]):
(-[WebHistoryItem documentState]):
(-[WebHistoryItem scrollPoint]):
(-[WebHistoryItem setScrollPoint:]):
(-[WebHistoryItem setAnchor:]):
(-[WebHistoryItem isTargetItem]):
(-[WebHistoryItem setIsTargetItem:]):
(-[WebHistoryItem _recurseToFindTargetItem]):
(-[WebHistoryItem targetItem]):
(-[WebHistoryItem formData]):
(-[WebHistoryItem setFormData:]):
(-[WebHistoryItem formContentType]):
(-[WebHistoryItem setFormContentType:]):
(-[WebHistoryItem formReferrer]):
(-[WebHistoryItem setFormReferrer:]):
(-[WebHistoryItem children]):
(-[WebHistoryItem addChildItem:]):
(-[WebHistoryItem childItemWithName:]):
(-[WebHistoryItem dictionaryRepresentation]):
(-[WebHistoryItem initFromDictionaryRepresentation:]):
(-[WebHistoryItem setAlwaysAttemptToUsePageCache:]):
(-[WebHistoryItem alwaysAttemptToUsePageCache]):
(-[WebHistoryItem _scheduleRelease]):
(-[WebHistoryItem setHasPageCache:]):
(-[WebHistoryItem pageCache]):
* Plugins.subproj/WebPluginError.h:
* Plugins.subproj/WebPluginError.m:
(-[WebPlugInError plugInPageURLString]):
* WebView.subproj/WebPreferences.h:
* WebView.subproj/WebPreferences.m:
(-[WebPreferences isJavaEnabled]):
(-[WebPreferences setIsJavaEnabled:]):
(-[WebPreferences isJavaScriptEnabled]):
(-[WebPreferences setIsJavaScriptEnabled:]):
(-[WebPreferences javaScriptCanOpenWindowsAutomatically]):
(-[WebPreferences arePlugInsEnabled]):
(-[WebPreferences setArePlugInsEnabled:]):
(-[WebPreferences allowsAnimatedImages]):
(-[WebPreferences allowsAnimatedImageLooping]):
(-[WebPreferences setAllowsAnimatedImageLooping:]):
(-[WebPreferences setLoadsImagesAutomatically:]):
(-[WebPreferences loadsImagesAutomatically]):
* WebView.subproj/WebViewPrivate.m:
(-[WebView _updateWebCoreSettingsFromPreferences:]):
WebBrowser:
WebPrefernces API changes:
JavaScriptCanOpenWindowsAutomatically -> javaScriptCanOpenWindowsAutomatically
setJavaScriptCanOpenWindowsAutomatically -> setJavaScriptCanOpenWindowsAutomatically
pluginPageURL -> plugInPageURLString
contentURL -> contentURLString
willLoadImagesAutomatically -> loadsImagesAutomatically
setWillLoadImagesAutomatically -> setLoadsImagesAutomatically
JavaEnabled -> isJavaEnabled
setJavaEnabled -> setIsJavaEnabled
JavaScriptEnabled -> isJavaScriptEnabled
setJavaScriptEnabled -> setIsJavaScriptEnabled
pluginsEnabled -> arePlugInsEnabled
setPluginsEnabled -> setArePlugInsEnabled
Reviewed by cblu.
* AppController.m:
(-[AppController validateUserInterfaceItem:]):
(-[AppController toggleJavaScriptCanNotOpenWindows:]):
* LoadProgressMonitor.m:
(-[LoadProgressMonitor webView:plugInFailedWithError:dataSource:]):
* Preferences.subproj/AppearancePreferences.m:
(-[AppearancePreferences toggleDisplayImages:]):
(-[AppearancePreferences initializeFromDefaults]):
* Preferences.subproj/SecurityPreferences.m:
(-[SecurityPreferences toggleJavaEnabled:]):
(-[SecurityPreferences toggleJavaScriptEnabled:]):
(-[SecurityPreferences toggleJavaScriptCanOpenWindows:]):
(-[SecurityPreferences updateJavaScriptViews]):
(-[SecurityPreferences togglePluginsEnabled:]):
(-[SecurityPreferences initializeFromDefaults]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3932 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/API-Issues.rtf b/WebKit/API-Issues.rtf
index 23710cb..56e34c6 100644
--- a/WebKit/API-Issues.rtf
+++ b/WebKit/API-Issues.rtf
@@ -11,9 +11,7 @@
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f2\fs20 \cf0 + Change WebPreferences' userStyleSheetLocation to an NSURL.\
-+ Remove WebController's customUserAgent property.\
-+ On WebController:\
+\f2\fs20 \cf0 + On WebController:\
Add -(BOOL)canGoBack, -(BOOL)canGoForward, -(BOOL)canCanel.\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
@@ -105,26 +103,7 @@ It's a good idea to try to stay away from ambiguous adjectives (that are also ve
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
\cf2 \
-WebPluginItem:\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li400\ql\qnatural
-
-\f2\fs20 \cf3 - (NSString *)contentURL;\
-- (NSString *)pluginPageURL;\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-
-\f1\fs24 \cf2 \
-In some other APIs where NSString containing URLs are returned, you use "...URLString" --- should maybe do that here too?\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Yes, good point.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 Also: Official spelling of plugin is supposed to be plugIn. At least that's what CF's plugIn mechanism had to be renamed to, and the word plugIn appears in one API in Foundation. I personally prefer plugin, like autorelease, or superview, but perhaps techpubs should bless this.\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 OK. I'll check this issue.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 WebKitErrors:\
+WebKitErrors:\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li400\ql\qnatural
@@ -164,68 +143,6 @@ Should this be "shared"? I realize NSUserDefaults uses "standard", but it's an
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
\cf2 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li400\ql\qnatural
-
-\f2\fs20 \cf6 /*!\
- @method JavaEnabled\
-*/\cf3 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li600\ql\qnatural
-\cf5 \
-- (\cf4 BOOL\cf5 )JavaEnabled;\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-
-\f1\fs24 \cf2 \
-Are we not allowed to use "java" ? 8-)\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Not sure. I'll check with tech pubs.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 Actually, I believe the guidelines prefer the use of "is" for cases like this:\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-
-\f2\fs20 \cf2 - (void)setEditable:(BOOL)flag;\
-- (BOOL)isEditable; \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-
-\f1\fs24 \cf0 Yes.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 so perhaps "isJavaEnabled" ? (Although there are a few more methods you'd want to change then...)\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Yes, I'll make the use of 'is' consistent.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li400\ql\qnatural
-
-\f2\fs20 \cf3 - (\cf4 BOOL\cf3 )allowAnimatedImages;\
-- (\cf4 void\cf3 )setAllowAnimatedImages:(\cf4 BOOL\cf3 )flag;\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-
-\f1\fs24 \cf2 \
-allowsAnimatedImages, setAllowsAnimatedImages: (a few more examples)\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Will change.\
-\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li400\ql\qnatural
-
-\f2\fs20 \cf3 - (\cf4 void\cf3 )setWillLoadImagesAutomatically: (\cf4 BOOL\cf3 )flag;\
-- (\cf4 BOOL\cf3 )willLoadImagesAutomatically;\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-
-\f1\fs24 \cf2 \
-loadsImagesAutomatically, ... ?\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\cf0 Good suggestion.\
-\
-Thanks!\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li200\ql\qnatural
-\cf2 Ali\
-\
-\
Add loadWithData:baseURL: to WebFrame\
\
\
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 54303d4..ed9736b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,102 @@
+2003-03-26 Richard Williamson <rjw at apple.com>
+
+ WebPreferences API changes:
+
+ JavaScriptCanOpenWindowsAutomatically -> javaScriptCanOpenWindowsAutomatically
+ setJavaScriptCanOpenWindowsAutomatically -> setJavaScriptCanOpenWindowsAutomatically
+ willLoadImagesAutomatically -> loadsImagesAutomatically
+ setWillLoadImagesAutomatically -> setLoadsImagesAutomatically
+ JavaEnabled -> isJavaEnabled
+ setJavaEnabled -> setIsJavaEnabled
+ JavaScriptEnabled -> isJavaScriptEnabled
+ setJavaScriptEnabled -> setIsJavaScriptEnabled
+ pluginsEnabled -> arePlugInsEnabled
+ setPluginsEnabled -> setArePlugInsEnabled
+ allowAnimatedImageLooping -> allowsAnimatedImageLooping
+ setAllowAnimatedImageLooping -> setAllowsAnimatedImageLooping
+ allowAnimatedImages -> allowsAnimatedImages
+ setAllowAnimatedImages -> setAllowsAnimatedImages
+
+ Made WebHistoryItem's ivars private.
+
+ WebPluginError API changes:
+
+ pluginPageURL -> plugInPageURLString
+ contentURL -> contentURLString
+
+ Reviewed by cblu.
+
+ * API-Issues.rtf:
+ * History.subproj/WebHistoryItem.h:
+ * History.subproj/WebHistoryItem.m:
+ (-[WebHistoryItemPrivate dealloc]):
+ (-[WebHistoryItem init]):
+ (-[WebHistoryItem dealloc]):
+ (-[WebHistoryItem URLString]):
+ (-[WebHistoryItem originalURLString]):
+ (-[WebHistoryItem title]):
+ (-[WebHistoryItem setDisplayTitle:]):
+ (-[WebHistoryItem icon]):
+ (-[WebHistoryItem lastVisitedDate]):
+ (-[WebHistoryItem hash]):
+ (-[WebHistoryItem anchor]):
+ (-[WebHistoryItem isEqual:]):
+ (-[WebHistoryItem description]):
+ (-[WebHistoryItem _retainIconInDatabase:]):
+ (-[WebHistoryItem initWithURL:target:parent:title:]):
+ (-[WebHistoryItem URL]):
+ (-[WebHistoryItem target]):
+ (-[WebHistoryItem parent]):
+ (-[WebHistoryItem setURL:]):
+ (-[WebHistoryItem setOriginalURLString:]):
+ (-[WebHistoryItem setTitle:]):
+ (-[WebHistoryItem setTarget:]):
+ (-[WebHistoryItem setParent:]):
+ (-[WebHistoryItem setLastVisitedDate:]):
+ (-[WebHistoryItem documentState]):
+ (-[WebHistoryItem scrollPoint]):
+ (-[WebHistoryItem setScrollPoint:]):
+ (-[WebHistoryItem setAnchor:]):
+ (-[WebHistoryItem isTargetItem]):
+ (-[WebHistoryItem setIsTargetItem:]):
+ (-[WebHistoryItem _recurseToFindTargetItem]):
+ (-[WebHistoryItem targetItem]):
+ (-[WebHistoryItem formData]):
+ (-[WebHistoryItem setFormData:]):
+ (-[WebHistoryItem formContentType]):
+ (-[WebHistoryItem setFormContentType:]):
+ (-[WebHistoryItem formReferrer]):
+ (-[WebHistoryItem setFormReferrer:]):
+ (-[WebHistoryItem children]):
+ (-[WebHistoryItem addChildItem:]):
+ (-[WebHistoryItem childItemWithName:]):
+ (-[WebHistoryItem dictionaryRepresentation]):
+ (-[WebHistoryItem initFromDictionaryRepresentation:]):
+ (-[WebHistoryItem setAlwaysAttemptToUsePageCache:]):
+ (-[WebHistoryItem alwaysAttemptToUsePageCache]):
+ (-[WebHistoryItem _scheduleRelease]):
+ (-[WebHistoryItem setHasPageCache:]):
+ (-[WebHistoryItem pageCache]):
+ * Plugins.subproj/WebPluginError.h:
+ * Plugins.subproj/WebPluginError.m:
+ (-[WebPlugInError plugInPageURLString]):
+ * WebView.subproj/WebPreferences.h:
+ * WebView.subproj/WebPreferences.m:
+ (-[WebPreferences isJavaEnabled]):
+ (-[WebPreferences setIsJavaEnabled:]):
+ (-[WebPreferences isJavaScriptEnabled]):
+ (-[WebPreferences setIsJavaScriptEnabled:]):
+ (-[WebPreferences javaScriptCanOpenWindowsAutomatically]):
+ (-[WebPreferences arePlugInsEnabled]):
+ (-[WebPreferences setArePlugInsEnabled:]):
+ (-[WebPreferences allowsAnimatedImages]):
+ (-[WebPreferences allowsAnimatedImageLooping]):
+ (-[WebPreferences setAllowsAnimatedImageLooping:]):
+ (-[WebPreferences setLoadsImagesAutomatically:]):
+ (-[WebPreferences loadsImagesAutomatically]):
+ * WebView.subproj/WebViewPrivate.m:
+ (-[WebView _updateWebCoreSettingsFromPreferences:]):
+
2003-03-26 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebKit/History.subproj/WebHistoryItem.h b/WebKit/History.subproj/WebHistoryItem.h
index 8025d43..8f7301e 100644
--- a/WebKit/History.subproj/WebHistoryItem.h
+++ b/WebKit/History.subproj/WebHistoryItem.h
@@ -7,6 +7,7 @@
#import <Cocoa/Cocoa.h>
+ at class WebHistoryItemPrivate;
@class NSURL;
/*!
@@ -19,28 +20,8 @@
*/
@interface WebHistoryItem : NSObject
{
- NSString *_URLString;
- NSString *_originalURLString;
- NSString *_target;
- NSString *_parent;
- NSString *_title;
- NSString *_displayTitle;
- NSCalendarDate *_lastVisitedDate;
- NSPoint _scrollPoint;
- NSString *anchor;
- NSArray *_documentState;
- NSMutableArray *_subItems;
- NSMutableDictionary *pageCache;
- BOOL _isTargetItem;
- BOOL _alwaysAttemptToUsePageCache;
- // info used to repost form data
- NSData *_formData;
- NSString *_formContentType;
- NSString *_formReferrer;
- void *_reserved1;
- void *_reserved2;
- void *_reserved3;
- void *_reserved4;
+ at private
+ WebHistoryItemPrivate *_private;
}
/*!
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 3fe0e76..ed05d9f 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -16,10 +16,57 @@
#import <CoreGraphics/CoreGraphicsPrivate.h>
+ at interface WebHistoryItemPrivate : NSObject
+{
+ at public
+ NSString *URLString;
+ NSString *originalURLString;
+ NSString *target;
+ NSString *parent;
+ NSString *title;
+ NSString *displayTitle;
+ NSCalendarDate *lastVisitedDate;
+ NSPoint scrollPoint;
+ NSString *anchor;
+ NSArray *documentState;
+ NSMutableArray *subItems;
+ NSMutableDictionary *pageCache;
+ BOOL isTargetItem;
+ BOOL alwaysAttemptToUsePageCache;
+ // info used to repost form data
+ NSData *formData;
+ NSString *formContentType;
+ NSString *formReferrer;
+}
+ at end
+
+ at implementation WebHistoryItemPrivate
+- (void)dealloc
+{
+ [URLString release];
+ [originalURLString release];
+ [target release];
+ [parent release];
+ [title release];
+ [displayTitle release];
+ [lastVisitedDate release];
+ [anchor release];
+ [documentState release];
+ [subItems release];
+ [pageCache release];
+ [formData release];
+ [formContentType release];
+ [formReferrer release];
+
+ [super dealloc];
+}
+ at end
+
@implementation WebHistoryItem
- (id)init
{
+ _private = [[WebHistoryItemPrivate alloc] init];
return [self initWithURL:nil title:nil];
}
@@ -27,81 +74,68 @@
{
[self _retainIconInDatabase:NO];
- [_URLString release];
- [_originalURLString release];
- [_target release];
- [_parent release];
- [_title release];
- [_displayTitle release];
- [_lastVisitedDate release];
- [anchor release];
- [_documentState release];
- [_subItems release];
- [pageCache release];
- [_formData release];
- [_formContentType release];
- [_formReferrer release];
-
+ [_private release];
+
[super dealloc];
}
// FIXME: need to decide it this class ever returns URLs, and the name of this method
- (NSString *)URLString
{
- return _URLString;
+ return _private->URLString;
}
// The first URL we loaded to get to where this history item points. Includes both client
// and server redirects.
- (NSString *)originalURLString
{
- return _originalURLString;
+ return _private->originalURLString;
}
- (NSString *)title
{
- return _title;
+ return _private->title;
}
- (void)setDisplayTitle:(NSString *)displayTitle
{
NSString *newDisplayTitle;
- if (displayTitle && [displayTitle isEqualToString:_title]) {
- newDisplayTitle = [_title retain];
+ if (displayTitle && [displayTitle isEqualToString:_private->title]) {
+ newDisplayTitle = [_private->title retain];
} else {
newDisplayTitle = [displayTitle copy];
}
- [_displayTitle release];
- _displayTitle = newDisplayTitle;
+ [_private->displayTitle release];
+ _private->displayTitle = newDisplayTitle;
}
- (NSString *)displayTitle;
{
- return _displayTitle;
+ return _private->displayTitle;
}
- (NSImage *)icon
{
// Always get fresh icon from database. It's a client's responsibility to watch
// for updates to the database if desired.
- return [[WebIconDatabase sharedIconDatabase] iconForURL:_URLString withSize:WebIconSmallSize];
+ return [[WebIconDatabase sharedIconDatabase] iconForURL:_private->URLString withSize:WebIconSmallSize];
}
- (NSCalendarDate *)lastVisitedDate
{
- return _lastVisitedDate;
+ return _private->lastVisitedDate;
}
- (unsigned)hash
{
- return [_URLString hash];
+ return [_private->URLString hash];
}
- (NSString *)anchor
{
- return anchor;
+ return _private->anchor;
}
- (BOOL)isEqual:(id)anObject
@@ -110,27 +144,27 @@
return NO;
}
- NSString *otherURL = ((WebHistoryItem *)anObject)->_URLString;
- return _URLString == otherURL || [_URLString isEqualToString:otherURL];
+ NSString *otherURL = ((WebHistoryItem *)anObject)->_private->URLString;
+ return _private->URLString == otherURL || [_private->URLString isEqualToString:otherURL];
}
- (NSString *)description
{
- NSMutableString *result = [NSMutableString stringWithFormat:@"%@ %@", [super description], _URLString];
- if (_target) {
- [result appendFormat:@" in \"%@\"", _target];
+ NSMutableString *result = [NSMutableString stringWithFormat:@"%@ %@", [super description], _private->URLString];
+ if (_private->target) {
+ [result appendFormat:@" in \"%@\"", _private->target];
}
- if (_isTargetItem) {
+ if (_private->isTargetItem) {
[result appendString:@" *target*"];
}
- if (_formData) {
+ if (_private->formData) {
[result appendString:@" *POST*"];
}
- if (_subItems) {
+ if (_private->subItems) {
int currPos = [result length];
int i;
- for (i = 0; i < (int)[_subItems count]; i++) {
- WebHistoryItem *child = [_subItems objectAtIndex:i];
+ for (i = 0; i < (int)[_private->subItems count]; i++) {
+ WebHistoryItem *child = [_private->subItems objectAtIndex:i];
[result appendString:@"\n"];
[result appendString:[child description]];
}
@@ -150,12 +184,12 @@
- (void)_retainIconInDatabase:(BOOL)retain
{
- if (_URLString) {
+ if (_private->URLString) {
WebIconDatabase *iconDB = [WebIconDatabase sharedIconDatabase];
if (retain) {
- [iconDB retainIconForURL:_URLString];
+ [iconDB retainIconForURL:_private->URLString];
} else {
- [iconDB releaseIconForURL:_URLString];
+ [iconDB releaseIconForURL:_private->URLString];
}
}
}
@@ -179,11 +213,12 @@
return nil;
}
- _URLString = [[URL absoluteString] copy];
- _target = [target copy];
- _parent = [parent copy];
- _title = [title copy];
- _lastVisitedDate = [[NSCalendarDate alloc] init];
+ _private = [[WebHistoryItemPrivate alloc] init];
+ _private->URLString = [[URL absoluteString] copy];
+ _private->target = [target copy];
+ _private->parent = [parent copy];
+ _private->title = [title copy];
+ _private->lastVisitedDate = [[NSCalendarDate alloc] init];
[self _retainIconInDatabase:YES];
@@ -192,26 +227,26 @@
- (NSURL *)URL
{
- return _URLString ? [NSURL _web_URLWithString:_URLString] : nil;
+ return _private->URLString ? [NSURL _web_URLWithString:_private->URLString] : nil;
}
- (NSString *)target
{
- return _target;
+ return _private->target;
}
- (NSString *)parent
{
- return _parent;
+ return _private->parent;
}
- (void)setURL:(NSURL *)URL
{
NSString *string = [URL absoluteString];
- if (!(string == _URLString || [string isEqual:_URLString])) {
+ if (!(string == _private->URLString || [string isEqual:_private->URLString])) {
[self _retainIconInDatabase:NO];
- [_URLString release];
- _URLString = [string copy];
+ [_private->URLString release];
+ _private->URLString = [string copy];
[self _retainIconInDatabase:YES];
}
}
@@ -221,94 +256,94 @@
- (void)setOriginalURLString:(NSString *)URL
{
NSString *newURL = [URL copy];
- [_originalURLString release];
- _originalURLString = newURL;
+ [_private->originalURLString release];
+ _private->originalURLString = newURL;
}
- (void)setTitle:(NSString *)title
{
NSString *newTitle;
- if (title && [title isEqualToString:_displayTitle]) {
- newTitle = [_displayTitle retain];
+ if (title && [title isEqualToString:_private->displayTitle]) {
+ newTitle = [_private->displayTitle retain];
} else {
newTitle = [title copy];
}
- [_title release];
- _title = newTitle;
+ [_private->title release];
+ _private->title = newTitle;
}
- (void)setTarget:(NSString *)target
{
NSString *copy = [target copy];
- [_target release];
- _target = copy;
+ [_private->target release];
+ _private->target = copy;
}
- (void)setParent:(NSString *)parent
{
NSString *copy = [parent copy];
- [_parent release];
- _parent = copy;
+ [_private->parent release];
+ _private->parent = copy;
}
- (void)setLastVisitedDate:(NSCalendarDate *)date
{
[date retain];
- [_lastVisitedDate release];
- _lastVisitedDate = date;
+ [_private->lastVisitedDate release];
+ _private->lastVisitedDate = date;
}
- (void)setDocumentState:(NSArray *)state;
{
NSArray *copy = [state copy];
- [_documentState release];
- _documentState = copy;
+ [_private->documentState release];
+ _private->documentState = copy;
}
- (NSArray *)documentState
{
- return _documentState;
+ return _private->documentState;
}
- (NSPoint)scrollPoint
{
- return _scrollPoint;
+ return _private->scrollPoint;
}
- (void)setScrollPoint:(NSPoint)scrollPoint
{
- _scrollPoint = scrollPoint;
+ _private->scrollPoint = scrollPoint;
}
- (void)setAnchor:(NSString *)a
{
NSString *copy = [a copy];
- [anchor release];
- anchor = copy;
+ [_private->anchor release];
+ _private->anchor = copy;
}
- (BOOL)isTargetItem
{
- return _isTargetItem;
+ return _private->isTargetItem;
}
- (void)setIsTargetItem:(BOOL)flag
{
- _isTargetItem = flag;
+ _private->isTargetItem = flag;
}
// Main diff from the public method is that the public method will default to returning
// the top item if it can't find anything marked as target and has no kids
- (WebHistoryItem *)_recurseToFindTargetItem
{
- if (_isTargetItem) {
+ if (_private->isTargetItem) {
return self;
- } else if (!_subItems) {
+ } else if (!_private->subItems) {
return nil;
} else {
int i;
- for (i = [_subItems count]-1; i >= 0; i--) {
- WebHistoryItem *match = [[_subItems objectAtIndex:i] _recurseToFindTargetItem];
+ for (i = [_private->subItems count]-1; i >= 0; i--) {
+ WebHistoryItem *match = [[_private->subItems objectAtIndex:i] _recurseToFindTargetItem];
if (match) {
return match;
}
@@ -319,7 +354,7 @@
- (WebHistoryItem *)targetItem
{
- if (_isTargetItem || !_subItems) {
+ if (_private->isTargetItem || !_private->subItems) {
return self;
} else {
return [self _recurseToFindTargetItem];
@@ -328,59 +363,59 @@
- (NSData *)formData
{
- return _formData;
+ return _private->formData;
}
- (void)setFormData:(NSData *)data
{
NSData *copy = [data copy];
- [_formData release];
- _formData = copy;
+ [_private->formData release];
+ _private->formData = copy;
}
- (NSString *)formContentType
{
- return _formContentType;
+ return _private->formContentType;
}
- (void)setFormContentType:(NSString *)type
{
NSString *copy = [type copy];
- [_formContentType release];
- _formContentType = copy;
+ [_private->formContentType release];
+ _private->formContentType = copy;
}
- (NSString *)formReferrer
{
- return _formReferrer;
+ return _private->formReferrer;
}
- (void)setFormReferrer:(NSString *)referrer
{
NSString *copy = [referrer copy];
- [_formReferrer release];
- _formReferrer = copy;
+ [_private->formReferrer release];
+ _private->formReferrer = copy;
}
- (NSArray *)children
{
- return _subItems;
+ return _private->subItems;
}
- (void)addChildItem:(WebHistoryItem *)item
{
- if (!_subItems) {
- _subItems = [[NSMutableArray arrayWithObject:item] retain];
+ if (!_private->subItems) {
+ _private->subItems = [[NSMutableArray arrayWithObject:item] retain];
} else {
- [_subItems addObject:item];
+ [_private->subItems addObject:item];
}
}
- (WebHistoryItem *)childItemWithName:(NSString *)name
{
int i;
- for (i = (_subItems ? [_subItems count] : 0)-1; i >= 0; i--) {
- WebHistoryItem *child = [_subItems objectAtIndex:i];
+ for (i = (_private->subItems ? [_private->subItems count] : 0)-1; i >= 0; i--) {
+ WebHistoryItem *child = [_private->subItems objectAtIndex:i];
if ([[child target] isEqualToString:name]) {
return child;
}
@@ -392,24 +427,24 @@
{
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:6];
- if (_URLString) {
- [dict setObject:_URLString forKey:@""];
+ if (_private->URLString) {
+ [dict setObject:_private->URLString forKey:@""];
}
- if (_title) {
- [dict setObject:_title forKey:@"title"];
+ if (_private->title) {
+ [dict setObject:_private->title forKey:@"title"];
}
- if (_displayTitle) {
- [dict setObject:_displayTitle forKey:@"displayTitle"];
+ if (_private->displayTitle) {
+ [dict setObject:_private->displayTitle forKey:@"displayTitle"];
}
- if (_lastVisitedDate) {
- [dict setObject:[NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
+ if (_private->lastVisitedDate) {
+ [dict setObject:[NSString stringWithFormat:@"%lf", [_private->lastVisitedDate timeIntervalSinceReferenceDate]]
forKey:@"lastVisitedDate"];
}
- if (_subItems != nil) {
- NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_subItems count]];
+ if (_private->subItems != nil) {
+ NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:[_private->subItems count]];
int i;
- for (i = [_subItems count]; i >= 0; i--) {
- [childDicts addObject: [[_subItems objectAtIndex:i] dictionaryRepresentation]];
+ for (i = [_private->subItems count]; i >= 0; i--) {
+ [childDicts addObject: [[_private->subItems objectAtIndex:i] dictionaryRepresentation]];
}
[dict setObject: childDicts forKey: @"children"];
}
@@ -422,6 +457,7 @@
NSString *URLString = [dict _web_stringForKey:@""];
NSString *title = [dict _web_stringForKey:@"title"];
+ _private = [[WebHistoryItemPrivate alloc] init];
[self initWithURL:(URLString ? [NSURL _web_URLWithString:URLString] : nil) title:title];
[self setDisplayTitle:[dict _web_stringForKey:@"displayTitle"]];
@@ -435,11 +471,11 @@
NSArray *childDicts = [dict objectForKey:@"children"];
if (childDicts) {
- _subItems = [[NSMutableArray alloc] initWithCapacity:[childDicts count]];
+ _private->subItems = [[NSMutableArray alloc] initWithCapacity:[childDicts count]];
int i;
for (i = [childDicts count]; i >= 0; i--) {
WebHistoryItem *child = [[WebHistoryItem alloc] initFromDictionaryRepresentation: [childDicts objectAtIndex:i]];
- [_subItems addObject: child];
+ [_private->subItems addObject: child];
}
}
@@ -448,12 +484,12 @@
- (void)setAlwaysAttemptToUsePageCache: (BOOL)flag
{
- _alwaysAttemptToUsePageCache = flag;
+ _private->alwaysAttemptToUsePageCache = flag;
}
- (BOOL)alwaysAttemptToUsePageCache
{
- return _alwaysAttemptToUsePageCache;
+ return _private->alwaysAttemptToUsePageCache;
}
@@ -464,7 +500,7 @@ static NSTimer *_pageCacheReleaseTimer = nil;
- (BOOL)hasPageCache;
{
- return pageCache != nil;
+ return _private->pageCache != nil;
}
+ (void)_invalidateReleaseTimer
@@ -491,10 +527,10 @@ static NSTimer *_pageCacheReleaseTimer = nil;
LOG (PageCache, "Scheduling release of %@", [self URLString]);
[WebHistoryItem _scheduleReleaseTimer];
- if (pageCache){
- [_pendingPageCacheToRelease addObject: pageCache];
- [pageCache release]; // Last reference held by _pendingPageCacheToRelease.
- pageCache = nil;
+ if (_private->pageCache){
+ [_pendingPageCacheToRelease addObject: _private->pageCache];
+ [_private->pageCache release]; // Last reference held by _pendingPageCacheToRelease.
+ _private->pageCache = nil;
}
if (!_windowWatcher){
@@ -535,16 +571,16 @@ static NSTimer *_pageCacheReleaseTimer = nil;
- (void)setHasPageCache: (BOOL)f
{
- if (f && !pageCache)
- pageCache = [[NSMutableDictionary alloc] init];
- if (!f && pageCache){
+ if (f && !_private->pageCache)
+ _private->pageCache = [[NSMutableDictionary alloc] init];
+ if (!f && _private->pageCache){
[self _scheduleRelease];
}
}
- pageCache
{
- return pageCache;
+ return _private->pageCache;
}
diff --git a/WebKit/Plugins.subproj/WebPlugInError.h b/WebKit/Plugins.subproj/WebPlugInError.h
index bbf9564..c75bbc0 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.h
+++ b/WebKit/Plugins.subproj/WebPlugInError.h
@@ -26,13 +26,13 @@
@method contentURL
@result The URL of the data that caused the error
*/
-- (NSString *)contentURL;
+- (NSString *)contentURLString;
/*!
@method plugInPageURL
@result Description forthcoming
*/
-- (NSString *)plugInPageURL;
+- (NSString *)plugInPageURLString;
/*!
@method pluInName
diff --git a/WebKit/Plugins.subproj/WebPlugInError.m b/WebKit/Plugins.subproj/WebPlugInError.m
index 75be76c..5fc63cd 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.m
+++ b/WebKit/Plugins.subproj/WebPlugInError.m
@@ -42,12 +42,12 @@
[super dealloc];
}
-- (NSString *)contentURL;
+- (NSString *)contentURLString;
{
return _private->contentURL;
}
-- (NSString *)plugInPageURL
+- (NSString *)plugInPageURLString
{
return _private->pluginPageURL;
}
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 2483c44..f00759b 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -478,7 +478,7 @@ static BOOL forceRealHitTest = NO;
_private->draggingImageURL = nil;
// We must have started over something draggable:
- ASSERT((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) ||
+ ASSERT((imageURL && [[WebPreferences standardPreferences] loadsImagesAutomatically]) ||
(!imageURL && linkURL) || isSelectedText);
NSPoint mouseDownPoint = [self convertPoint:[_private->mouseDownEvent locationInWindow] fromView:nil];
@@ -549,7 +549,7 @@ static BOOL forceRealHitTest = NO;
NSURL *imageURL = [mouseDownElement objectForKey: WebElementImageURLKey];
- if ((imageURL && [[WebPreferences standardPreferences] willLoadImagesAutomatically]) ||
+ if ((imageURL && [[WebPreferences standardPreferences] loadsImagesAutomatically]) ||
(!imageURL && [mouseDownElement objectForKey: WebElementLinkURLKey]) ||
([[mouseDownElement objectForKey:WebElementIsSelectedTextKey] boolValue] &&
([mouseDraggedEvent timestamp] - [_private->mouseDownEvent timestamp]) > TextDragDelay)) {
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 62271f6..f1fc401 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -158,29 +158,29 @@ extern NSString *WebPreferencesChangedNotification;
/*!
@method JavaEnabled
*/
-- (BOOL)JavaEnabled;
+- (BOOL)isJavaEnabled;
/*!
@method setJavaEnabled:
@param flag
*/
-- (void)setJavaEnabled:(BOOL)flag;
+- (void)setIsJavaEnabled:(BOOL)flag;
/*!
@method JavaScriptEnabled
*/
-- (BOOL)JavaScriptEnabled;
+- (BOOL)isJavaScriptEnabled;
/*!
@method setJavaScriptEnabled:
@param flag
*/
-- (void)setJavaScriptEnabled:(BOOL)flag;
+- (void)setIsJavaScriptEnabled:(BOOL)flag;
/*!
@method JavaScriptCanOpenWindowsAutomatically
*/
-- (BOOL)JavaScriptCanOpenWindowsAutomatically;
+- (BOOL)javaScriptCanOpenWindowsAutomatically;
/*!
@method setJavaScriptCanOpenWindowsAutomatically:
@@ -191,45 +191,45 @@ extern NSString *WebPreferencesChangedNotification;
/*!
@method pluginsEnabled
*/
-- (BOOL)pluginsEnabled;
+- (BOOL)arePlugInsEnabled;
/*!
@method setPluginsEnabled:
@param flag
*/
-- (void)setPluginsEnabled:(BOOL)flag;
+- (void)setArePlugInsEnabled:(BOOL)flag;
/*!
@method allowAnimatedImages
*/
-- (BOOL)allowAnimatedImages;
+- (BOOL)allowsAnimatedImages;
/*!
@method setAllowAnimatedImages:
@param flag
*/
-- (void)setAllowAnimatedImages:(BOOL)flag;
+- (void)setAllowsAnimatedImages:(BOOL)flag;
/*!
@method allowAnimatedImageLooping
*/
-- (BOOL)allowAnimatedImageLooping;
+- (BOOL)allowsAnimatedImageLooping;
/*!
@method setAllowAnimatedImageLooping:
@param flag
*/
-- (void)setAllowAnimatedImageLooping: (BOOL)flag;
+- (void)setAllowsAnimatedImageLooping: (BOOL)flag;
/*!
@method setWillLoadImagesAutomatically:
@param flag
*/
-- (void)setWillLoadImagesAutomatically: (BOOL)flag;
+- (void)setLoadsImagesAutomatically: (BOOL)flag;
/*!
@method willLoadImagesAutomatically
*/
-- (BOOL)willLoadImagesAutomatically;
+- (BOOL)loadsImagesAutomatically;
@end
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 8784097..af9aab6 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -268,27 +268,27 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
[self _setStringValue: [URL absoluteString] forKey: WebKitUserStyleSheetLocationPreferenceKey];
}
-- (BOOL)JavaEnabled
+- (BOOL)isJavaEnabled
{
return [self _boolValueForKey: WebKitJavaEnabledPreferenceKey];
}
-- (void)setJavaEnabled:(BOOL)flag
+- (void)setIsJavaEnabled:(BOOL)flag
{
[self _setBoolValue: flag forKey: WebKitJavaEnabledPreferenceKey];
}
-- (BOOL)JavaScriptEnabled
+- (BOOL)isJavaScriptEnabled
{
return [self _boolValueForKey: WebKitJavaScriptEnabledPreferenceKey];
}
-- (void)setJavaScriptEnabled:(BOOL)flag
+- (void)setIsJavaScriptEnabled:(BOOL)flag
{
[self _setBoolValue: flag forKey: WebKitJavaScriptEnabledPreferenceKey];
}
-- (BOOL)JavaScriptCanOpenWindowsAutomatically
+- (BOOL)javaScriptCanOpenWindowsAutomatically
{
return [self _boolValueForKey: WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey];
}
@@ -298,42 +298,42 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
[self _setBoolValue: flag forKey: WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey];
}
-- (BOOL)pluginsEnabled
+- (BOOL)arePlugInsEnabled
{
return [self _boolValueForKey: WebKitPluginsEnabledPreferenceKey];
}
-- (void)setPluginsEnabled:(BOOL)flag
+- (void)setArePlugInsEnabled:(BOOL)flag
{
[self _setBoolValue: flag forKey: WebKitPluginsEnabledPreferenceKey];
}
-- (BOOL)allowAnimatedImages
+- (BOOL)allowsAnimatedImages
{
return [self _boolValueForKey: WebKitAllowAnimatedImagesPreferenceKey];
}
-- (void)setAllowAnimatedImages:(BOOL)flag;
+- (void)setAllowsAnimatedImages:(BOOL)flag;
{
[self _setBoolValue: flag forKey: WebKitAllowAnimatedImagesPreferenceKey];
}
-- (BOOL)allowAnimatedImageLooping
+- (BOOL)allowsAnimatedImageLooping
{
return [self _boolValueForKey: WebKitAllowAnimatedImageLoopingPreferenceKey];
}
-- (void)setAllowAnimatedImageLooping: (BOOL)flag
+- (void)setAllowsAnimatedImageLooping: (BOOL)flag
{
[self _setBoolValue: flag forKey: WebKitAllowAnimatedImageLoopingPreferenceKey];
}
-- (void)setWillLoadImagesAutomatically: (BOOL)flag
+- (void)setLoadsImagesAutomatically: (BOOL)flag
{
[self _setBoolValue: flag forKey: WebKitDisplayImagesKey];
}
-- (BOOL)willLoadImagesAutomatically
+- (BOOL)loadsImagesAutomatically
{
return [self _boolValueForKey: WebKitDisplayImagesKey];
}
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index b1f9c34..725a386 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -363,15 +363,15 @@
[_private->settings setDefaultFontSize:[preferences defaultFontSize]];
[_private->settings setFantasyFontFamily:[preferences fantasyFontFamily]];
[_private->settings setFixedFontFamily:[preferences fixedFontFamily]];
- [_private->settings setJavaEnabled:[preferences JavaEnabled]];
- [_private->settings setJavaScriptEnabled:[preferences JavaScriptEnabled]];
- [_private->settings setJavaScriptCanOpenWindowsAutomatically:[preferences JavaScriptCanOpenWindowsAutomatically]];
+ [_private->settings setJavaEnabled:[preferences isJavaEnabled]];
+ [_private->settings setJavaScriptEnabled:[preferences isJavaScriptEnabled]];
+ [_private->settings setJavaScriptCanOpenWindowsAutomatically:[preferences javaScriptCanOpenWindowsAutomatically]];
[_private->settings setMinimumFontSize:[preferences minimumFontSize]];
- [_private->settings setPluginsEnabled:[preferences pluginsEnabled]];
+ [_private->settings setPluginsEnabled:[preferences arePlugInsEnabled]];
[_private->settings setSansSerifFontFamily:[preferences sansSerifFontFamily]];
[_private->settings setSerifFontFamily:[preferences serifFontFamily]];
[_private->settings setStandardFontFamily:[preferences standardFontFamily]];
- [_private->settings setWillLoadImagesAutomatically:[preferences willLoadImagesAutomatically]];
+ [_private->settings setWillLoadImagesAutomatically:[preferences loadsImagesAutomatically]];
if ([preferences userStyleSheetEnabled]) {
[_private->settings setUserStyleSheetLocation:[[preferences userStyleSheetLocation] absoluteString]];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list