[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:30:22 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c6125447c50de6014930783cbd244fa530532949
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 8 19:37:43 2002 +0000
top level:
* Tests/WebFoundation-Misc/ifnsurlextensions-test.m: Added code to
check the new URL extras methods against the old original versions,
which are pasted in here for now.
* Tests/WebFoundation-Misc/ifnsurlextensions-test.chk: Updated result
to match the changes to _web_URLByRemovingLastPathComponent, and to
reflect the new "compare with old original versions" testing.
WebFoundation:
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _web_URLByRemovingLastPathComponent]): Changed behavior
when the path is "/" to return the same URL with a path of "", to
match the behavior of the old WebNSURLGetParent. I had hoped this would
fix bug 3019790, but it did not.
WebCore:
- fixed 3019353 -- Japanese (Autodetect) encoding not properly supported
* kwq/make-charset-table.pl: Add a "japanese-autodetect" entry to the table
explicitly, with a hardcoded encoding value. This should be good enough.
* kwq/KWQKHTMLSettings.mm: (KHTMLSettings::mediumFixedFontSize):
* kwq/WebCoreEncodings.h:
* kwq/WebCoreSettings.h:
* kwq/WebCoreSettings.m:
Change "fixed font size" to "default fixed font size".
Placeholders for the "drawing observer" method that I'll be using
to implement the "dump page as diffable text" feature.
* kwq/WebCoreTestController.h: Added.
* kwq/WebCoreTestController.m: Added.
* WebCore.exp: Mention new class.
* WebCore.pbproj/project.pbxproj: Mention new files.
WebKit:
Placeholders for the "drawing observer" method that I'll be using
to implement the "dump page as diffable text" feature.
* Misc.subproj/WebTestController.h: Added.
* Misc.subproj/WebTestController.m: Added.
* WebKit.pbproj/project.pbxproj: Mention new files.
* WebKit.exp: Mention new class.
* WebView.subproj/WebPreferences.h:
* WebView.subproj/WebPreferences.m:
Changed "fixed font size" to "default fixed font size".
WebBrowser:
Some fixes to the text encoding menus.
* Preferences.subproj/TextPreferences.m:
(-[TextPreferences takeDefaultCharacterSetFrom:]): Update the text encoding
menu when the character set is changed, because the section that includes
that character set shows up at the top.
(-[TextPreferences awakeFromNib]): Pass the TextPreferences object as the target
for the menu items, because it's not going to be in the responder chain.
* AppController.h: Added updateTextEncodingMenu.
* AppController.m:
(-[AppController applicationDidFinishLaunching:]): Call updateTextEncodingMenu.
(-[AppController updateTextEncodingMenu]): Put the code to set up the text
encoding menu in here, so it can be called when the default encoding changes.
* TextEncodingMenu.h: Added target and preferred encoding parameters.
* TextEncodingMenu.m:
(-[NSMenu addItemToMenuForEncoding:withTarget:action:]): Add target setting.
(-[NSMenu addStandardTextEncodingMenuItemsWithTarget:action:preferredEncoding:]):
Remove old items before adding new so this can be reused on a menu. Fixed a bug
in the original Mail code that causes an extra separator to be left at the bottom
when the chosen group is the last one in the list.
* LocationChangeHandler.m: Add an import that is needed now that I removed some
unneeded imports from AppController.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1778 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 51769d8..18e43ac 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,24 @@
+2002-08-08 Darin Adler <darin at apple.com>
+
+ - fixed 3019353 -- Japanese (Autodetect) encoding not properly supported
+
+ * kwq/make-charset-table.pl: Add a "japanese-autodetect" entry to the table
+ explicitly, with a hardcoded encoding value. This should be good enough.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::mediumFixedFontSize):
+ * kwq/WebCoreEncodings.h:
+ * kwq/WebCoreSettings.h:
+ * kwq/WebCoreSettings.m:
+ Change "fixed font size" to "default fixed font size".
+
+ Placeholders for the "drawing observer" method that I'll be using
+ to implement the "dump page as diffable text" feature.
+
+ * kwq/WebCoreTestController.h: Added.
+ * kwq/WebCoreTestController.m: Added.
+ * WebCore.exp: Mention new class.
+ * WebCore.pbproj/project.pbxproj: Mention new files.
+
2002-08-08 Maciej Stachowiak <mjs at apple.com>
Added an SPI that can be used to get at the WebCore
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 51769d8..18e43ac 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,24 @@
+2002-08-08 Darin Adler <darin at apple.com>
+
+ - fixed 3019353 -- Japanese (Autodetect) encoding not properly supported
+
+ * kwq/make-charset-table.pl: Add a "japanese-autodetect" entry to the table
+ explicitly, with a hardcoded encoding value. This should be good enough.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::mediumFixedFontSize):
+ * kwq/WebCoreEncodings.h:
+ * kwq/WebCoreSettings.h:
+ * kwq/WebCoreSettings.m:
+ Change "fixed font size" to "default fixed font size".
+
+ Placeholders for the "drawing observer" method that I'll be using
+ to implement the "dump page as diffable text" feature.
+
+ * kwq/WebCoreTestController.h: Added.
+ * kwq/WebCoreTestController.m: Added.
+ * WebCore.exp: Mention new class.
+ * WebCore.pbproj/project.pbxproj: Mention new files.
+
2002-08-08 Maciej Stachowiak <mjs at apple.com>
Added an SPI that can be used to get at the WebCore
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 51769d8..18e43ac 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2002-08-08 Darin Adler <darin at apple.com>
+
+ - fixed 3019353 -- Japanese (Autodetect) encoding not properly supported
+
+ * kwq/make-charset-table.pl: Add a "japanese-autodetect" entry to the table
+ explicitly, with a hardcoded encoding value. This should be good enough.
+
+ * kwq/KWQKHTMLSettings.mm: (KHTMLSettings::mediumFixedFontSize):
+ * kwq/WebCoreEncodings.h:
+ * kwq/WebCoreSettings.h:
+ * kwq/WebCoreSettings.m:
+ Change "fixed font size" to "default fixed font size".
+
+ Placeholders for the "drawing observer" method that I'll be using
+ to implement the "dump page as diffable text" feature.
+
+ * kwq/WebCoreTestController.h: Added.
+ * kwq/WebCoreTestController.m: Added.
+ * WebCore.exp: Mention new class.
+ * WebCore.pbproj/project.pbxproj: Mention new files.
+
2002-08-08 Maciej Stachowiak <mjs at apple.com>
Added an SPI that can be used to get at the WebCore
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index f720175..d1267ec 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -4,5 +4,6 @@
.objc_class_name_WebCoreEncodings
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
+.objc_class_name_WebCoreTestController
.objc_class_name_WebCoreTextRendererFactory
.objc_class_name_WebCoreViewFactory
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 6373243..709a8f4 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -491,6 +491,7 @@
F5117BCD02F9FFEF018635CE,
F5117BCF02F9FFEF018635CE,
F56234E103026D7301629B47,
+ F593F87D0302BE00018635CE,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -720,6 +721,7 @@
F5117BCE02F9FFEF018635CE,
F5117BD002F9FFEF018635CE,
F56234E203026D7301629B47,
+ F593F87E0302BE00018635CE,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -5399,6 +5401,8 @@
F587855002DE375901EA4122,
F565AE8502ECA583018635CA,
F565AE8602ECA583018635CA,
+ F593F87B0302BE00018635CE,
+ F593F87C0302BE00018635CE,
F587855102DE375901EA4122,
F587855202DE375901EA4122,
F587855302DE375901EA4122,
@@ -7434,6 +7438,31 @@
path = ../WebCore.exp;
refType = 4;
};
+ F593F87B0302BE00018635CE = {
+ isa = PBXFileReference;
+ path = WebCoreTestController.h;
+ refType = 4;
+ };
+ F593F87C0302BE00018635CE = {
+ isa = PBXFileReference;
+ path = WebCoreTestController.m;
+ refType = 4;
+ };
+ F593F87D0302BE00018635CE = {
+ fileRef = F593F87B0302BE00018635CE;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ F593F87E0302BE00018635CE = {
+ fileRef = F593F87C0302BE00018635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F5A1B04902DE8ABA018635CA = {
isa = PBXFileReference;
name = linkCursor.tiff;
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index cc7fbe3..79e88bc 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -82,7 +82,7 @@ int KHTMLSettings::mediumFontSize() const
int KHTMLSettings::mediumFixedFontSize() const
{
- return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitFixedFontSize"];
+ return [[NSUserDefaults standardUserDefaults] integerForKey:@"WebKitDefaultFixedFontSize"];
}
bool KHTMLSettings::changeCursor() const
diff --git a/WebCore/kwq/WebCoreSettings.h b/WebCore/kwq/WebCoreSettings.h
index 3bc31c9..de694fb 100644
--- a/WebCore/kwq/WebCoreSettings.h
+++ b/WebCore/kwq/WebCoreSettings.h
@@ -35,7 +35,7 @@
NSString *fantasyFontFamily;
float minimumFontSize;
float defaultFontSize;
- float fixedFontSize;
+ float defaultFixedFontSize;
BOOL JavaEnabled;
BOOL pluginsEnabled;
BOOL JavaScriptEnabled;
@@ -68,8 +68,8 @@
- (void)setDefaultFontSize:(float)size;
- (float)defaultFontSize;
-- (void)setFixedFontSize:(float)size;
-- (float)fixedFontSize;
+- (void)setDefaultFixedFontSize:(float)size;
+- (float)defaultFixedFontSize;
- (void)setJavaEnabled:(BOOL)enabled;
- (BOOL)JavaEnabled;
diff --git a/WebCore/kwq/WebCoreSettings.m b/WebCore/kwq/WebCoreSettings.m
index ddfaabd..08ed669 100644
--- a/WebCore/kwq/WebCoreSettings.m
+++ b/WebCore/kwq/WebCoreSettings.m
@@ -140,14 +140,14 @@
return defaultFontSize;
}
-- (void)setFixedFontSize:(float)size
+- (void)setDefaultFixedFontSize:(float)size
{
- fixedFontSize = size;
+ defaultFixedFontSize = size;
}
-- (float)fixedFontSize
+- (float)defaultFixedFontSize
{
- return fixedFontSize;
+ return defaultFixedFontSize;
}
- (void)setJavaEnabled:(BOOL)enabled
diff --git a/WebCore/kwq/WebCoreJavaScript.h b/WebCore/kwq/WebCoreTestController.h
similarity index 89%
copy from WebCore/kwq/WebCoreJavaScript.h
copy to WebCore/kwq/WebCoreTestController.h
index 416378f..d7efdb2 100644
--- a/WebCore/kwq/WebCoreJavaScript.h
+++ b/WebCore/kwq/WebCoreTestController.h
@@ -25,16 +25,13 @@
#import <Foundation/Foundation.h>
- at interface WebCoreJavaScript : NSObject
+ at protocol WebCoreDrawingObserver <NSObject>
+ at end
+
+ at interface WebCoreTestController : NSObject
{
}
-+ (int)interpreterCount;
-
-+ (int)objectCount;
-+ (int)noGCAllowedObjectCount;
-+ (int)referencedObjectCount;
-
-+ (void)garbageCollect;
++ (void)setDrawingObserver:(id <WebCoreDrawingObserver>)observer;
@end
diff --git a/WebCore/kwq/KWQKLibrary.h b/WebCore/kwq/WebCoreTestController.m
similarity index 90%
copy from WebCore/kwq/KWQKLibrary.h
copy to WebCore/kwq/WebCoreTestController.m
index f5e7453..b4d1172 100644
--- a/WebCore/kwq/KWQKLibrary.h
+++ b/WebCore/kwq/WebCoreTestController.m
@@ -23,10 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <global.h>
+#import "WebCoreTestController.h"
-class KLibrary
+ at implementation WebCoreTestController
+
++ (void)setDrawingObserver:(id <WebCoreDrawingObserver>)observer
{
-public:
- void unload() { }
-};
+}
+
+ at end
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index d1674d7..d9ee2e8 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -25,6 +25,15 @@ sub emit_suffix
print TABLE ",\n {NULL,\n -1,\n $invalid_encoding}\n};\n";
}
+sub emit_line
+{
+ my ($name, $mibNum, $encodingNum) = @_;
+ print TABLE ",\n" if ($already_wrote_one);
+ print TABLE ' {"' . $name . '",' . "\n";
+ print TABLE " " . $mib_enum . ",\n";
+ print TABLE " " . $encodingNum . "}";
+ $already_wrote_one = 1;
+}
sub emit_output
{
@@ -42,11 +51,7 @@ sub emit_output
unless ($MAC_SUPPORTED_ONLY && $mac_string_encoding eq $invalid_encoding) {
foreach my $name ($canonical_name, @aliases) {
- print TABLE ",\n" if ($already_wrote_one);
- print TABLE ' {"' . ${name} . '",' . "\n";
- print TABLE " " . ${mib_enum} . ",\n";
- print TABLE " " . ${mac_string_encoding} . "}";
- $already_wrote_one = 1;
+ emit_line($name, $mib_enum, $mac_string_encoding);
}
}
}
@@ -86,11 +91,7 @@ sub process_iana_charsets {
sub emit_unused_mac_encodings {
foreach my $name (keys %name_to_mac_encoding) {
if (! $used_mac_encodings{$name}) {
- print TABLE ",\n" if ($already_wrote_one);
- print TABLE ' {"' . ${name} . '",' . "\n";
- print TABLE " " . -1 . ",\n";
- print TABLE " " . $name_to_mac_encoding{$name} . "}";
- $already_wrote_one = 1;
+ emit_line($name, -1, $name_to_mac_encoding{$name});
}
}
}
@@ -105,6 +106,7 @@ emit_prefix;
process_mac_encodings;
process_iana_charsets;
emit_unused_mac_encodings;
+emit_line("japanese-autodetect", -1, "0xAFE"); # hard-code japanese autodetect
emit_suffix;
close TABLE;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b1f62bf..5f63f26 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-08-08 Darin Adler <darin at apple.com>
+
+ Placeholders for the "drawing observer" method that I'll be using
+ to implement the "dump page as diffable text" feature.
+
+ * Misc.subproj/WebTestController.h: Added.
+ * Misc.subproj/WebTestController.m: Added.
+ * WebKit.pbproj/project.pbxproj: Mention new files.
+ * WebKit.exp: Mention new class.
+
+ * WebView.subproj/WebPreferences.h:
+ * WebView.subproj/WebPreferences.m:
+ Changed "fixed font size" to "default fixed font size".
+
2002-08-08 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b1f62bf..5f63f26 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-08-08 Darin Adler <darin at apple.com>
+
+ Placeholders for the "drawing observer" method that I'll be using
+ to implement the "dump page as diffable text" feature.
+
+ * Misc.subproj/WebTestController.h: Added.
+ * Misc.subproj/WebTestController.m: Added.
+ * WebKit.pbproj/project.pbxproj: Mention new files.
+ * WebKit.exp: Mention new class.
+
+ * WebView.subproj/WebPreferences.h:
+ * WebView.subproj/WebPreferences.m:
+ Changed "fixed font size" to "default fixed font size".
+
2002-08-08 Chris Blumenberg <cblu at apple.com>
* Plugins.subproj/WebPluginStream.m:
diff --git a/WebKit/Misc.subproj/WebTestController.h b/WebKit/Misc.subproj/WebTestController.h
new file mode 100644
index 0000000..54fb693
--- /dev/null
+++ b/WebKit/Misc.subproj/WebTestController.h
@@ -0,0 +1,20 @@
+//
+// WebTestController.h
+// WebKit
+//
+// Created by Darin Adler on Thu Aug 08 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+ at protocol WebDrawingObserver <NSObject>
+ at end
+
+ at interface WebTestController : NSObject
+{
+}
+
++ (void)setDrawingObserver:(id <WebDrawingObserver>)observer;
+
+ at end
diff --git a/WebKit/Misc.subproj/WebTestController.m b/WebKit/Misc.subproj/WebTestController.m
new file mode 100644
index 0000000..22c0847
--- /dev/null
+++ b/WebKit/Misc.subproj/WebTestController.m
@@ -0,0 +1,48 @@
+//
+// WebTestController.m
+// WebKit
+//
+// Created by Darin Adler on Thu Aug 08 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import "WebTestController.h"
+
+#import <WebCore/WebCoreTestController.h>
+
+ at interface WebForwardingDrawingObserver : NSObject <WebCoreDrawingObserver>
+{
+ id <WebDrawingObserver> _target;
+}
+
+- initWithTarget:(id <WebDrawingObserver>)target;
+
+ at end
+
+ at implementation WebForwardingDrawingObserver
+
+- initWithTarget:(id <WebDrawingObserver>)target
+{
+ self = [super init];
+ if (self == nil) {
+ return nil;
+ }
+
+ _target = [target retain];
+
+ return self;
+}
+
+ at end
+
+ at implementation WebTestController
+
++ (void)setDrawingObserver:(id <WebDrawingObserver>)observer
+{
+ WebForwardingDrawingObserver *forwardingObserver =
+ [[WebForwardingDrawingObserver alloc] initWithTarget:observer];
+ [WebCoreTestController setDrawingObserver:forwardingObserver];
+ [forwardingObserver release];
+}
+
+ at end
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 338cb02..db425c1 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -20,5 +20,6 @@
.objc_class_name_WebRenderNode
.objc_class_name_WebStandardPanels
.objc_class_name_WebStringTruncator
+.objc_class_name_WebTestController
.objc_class_name_WebURLsWithTitles
.objc_class_name_WebView
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 51561d9..61afa3e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -267,6 +267,7 @@
354F260002EF441D0ACA2ACA,
3519E9EF02F0DF570ACA2ACA,
F5E7B24703025CE801A80180,
+ F501251D0302EA04018635CE,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -352,6 +353,7 @@
F505C20C02FB4F18018635CE,
F5F732D302FF4D4F01A80180,
F5E7B24803025CE801A80180,
+ F501251E0302EA04018635CE,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1219,6 +1221,31 @@
//F52
//F53
//F54
+ F501251B0302EA04018635CE = {
+ isa = PBXFileReference;
+ path = WebTestController.h;
+ refType = 4;
+ };
+ F501251C0302EA04018635CE = {
+ isa = PBXFileReference;
+ path = WebTestController.m;
+ refType = 4;
+ };
+ F501251D0302EA04018635CE = {
+ fileRef = F501251B0302EA04018635CE;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ F501251E0302EA04018635CE = {
+ fileRef = F501251C0302EA04018635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
F505C20B02FB4F18018635CE = {
isa = PBXFileReference;
path = WebLocationChangeHandler.m;
@@ -1503,10 +1530,11 @@
F53444CF02E87CBA018635CA,
F5F81C3902B67C26018635CA,
F5F81C3A02B67C26018635CA,
+ F501251B0302EA04018635CE,
+ F501251C0302EA04018635CE,
);
isa = PBXGroup;
- name = Debugging;
- path = "";
+ path = Misc.subproj;
refType = 4;
};
F531DDFF02F0C36F018635CA = {
@@ -1523,14 +1551,12 @@
};
F53444CE02E87CBA018635CA = {
isa = PBXFileReference;
- name = WebKitStatistics.h;
- path = Misc.subproj/WebKitStatistics.h;
+ path = WebKitStatistics.h;
refType = 4;
};
F53444CF02E87CBA018635CA = {
isa = PBXFileReference;
- name = WebKitStatistics.m;
- path = Misc.subproj/WebKitStatistics.m;
+ path = WebKitStatistics.m;
refType = 4;
};
F53444D002E87CBA018635CA = {
@@ -1550,8 +1576,7 @@
};
F53444D202E87D4B018635CA = {
isa = PBXFileReference;
- name = WebKitStatisticsPrivate.h;
- path = Misc.subproj/WebKitStatisticsPrivate.h;
+ path = WebKitStatisticsPrivate.h;
refType = 4;
};
F53444D302E87D4B018635CA = {
@@ -1763,8 +1788,7 @@
};
F59EAE3E0253C7EE018635CA = {
isa = PBXFileReference;
- name = WebCoreStatistics.h;
- path = Misc.subproj/WebCoreStatistics.h;
+ path = WebCoreStatistics.h;
refType = 4;
};
F59EAE400253C7EE018635CA = {
@@ -1778,8 +1802,7 @@
};
F59EAE410253C8DE018635CA = {
isa = PBXFileReference;
- name = WebCoreStatistics.m;
- path = Misc.subproj/WebCoreStatistics.m;
+ path = WebCoreStatistics.m;
refType = 4;
};
F59EAE420253C8DE018635CA = {
@@ -2293,13 +2316,13 @@
F5F81C3502B67C0F018635CA = {
isa = PBXFileReference;
name = WebDOMNode.h;
- path = WebView.subproj/WebDOMNode.h;
+ path = ../WebView.subproj/WebDOMNode.h;
refType = 4;
};
F5F81C3602B67C0F018635CA = {
isa = PBXFileReference;
name = WebDOMNode.m;
- path = WebView.subproj/WebDOMNode.m;
+ path = ../WebView.subproj/WebDOMNode.m;
refType = 4;
};
F5F81C3702B67C0F018635CA = {
@@ -2320,13 +2343,13 @@
F5F81C3902B67C26018635CA = {
isa = PBXFileReference;
name = WebRenderNode.h;
- path = WebView.subproj/WebRenderNode.h;
+ path = ../WebView.subproj/WebRenderNode.h;
refType = 4;
};
F5F81C3A02B67C26018635CA = {
isa = PBXFileReference;
name = WebRenderNode.m;
- path = WebView.subproj/WebRenderNode.m;
+ path = ../WebView.subproj/WebRenderNode.m;
refType = 4;
};
F5F81C3B02B67C26018635CA = {
diff --git a/WebKit/WebView.subproj/WebPreferences.h b/WebKit/WebView.subproj/WebPreferences.h
index 51bd61e..027ca76 100644
--- a/WebKit/WebView.subproj/WebPreferences.h
+++ b/WebKit/WebView.subproj/WebPreferences.h
@@ -32,8 +32,8 @@
- (int)defaultFontSize;
- (void)setDefaultFontSize:(int)size;
-- (int)fixedFontSize;
-- (void)setFixedFontSize:(int)size;
+- (int)defaultFixedFontSize;
+- (void)setDefaultFixedFontSize:(int)size;
- (int)minimumFontSize;
- (void)setMinimumFontSize:(int)size;
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index b94f93e..646e41b 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -16,7 +16,7 @@
#define WebKitFantasyFontPreferenceKey @"WebKitFantasyFont"
#define WebKitMinimumFontSizePreferenceKey @"WebKitMinimumFontSize"
#define WebKitDefaultFontSizePreferenceKey @"WebKitDefaultFontSize"
-#define WebKitFixedFontSizePreferenceKey @"WebKitFixedFontSize"
+#define WebKitDefaultFixedFontSizePreferenceKey @"WebKitDefaultFixedFontSize"
#define WebKitDefaultTextEncodingPreferenceKey @"WebKitDefaultTextEncoding"
#define WebKitUserStyleSheetEnabledPreferenceKey @"WebKitUserStyleSheetEnabledPreferenceKey"
#define WebKitUserStyleSheetLocationPreferenceKey @"WebKitUserStyleSheetLocationPreferenceKey"
@@ -71,7 +71,7 @@ static WebPreferences *_standardPreferences = nil;
@"Papyrus", WebKitFantasyFontPreferenceKey,
@"6", WebKitMinimumFontSizePreferenceKey,
@"14", WebKitDefaultFontSizePreferenceKey,
- @"14", WebKitFixedFontSizePreferenceKey,
+ @"14", WebKitDefaultFixedFontSizePreferenceKey,
defaultTextEncoding, WebKitDefaultTextEncodingPreferenceKey,
@"1.85", WebKitInitialTimedLayoutDelayPreferenceKey,
@"4096", WebKitInitialTimedLayoutSizePreferenceKey,
@@ -163,14 +163,14 @@ static WebPreferences *_standardPreferences = nil;
[[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitDefaultFontSizePreferenceKey];
}
-- (int)fixedFontSize
+- (int)defaultFixedFontSize
{
- return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitFixedFontSizePreferenceKey];
+ return [[NSUserDefaults standardUserDefaults] integerForKey:WebKitDefaultFixedFontSizePreferenceKey];
}
-- (void)setFixedFontSize:(int)size
+- (void)setDefaultFixedFontSize:(int)size
{
- [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitFixedFontSizePreferenceKey];
+ [[NSUserDefaults standardUserDefaults] setInteger:size forKey:WebKitDefaultFixedFontSizePreferenceKey];
}
- (int)minimumFontSize
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list