Title: [103355] trunk/Source/WebKit2
- Revision
- 103355
- Author
- ander...@apple.com
- Date
- 2011-12-20 15:28:37 -0800 (Tue, 20 Dec 2011)
Log Message
Try to fix the Windows build.
* UIProcess/win/WebPopupMenuProxyWin.cpp:
(WebKit::WebPopupMenuProxyWin::showPopupMenu):
(WebKit::WebPopupMenuProxyWin::setFocusedIndex):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103354 => 103355)
--- trunk/Source/WebKit2/ChangeLog 2011-12-20 23:13:59 UTC (rev 103354)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-20 23:28:37 UTC (rev 103355)
@@ -1,3 +1,11 @@
+2011-12-20 Anders Carlsson <ander...@apple.com>
+
+ Try to fix the Windows build.
+
+ * UIProcess/win/WebPopupMenuProxyWin.cpp:
+ (WebKit::WebPopupMenuProxyWin::showPopupMenu):
+ (WebKit::WebPopupMenuProxyWin::setFocusedIndex):
+
2011-12-20 Simon Hausmann <simon.hausm...@nokia.com>
[Qt][WK2] Remove statusBarMessageChanged
Modified: trunk/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp (103354 => 103355)
--- trunk/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp 2011-12-20 23:13:59 UTC (rev 103354)
+++ trunk/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp 2011-12-20 23:28:37 UTC (rev 103355)
@@ -325,10 +325,10 @@
m_showPopup = false;
::ShowWindow(m_popup, SW_HIDE);
- if (!m_client)
+ if (!WebPropupMenuProxy::m_client)
return;
- m_client->valueChangedForPopupMenu(this, m_newSelectedIndex);
+ WebPropupMenuProxy::m_client->valueChangedForPopupMenu(this, m_newSelectedIndex);
// <https://bugs.webkit.org/show_bug.cgi?id=57904> In order to properly call the onClick()
// handler on a <select> element, we need to fake a mouse up event in the main window.
@@ -338,10 +338,10 @@
// Thus, we are virtually clicking at the
// same location where the mouse down event occurred. This allows the hit test to select
// the correct element, and thereby call the onClick() JS handler.
- if (!m_client->currentlyProcessedMouseDownEvent())
+ if (!WebPropupMenuProxy::m_client->currentlyProcessedMouseDownEvent())
return;
- const MSG* initiatingWinEvent = m_client->currentlyProcessedMouseDownEvent()->nativeEvent();
+ const MSG* initiatingWinEvent = WebPropupMenuProxy::m_client->currentlyProcessedMouseDownEvent()->nativeEvent();
MSG fakeEvent = *initiatingWinEvent;
fakeEvent.message = WM_LBUTTONUP;
::PostMessage(fakeEvent.hwnd, fakeEvent.message, fakeEvent.wParam, fakeEvent.lParam);
@@ -870,8 +870,8 @@
m_focusedIndex = i;
if (!hotTracking) {
- if (m_client)
- m_client->setTextFromItemForPopupMenu(this, i);
+ if (WebPropupMenuProxy::m_client)
+ WebPropupMenuProxy::m_client->setTextFromItemForPopupMenu(this, i);
}
if (!scrollToRevealSelection())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
