[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:52:06 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d9650806ebea9a05ae31cb78bbd4dd091798b916
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 22 00:45:04 2002 +0000
WebCore:
* kwq/KWQInputDialog.mm: (QInputDialog::getText): Call the view factory to do the
heavy lifting.
* kwq/WebCoreViewFactory.h: Add runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:.
Use a protocol for the subclass responsibility.
* kwq/WebCoreViewFactory.m: Remove stub methods not needed because of the subclass responsibility
technique we are using.
* kwq/qt/qstylesheet.h: Made this inline, since it does nothing.
* kwq/KWQStyleSheet.mm: Removed.
* WebCore.pbproj/project.pbxproj: Removed KWQStyleSheet.mm.
WebKit:
* WebCoreSupport.subproj/WebViewFactory.h: Changed to use new protocol scheme so we
get an error if we forget to implement something.
* WebCoreSupport.subproj/WebViewFactory.m:
(-[WebViewFactory runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]): Stub.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2405 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6e03e1a..abf6e30 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-21 Darin Adler <darin at apple.com>
+
+ * kwq/KWQInputDialog.mm: (QInputDialog::getText): Call the view factory to do the
+ heavy lifting.
+
+ * kwq/WebCoreViewFactory.h: Add runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:.
+ Use a protocol for the subclass responsibility.
+ * kwq/WebCoreViewFactory.m: Remove stub methods not needed because of the subclass responsibility
+ technique we are using.
+
+ * kwq/qt/qstylesheet.h: Made this inline, since it does nothing.
+ * kwq/KWQStyleSheet.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQStyleSheet.mm.
+
2002-10-21 David Hyatt <hyatt at apple.com>
Implement support for a new @-rule called @konq-quirks. This
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6e03e1a..abf6e30 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-10-21 Darin Adler <darin at apple.com>
+
+ * kwq/KWQInputDialog.mm: (QInputDialog::getText): Call the view factory to do the
+ heavy lifting.
+
+ * kwq/WebCoreViewFactory.h: Add runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:.
+ Use a protocol for the subclass responsibility.
+ * kwq/WebCoreViewFactory.m: Remove stub methods not needed because of the subclass responsibility
+ technique we are using.
+
+ * kwq/qt/qstylesheet.h: Made this inline, since it does nothing.
+ * kwq/KWQStyleSheet.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQStyleSheet.mm.
+
2002-10-21 David Hyatt <hyatt at apple.com>
Implement support for a new @-rule called @konq-quirks. This
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6e03e1a..abf6e30 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-10-21 Darin Adler <darin at apple.com>
+
+ * kwq/KWQInputDialog.mm: (QInputDialog::getText): Call the view factory to do the
+ heavy lifting.
+
+ * kwq/WebCoreViewFactory.h: Add runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:.
+ Use a protocol for the subclass responsibility.
+ * kwq/WebCoreViewFactory.m: Remove stub methods not needed because of the subclass responsibility
+ technique we are using.
+
+ * kwq/qt/qstylesheet.h: Made this inline, since it does nothing.
+ * kwq/KWQStyleSheet.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQStyleSheet.mm.
+
2002-10-21 David Hyatt <hyatt at apple.com>
Implement support for a new @-rule called @konq-quirks. This
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 2bdd4ba..11f4ad2 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -599,7 +599,6 @@
F58785C202DE375901EA4122,
F58785C302DE375901EA4122,
F58785C402DE375901EA4122,
- F58785C602DE375901EA4122,
F58785C802DE375901EA4122,
F58785C902DE375901EA4122,
F58785CA02DE375901EA4122,
@@ -4860,13 +4859,6 @@
path = ../KWQStringList.mm;
refType = 4;
};
- F587853402DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = KWQStyleSheet.mm;
- path = ../KWQStyleSheet.mm;
- refType = 4;
- };
F587853502DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -5646,12 +5638,6 @@
settings = {
};
};
- F58785C602DE375901EA4122 = {
- fileRef = F587853402DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58785C702DE375901EA4122 = {
fileRef = F587853502DE375901EA4122;
isa = PBXBuildFile;
@@ -8008,7 +7994,6 @@
F58786BB02DE3B8601EA4122,
F57B0EE002EBC78B018635CA,
F58786BC02DE3B8601EA4122,
- F587853402DE375901EA4122,
F58786BD02DE3B8601EA4122,
F587853702DE375901EA4122,
F58786BE02DE3B8601EA4122,
diff --git a/WebCore/kwq/KWQInputDialog.mm b/WebCore/kwq/KWQInputDialog.mm
index 7922196..e2cccd1 100644
--- a/WebCore/kwq/KWQInputDialog.mm
+++ b/WebCore/kwq/KWQInputDialog.mm
@@ -24,10 +24,13 @@
*/
#import <qinputdialog.h>
-#import <KWQLogging.h>
-QString QInputDialog::getText(const QString &, const QString &, QLineEdit::EchoMode, const QString &, bool *)
+#import <WebCoreViewFactory.h>
+
+QString QInputDialog::getText(const QString &, const QString &prompt, QLineEdit::EchoMode, const QString &defaultValue, bool *ok)
{
- FATAL("not implemented");
- return QString();
+ NSString *result;
+ *ok = [[WebCoreViewFactory sharedFactory] runJavaScriptTextInputPanelWithPrompt:prompt.getNSString()
+ defaultText:defaultValue.getNSString() returningText:&result];
+ return *ok ? QString::fromNSString(result) : QString();
}
diff --git a/WebCore/kwq/KWQStyleSheet.h b/WebCore/kwq/KWQStyleSheet.h
index 7b67c12..f0d1f25 100644
--- a/WebCore/kwq/KWQStyleSheet.h
+++ b/WebCore/kwq/KWQStyleSheet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSTYLESHEET_H_
-#define QSTYLESHEET_H_
+#ifndef QSTYLESHEET_H
+#define QSTYLESHEET_H
-class QString;
+#include <qstring.h>
class QStyleSheet
{
public:
- static QString convertFromPlainText(const QString &);
+ static QString convertFromPlainText(const QString &s) { return s; }
};
-#endif /* QSTYLESHEET_H_ */
+#endif /* QSTYLESHEET_H */
diff --git a/WebCore/kwq/KWQStyleSheet.mm b/WebCore/kwq/KWQStyleSheet.mm
deleted file mode 100644
index 812c884..0000000
--- a/WebCore/kwq/KWQStyleSheet.mm
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <qstylesheet.h>
-#import <qstring.h>
-
-QString QStyleSheet::convertFromPlainText(const QString &str)
-{
- return QString(str);
-}
-
diff --git a/WebCore/kwq/WebCoreViewFactory.h b/WebCore/kwq/WebCoreViewFactory.h
index ced6e87..ac555ea 100644
--- a/WebCore/kwq/WebCoreViewFactory.h
+++ b/WebCore/kwq/WebCoreViewFactory.h
@@ -28,26 +28,34 @@
@class NSString;
@class NSView;
- at interface WebCoreViewFactory : NSObject
-{
-}
+ at protocol WebCorePluginInfo <NSObject>
-+ (WebCoreViewFactory *)sharedFactory;
-- init;
+- (NSString *)name;
+- (NSString *)filename;
+- (NSString *)pluginDescription;
+- (NSDictionary *)MIMEToExtensionsDictionary;
+- (NSDictionary *)MIMEToDescriptionDictionary;
+
+ at end
+
+ at protocol WebCoreViewFactory
- (NSView *)viewForPluginWithURL:(NSURL *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSURL *)baseURL;
- (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)URL parameters:(NSDictionary *)parameters;
+- (BOOL)runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText returningText:(NSString **)result;
+
@end
- at protocol WebCorePluginInfo <NSObject>
+ at interface WebCoreViewFactory : NSObject
+{
+}
-- (NSString *)name;
-- (NSString *)filename;
-- (NSString *)pluginDescription;
-- (NSDictionary *)MIMEToExtensionsDictionary;
-- (NSDictionary *)MIMEToDescriptionDictionary;
++ (WebCoreViewFactory *)sharedFactory;
+
+ at end
+ at interface WebCoreViewFactory (SubclassResponsibility) <WebCoreViewFactory>
@end
diff --git a/WebCore/kwq/WebCoreViewFactory.m b/WebCore/kwq/WebCoreViewFactory.m
index a34953a..7c63b95 100644
--- a/WebCore/kwq/WebCoreViewFactory.m
+++ b/WebCore/kwq/WebCoreViewFactory.m
@@ -45,19 +45,4 @@ static WebCoreViewFactory *sharedFactory;
return self;
}
-- (NSView *)viewForPluginWithURL:(NSURL *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSURL *)baseURL;
-{
- return nil;
-}
-
-- (NSArray *)pluginsInfo
-{
- return nil;
-}
-
-- (NSView *)viewForJavaAppletWithFrame:(NSRect)frame baseURL:(NSURL *)baseURL parameters:(NSDictionary *)parameters
-{
- return nil;
-}
-
@end
diff --git a/WebCore/kwq/qt/qstylesheet.h b/WebCore/kwq/qt/qstylesheet.h
index 7b67c12..f0d1f25 100644
--- a/WebCore/kwq/qt/qstylesheet.h
+++ b/WebCore/kwq/qt/qstylesheet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,15 +23,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QSTYLESHEET_H_
-#define QSTYLESHEET_H_
+#ifndef QSTYLESHEET_H
+#define QSTYLESHEET_H
-class QString;
+#include <qstring.h>
class QStyleSheet
{
public:
- static QString convertFromPlainText(const QString &);
+ static QString convertFromPlainText(const QString &s) { return s; }
};
-#endif /* QSTYLESHEET_H_ */
+#endif /* QSTYLESHEET_H */
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ef89cc7..96ae218 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-21 Darin Adler <darin at apple.com>
+
+ * WebCoreSupport.subproj/WebViewFactory.h: Changed to use new protocol scheme so we
+ get an error if we forget to implement something.
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]): Stub.
+
2002-10-21 Richard Williamson <rjw at apple.com>
More incremental tweaks. Will be factoring common
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ef89cc7..96ae218 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-21 Darin Adler <darin at apple.com>
+
+ * WebCoreSupport.subproj/WebViewFactory.h: Changed to use new protocol scheme so we
+ get an error if we forget to implement something.
+ * WebCoreSupport.subproj/WebViewFactory.m:
+ (-[WebViewFactory runJavaScriptTextInputPanelWithPrompt:defaultText:returningText:]): Stub.
+
2002-10-21 Richard Williamson <rjw at apple.com>
More incremental tweaks. Will be factoring common
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.h b/WebKit/WebCoreSupport.subproj/WebViewFactory.h
index b29bcc1..9073bf8 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.h
@@ -8,7 +8,7 @@
#import <WebCore/WebCoreViewFactory.h>
- at interface WebViewFactory : WebCoreViewFactory
+ at interface WebViewFactory : WebCoreViewFactory <WebCoreViewFactory>
{
}
diff --git a/WebKit/WebCoreSupport.subproj/WebViewFactory.m b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
index 7d09751..7ef7208 100644
--- a/WebKit/WebCoreSupport.subproj/WebViewFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebViewFactory.m
@@ -88,4 +88,9 @@
arguments:parameters] autorelease];
}
+- (BOOL)runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString *)defaultText returningText:(NSString **)result
+{
+ return NO;
+}
+
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list