[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_window.cpp
Vicki
vicki at opensource.apple.com
Mon Jun 13 17:29:41 PDT 2005
vicki 05/06/13 17:29:40
Modified: . ChangeLog
khtml/ecma kjs_window.cpp
Log:
Reviewed by Darin.
No test cases added since the steps to reproduce require use of showModalDialog.
- fix for <rdar://problem/4145910> parameters not working in showModalDialog
test page (dialogWidth, dialogHeight, etc.)
* khtml/ecma/kjs_window.cpp:
(KJS::parseFeatures): add a check for colon character in the feature string
Revision Changes Path
1.4264 +12 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4263
retrieving revision 1.4264
diff -u -r1.4263 -r1.4264
--- ChangeLog 14 Jun 2005 00:23:41 -0000 1.4263
+++ ChangeLog 14 Jun 2005 00:29:35 -0000 1.4264
@@ -1,3 +1,15 @@
+2005-06-13 Vicki Murley <vicki at apple.com>
+
+ Reviewed by Darin.
+
+ No test cases added since the steps to reproduce require use of showModalDialog.
+
+ - fix for <rdar://problem/4145910> parameters not working in showModalDialog
+ test page (dialogWidth, dialogHeight, etc.)
+
+ * khtml/ecma/kjs_window.cpp:
+ (KJS::parseFeatures): add a check for colon character in the feature string
+
2005-06-13 Maciej Stachowiak <mjs at apple.com>
Reviewed by Chris Blumenberg and Adele.
1.159 +5 -0 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kjs_window.cpp 8 Jun 2005 08:39:20 -0000 1.158
+++ kjs_window.cpp 14 Jun 2005 00:29:40 -0000 1.159
@@ -520,6 +520,11 @@
for (QStringList::ConstIterator it = features.begin(); it != end; ++it) {
QString s = *it;
int pos = s.find('=');
+ int colonPos = s.find(':');
+ if (pos >= 0 && colonPos >= 0)
+ continue; // ignore any strings that have both = and :
+ if (pos < 0)
+ pos = colonPos;
if (pos < 0) {
// null string for value means key without value
map.insert(s.stripWhiteSpace().lower(), QString());
More information about the webkit-changes
mailing list