[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
girish at forwardbias.in
girish at forwardbias.in
Thu Feb 4 21:24:54 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit bfc63f104f65cd3ed35c5851827c312350ba22e6
Author: girish at forwardbias.in <girish at forwardbias.in@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 17:01:57 2010 +0000
[Qt] Save the QWebPageClient instead of the ownerWidget in QtAbstractWebPopup
Reviewed by Simon Hausmann.
The QWebPageClient is required for the QtFallbackWebPopup. QtFallbackWebPopup will
need it to create a QGraphicsProxyWidget (in a future commit) for the
QGraphicsWebView's web popup.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7348927..44ef54f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-01-22 Girish Ramakrishnan <girish at forwardbias.in>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Save the QWebPageClient instead of the ownerWidget in QtAbstractWebPopup
+
+ The QWebPageClient is required for the QtFallbackWebPopup. QtFallbackWebPopup will
+ need it to create a QGraphicsProxyWidget (in a future commit) for the
+ QGraphicsWebView's web popup.
+
+ * platform/qt/PopupMenuQt.cpp:
+ (WebCore::PopupMenu::show):
+ * platform/qt/QtAbstractWebPopup.cpp:
+ (WebCore::QtAbstractWebPopup::QtAbstractWebPopup):
+ (WebCore::QtAbstractWebPopup::popupDidHide):
+ (WebCore::QtAbstractWebPopup::valueChanged):
+ (WebCore::QtAbstractWebPopup::itemType):
+ * platform/qt/QtAbstractWebPopup.h:
+ (WebCore::QtAbstractWebPopup::itemText):
+ (WebCore::QtAbstractWebPopup::itemToolTip):
+ (WebCore::QtAbstractWebPopup::itemIsEnabled):
+ (WebCore::QtAbstractWebPopup::itemCount):
+ (WebCore::QtAbstractWebPopup::pageClient):
+ (WebCore::QtAbstractWebPopup::font):
+
2010-01-22 Simon Hausmann <simon.hausmann at nokia.com>
Unreviewed Qt "build" fix.
diff --git a/WebCore/platform/qt/PopupMenuQt.cpp b/WebCore/platform/qt/PopupMenuQt.cpp
index ae4fc20..315b891 100644
--- a/WebCore/platform/qt/PopupMenuQt.cpp
+++ b/WebCore/platform/qt/PopupMenuQt.cpp
@@ -55,9 +55,9 @@ void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
if (!m_popup)
m_popup = chromeClient->createSelectPopup();
- m_popup->m_client = m_popupClient;
+ m_popup->m_popupClient = m_popupClient;
m_popup->m_currentIndex = index;
- m_popup->m_view = chromeClient->platformPageClient()->ownerWidget();
+ m_popup->m_pageClient = chromeClient->platformPageClient();
QRect geometry(rect);
geometry.moveTopLeft(view->contentsToWindow(rect.topLeft()));
diff --git a/WebCore/platform/qt/QtAbstractWebPopup.cpp b/WebCore/platform/qt/QtAbstractWebPopup.cpp
index ef7cc2c..7dd7e36 100644
--- a/WebCore/platform/qt/QtAbstractWebPopup.cpp
+++ b/WebCore/platform/qt/QtAbstractWebPopup.cpp
@@ -26,8 +26,8 @@
namespace WebCore {
QtAbstractWebPopup::QtAbstractWebPopup()
- : m_client(0)
- , m_view(0)
+ : m_popupClient(0)
+ , m_pageClient(0)
, m_currentIndex(-1)
{
}
@@ -38,21 +38,21 @@ QtAbstractWebPopup::~QtAbstractWebPopup()
void QtAbstractWebPopup::popupDidHide(bool acceptSuggestions)
{
- Q_ASSERT(m_client);
- m_client->popupDidHide(acceptSuggestions);
+ Q_ASSERT(m_popupClient);
+ m_popupClient->popupDidHide(acceptSuggestions);
}
void QtAbstractWebPopup::valueChanged(int index)
{
- Q_ASSERT(m_client);
- m_client->valueChanged(index);
+ Q_ASSERT(m_popupClient);
+ m_popupClient->valueChanged(index);
}
QtAbstractWebPopup::ItemType QtAbstractWebPopup::itemType(int idx) const
{
- if (m_client->itemIsSeparator(idx))
+ if (m_popupClient->itemIsSeparator(idx))
return Separator;
- if (m_client->itemIsLabel(idx))
+ if (m_popupClient->itemIsLabel(idx))
return Group;
return Option;
}
diff --git a/WebCore/platform/qt/QtAbstractWebPopup.h b/WebCore/platform/qt/QtAbstractWebPopup.h
index 1c8f05b..d56249c 100644
--- a/WebCore/platform/qt/QtAbstractWebPopup.h
+++ b/WebCore/platform/qt/QtAbstractWebPopup.h
@@ -27,20 +27,21 @@
#include <QRect>
#include <QWidget>
-namespace WebCore {
+class QWebPageClient;
+namespace WebCore {
class QtAbstractWebPopup {
public:
enum ItemType { Option, Group, Separator };
ItemType itemType(int) const;
- QString itemText(int idx) const { return m_client->itemText(idx); }
- QString itemToolTip(int idx) const { return m_client->itemToolTip(idx); }
- bool itemIsEnabled(int idx) const { return m_client->itemIsEnabled(idx); }
- int itemCount() const { return m_client->listSize(); }
+ QString itemText(int idx) const { return m_popupClient->itemText(idx); }
+ QString itemToolTip(int idx) const { return m_popupClient->itemToolTip(idx); }
+ bool itemIsEnabled(int idx) const { return m_popupClient->itemIsEnabled(idx); }
+ int itemCount() const { return m_popupClient->listSize(); }
- QWidget* view() { return m_view; }
+ QWebPageClient* pageClient() const { return m_pageClient; }
QRect geometry() const { return m_geometry; }
int currentIndex() const { return m_currentIndex; }
@@ -53,12 +54,12 @@ public:
void popupDidHide(bool acceptSuggestions);
void valueChanged(int index);
- QFont font() { return m_client->menuStyle().font().font(); }
+ QFont font() { return m_popupClient->menuStyle().font().font(); }
private:
friend class PopupMenu;
- PopupMenuClient* m_client;
- QWidget* m_view;
+ PopupMenuClient* m_popupClient;
+ QWebPageClient* m_pageClient;
int m_currentIndex;
QRect m_geometry;
};
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f623167..134c43c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
2010-01-22 Girish Ramakrishnan <girish at forwardbias.in>
+ Reviewed by Simon Hausmann.
+
+ [Qt] Save the QWebPageClient instead of the ownerWidget in QtAbstractWebPopup
+
+ The QWebPageClient is required for the QtFallbackWebPopup. QtFallbackWebPopup will
+ need it to create a QGraphicsProxyWidget (in a future commit) for the
+ QGraphicsWebView's web popup.
+
+ * WebCoreSupport/QtFallbackWebPopup.cpp:
+ (WebCore::QtFallbackWebPopup::show):
+
+2010-01-22 Girish Ramakrishnan <girish at forwardbias.in>
+
Reviewed by Kenneth Rohde Christiansen.
QState::polished() was renamed to QState::propertiesAssigned() when
diff --git a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
index be98e53..ce17537 100644
--- a/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
+++ b/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp
@@ -81,7 +81,7 @@ QtFallbackWebPopup::~QtFallbackWebPopup()
void QtFallbackWebPopup::show()
{
populate();
- m_combo->setParent(view());
+ m_combo->setParent(pageClient()->ownerWidget());
m_combo->setCurrentIndex(currentIndex());
QRect rect = geometry();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list