Title: [232336] trunk/Source/WebKitLegacy/win
- Revision
- 232336
- Author
- [email protected]
- Date
- 2018-05-30 22:34:24 -0700 (Wed, 30 May 2018)
Log Message
REGRESSION(r232316) [Win] error C2039: 'event': is not a member of 'WebCore::NavigationAction'
https://bugs.webkit.org/show_bug.cgi?id=186125
Unreviewed build fix
* WebActionPropertyBag.cpp:
(WebActionPropertyBag::Read):
(findMouseEvent): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (232335 => 232336)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-05-31 04:22:59 UTC (rev 232335)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-05-31 05:34:24 UTC (rev 232336)
@@ -1,3 +1,14 @@
+2018-05-30 Fujii Hironori <[email protected]>
+
+ REGRESSION(r232316) [Win] error C2039: 'event': is not a member of 'WebCore::NavigationAction'
+ https://bugs.webkit.org/show_bug.cgi?id=186125
+
+ Unreviewed build fix
+
+ * WebActionPropertyBag.cpp:
+ (WebActionPropertyBag::Read):
+ (findMouseEvent): Deleted.
+
2018-05-27 Fujii Hironori <[email protected]>
REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
Modified: trunk/Source/WebKitLegacy/win/WebActionPropertyBag.cpp (232335 => 232336)
--- trunk/Source/WebKitLegacy/win/WebActionPropertyBag.cpp 2018-05-31 04:22:59 UTC (rev 232335)
+++ trunk/Source/WebKitLegacy/win/WebActionPropertyBag.cpp 2018-05-31 05:34:24 UTC (rev 232336)
@@ -98,14 +98,6 @@
return !wcscmp(s1, s2);
}
-static const MouseEvent* findMouseEvent(const Event* event)
-{
- for (const Event* e = event; e; e = e->underlyingEvent())
- if (e->isMouseEvent())
- return static_cast<const MouseEvent*>(e);
- return nullptr;
-}
-
HRESULT WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog * /*pErrorLog*/)
{
if (!pszPropName)
@@ -119,16 +111,16 @@
return S_OK;
}
if (isEqual(pszPropName, WebActionElementKey)) {
- if (const MouseEvent* mouseEvent = findMouseEvent(m_action.event())) {
+ if (auto mouseEvent = m_action.mouseEventData()) {
V_VT(pVar) = VT_UNKNOWN;
- V_UNKNOWN(pVar) = WebElementPropertyBag::createInstance(m_frame->eventHandler().hitTestResultAtPoint(mouseEvent->absoluteLocation()));
+ V_UNKNOWN(pVar) = WebElementPropertyBag::createInstance(m_frame->eventHandler().hitTestResultAtPoint(mouseEvent->absoluteLocation));
return S_OK;
}
}
if (isEqual(pszPropName, WebActionButtonKey)) {
- if (const MouseEvent* mouseEvent = findMouseEvent(m_action.event())) {
+ if (auto mouseEvent = m_action.mouseEventData()) {
V_VT(pVar) = VT_I4;
- V_I4(pVar) = mouseEvent->button();
+ V_I4(pVar) = mouseEvent->button;
return S_OK;
}
}
@@ -138,14 +130,14 @@
return S_OK;
}
if (isEqual(pszPropName, WebActionModifierFlagsKey)) {
- if (const UIEventWithKeyState* keyEvent = findEventWithKeyState(const_cast<Event*>(m_action.event()))) {
+ if (auto keyEvent = m_action.keyStateEventData()) {
unsigned modifiers = 0;
- if (keyEvent->ctrlKey())
+ if (keyEvent->ctrlKey)
modifiers |= MK_CONTROL;
- if (keyEvent->shiftKey())
+ if (keyEvent->shiftKey)
modifiers |= MK_SHIFT;
- if (keyEvent->altKey())
+ if (keyEvent->altKey)
modifiers |= MK_ALT;
V_VT(pVar) = VT_UI4;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
