[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
pkasting at chromium.org
pkasting at chromium.org
Thu Feb 4 21:25:13 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 9d36e00cdb67715f2542ca77b82c86434ea32ce8
Author: pkasting at chromium.org <pkasting at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 22:05:40 2010 +0000
Not reviewed, backout.
Back out r52673, which caused several regressions.
https://bugs.webkit.org/show_bug.cgi?id=32533
WebCore:
* platform/PopupMenuClient.h:
* platform/chromium/PopupMenuChromium.cpp:
(WebCore::PopupContainer::hidePopup):
(WebCore::PopupListBox::handleKeyEvent):
(WebCore::PopupListBox::abandon):
(WebCore::PopupListBox::acceptIndex):
(WebCore::PopupListBox::selectIndex):
(WebCore::PopupListBox::clearSelection):
(WebCore::PopupListBox::hidePopup):
* platform/gtk/PopupMenuGtk.cpp:
(WebCore::PopupMenu::menuUnmapped):
* platform/mac/PopupMenuMac.mm:
(WebCore::PopupMenu::show):
* platform/qt/QtAbstractWebPopup.cpp:
(WebCore::QtAbstractWebPopup::popupDidHide):
* platform/qt/QtAbstractWebPopup.h:
* platform/win/PopupMenuWin.cpp:
(WebCore::PopupMenu::hide):
* platform/wx/PopupMenuWx.cpp:
(WebCore::PopupMenu::OnMenuItemSelected):
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::popupDidHide):
* rendering/RenderMenuList.h:
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::popupDidHide):
* rendering/RenderTextControlSingleLine.h:
WebKit/chromium:
* src/AutocompletePopupMenuClient.cpp:
(WebKit::AutocompletePopupMenuClient::initialize):
(WebKit::AutocompletePopupMenuClient::popupDidHide):
(WebKit::AutocompletePopupMenuClient::setTextFromItem):
* src/AutocompletePopupMenuClient.h:
WebKit/qt:
* WebCoreSupport/QtFallbackWebPopup.cpp:
(WebCore::QtFallbackWebPopupCombo::hidePopup):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53716 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a078636..c755699 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2010-01-22 Peter Kasting <pkasting at google.com>
+
+ Not reviewed, backout.
+
+ Back out r52673, which caused several regressions.
+ https://bugs.webkit.org/show_bug.cgi?id=32533
+
+ * platform/PopupMenuClient.h:
+ * platform/chromium/PopupMenuChromium.cpp:
+ (WebCore::PopupContainer::hidePopup):
+ (WebCore::PopupListBox::handleKeyEvent):
+ (WebCore::PopupListBox::abandon):
+ (WebCore::PopupListBox::acceptIndex):
+ (WebCore::PopupListBox::selectIndex):
+ (WebCore::PopupListBox::clearSelection):
+ (WebCore::PopupListBox::hidePopup):
+ * platform/gtk/PopupMenuGtk.cpp:
+ (WebCore::PopupMenu::menuUnmapped):
+ * platform/mac/PopupMenuMac.mm:
+ (WebCore::PopupMenu::show):
+ * platform/qt/QtAbstractWebPopup.cpp:
+ (WebCore::QtAbstractWebPopup::popupDidHide):
+ * platform/qt/QtAbstractWebPopup.h:
+ * platform/win/PopupMenuWin.cpp:
+ (WebCore::PopupMenu::hide):
+ * platform/wx/PopupMenuWx.cpp:
+ (WebCore::PopupMenu::OnMenuItemSelected):
+ * rendering/RenderMenuList.cpp:
+ (WebCore::RenderMenuList::popupDidHide):
+ * rendering/RenderMenuList.h:
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::popupDidHide):
+ * rendering/RenderTextControlSingleLine.h:
+
2010-01-22 Dan Bernstein <mitz at apple.com>
Rubber-stamped by Darin Adler.
diff --git a/WebCore/platform/PopupMenuClient.h b/WebCore/platform/PopupMenuClient.h
index 3f841d5..2614fe2 100644
--- a/WebCore/platform/PopupMenuClient.h
+++ b/WebCore/platform/PopupMenuClient.h
@@ -37,7 +37,7 @@ class PopupMenuClient {
public:
virtual ~PopupMenuClient() {}
virtual void valueChanged(unsigned listIndex, bool fireEvents = true) = 0;
- virtual void selectionChanged(unsigned listIndex, bool fireEvents = true) = 0;
+
virtual String itemText(unsigned listIndex) const = 0;
virtual String itemToolTip(unsigned listIndex) const = 0;
virtual bool itemIsEnabled(unsigned listIndex) const = 0;
@@ -49,7 +49,7 @@ public:
virtual int clientPaddingRight() const = 0;
virtual int listSize() const = 0;
virtual int selectedIndex() const = 0;
- virtual void popupDidHide(bool acceptSuggestions) = 0;
+ virtual void popupDidHide() = 0;
virtual bool itemIsSeparator(unsigned listIndex) const = 0;
virtual bool itemIsLabel(unsigned listIndex) const = 0;
virtual bool itemIsSelected(unsigned listIndex) const = 0;
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index d813ec7..cab7ced 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -106,7 +106,7 @@ public:
// PopupListBox methods
// Hides the popup.
- void hidePopup(bool acceptSuggestions);
+ void hidePopup();
// Updates our internal list to match the client.
void updateFromElement();
@@ -381,7 +381,7 @@ void PopupContainer::showExternal(const IntRect& rect, FrameView* v, int index)
void PopupContainer::hidePopup()
{
- listBox()->hidePopup(true);
+ listBox()->hidePopup();
}
void PopupContainer::layout()
@@ -631,7 +631,7 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event)
return true;
case VKEY_RETURN:
if (m_selectedIndex == -1) {
- hidePopup(false);
+ hidePopup();
// Don't eat the enter if nothing is selected.
return false;
}
@@ -884,7 +884,7 @@ void PopupListBox::abandon()
m_selectedIndex = m_originalIndex;
- hidePopup(false);
+ hidePopup();
if (m_acceptedIndexOnAbandon >= 0) {
m_popupClient->valueChanged(m_acceptedIndexOnAbandon);
@@ -921,7 +921,7 @@ void PopupListBox::acceptIndex(int index)
if (index < 0) {
if (m_popupClient) {
// Enter pressed with no selection, just close the popup.
- hidePopup(false);
+ hidePopup();
}
return;
}
@@ -930,7 +930,7 @@ void PopupListBox::acceptIndex(int index)
RefPtr<PopupListBox> keepAlive(this);
// Hide ourselves first since valueChanged may have numerous side-effects.
- hidePopup(true);
+ hidePopup();
// Tell the <select> PopupMenuClient what index was selected.
m_popupClient->valueChanged(index);
@@ -948,7 +948,6 @@ void PopupListBox::selectIndex(int index)
invalidateRow(m_selectedIndex);
scrollToRevealSelection();
- m_popupClient->selectionChanged(m_selectedIndex);
}
}
@@ -1010,7 +1009,6 @@ void PopupListBox::clearSelection()
if (m_selectedIndex != -1) {
invalidateRow(m_selectedIndex);
m_selectedIndex = -1;
- m_popupClient->selectionChanged(m_selectedIndex);
}
}
@@ -1078,7 +1076,7 @@ void PopupListBox::adjustSelectedIndex(int delta)
scrollToRevealSelection();
}
-void PopupListBox::hidePopup(bool acceptSuggestions)
+void PopupListBox::hidePopup()
{
if (parent()) {
PopupContainer* container = static_cast<PopupContainer*>(parent());
@@ -1086,7 +1084,7 @@ void PopupListBox::hidePopup(bool acceptSuggestions)
container->client()->popupClosed(container);
}
- m_popupClient->popupDidHide(acceptSuggestions);
+ m_popupClient->popupDidHide();
}
void PopupListBox::updateFromElement()
diff --git a/WebCore/platform/gtk/PopupMenuGtk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
index 96d9e90..0363ac4 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.cpp
+++ b/WebCore/platform/gtk/PopupMenuGtk.cpp
@@ -133,7 +133,7 @@ void PopupMenu::menuItemActivated(GtkMenuItem* item, PopupMenu* that)
void PopupMenu::menuUnmapped(GtkWidget*, PopupMenu* that)
{
ASSERT(that->client());
- that->client()->popupDidHide(true);
+ that->client()->popupDidHide();
}
void PopupMenu::menuPositionFunction(GtkMenu*, gint* x, gint* y, gboolean* pushIn, PopupMenu* that)
diff --git a/WebCore/platform/mac/PopupMenuMac.mm b/WebCore/platform/mac/PopupMenuMac.mm
index c30b774..22f1e5b 100644
--- a/WebCore/platform/mac/PopupMenuMac.mm
+++ b/WebCore/platform/mac/PopupMenuMac.mm
@@ -114,7 +114,7 @@ void PopupMenu::show(const IntRect& r, FrameView* v, int index)
int numItems = [m_popup.get() numberOfItems];
if (numItems <= 0) {
if (client())
- client()->popupDidHide(true);
+ client()->popupDidHide();
return;
}
ASSERT(numItems > index);
@@ -171,7 +171,7 @@ void PopupMenu::show(const IntRect& r, FrameView* v, int index)
if (client()) {
int newIndex = [m_popup.get() indexOfSelectedItem];
- client()->popupDidHide(true);
+ client()->popupDidHide();
// Adjust newIndex for hidden first item.
if (!client()->shouldPopOver())
diff --git a/WebCore/platform/qt/QtAbstractWebPopup.cpp b/WebCore/platform/qt/QtAbstractWebPopup.cpp
index 7dd7e36..f64287d 100644
--- a/WebCore/platform/qt/QtAbstractWebPopup.cpp
+++ b/WebCore/platform/qt/QtAbstractWebPopup.cpp
@@ -36,10 +36,10 @@ QtAbstractWebPopup::~QtAbstractWebPopup()
{
}
-void QtAbstractWebPopup::popupDidHide(bool acceptSuggestions)
+void QtAbstractWebPopup::popupDidHide()
{
Q_ASSERT(m_popupClient);
- m_popupClient->popupDidHide(acceptSuggestions);
+ m_popupClient->popupDidHide();
}
void QtAbstractWebPopup::valueChanged(int index)
diff --git a/WebCore/platform/qt/QtAbstractWebPopup.h b/WebCore/platform/qt/QtAbstractWebPopup.h
index d56249c..93b4122 100644
--- a/WebCore/platform/qt/QtAbstractWebPopup.h
+++ b/WebCore/platform/qt/QtAbstractWebPopup.h
@@ -51,7 +51,7 @@ public:
virtual void show() = 0;
virtual void hide() = 0;
- void popupDidHide(bool acceptSuggestions);
+ void popupDidHide();
void valueChanged(int index);
QFont font() { return m_popupClient->menuStyle().font().font(); }
diff --git a/WebCore/platform/win/PopupMenuWin.cpp b/WebCore/platform/win/PopupMenuWin.cpp
index c998ca4..4ba5e30 100644
--- a/WebCore/platform/win/PopupMenuWin.cpp
+++ b/WebCore/platform/win/PopupMenuWin.cpp
@@ -274,7 +274,7 @@ void PopupMenu::hide()
::ShowWindow(m_popup, SW_HIDE);
if (client())
- client()->popupDidHide(true);
+ client()->popupDidHide();
// Post a WM_NULL message to wake up the message pump if necessary.
::PostMessage(m_popup, WM_NULL, 0, 0);
diff --git a/WebCore/platform/wx/PopupMenuWx.cpp b/WebCore/platform/wx/PopupMenuWx.cpp
index a338e6a..9b0deba 100644
--- a/WebCore/platform/wx/PopupMenuWx.cpp
+++ b/WebCore/platform/wx/PopupMenuWx.cpp
@@ -88,7 +88,7 @@ void PopupMenu::OnMenuItemSelected(wxCommandEvent& event)
{
if (client()) {
client()->valueChanged(event.GetId() - s_menuStartId);
- client()->popupDidHide(true);
+ client()->popupDidHide();
}
// TODO: Do we need to call Disconnect here? Do we have a ref to the native window still?
}
diff --git a/WebCore/rendering/RenderMenuList.cpp b/WebCore/rendering/RenderMenuList.cpp
index bf732fc..bea250d 100644
--- a/WebCore/rendering/RenderMenuList.cpp
+++ b/WebCore/rendering/RenderMenuList.cpp
@@ -451,7 +451,7 @@ int RenderMenuList::selectedIndex() const
return select->optionToListIndex(select->selectedIndex());
}
-void RenderMenuList::popupDidHide(bool)
+void RenderMenuList::popupDidHide()
{
m_popupIsVisible = false;
}
diff --git a/WebCore/rendering/RenderMenuList.h b/WebCore/rendering/RenderMenuList.h
index 266869b..a5aa041 100644
--- a/WebCore/rendering/RenderMenuList.h
+++ b/WebCore/rendering/RenderMenuList.h
@@ -84,7 +84,7 @@ private:
virtual int clientPaddingRight() const;
virtual int listSize() const;
virtual int selectedIndex() const;
- virtual void popupDidHide(bool acceptSuggestions);
+ virtual void popupDidHide();
virtual bool itemIsSeparator(unsigned listIndex) const;
virtual bool itemIsLabel(unsigned listIndex) const;
virtual bool itemIsSelected(unsigned listIndex) const;
@@ -92,7 +92,6 @@ private:
virtual bool valueShouldChangeOnHotTrack() const { return true; }
virtual bool shouldPopOver() const { return !POPUP_MENU_PULLS_DOWN; }
virtual void valueChanged(unsigned listIndex, bool fireOnChange = true);
- virtual void selectionChanged(unsigned, bool) {}
virtual FontSelector* fontSelector() const;
virtual HostWindow* hostWindow() const;
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarClient*, ScrollbarOrientation, ScrollbarControlSize);
diff --git a/WebCore/rendering/RenderTextControlSingleLine.cpp b/WebCore/rendering/RenderTextControlSingleLine.cpp
index e3342dd..1c83466 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.cpp
+++ b/WebCore/rendering/RenderTextControlSingleLine.cpp
@@ -728,7 +728,7 @@ int RenderTextControlSingleLine::selectedIndex() const
return -1;
}
-void RenderTextControlSingleLine::popupDidHide(bool)
+void RenderTextControlSingleLine::popupDidHide()
{
m_searchPopupIsVisible = false;
}
diff --git a/WebCore/rendering/RenderTextControlSingleLine.h b/WebCore/rendering/RenderTextControlSingleLine.h
index e47d87e..e30ff0d 100644
--- a/WebCore/rendering/RenderTextControlSingleLine.h
+++ b/WebCore/rendering/RenderTextControlSingleLine.h
@@ -98,7 +98,6 @@ private:
// PopupMenuClient methods
virtual void valueChanged(unsigned listIndex, bool fireEvents = true);
- virtual void selectionChanged(unsigned, bool) {}
virtual String itemText(unsigned listIndex) const;
virtual String itemToolTip(unsigned) const { return String(); }
virtual bool itemIsEnabled(unsigned listIndex) const;
@@ -110,7 +109,7 @@ private:
virtual int clientPaddingRight() const;
virtual int listSize() const;
virtual int selectedIndex() const;
- virtual void popupDidHide(bool acceptSuggestion);
+ virtual void popupDidHide();
virtual bool itemIsSeparator(unsigned listIndex) const;
virtual bool itemIsLabel(unsigned listIndex) const;
virtual bool itemIsSelected(unsigned listIndex) const;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 67d7278..49f6141 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-22 Peter Kasting <pkasting at google.com>
+
+ Not reviewed, backout.
+
+ Back out r52673, which caused several regressions.
+ https://bugs.webkit.org/show_bug.cgi?id=32533
+
+ * src/AutocompletePopupMenuClient.cpp:
+ (WebKit::AutocompletePopupMenuClient::initialize):
+ (WebKit::AutocompletePopupMenuClient::popupDidHide):
+ (WebKit::AutocompletePopupMenuClient::setTextFromItem):
+ * src/AutocompletePopupMenuClient.h:
+
2010-01-21 Jeremy Orlow <jorlow at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/AutocompletePopupMenuClient.cpp b/WebKit/chromium/src/AutocompletePopupMenuClient.cpp
index 35c4ade..62d4dff 100644
--- a/WebKit/chromium/src/AutocompletePopupMenuClient.cpp
+++ b/WebKit/chromium/src/AutocompletePopupMenuClient.cpp
@@ -59,16 +59,11 @@ void AutocompletePopupMenuClient::initialize(
const WebVector<WebString>& suggestions,
int defaultSuggestionIndex)
{
- if (!m_lastFieldValues)
- m_lastFieldValues.set(new FieldValuesMap);
ASSERT(defaultSuggestionIndex < static_cast<int>(suggestions.size()));
m_textField = textField;
- m_typedFieldValue = textField->value();
m_selectedIndex = defaultSuggestionIndex;
setSuggestions(suggestions);
- setInitialAutocompleteValue();
-
FontDescription fontDescription;
m_webView->theme()->systemFont(CSSValueWebkitControl, fontDescription);
// Use a smaller font size to match IE/Firefox.
@@ -84,40 +79,6 @@ void AutocompletePopupMenuClient::initialize(
textField->renderer()->style()->direction()));
}
-
-void AutocompletePopupMenuClient::setInitialAutocompleteValue()
-{
- if (!m_suggestions.size() || !m_textField->name().length() || !m_typedFieldValue.length())
- return;
- int newIndex = m_selectedIndex >= 0 ? m_selectedIndex : 0;
- String suggestion = m_suggestions[newIndex];
- bool hasPreviousValue = m_lastFieldValues->contains(m_textField->name());
- String prevValue;
- if (hasPreviousValue)
- prevValue = m_lastFieldValues->get(m_textField->name());
- if (!hasPreviousValue || m_typedFieldValue.length() > m_lastFieldValues->get(m_textField->name()).length()) {
- int start = 0;
- String newSuggestion = suggestion;
- if (suggestion.startsWith(m_typedFieldValue))
- m_selectedIndex = newIndex;
- if (suggestion.startsWith(m_typedFieldValue, false)) {
- newSuggestion = m_typedFieldValue;
- if (suggestion.length() > m_typedFieldValue.length()) {
- newSuggestion.append(suggestion.substring(m_typedFieldValue.length(),
- suggestion.length() - m_typedFieldValue.length()));
- }
- start = m_typedFieldValue.length();
- }
- m_textField->setSuggestedValue(newSuggestion);
- m_textField->setSelectionRange(start, newSuggestion.length());
- }
- if (hasPreviousValue)
- m_lastFieldValues->set(m_textField->name(), m_typedFieldValue);
- else
- m_lastFieldValues->add(m_textField->name(), m_typedFieldValue);
-}
-
-
void AutocompletePopupMenuClient::valueChanged(unsigned listIndex, bool fireEvents)
{
m_textField->setValue(m_suggestions[listIndex]);
@@ -128,21 +89,6 @@ void AutocompletePopupMenuClient::valueChanged(unsigned listIndex, bool fireEven
static_cast<HTMLInputElement*>(m_textField.get()));
}
-void AutocompletePopupMenuClient::selectionChanged(unsigned listIndex, bool fireEvents)
-{
- if (listIndex != static_cast<unsigned>(-1)) {
- m_textField->setSuggestedValue(m_suggestions[listIndex]);
- m_textField->setSelectionRange(m_typedFieldValue.length(),
- m_suggestions[listIndex].length());
- } else {
- m_textField->setValue(m_typedFieldValue);
- if (m_lastFieldValues->contains(m_textField->name()))
- m_lastFieldValues->set(m_textField->name(), m_typedFieldValue);
- else
- m_lastFieldValues->add(m_textField->name(), m_typedFieldValue);
- }
-}
-
String AutocompletePopupMenuClient::itemText(unsigned listIndex) const
{
return m_suggestions[listIndex];
@@ -172,31 +118,14 @@ int AutocompletePopupMenuClient::clientPaddingRight() const
return style ? m_webView->theme()->popupInternalPaddingRight(style) : 0;
}
-void AutocompletePopupMenuClient::popupDidHide(bool acceptSuggestions)
+void AutocompletePopupMenuClient::popupDidHide()
{
- if (acceptSuggestions) {
- String suggestedValue = m_textField->suggestedValue();
- if (!suggestedValue.isNull())
- m_textField->setValue(suggestedValue);
- } else
- m_textField->setValue(m_typedFieldValue);
-
- resetLastFieldValue();
m_webView->autoCompletePopupDidHide();
}
void AutocompletePopupMenuClient::setTextFromItem(unsigned listIndex)
{
m_textField->setValue(m_suggestions[listIndex]);
- resetLastFieldValue();
-}
-
-void AutocompletePopupMenuClient::resetLastFieldValue()
-{
- if (m_lastFieldValues->contains(m_textField->name()))
- m_lastFieldValues->set(m_textField->name(), m_textField->value());
- else
- m_lastFieldValues->add(m_textField->name(), m_textField->value());
}
FontSelector* AutocompletePopupMenuClient::fontSelector() const
diff --git a/WebKit/chromium/src/AutocompletePopupMenuClient.h b/WebKit/chromium/src/AutocompletePopupMenuClient.h
index f997d72..ad24e54 100644
--- a/WebKit/chromium/src/AutocompletePopupMenuClient.h
+++ b/WebKit/chromium/src/AutocompletePopupMenuClient.h
@@ -58,7 +58,6 @@ public:
// WebCore::PopupMenuClient methods:
virtual void valueChanged(unsigned listIndex, bool fireEvents = true);
- virtual void selectionChanged(unsigned listIndex, bool fireEvents = true);
virtual WebCore::String itemText(unsigned listIndex) const;
virtual WebCore::String itemToolTip(unsigned lastIndex) const { return WebCore::String(); }
virtual bool itemIsEnabled(unsigned listIndex) const { return true; }
@@ -70,7 +69,7 @@ public:
virtual int clientPaddingRight() const;
virtual int listSize() const { return m_suggestions.size(); }
virtual int selectedIndex() const { return m_selectedIndex; }
- virtual void popupDidHide(bool acceptSuggestion);
+ virtual void popupDidHide();
virtual bool itemIsSeparator(unsigned listIndex) const { return false; }
virtual bool itemIsLabel(unsigned listIndex) const { return false; }
virtual bool itemIsSelected(unsigned listIndex) const { return false; }
@@ -86,17 +85,12 @@ public:
private:
WebCore::RenderStyle* textFieldStyle() const;
- void setInitialAutocompleteValue();
- void resetLastFieldValue();
RefPtr<WebCore::HTMLInputElement> m_textField;
Vector<WebCore::String> m_suggestions;
int m_selectedIndex;
WebViewImpl* m_webView;
- WebCore::String m_typedFieldValue;
OwnPtr<WebCore::PopupMenuStyle> m_style;
- typedef HashMap<WebCore::String, WebCore::String> FieldValuesMap;
- OwnPtr<FieldValuesMap> m_lastFieldValues;
};
} // namespace WebKit
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 134c43c..89200fc 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-22 Peter Kasting <pkasting at google.com>
+
+ Not reviewed, backout.
+
+ Back out r52673, which caused several regressions.
+ https://bugs.webkit.org/show_bug.cgi?id=32533
+
+ * WebCoreSupport/QtFallbackWebPopup.cpp:
+ (WebCore::QtFallbackWebPopupCombo::hidePopup):
+
2010-01-22 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index ce17537..1edbce3 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -59,7 +59,7 @@ void QtFallbackWebPopupCombo::hidePopup()
return;
m_ownerPopup.m_popupVisible = false;
- m_ownerPopup.popupDidHide(true);
+ m_ownerPopup.popupDidHide();
}
// QtFallbackWebPopup
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list