Changeset 19282 for S60/trunk/WebCore

Timestamp:

01/30/07 19:03:03 (2 years ago)

Author:

brmorris

Message:

yaharon, reviewed by zalan.

DESC: BrowserNG: Redundant password manager notification on secure pages (MLIO-6XXEVU)
http://bugs.webkit.org/show_bug.cgi?id=12484

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/WebCoreFormDataElement.h (modified) (1 diff)
• khtml/html/html_formimpl.cpp (modified) (21 diffs)
• kwq/KWQKHTMLPart.cpp (modified) (2 diffs)
• kwq/KWQKHTMLPart.h (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yaharon, reviewed by zalan.
+        DESC: BrowserNG: Redundant password manager notification on secure pages (MLIO-6XXEVU)
+        http://bugs.webkit.org/show_bug.cgi?id=12484
+        
+
 2007-01-29  bujtas  <zbujtas@gmail.com>
 

S60/trunk/WebCore/bridge/WebCoreFormDataElement.h

@@ -66 +66 @@
   HBufC* iValue;
   TBool isPassword;
+  TBool isAutoComplete;
 
 };

S60/trunk/WebCore/khtml/html/html_formimpl.cpp

@@ -154 +154 @@
 
     if (getDocument()->isHTMLDocument()) {
-        HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
-        document->addNamedImageOrForm(oldNameAttr);
-        document->addNamedImageOrForm(oldIdAttr);
+    HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
+    document->addNamedImageOrForm(oldNameAttr);
+    document->addNamedImageOrForm(oldIdAttr);
     }
 
@@ -170 +170 @@
 {
     if (getDocument()->isHTMLDocument()) {
-        HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
-        document->removeNamedImageOrForm(oldNameAttr);
-        document->removeNamedImageOrForm(oldIdAttr);
+    HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
+    document->removeNamedImageOrForm(oldNameAttr);
+    document->removeNamedImageOrForm(oldIdAttr);
     }
 
@@ -182 +182 @@
     int len = 0;
     for (unsigned i = 0; i < formElements.count(); ++i)
-        if (formElements[i]->isEnumeratable())
-            ++len;
+    if (formElements[i]->isEnumeratable())
+        ++len;
 
     return len;
@@ -539 +539 @@
 
     HTMLGenericFormElementImpl* firstSuccessfulSubmitButton = 0;
-    bool needButtonActivation = activateSubmitButton;   // do we need to activate a submit button?
+    bool needButtonActivation = activateSubmitButton;   // do we need to activate a submit button?
 
 #if APPLE_CHANGES
@@ -557 +557 @@
                 KWQ(part)->recordFormValue(input->name().string(), input->value().string(),
 #ifdef NOKIA_CHANGES
-                (input->inputType() ==  HTMLInputElementImpl::PASSWORD));
+                (input->inputType() ==  HTMLInputElementImpl::PASSWORD), input->autoComplete());
 #else
                 this);
@@ -679 +679 @@
     case ATTR_ONSUBMIT:
         setHTMLEventListener(EventImpl::SUBMIT_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     case ATTR_ONRESET:
         setHTMLEventListener(EventImpl::RESET_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     case ATTR_NAME:
-        {
-            QString newNameAttr = attr->value().string();
-            if (attached() && getDocument()->isHTMLDocument()) {
-                HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
-                document->removeNamedImageOrForm(oldNameAttr);
-                document->addNamedImageOrForm(newNameAttr);
-            }
-            oldNameAttr = newNameAttr;
-        }
-        break;
+    {
+        QString newNameAttr = attr->value().string();
+        if (attached() && getDocument()->isHTMLDocument()) {
+        HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
+        document->removeNamedImageOrForm(oldNameAttr);
+        document->addNamedImageOrForm(newNameAttr);
+        }
+        oldNameAttr = newNameAttr;
+    }
+    break;
     case ATTR_ID:
-        {
-            QString newIdAttr = attr->value().string();
-            if (attached() && getDocument()->isHTMLDocument()) {
-                HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
-                document->removeNamedImageOrForm(oldIdAttr);
-                document->addNamedImageOrForm(newIdAttr);
-            }
-            oldIdAttr = newIdAttr;
-        }
-        // fall through
+    {
+        QString newIdAttr = attr->value().string();
+        if (attached() && getDocument()->isHTMLDocument()) {
+        HTMLDocumentImpl *document = static_cast<HTMLDocumentImpl *>(getDocument());
+        document->removeNamedImageOrForm(oldIdAttr);
+        document->addNamedImageOrForm(newIdAttr);
+        }
+        oldIdAttr = newIdAttr;
+    }
+    // fall through
     default:
         HTMLElementImpl::parseHTMLAttribute(attr);
@@ -792 +792 @@
 
     if (f)
-        m_form = f;
+    m_form = f;
     else
-        m_form = getForm();
+    m_form = getForm();
     if (m_form)
         m_form->registerFormElement(this);
@@ -839 +839 @@
     // be removed from that form's element list.
     if (!m_form) {
-        m_form = getForm();
-        if (m_form)
-            m_form->registerFormElement(this);
+    m_form = getForm();
+    if (m_form)
+        m_form->registerFormElement(this);
     }
 
@@ -967 +967 @@
                 (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() & QWidget::TabFocus);
         }
-        if (getDocument()->part())
-            return getDocument()->part()->tabsToAllControls();
+    if (getDocument()->part())
+        return getDocument()->part()->tabsToAllControls();
     }
     return false;
@@ -1005 +1005 @@
 
 #if APPLE_CHANGES
-        // We don't want this default key event handling, we'll count on
-        // Cocoa event dispatch if the event doesn't get blocked.
+    // We don't want this default key event handling, we'll count on
+    // Cocoa event dispatch if the event doesn't get blocked.
 #else
-        if (evt->id()==EventImpl::KEYDOWN_EVENT ||
-            evt->id()==EventImpl::KEYUP_EVENT)
-        {
-            KeyboardEventImpl * k = static_cast<KeyboardEventImpl *>(evt);
-            if (k->keyVal() == QChar('\n').unicode() && m_render && m_render->isWidget() && k->qKeyEvent)
-                QApplication::sendEvent(static_cast<RenderWidget *>(m_render)->widget(), k->qKeyEvent);
-        }
-#endif
-
-        if (evt->id()==EventImpl::DOMFOCUSOUT_EVENT && isEditable() && part && m_render && m_render->isWidget()) {
-            KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(part->browserExtension());
-            QWidget *widget = static_cast<RenderWidget*>(m_render)->widget();
-            if (ext)
-                ext->editableWidgetBlurred(widget);
-
-            // ### Don't count popup as a valid reason for losing the focus (example: opening the options of a select
-            // combobox shouldn't emit onblur)
-        }
+    if (evt->id()==EventImpl::KEYDOWN_EVENT ||
+        evt->id()==EventImpl::KEYUP_EVENT)
+    {
+        KeyboardEventImpl * k = static_cast<KeyboardEventImpl *>(evt);
+        if (k->keyVal() == QChar('\n').unicode() && m_render && m_render->isWidget() && k->qKeyEvent)
+        QApplication::sendEvent(static_cast<RenderWidget *>(m_render)->widget(), k->qKeyEvent);
+    }
+#endif
+
+    if (evt->id()==EventImpl::DOMFOCUSOUT_EVENT && isEditable() && part && m_render && m_render->isWidget()) {
+        KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(part->browserExtension());
+        QWidget *widget = static_cast<RenderWidget*>(m_render)->widget();
+        if (ext)
+        ext->editableWidgetBlurred(widget);
+
+        // ### Don't count popup as a valid reason for losing the focus (example: opening the options of a select
+        // combobox shouldn't emit onblur)
+    }
     }
     HTMLElementImpl::defaultEventHandler(evt);
@@ -1130 +1130 @@
 {
     if(getDocument()->focusNode() == this)
-        getDocument()->setFocusNode(0);
+    getDocument()->setFocusNode(0);
 }
 
@@ -1386 +1386 @@
 QString HTMLInputElementImpl::state( )
 {
-    assert(m_type != PASSWORD);         // should never save/restore password fields
+    assert(m_type != PASSWORD);     // should never save/restore password fields
 
     QString state = HTMLGenericFormElementImpl::state();
@@ -1400 +1400 @@
 void HTMLInputElementImpl::restoreState(QStringList &states)
 {
-    assert(m_type != PASSWORD);         // should never save/restore password fields
+    assert(m_type != PASSWORD);     // should never save/restore password fields
 
     QString state = HTMLGenericFormElementImpl::findMatchingState(states);
@@ -2177 +2177 @@
 {
     if(getDocument()->focusNode() == this)
-        getDocument()->setFocusNode(0);
+    getDocument()->setFocusNode(0);
 }
 
@@ -2204 +2204 @@
             yPos = me->clientY() - offsetY;
         }
-                me->setDefaultHandled();
+        me->setDefaultHandled();
     }
 
@@ -2520 +2520 @@
 {
     if(getDocument()->focusNode() == this)
-        getDocument()->setFocusNode(0);
+    getDocument()->setFocusNode(0);
 }
 
@@ -2772 +2772 @@
             // ### what if optgroup contains just comments? don't want one of no options in it...
 #if NOKIA_CHANGES 
-                        // OOM handling
+            // OOM handling
             if( !m_listItems.resize(m_listItems.size()+1) )
-                        {
-                                m_listItems.resize( 1 );        // avoid no options in a select element
-                                m_recalcListItems = false;
-
-                                return;
-                        }
+            {
+                m_listItems.resize( 1 );    // avoid no options in a select element
+                m_recalcListItems = false;
+
+                return;
+            }
 #endif
             m_listItems[m_listItems.size()-1] = static_cast<HTMLElementImpl*>(current);
@@ -2786 +2786 @@
         if (current->id() == ID_OPTION) {
 #if NOKIA_CHANGES 
-                        // OOM handling
+            // OOM handling
             if( !m_listItems.resize(m_listItems.size()+1) )
-                        {
-                                m_listItems.resize( 1 );        // avoid no options in a select element
-                                m_recalcListItems = false;
-
-                                return;
-                        }
+            {
+                m_listItems.resize( 1 );    // avoid no options in a select element
+                m_recalcListItems = false;
+
+                return;
+            }
 #endif
             m_listItems[m_listItems.size()-1] = static_cast<HTMLElementImpl*>(current);
@@ -3288 +3288 @@
     case ATTR_ONFOCUS:
         setHTMLEventListener(EventImpl::FOCUS_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     case ATTR_ONBLUR:
         setHTMLEventListener(EventImpl::BLUR_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     case ATTR_ONSELECT:
         setHTMLEventListener(EventImpl::SELECT_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     case ATTR_ONCHANGE:
         setHTMLEventListener(EventImpl::CHANGE_EVENT,
-            getDocument()->createHTMLEventListener(attr->value().string(), this));
+        getDocument()->createHTMLEventListener(attr->value().string(), this));
         break;
     default:
@@ -3397 +3397 @@
 {
     if(getDocument()->focusNode() == this)
-        getDocument()->setFocusNode(0);
+    getDocument()->setFocusNode(0);
 }
 
@@ -3459 +3459 @@
     {
     case ATTR_PROMPT:
-        setValue(attr->value());
+    setValue(attr->value());
     default:
         // don't call HTMLInputElement::parseHTMLAttribute here, as it would

S60/trunk/WebCore/kwq/KWQKHTMLPart.cpp

@@ -719 +719 @@
 
 //void KWQKHTMLPart::recordFormValue(const QString &name, const QString &value, HTMLFormElementImpl *element)
-void KWQKHTMLPart::recordFormValue(const QString &name, const QString &value, TBool isPassword)
-{
-    TRAP_IGNORE(recordFormValueL(name, value, isPassword));
-}
-
-void KWQKHTMLPart::recordFormValueL(const QString &name, const QString &value, TBool isPassword)
+void KWQKHTMLPart::recordFormValue(const QString &name, const QString &value, TBool isPassword, TBool isAutoComplete)
+{
+    TRAP_IGNORE(recordFormValueL(name, value, isPassword, isAutoComplete));
+}
+
+void KWQKHTMLPart::recordFormValueL(const QString &name, const QString &value, TBool isPassword, TBool isAutoComplete)
   {
   if (!_formValuesAboutToBeSubmitted) {
@@ -732 +732 @@
     CWebCoreFormDataElement* fDataElem = new (ELeave) CWebCoreFormDataElement();
     fDataElem->isPassword = isPassword;
+    fDataElem->isAutoComplete = isAutoComplete;
     // copy name and value since they get deleted before being saved
     fDataElem->iKey = name.Des().AllocLC();

S60/trunk/WebCore/kwq/KWQKHTMLPart.h

@@ -261 +261 @@
     void clearRecordedFormValues();
     //void recordFormValue(const QString &name, const QString &value, DOM::HTMLFormElementImpl *element);
-    void recordFormValue(const QString &name, const QString &value,TBool isPassword);
+    void recordFormValue(const QString &name, const QString &value,TBool isPassword, TBool isAutoComplete);
     DOM::HTMLFormElementImpl *currentForm() const;
 
@@ -368 +368 @@
     int calculateZoomFactor() const;
   // Leaving version of void recordFormValue(const QString &name, const QString &value,TBool isPassword);
-    void recordFormValueL(const QString &name, const QString &value,TBool isPassword);
+    void recordFormValueL(const QString &name, const QString &value,TBool isPassword, TBool isAutoComplete);
 
     virtual void khtmlMousePressEvent(khtml::MousePressEvent *);