Changeset 119713 in webkit


Ignore:
Timestamp:
Jun 7, 2012 5:59:54 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Add enable credential autofill and enable form autofill feature control in WebSetting
​https://bugs.webkit.org/show_bug.cgi?id=88513

Patch by Jonathan Dong <Jonathan Dong> on 2012-06-07
Reviewed by Rob Buis.

RIM PR: #163391
Implemented credential autofill setting and form autofill setting.

Internally reviewed by Leo Yang <​leo.yang@torchmobile.com.cn>.

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::autofillTextField):
(BlackBerry::WebKit::WebPagePrivate::authenticationChallenge):
(BlackBerry::WebKit::WebPage::clearCredentials):
(BlackBerry::WebKit::WebPage::clearAutofillData):
(BlackBerry::WebKit::WebPage::clearNeverRememberSites):

  • Api/WebSettings.cpp:

(WebKit):
(BlackBerry::WebKit::WebSettings::standardSettings):
(BlackBerry::WebKit::WebSettings::isCredentialAutofillEnabled):
(BlackBerry::WebKit::WebSettings::setCredentialAutofillEnabled):
(BlackBerry::WebKit::WebSettings::isFormAutofillEnabled):
(BlackBerry::WebKit::WebSettings::setFormAutofillEnabled):

  • Api/WebSettings.h:
  • WebCoreSupport/EditorClientBlackBerry.cpp:

(WebCore::EditorClientBlackBerry::textFieldDidEndEditing):
(WebCore::EditorClientBlackBerry::textDidChangeInTextField):

  • WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoad):
(WebCore::FrameLoaderClientBlackBerry::dispatchWillSubmitForm):
(WebCore::FrameLoaderClientBlackBerry::dispatchWillSendSubmitEvent):

Location:
trunk/Source/WebKit/blackberry
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r119679 r119713  
    314314void WebPage::autofillTextField(const string& item)
    315315{
     316    if (!d->m_webSettings->isFormAutofillEnabled())
     317        return;
     318
    316319    d->m_autofillManager->autofillTextField(item.c_str());
    317320}
    … …  
    21582161
    21592162#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    2160     if (!m_webSettings->isPrivateBrowsingEnabled())
     2163    if (m_webSettings->isCredentialAutofillEnabled() && !m_webSettings->isPrivateBrowsingEnabled())
    21612164        credentialManager().autofillAuthenticationChallenge(protectionSpace, username, password);
    21622165#endif
    … …  
    21662169#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    21672170    Credential credential(username, password, CredentialPersistencePermanent);
    2168     if (!m_webSettings->isPrivateBrowsingEnabled() && isConfirmed)
     2171    if (m_webSettings->isCredentialAutofillEnabled() && !m_webSettings->isPrivateBrowsingEnabled() && isConfirmed)
    21692172        credentialManager().saveCredentialIfConfirmed(this, CredentialTransformData(url, protectionSpace, credential));
    21702173#else
    … …  
    52865289{
    52875290#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    5288     credentialManager().clearCredentials();
     5291    if (d->m_webSettings->isCredentialAutofillEnabled())
     5292        credentialManager().clearCredentials();
    52895293#endif
    52905294}
    … …  
    52925296void WebPage::clearAutofillData()
    52935297{
    5294     AutofillManager::clear();
     5298    if (d->m_webSettings->isFormAutofillEnabled())
     5299        AutofillManager::clear();
    52955300}
    52965301
    … …  
    52985303{
    52995304#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    5300     credentialManager().clearNeverRememberSites();
     5305    if (d->m_webSettings->isCredentialAutofillEnabled())
     5306        credentialManager().clearNeverRememberSites();
    53015307#endif
    53025308}

  • trunk/Source/WebKit/blackberry/Api/WebSettings.cpp

    r119566 r119713  
    5656DEFINE_STATIC_LOCAL(String, BlackBerryZoomToFitOnLoadEnabled, ("BlackBerryZoomToFitOnLoadEnabled"));
    5757DEFINE_STATIC_LOCAL(String, BlackBerryFullScreenVideoCapable, ("BlackBerryFullScreenVideoCapable"));
     58DEFINE_STATIC_LOCAL(String, BlackBerryCredentialAutofillEnabled, ("BlackBerryCredentialAutofillEnabled"));
     59DEFINE_STATIC_LOCAL(String, BlackBerryFormAutofillEnabled, ("BlackBerryFormAutofillEnabled"));
    5860DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, ("SpatialNavigationEnabled"));
    5961DEFINE_STATIC_LOCAL(String, WebKitDatabasePath, ("WebKitDatabasePath"));
    … …  
    166168    settings->m_private->setBoolean(BlackBerryZoomToFitOnLoadEnabled, true);
    167169    settings->m_private->setBoolean(BlackBerryFullScreenVideoCapable, false);
     170    settings->m_private->setBoolean(BlackBerryCredentialAutofillEnabled, false);
     171    settings->m_private->setBoolean(BlackBerryFormAutofillEnabled, false);
    168172
    169173    settings->m_private->setInteger(WebKitDefaultFontSize, 16);
    … …  
    773777}
    774778
     779bool WebSettings::isCredentialAutofillEnabled() const
     780{
     781    return m_private->getBoolean(BlackBerryCredentialAutofillEnabled);
     782}
     783
     784void WebSettings::setCredentialAutofillEnabled(bool enable)
     785{
     786    return m_private->setBoolean(BlackBerryCredentialAutofillEnabled, enable);
     787}
     788
     789bool WebSettings::isFormAutofillEnabled() const
     790{
     791    return m_private->getBoolean(BlackBerryFormAutofillEnabled);
     792}
     793
     794void WebSettings::setFormAutofillEnabled(bool enable)
     795{
     796    return m_private->setBoolean(BlackBerryFormAutofillEnabled, enable);
     797}
     798
    775799} // namespace WebKit
    776800} // namespace BlackBerry

  • trunk/Source/WebKit/blackberry/Api/WebSettings.h

    r119566 r119713  
    227227    void setFullScreenVideoCapable(bool);
    228228
     229    bool isCredentialAutofillEnabled() const;
     230    void setCredentialAutofillEnabled(bool);
     231
     232    bool isFormAutofillEnabled() const;
     233    void setFormAutofillEnabled(bool);
     234
    229235private:
    230236    WebSettingsPrivate* m_private;

  • trunk/Source/WebKit/blackberry/ChangeLog

    r119681 r119713  
     12012-06-07  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
     2
     3        [BlackBerry] Add enable credential autofill and enable form autofill feature control in WebSetting
     4        https://bugs.webkit.org/show_bug.cgi?id=88513
     5
     6        Reviewed by Rob Buis.
     7
     8        RIM PR: #163391
     9        Implemented credential autofill setting and form autofill setting.
     10
     11        Internally reviewed by Leo Yang <leo.yang@torchmobile.com.cn>.
     12
     13        * Api/WebPage.cpp:
     14        (BlackBerry::WebKit::WebPage::autofillTextField):
     15        (BlackBerry::WebKit::WebPagePrivate::authenticationChallenge):
     16        (BlackBerry::WebKit::WebPage::clearCredentials):
     17        (BlackBerry::WebKit::WebPage::clearAutofillData):
     18        (BlackBerry::WebKit::WebPage::clearNeverRememberSites):
     19        * Api/WebSettings.cpp:
     20        (WebKit):
     21        (BlackBerry::WebKit::WebSettings::standardSettings):
     22        (BlackBerry::WebKit::WebSettings::isCredentialAutofillEnabled):
     23        (BlackBerry::WebKit::WebSettings::setCredentialAutofillEnabled):
     24        (BlackBerry::WebKit::WebSettings::isFormAutofillEnabled):
     25        (BlackBerry::WebKit::WebSettings::setFormAutofillEnabled):
     26        * Api/WebSettings.h:
     27        * WebCoreSupport/EditorClientBlackBerry.cpp:
     28        (WebCore::EditorClientBlackBerry::textFieldDidEndEditing):
     29        (WebCore::EditorClientBlackBerry::textDidChangeInTextField):
     30        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
     31        (WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoad):
     32        (WebCore::FrameLoaderClientBlackBerry::dispatchWillSubmitForm):
     33        (WebCore::FrameLoaderClientBlackBerry::dispatchWillSendSubmitEvent):
     34
    1352012-06-06  Antonio Gomes  <agomes@rim.com>
    236

  • trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp

    r119239 r119713  
    510510void EditorClientBlackBerry::textFieldDidEndEditing(Element* element)
    511511{
    512     if (HTMLInputElement* inputElement = element->toInputElement())
    513         m_webPagePrivate->m_autofillManager->textFieldDidEndEditing(inputElement);
     512    if (m_webPagePrivate->m_webSettings->isFormAutofillEnabled()) {
     513        if (HTMLInputElement* inputElement = element->toInputElement())
     514            m_webPagePrivate->m_autofillManager->textFieldDidEndEditing(inputElement);
     515    }
    514516}
    515517
    516518void EditorClientBlackBerry::textDidChangeInTextField(Element* element)
    517519{
    518     if (HTMLInputElement* inputElement = element->toInputElement())
    519         m_webPagePrivate->m_autofillManager->didChangeInTextField(inputElement);
     520    if (m_webPagePrivate->m_webSettings->isFormAutofillEnabled()) {
     521        if (HTMLInputElement* inputElement = element->toInputElement())
     522            m_webPagePrivate->m_autofillManager->didChangeInTextField(inputElement);
     523    }
    520524}
    521525

  • trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

    r118109 r119713  
    609609
    610610#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    611     if (!m_webPagePrivate->m_webSettings->isPrivateBrowsingEnabled())
     611    if (m_webPagePrivate->m_webSettings->isCredentialAutofillEnabled()
     612        && !m_webPagePrivate->m_webSettings->isPrivateBrowsingEnabled())
    612613        credentialManager().autofillPasswordForms(m_frame->document()->forms());
    613614#endif
    … …  
    707708{
    708709    if (!m_webPagePrivate->m_webSettings->isPrivateBrowsingEnabled()) {
    709         m_webPagePrivate->m_autofillManager->saveTextFields(formState->form());
     710        if (m_webPagePrivate->m_webSettings->isFormAutofillEnabled())
     711            m_webPagePrivate->m_autofillManager->saveTextFields(formState->form());
    710712#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    711         credentialManager().saveCredentialIfConfirmed(m_webPagePrivate, CredentialTransformData(formState->form()));
     713        if (m_webPagePrivate->m_webSettings->isCredentialAutofillEnabled())
     714            credentialManager().saveCredentialIfConfirmed(m_webPagePrivate, CredentialTransformData(formState->form()));
    712715#endif
    713716    }
    … …  
    720723{
    721724    if (!m_webPagePrivate->m_webSettings->isPrivateBrowsingEnabled()) {
    722         m_webPagePrivate->m_autofillManager->saveTextFields(prpFormState->form());
     725        if (m_webPagePrivate->m_webSettings->isFormAutofillEnabled())
     726            m_webPagePrivate->m_autofillManager->saveTextFields(prpFormState->form());
    723727#if ENABLE(BLACKBERRY_CREDENTIAL_PERSIST)
    724     credentialManager().saveCredentialIfConfirmed(m_webPagePrivate, CredentialTransformData(prpFormState->form()));
     728        if (m_webPagePrivate->m_webSettings->isCredentialAutofillEnabled())
     729            credentialManager().saveCredentialIfConfirmed(m_webPagePrivate, CredentialTransformData(prpFormState->form()));
    725730#endif
    726731    }
Note: See TracChangeset for help on using the changeset viewer.