[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:14:19 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1b383fabaa76b7d3ec94a1ea0457274ef5c5f772
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 20 23:05:33 2003 +0000
WebCore:
Fixed: <rdar://problem/3491225>: Need UI and localized strings for <KEYGEN> support
Reviewed by john.
* WebCore-combined.exp:
* WebCore.exp:
* WebCore.pbproj/project.pbxproj:
* kwq/KWQKSSLKeyGen.h:
* kwq/KWQKSSLKeyGen.mm: Added.
(KSSLKeyGen::supportedKeySizes): implemented, calls [WebCoreLocalizedStringFactory keyGenerationMenuItemTitles]
* kwq/WebCoreLocalizedStringFactory.h: Added.
* kwq/WebCoreLocalizedStringFactory.m: Added.
(+[WebCoreLocalizedStringFactory sharedFactory]): new
(-[WebCoreLocalizedStringFactory init]): new
(-[WebCoreLocalizedStringFactory keyGenerationMenuItemTitles]): new
WebKit:
Fixed: <rdar://problem/3491229>: Need UI and localized strings for <KEYGEN> support
Reviewed by john.
* ChangeLog:
* English.lproj/Localizable.strings:
* WebCoreSupport.subproj/WebLocalizedStringFactory.h: Added.
* WebCoreSupport.subproj/WebLocalizedStringFactory.m: Added.
(+[WebLocalizedStringFactory createSharedFactory]): new
(-[WebLocalizedStringFactory dealloc]): new
(-[WebLocalizedStringFactory keyGenerationMenuItemTitles]): new
* WebKit.pbproj/project.pbxproj:
* WebView.subproj/WebFrameView.m: call [WebLocalizedStringFactory createSharedFactory]
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 48b6d1f..35b50d0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-11-20 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: <rdar://problem/3491225>: Need UI and localized strings for <KEYGEN> support
+
+ Reviewed by john.
+
+ * WebCore-combined.exp:
+ * WebCore.exp:
+ * WebCore.pbproj/project.pbxproj:
+ * kwq/KWQKSSLKeyGen.h:
+ * kwq/KWQKSSLKeyGen.mm: Added.
+ (KSSLKeyGen::supportedKeySizes): implemented, calls [WebCoreLocalizedStringFactory keyGenerationMenuItemTitles]
+ * kwq/WebCoreLocalizedStringFactory.h: Added.
+ * kwq/WebCoreLocalizedStringFactory.m: Added.
+ (+[WebCoreLocalizedStringFactory sharedFactory]): new
+ (-[WebCoreLocalizedStringFactory init]): new
+ (-[WebCoreLocalizedStringFactory keyGenerationMenuItemTitles]): new
+
2003-11-19 Maciej Stachowiak <mjs at apple.com>
Reviewed by Ken.
diff --git a/WebCore/WebCore-combined.exp b/WebCore/WebCore-combined.exp
index 925ae56..cc3552c 100644
--- a/WebCore/WebCore-combined.exp
+++ b/WebCore/WebCore-combined.exp
@@ -6,6 +6,7 @@
.objc_class_name_WebCoreGraphicsBridge
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
+.objc_class_name_WebCoreLocalizedStringFactory
.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
diff --git a/WebCore/WebCore.exp b/WebCore/WebCore.exp
index 0577cd1..5e61dd5 100644
--- a/WebCore/WebCore.exp
+++ b/WebCore/WebCore.exp
@@ -6,6 +6,7 @@
.objc_class_name_WebCoreGraphicsBridge
.objc_class_name_WebCoreImageRendererFactory
.objc_class_name_WebCoreJavaScript
+.objc_class_name_WebCoreLocalizedStringFactory
.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextRendererFactory
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 89b1689..a90e7fb 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -519,6 +519,7 @@
BE26F15505517DE000BFA0C3,
654E7EE40569FD4600358BD2,
654E7EE50569FD4600358BD2,
+ 84B2B1F9056BEF3A00D2B771,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -782,6 +783,8 @@
65732B69054EF483007B42F8,
BE26F15605517DE000BFA0C3,
654E7EE30569FD4600358BD2,
+ 84B2B1FA056BEF3A00D2B771,
+ 84B2B250056BF15F00D2B771,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1142,6 +1145,51 @@
//842
//843
//844
+ 84B2B1F7056BEF3A00D2B771 = {
+ expectedFileType = sourcecode.c.h;
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebCoreLocalizedStringFactory.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84B2B1F8056BEF3A00D2B771 = {
+ expectedFileType = sourcecode.c.objc;
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = WebCoreLocalizedStringFactory.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84B2B1F9056BEF3A00D2B771 = {
+ fileRef = 84B2B1F7056BEF3A00D2B771;
+ isa = PBXBuildFile;
+ settings = {
+ ATTRIBUTES = (
+ Private,
+ );
+ };
+ };
+ 84B2B1FA056BEF3A00D2B771 = {
+ fileRef = 84B2B1F8056BEF3A00D2B771;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84B2B24F056BF15F00D2B771 = {
+ expectedFileType = sourcecode.cpp.objcpp;
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = KWQKSSLKeyGen.mm;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84B2B250056BF15F00D2B771 = {
+ fileRef = 84B2B24F056BF15F00D2B771;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
84C0FA1E052B9652000440A1 = {
children = (
84C0FA24052B966D000440A1,
@@ -7750,6 +7798,8 @@
F5B2A52B02E22573018635CB,
F5B2A52C02E22573018635CB,
BE983D95052A2E0A00892D85,
+ 84B2B1F7056BEF3A00D2B771,
+ 84B2B1F8056BEF3A00D2B771,
F587855002DE375901EA4122,
9325AAB7041D0E9A00A9CAC5,
9325AAB8041D0E9A00A9CAC5,
@@ -8407,7 +8457,6 @@
};
F587865F02DE3A9C01EA4122 = {
children = (
- F587866602DE3B1201EA4122,
F58784E502DE375901EA4122,
F587864902DE3A9A01EA4122,
F587864A02DE3A9A01EA4122,
@@ -8421,6 +8470,8 @@
F587850602DE375901EA4122,
F587865202DE3A9A01EA4122,
F587850702DE375901EA4122,
+ F587866202DE3B1101EA4122,
+ 84B2B24F056BF15F00D2B771,
);
isa = PBXGroup;
name = kio;
@@ -8442,16 +8493,6 @@
settings = {
};
};
- F587866602DE3B1201EA4122 = {
- children = (
- F587866202DE3B1101EA4122,
- );
- isa = PBXGroup;
- name = kssl;
- path = "";
- refType = 4;
- sourceTree = "<group>";
- };
F587866702DE3B3201EA4122 = {
expectedFileType = sourcecode.c.h;
fileEncoding = 30;
diff --git a/WebCore/kwq/KWQKSSLKeyGen.h b/WebCore/kwq/KWQKSSLKeyGen.h
index 5ef628c..33f3a3b 100644
--- a/WebCore/kwq/KWQKSSLKeyGen.h
+++ b/WebCore/kwq/KWQKSSLKeyGen.h
@@ -27,6 +27,7 @@
#define KSSLKEYGEN_H_
#include "KWQStringList.h"
+#include "QWidget.h"
class QDialog
{
@@ -37,7 +38,7 @@ public:
class KSSLKeyGen
{
public:
- static QStringList supportedKeySizes() { return QStringList(); }
+ static QStringList supportedKeySizes();
KSSLKeyGen(QWidget *, const char *, bool) { }
void setKeySize(int) { }
int exec() { return QDialog::Rejected; }
diff --git a/WebCore/kwq/WebCoreGraphicsBridge.m b/WebCore/kwq/KWQKSSLKeyGen.mm
similarity index 74%
copy from WebCore/kwq/WebCoreGraphicsBridge.m
copy to WebCore/kwq/KWQKSSLKeyGen.mm
index 89254f1..92ae06b 100644
--- a/WebCore/kwq/WebCoreGraphicsBridge.m
+++ b/WebCore/kwq/KWQKSSLKeyGen.mm
@@ -23,31 +23,18 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WebCoreGraphicsBridge.h"
-
-#import "KWQAssertions.h"
-
- at implementation WebCoreGraphicsBridge
-
-static WebCoreGraphicsBridge *sharedBridge;
-
-+ (WebCoreGraphicsBridge *)sharedBridge
-{
- return sharedBridge;
+#import "KWQKSSLKeyGen.h"
+
+#import "KWQString.h"
+#import "WebCoreLocalizedStringFactory.h"
+
+QStringList KSSLKeyGen::supportedKeySizes()
+{
+ NSEnumerator *enumerator = [[[WebCoreLocalizedStringFactory sharedFactory] keyGenerationMenuItemTitles] objectEnumerator];
+ QStringList supportedKeySizes = QStringList();
+ NSString *string;
+ while ((string = [enumerator nextObject]) != nil) {
+ supportedKeySizes.append(QString::fromNSString(string));
+ }
+ return supportedKeySizes;
}
-
-- (id)init
-{
- [super init];
-
- ASSERT(!sharedBridge);
- sharedBridge = [self retain];
-
- return self;
-}
-
-- (void)setFocusRingStyle:(NSFocusRingPlacement)placement radius:(int)radius color:(NSColor *)color
-{
-}
-
- at end
diff --git a/WebKit/WebCoreSupport.subproj/WebGraphicsBridge.h b/WebCore/kwq/WebCoreLocalizedStringFactory.h
similarity index 88%
copy from WebKit/WebCoreSupport.subproj/WebGraphicsBridge.h
copy to WebCore/kwq/WebCoreLocalizedStringFactory.h
index 1110d2b..714160d 100644
--- a/WebKit/WebCoreSupport.subproj/WebGraphicsBridge.h
+++ b/WebCore/kwq/WebCoreLocalizedStringFactory.h
@@ -23,14 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Cocoa/Cocoa.h>
-#import <WebCore/WebCoreGraphicsBridge.h>
+#import <Foundation/Foundation.h>
- at interface WebGraphicsBridge : WebCoreGraphicsBridge
-{
-}
+ at interface WebCoreLocalizedStringFactory : NSObject
-+ (void)createSharedBridge;
-+ (WebGraphicsBridge *)sharedBridge;
++ (WebCoreLocalizedStringFactory *)sharedFactory;
+
+- (NSArray *)keyGenerationMenuItemTitles;
@end
diff --git a/WebCore/kwq/WebCoreGraphicsBridge.m b/WebCore/kwq/WebCoreLocalizedStringFactory.m
similarity index 81%
copy from WebCore/kwq/WebCoreGraphicsBridge.m
copy to WebCore/kwq/WebCoreLocalizedStringFactory.m
index 89254f1..8192cde 100644
--- a/WebCore/kwq/WebCoreGraphicsBridge.m
+++ b/WebCore/kwq/WebCoreLocalizedStringFactory.m
@@ -23,31 +23,32 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WebCoreGraphicsBridge.h"
+#import "WebCoreLocalizedStringFactory.h"
#import "KWQAssertions.h"
- at implementation WebCoreGraphicsBridge
+static WebCoreLocalizedStringFactory *sharedFactory;
-static WebCoreGraphicsBridge *sharedBridge;
+ at implementation WebCoreLocalizedStringFactory
-+ (WebCoreGraphicsBridge *)sharedBridge
++ (WebCoreLocalizedStringFactory *)sharedFactory
{
- return sharedBridge;
+ return sharedFactory;
}
-- (id)init
+- init
{
[super init];
- ASSERT(!sharedBridge);
- sharedBridge = [self retain];
+ ASSERT(!sharedFactory);
+ sharedFactory = [self retain];
return self;
}
-- (void)setFocusRingStyle:(NSFocusRingPlacement)placement radius:(int)radius color:(NSColor *)color
+- (NSArray *)keyGenerationMenuItemTitles
{
+ return nil;
}
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1fa59f4..4806d28 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-11-20 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: <rdar://problem/3491229>: Need UI and localized strings for <KEYGEN> support
+
+ Reviewed by john.
+
+ * ChangeLog:
+ * English.lproj/Localizable.strings:
+ * WebCoreSupport.subproj/WebLocalizedStringFactory.h: Added.
+ * WebCoreSupport.subproj/WebLocalizedStringFactory.m: Added.
+ (+[WebLocalizedStringFactory createSharedFactory]): new
+ (-[WebLocalizedStringFactory dealloc]): new
+ (-[WebLocalizedStringFactory keyGenerationMenuItemTitles]): new
+ * WebKit.pbproj/project.pbxproj:
+ * WebView.subproj/WebFrameView.m: call [WebLocalizedStringFactory createSharedFactory]
+
2003-11-20 Richard Williamson <rjw at apple.com>
Added spin of event loop during applet lookup poll. This
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 7239682..eb8c7a7 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.h b/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.h
new file mode 100644
index 0000000..2fbd3fb
--- /dev/null
+++ b/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.h
@@ -0,0 +1,17 @@
+//
+// WebLocalizedStringFactory.h
+// WebKit
+//
+// Created by Chris Blumenberg on Thu Nov 20 2003.
+// Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebCore/WebCoreLocalizedStringFactory.h>
+
+
+ at interface WebLocalizedStringFactory : WebCoreLocalizedStringFactory
+{
+ NSArray *keyGenerationMenuItemTitles;
+}
++ (void)createSharedFactory;
+ at end
diff --git a/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.m b/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.m
new file mode 100644
index 0000000..ed34c6b
--- /dev/null
+++ b/WebKit/WebCoreSupport.subproj/WebLocalizedStringFactory.m
@@ -0,0 +1,41 @@
+//
+// WebLocalizedStringFactory.m
+// WebKit
+//
+// Created by Chris Blumenberg on Thu Nov 20 2003.
+// Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebKit/WebLocalizedStringFactory.h>
+
+#import <WebKit/WebAssertions.h>
+#import <WebKit/WebLocalizableStrings.h>
+
+ at implementation WebLocalizedStringFactory
+
++ (void)createSharedFactory
+{
+ if (![self sharedFactory]) {
+ [[[self alloc] init] release];
+ }
+ ASSERT([[self sharedFactory] isKindOfClass:self]);
+}
+
+- (void)dealloc
+{
+ [keyGenerationMenuItemTitles release];
+ [super dealloc];
+}
+
+- (NSArray *)keyGenerationMenuItemTitles
+{
+ if (!keyGenerationMenuItemTitles) {
+ keyGenerationMenuItemTitles = [[NSArray alloc] initWithObjects:
+ UI_STRING("2048 (High Grade)", "Menu item title for KEYGEN pop-up menu"),
+ UI_STRING("1024 (Medium Grade)", "Menu item title for KEYGEN pop-up menu"),
+ UI_STRING("512 (Low Grade)", "Menu item title for KEYGEN pop-up menu"), nil];
+ }
+ return keyGenerationMenuItemTitles;
+}
+
+ at end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index dd135e3..37ba11e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -327,6 +327,7 @@
BECD142B0565830A005BB09C,
65A7D44B0568AB2600E70EF6,
BE887C01056D3A6E009BB3E7,
+ 84723BE5056D719E0044BFEA,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -442,6 +443,7 @@
BE26F19005517E0800BFA0C3,
BECD142C0565830A005BB09C,
BE887C02056D3A6E009BB3E7,
+ 84723BE6056D719E0044BFEA,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -2085,6 +2087,34 @@
settings = {
};
};
+ 84723BE3056D719E0044BFEA = {
+ expectedFileType = sourcecode.c.h;
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebLocalizedStringFactory.h;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84723BE4056D719E0044BFEA = {
+ expectedFileType = sourcecode.c.objc;
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ path = WebLocalizedStringFactory.m;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84723BE5056D719E0044BFEA = {
+ fileRef = 84723BE3056D719E0044BFEA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84723BE6056D719E0044BFEA = {
+ fileRef = 84723BE4056D719E0044BFEA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
848DFF410365F6FB00CA2ACA = {
children = (
F5F717220288493C018635CA,
@@ -3686,6 +3716,8 @@
9CE1F8A302A5C6F30ECA2ACD,
9345D4EA0365C5B2008635CE,
9345D4EB0365C5B2008635CE,
+ 84723BE3056D719E0044BFEA,
+ 84723BE4056D719E0044BFEA,
F5E0E10802BC45F8018635CA,
F5E0E10902BC45F8018635CA,
F5B36B410281DF55018635CB,
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index c1798c0..fbd3187 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -19,6 +19,7 @@
#import <WebKit/WebImageView.h>
#import <WebKit/WebKitErrorsPrivate.h>
#import <WebKit/WebKitStatisticsPrivate.h>
+#import <WebKit/WebLocalizedStringFactory.h>
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebTextRendererFactory.h>
@@ -413,6 +414,7 @@ static NSMutableDictionary *viewTypes;
[WebImageRendererFactory createSharedFactory];
[WebCookieAdapter createSharedAdapter];
[WebGraphicsBridge createSharedBridge];
+ [WebLocalizedStringFactory createSharedFactory];
_private = [[WebFrameViewPrivate alloc] init];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list