[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:11:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit cc15cd3f501080645a64014be84bb38747cc9317
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 11 21:58:52 2003 +0000
Reviewed by Maciej
Fix for this bug:
<rdar://problem/3480173>: Too many names for programmatic click functions
Changed all instances of performClick() and simulateClick() to click().
Changed all instances of performSubmitClick() to submitClick().
Additionally, KWQButton had a simulateClick method, which was redundant
given that its superclass has a performClick: method.
* khtml/html/html_formimpl.cpp:
(HTMLFormElementImpl::submitClick):
(HTMLInputElementImpl::defaultEventHandler):
(HTMLSelectElementImpl::defaultEventHandler):
* khtml/html/html_formimpl.h:
* khtml/html/html_inlineimpl.cpp:
(HTMLAnchorElementImpl::defaultEventHandler):
(HTMLAnchorElementImpl::click):
* khtml/html/html_inlineimpl.h:
* khtml/rendering/render_form.cpp:
(RenderLineEdit::slotReturnPressed):
* kwq/KWQButton.h:
* kwq/KWQButton.mm:
(QButton::click):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5457 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 923c17f..e8f9cba 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,32 @@
+2003-11-11 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Maciej
+
+ Fix for this bug:
+
+ <rdar://problem/3480173>: Too many names for programmatic click functions
+
+ Changed all instances of performClick() and simulateClick() to click().
+ Changed all instances of performSubmitClick() to submitClick().
+
+ Additionally, KWQButton had a simulateClick method, which was redundant
+ given that its superclass has a performClick: method.
+
+ * khtml/html/html_formimpl.cpp:
+ (HTMLFormElementImpl::submitClick):
+ (HTMLInputElementImpl::defaultEventHandler):
+ (HTMLSelectElementImpl::defaultEventHandler):
+ * khtml/html/html_formimpl.h:
+ * khtml/html/html_inlineimpl.cpp:
+ (HTMLAnchorElementImpl::defaultEventHandler):
+ (HTMLAnchorElementImpl::click):
+ * khtml/html/html_inlineimpl.h:
+ * khtml/rendering/render_form.cpp:
+ (RenderLineEdit::slotReturnPressed):
+ * kwq/KWQButton.h:
+ * kwq/KWQButton.mm:
+ (QButton::click):
+
2003-11-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by John.
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 1d31e10..eda5071 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -143,7 +143,7 @@ long HTMLFormElementImpl::length() const
}
#if APPLE_CHANGES
-void HTMLFormElementImpl::performSubmitClick()
+void HTMLFormElementImpl::submitClick()
{
bool submitFound = false;
QPtrListIterator<HTMLGenericFormElementImpl> it(formElements);
@@ -162,7 +162,7 @@ void HTMLFormElementImpl::performSubmitClick()
element->dispatchMouseEvent(&e2, EventImpl::KHTML_CLICK_EVENT);
}
else {
- static_cast<QButton *>(static_cast<RenderWidget *>(element->renderer())->widget())->simulateClick();
+ static_cast<QButton *>(static_cast<RenderWidget *>(element->renderer())->widget())->click();
}
break;
}
@@ -1729,7 +1729,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
case SUBMIT:
// simulate mouse click for spacebar, return, and enter
if (key == "U+000020" || key == "U+00000d" || key == "Enter") {
- m_form->performSubmitClick();
+ m_form->submitClick();
evt->setDefaultHandled();
}
break;
@@ -1738,7 +1738,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
// for return or enter, find the first successful image or submit element
// send it a simulated mouse click
if (key == "U+00000d" || key == "Enter") {
- m_form->performSubmitClick();
+ m_form->submitClick();
evt->setDefaultHandled();
}
break;
@@ -1751,7 +1751,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
QWidget *widget = static_cast<RenderWidget *>(m_render)->widget();
bool hasMarkedText = widget ? static_cast<QLineEdit *>(widget)->hasMarkedText() : false;
if (!hasMarkedText && (key == "U+00000d" || key == "Enter")) {
- m_form->performSubmitClick();
+ m_form->submitClick();
evt->setDefaultHandled();
}
break;
@@ -2271,7 +2271,7 @@ void HTMLSelectElementImpl::defaultEventHandler(EventImpl *evt)
DOMString key = static_cast<KeyboardEventImpl *>(evt)->keyIdentifier();
if (key == "U+00000d" || key == "Enter") {
- m_form->performSubmitClick();
+ m_form->submitClick();
evt->setDefaultHandled();
}
}
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 1b386cb..77d4ee1 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -98,7 +98,7 @@ public:
virtual bool isMalformed() { return m_malformed; }
#if APPLE_CHANGES
- void performSubmitClick();
+ void submitClick();
#endif
static void i18nData();
diff --git a/WebCore/khtml/html/html_inlineimpl.cpp b/WebCore/khtml/html/html_inlineimpl.cpp
index 49d4d60..5ee195c 100644
--- a/WebCore/khtml/html/html_inlineimpl.cpp
+++ b/WebCore/khtml/html/html_inlineimpl.cpp
@@ -96,7 +96,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
if (k->qKeyEvent()) {
k->qKeyEvent()->accept();
evt->setDefaultHandled();
- performClick();
+ click();
return;
}
}
@@ -189,7 +189,7 @@ void HTMLAnchorElementImpl::parseAttribute(AttributeImpl *attr)
}
}
-void HTMLAnchorElementImpl::performClick()
+void HTMLAnchorElementImpl::click()
{
int x = 0;
int y = 0;
diff --git a/WebCore/khtml/html/html_inlineimpl.h b/WebCore/khtml/html/html_inlineimpl.h
index 447246a..74003d1 100644
--- a/WebCore/khtml/html/html_inlineimpl.h
+++ b/WebCore/khtml/html/html_inlineimpl.h
@@ -43,7 +43,7 @@ public:
virtual Id id() const;
virtual void parseAttribute(AttributeImpl *attr);
virtual void defaultEventHandler(EventImpl *evt);
- void performClick();
+ void click();
protected:
bool m_hasTarget : 1;
};
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index db80bff..581f33e 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -535,7 +535,7 @@ void RenderLineEdit::slotReturnPressed()
HTMLFormElementImpl* fe = element()->form();
if ( fe )
- fe->performSubmitClick();
+ fe->submitClick();
}
void RenderLineEdit::handleFocusOut()
diff --git a/WebCore/kwq/KWQButton.h b/WebCore/kwq/KWQButton.h
index 5e334eb..0a596d0 100644
--- a/WebCore/kwq/KWQButton.h
+++ b/WebCore/kwq/KWQButton.h
@@ -41,7 +41,7 @@ public:
void setWritingDirection(QPainter::TextDirection);
virtual void clicked();
- virtual void simulateClick();
+ virtual void click();
// QWidget overrides
virtual void setFont(const QFont &);
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index 1c33c06..52da923 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -47,7 +47,6 @@
- (id)initWithQButton:(QButton *)b;
- (void)sendConsumedMouseUpIfNeeded;
-- (void)simulateClick;
@end
@@ -89,11 +88,6 @@
}
}
--(void)simulateClick
-{
- [self performClick:self];
-}
-
-(void)mouseDown:(NSEvent *)event
{
needToSendConsumedMouseUp = YES;
@@ -278,12 +272,12 @@ void QButton::clicked()
KWQ_UNBLOCK_EXCEPTIONS;
}
-void QButton::simulateClick()
+void QButton::click()
{
KWQ_BLOCK_EXCEPTIONS;
KWQButton *button = (KWQButton *)getView();
- [button simulateClick];
+ [button performClick:nil];
KWQ_UNBLOCK_EXCEPTIONS;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list