[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
inferno at chromium.org
inferno at chromium.org
Wed Dec 22 13:18:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 95d4b2dfc170dd55fa6ffca87a3c817aff48551c
Author: inferno at chromium.org <inferno at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 10 22:16:07 2010 +0000
2010-09-10 David Holloway <dhollowa at chromium.org>
Reviewed by Adam Barth.
Change WebKit::WebFormElement::wasUserSubmitted to use WebCore::HTMLFormElement::submittedByUserGesture
instead of WebCore::HTMLFormElement::submissionTrigger.
Chromium AutoFill feature semantics changed with respect to what we mean by "user submitted" form. A
more accurate measure of the user manually submitting a form is via user gesture.
https://bugs.webkit.org/show_bug.cgi?id=45128
* src/WebFormElement.cpp:
(WebKit::WebFormElement::wasUserSubmitted):
2010-09-10 David Holloway <dhollowa at chromium.org>
Reviewed by Adam Barth.
Replace WebCore::HTMLFormElement::submissionTrigger with WebCore::HTMLFormElement::submittedByUserGesture.
Chromium AutoFill feature semantics changed with respect to what we mean by "user submitted" form. A
more accurate measure of the user manually submitting a form is via user gesture.
https://bugs.webkit.org/show_bug.cgi?id=45128
No new tests as this is only used by the Chromium WebKit API.
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::HTMLFormElement):
(WebCore::HTMLFormElement::prepareSubmit):
(WebCore::HTMLFormElement::submit):
(WebCore::HTMLFormElement::submittedByUserGesture):
* html/HTMLFormElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 13996f1..b48908c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-10 David Holloway <dhollowa at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Replace WebCore::HTMLFormElement::submissionTrigger with WebCore::HTMLFormElement::submittedByUserGesture.
+ Chromium AutoFill feature semantics changed with respect to what we mean by "user submitted" form. A
+ more accurate measure of the user manually submitting a form is via user gesture.
+ https://bugs.webkit.org/show_bug.cgi?id=45128
+
+ No new tests as this is only used by the Chromium WebKit API.
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::HTMLFormElement):
+ (WebCore::HTMLFormElement::prepareSubmit):
+ (WebCore::HTMLFormElement::submit):
+ (WebCore::HTMLFormElement::submittedByUserGesture):
+ * html/HTMLFormElement.h:
+
2010-09-10 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/html/HTMLFormElement.cpp b/WebCore/html/HTMLFormElement.cpp
index 56ffd0f..db5da66 100644
--- a/WebCore/html/HTMLFormElement.cpp
+++ b/WebCore/html/HTMLFormElement.cpp
@@ -65,7 +65,7 @@ using namespace HTMLNames;
HTMLFormElement::HTMLFormElement(const QualifiedName& tagName, Document* document)
: HTMLElement(tagName, document)
- , m_submissionTrigger(NotSubmittedByJavaScript)
+ , m_wasUserSubmitted(false)
, m_autocomplete(true)
, m_insubmit(false)
, m_doingsubmit(false)
@@ -106,13 +106,13 @@ bool HTMLFormElement::rendererIsNeeded(RenderStyle* style)
{
if (!isDemoted())
return HTMLElement::rendererIsNeeded(style);
-
+
Node* node = parentNode();
RenderObject* parentRenderer = node->renderer();
bool parentIsTableElementPart = (parentRenderer->isTable() && node->hasTagName(tableTag))
|| (parentRenderer->isTableRow() && node->hasTagName(trTag))
|| (parentRenderer->isTableSection() && node->hasTagName(tbodyTag))
- || (parentRenderer->isTableCol() && node->hasTagName(colTag))
+ || (parentRenderer->isTableCol() && node->hasTagName(colTag))
|| (parentRenderer->isTableCell() && node->hasTagName(trTag));
if (!parentIsTableElementPart)
@@ -139,7 +139,7 @@ void HTMLFormElement::removedFromDocument()
{
if (document()->isHTMLDocument())
static_cast<HTMLDocument*>(document())->removeNamedItem(m_name);
-
+
HTMLElement::removedFromDocument();
}
@@ -263,7 +263,7 @@ bool HTMLFormElement::prepareSubmit(Event* event)
m_insubmit = false;
if (m_doingsubmit)
- submit(event, true, false, NotSubmittedByJavaScript);
+ submit(event, true, true, NotSubmittedByJavaScript);
return m_doingsubmit;
}
@@ -271,12 +271,12 @@ bool HTMLFormElement::prepareSubmit(Event* event)
void HTMLFormElement::submit(Frame* javaScriptActiveFrame)
{
if (javaScriptActiveFrame)
- submit(0, false, !javaScriptActiveFrame->script()->anyPageIsProcessingUserGesture(), SubmittedByJavaScript);
+ submit(0, false, javaScriptActiveFrame->script()->anyPageIsProcessingUserGesture(), SubmittedByJavaScript);
else
- submit(0, false, false, NotSubmittedByJavaScript);
+ submit(0, false, true, NotSubmittedByJavaScript);
}
-void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool lockHistory, FormSubmissionTrigger formSubmissionTrigger)
+void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool processingUserGesture, FormSubmissionTrigger formSubmissionTrigger)
{
FrameView* view = document()->view();
Frame* frame = document()->frame();
@@ -289,11 +289,11 @@ void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool lockH
}
m_insubmit = true;
- m_submissionTrigger = formSubmissionTrigger;
+ m_wasUserSubmitted = processingUserGesture;
HTMLFormControlElement* firstSuccessfulSubmitButton = 0;
bool needButtonActivation = activateSubmitButton; // do we need to activate a submit button?
-
+
for (unsigned i = 0; i < m_associatedElements.size(); ++i) {
HTMLFormControlElement* control = m_associatedElements[i];
if (needButtonActivation) {
@@ -307,11 +307,11 @@ void HTMLFormElement::submit(Event* event, bool activateSubmitButton, bool lockH
if (needButtonActivation && firstSuccessfulSubmitButton)
firstSuccessfulSubmitButton->setActivatedSubmit(true);
- frame->loader()->submitForm(FormSubmission::create(this, m_attributes, event, lockHistory, formSubmissionTrigger));
+ frame->loader()->submitForm(FormSubmission::create(this, m_attributes, event, !processingUserGesture, formSubmissionTrigger));
if (needButtonActivation && firstSuccessfulSubmitButton)
firstSuccessfulSubmitButton->setActivatedSubmit(false);
-
+
m_doingsubmit = m_insubmit = false;
}
@@ -355,7 +355,7 @@ void HTMLFormElement::parseMappedAttribute(Attribute* attr)
} else if (attr->name() == autocompleteAttr) {
m_autocomplete = !equalIgnoringCase(attr->value(), "off");
if (!m_autocomplete)
- document()->registerForDocumentActivationCallbacks(this);
+ document()->registerForDocumentActivationCallbacks(this);
else
document()->unregisterForDocumentActivationCallbacks(this);
} else if (attr->name() == onsubmitAttr)
@@ -482,9 +482,9 @@ String HTMLFormElement::target() const
return getAttribute(targetAttr);
}
-FormSubmissionTrigger HTMLFormElement::submissionTrigger() const
+bool HTMLFormElement::wasUserSubmitted() const
{
- return m_submissionTrigger;
+ return m_wasUserSubmitted;
}
HTMLFormControlElement* HTMLFormElement::defaultButton() const
@@ -556,13 +556,13 @@ void HTMLFormElement::getNamedElements(const AtomicString& name, Vector<RefPtr<N
}
// name has been accessed, remember it
if (namedItems.size() && aliasElem != namedItems.first())
- addElementAlias(static_cast<HTMLFormControlElement*>(namedItems.first().get()), name);
+ addElementAlias(static_cast<HTMLFormControlElement*>(namedItems.first().get()), name);
}
void HTMLFormElement::documentDidBecomeActive()
{
ASSERT(!m_autocomplete);
-
+
for (unsigned i = 0; i < m_associatedElements.size(); ++i)
m_associatedElements[i]->reset();
}
diff --git a/WebCore/html/HTMLFormElement.h b/WebCore/html/HTMLFormElement.h
index 151b2e8..b996d9d 100644
--- a/WebCore/html/HTMLFormElement.h
+++ b/WebCore/html/HTMLFormElement.h
@@ -42,7 +42,7 @@ class TextEncoding;
struct CollectionCache;
-class HTMLFormElement : public HTMLElement {
+class HTMLFormElement : public HTMLElement {
public:
static PassRefPtr<HTMLFormElement> create(Document*);
static PassRefPtr<HTMLFormElement> create(const QualifiedName&, Document*);
@@ -98,7 +98,7 @@ public:
virtual String target() const;
- FormSubmissionTrigger submissionTrigger() const;
+ bool wasUserSubmitted() const;
HTMLFormControlElement* defaultButton() const;
@@ -117,7 +117,7 @@ private:
virtual bool rendererIsNeeded(RenderStyle*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
-
+
virtual void handleLocalEvents(Event*);
virtual void parseMappedAttribute(Attribute*);
@@ -129,7 +129,7 @@ private:
virtual void willMoveToNewOwnerDocument();
virtual void didMoveToNewOwnerDocument();
- void submit(Event*, bool activateSubmitButton, bool lockHistory, FormSubmissionTrigger);
+ void submit(Event*, bool activateSubmitButton, bool processingUserGesture, FormSubmissionTrigger);
unsigned formElementIndex(HTMLFormControlElement*);
// Returns true if the submission should be proceeded.
@@ -147,11 +147,11 @@ private:
OwnPtr<CollectionCache> m_collectionCache;
CheckedRadioButtons m_checkedRadioButtons;
-
+
Vector<HTMLFormControlElement*> m_associatedElements;
Vector<HTMLImageElement*> m_imageElements;
- FormSubmissionTrigger m_submissionTrigger;
+ bool m_wasUserSubmitted;
bool m_autocomplete : 1;
bool m_insubmit : 1;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ee87a50..9d53d15 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10 David Holloway <dhollowa at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Change WebKit::WebFormElement::wasUserSubmitted to use WebCore::HTMLFormElement::submittedByUserGesture
+ instead of WebCore::HTMLFormElement::submissionTrigger.
+ Chromium AutoFill feature semantics changed with respect to what we mean by "user submitted" form. A
+ more accurate measure of the user manually submitting a form is via user gesture.
+ https://bugs.webkit.org/show_bug.cgi?id=45128
+
+ * src/WebFormElement.cpp:
+ (WebKit::WebFormElement::wasUserSubmitted):
+
2010-09-09 Darin Adler <darin at apple.com>
Reviewed by Adam Barth.
diff --git a/WebKit/chromium/src/WebFormElement.cpp b/WebKit/chromium/src/WebFormElement.cpp
index 9c77732..7a01053 100644
--- a/WebKit/chromium/src/WebFormElement.cpp
+++ b/WebKit/chromium/src/WebFormElement.cpp
@@ -68,7 +68,7 @@ WebString WebFormElement::method() const
bool WebFormElement::wasUserSubmitted() const
{
- return constUnwrap<HTMLFormElement>()->submissionTrigger() == NotSubmittedByJavaScript;
+ return constUnwrap<HTMLFormElement>()->wasUserSubmitted();
}
void WebFormElement::submit()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list