Attachment 341643 Details for Bug 186125 – Patch

[patch] Patch

bug-186125-20180531142451.patch (text/plain), 3.38 KB, created by Fujii Hironori on 2018-05-30 22:24:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-30 22:24:52 PDT

Size: 3.38 KB

patch

obsolete

>Subversion Revision: 232333
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index 18b047d43da383a50c20bbc64d1e60519e68d14b..f4a609bb6d1819353fe9d32aea07d2715b51540b 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-30  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        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  <Hironori.Fujii@sony.com>
> 
>         REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
>diff --git a/Source/WebKitLegacy/win/WebActionPropertyBag.cpp b/Source/WebKitLegacy/win/WebActionPropertyBag.cpp
>index 721d1cd52d26b9c3fbe2a799a8dd3a3e67e3166d..330b906da0e327568d308ba9efa36b207cba3002 100644
>--- a/Source/WebKitLegacy/win/WebActionPropertyBag.cpp
>+++ b/Source/WebKitLegacy/win/WebActionPropertyBag.cpp
>@@ -98,14 +98,6 @@ static bool isEqual(LPCWSTR s1, LPCWSTR s2)
>     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 @@ HRESULT WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorL
>         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 @@ HRESULT WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorL
>         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;

Actions: View | Formatted Diff | Diff

Attachments on bug 186125: 341643