[webkit-changes] cvs commit: WebCore/kwq KWQSlot.mm
Alexey
ap at opensource.apple.com
Sat Dec 24 02:02:23 PST 2005
ap 05/12/24 02:02:23
Modified: . ChangeLog
khtml/rendering render_form.cpp render_form.h
kwq KWQSlot.mm
Log:
Reviewed by Maciej.
- fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6221
REGRESSION: Password field is blank error for secure websites using
password field (ToT, 12/24/05)
* khtml/kwq/KWQSlot.mm:
(KWQSlot::KWQSlot): Changed the parameter type of slotTextChanged to const DOMString &
* khtml/rendering/render_form.h:
* khtml/rendering/render_form.cpp:
(RenderLineEdit::RenderLineEdit): ditto.
(RenderLineEdit::slotTextChanged): ditto.
(RenderFileButton::RenderFileButton): ditto.
(RenderFileButton::slotTextChanged): ditto.
Revision Changes Path
1.37 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 23 Dec 2005 23:04:06 -0000 1.36
+++ ChangeLog 24 Dec 2005 10:02:21 -0000 1.37
@@ -1,3 +1,20 @@
+2005-12-24 Mitz Pettel <opendarwin.org at mitzpettel.com>
+
+ Reviewed by Maciej.
+
+ - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6221
+ REGRESSION: Password field is blank error for secure websites using
+ password field (ToT, 12/24/05)
+
+ * khtml/kwq/KWQSlot.mm:
+ (KWQSlot::KWQSlot): Changed the parameter type of slotTextChanged to const DOMString &
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_form.cpp:
+ (RenderLineEdit::RenderLineEdit): ditto.
+ (RenderLineEdit::slotTextChanged): ditto.
+ (RenderFileButton::RenderFileButton): ditto.
+ (RenderFileButton::slotTextChanged): ditto.
+
2005-12-22 Geoffrey Garen <ggaren at apple.com>
Reviewed by vicki (yay!), eric.
1.137 +6 -6 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- render_form.cpp 23 Dec 2005 18:44:23 -0000 1.136
+++ render_form.cpp 24 Dec 2005 10:02:22 -0000 1.137
@@ -202,7 +202,7 @@
edit->setLiveSearch(false);
connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
connect(edit, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()));
- connect(edit,SIGNAL(textChanged(const QString &)),this,SLOT(slotTextChanged(const QString &)));
+ connect(edit,SIGNAL(textChanged(const QString &)),this,SLOT(slotTextChanged(const DOMString &)));
connect(edit,SIGNAL(clicked()),this,SLOT(slotClicked()));
connect(edit,SIGNAL(performSearch()), this, SLOT(slotPerformSearch()));
@@ -324,7 +324,7 @@
RenderFormElement::updateFromElement();
}
-void RenderLineEdit::slotTextChanged(const QString &string)
+void RenderLineEdit::slotTextChanged(const DOMString &string)
{
if (m_updating) // Don't alter the value if we are in the middle of initing the control, since
return; // we are getting the value from the DOM and it's not user input.
@@ -332,7 +332,7 @@
// A null string value is used to indicate that the form control has not altered the original
// default value. That means that we should never use the null string value when the user
// empties a textfield, but should always force an empty textfield to use the empty string.
- QString newText = string.isNull() ? "" : string;
+ QString newText = string.isNull() ? "" : string.qstring();
newText.replace(backslashAsCurrencySymbol(), QChar('\\'));
element()->setValueFromRenderer(newText);
}
@@ -532,7 +532,7 @@
: RenderFormElement(element)
{
KWQFileButton *w = new KWQFileButton(view()->part());
- connect(w, SIGNAL(textChanged(const QString &)),this,SLOT(slotTextChanged(const QString &)));
+ connect(w, SIGNAL(textChanged(const QString &)),this,SLOT(slotTextChanged(const DOMString &)));
connect(w, SIGNAL(clicked()), this, SLOT(slotClicked()));
setQWidget(w);
}
@@ -570,9 +570,9 @@
element()->form()->prepareSubmit();
}
-void RenderFileButton::slotTextChanged(const QString &string)
+void RenderFileButton::slotTextChanged(const DOMString &string)
{
- element()->m_value = DOMString(string);
+ element()->m_value = string;
element()->onChange();
}
1.61 +2 -2 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- render_form.h 23 Dec 2005 18:44:23 -0000 1.60
+++ render_form.h 24 Dec 2005 10:02:22 -0000 1.61
@@ -150,7 +150,7 @@
public slots:
void slotReturnPressed();
- void slotTextChanged(const QString &string);
+ void slotTextChanged(const DOM::DOMString &string);
void slotSelectionChanged();
void slotPerformSearch();
public:
@@ -219,7 +219,7 @@
public slots:
virtual void slotClicked();
virtual void slotReturnPressed();
- virtual void slotTextChanged(const QString &string);
+ virtual void slotTextChanged(const DOM::DOMString &string);
protected:
virtual bool isEditable() const { return true; }
1.38 +1 -1 WebCore/kwq/KWQSlot.mm
Index: KWQSlot.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQSlot.mm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- KWQSlot.mm 23 Dec 2005 18:44:38 -0000 1.37
+++ KWQSlot.mm 24 Dec 2005 10:02:23 -0000 1.38
@@ -134,7 +134,7 @@
m_function = slotParentDestroyed;
} else if (KWQNamesMatch(member, SLOT(submitFormAgain()))) {
m_function = slotSubmitFormAgain;
- } else if (KWQNamesMatch(member, SLOT(slotTextChanged(const QString &)))) {
+ } else if (KWQNamesMatch(member, SLOT(slotTextChanged(const DOMString &)))) {
m_function = slotTextChangedWithString;
} else if (KWQNamesMatch(member, SLOT(slotData(KIO::Job *, const char *, int)))) {
if (object->isKHTMLLoader()) {
More information about the webkit-changes
mailing list