[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [232336] trunk/Source/WebKitLegacy/win
From: Hironori.Fujii () sony ! com
Date: 2018-05-31 5:34:24
Message-ID: 20180531053424.4202410051CE () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[232336] trunk/Source/WebKitLegacy/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/232336">232336</a></dd> \
<dt>Author</dt> <dd>Hironori.Fujii@sony.com</dd> <dt>Date</dt> <dd>2018-05-30 \
22:34:24 -0700 (Wed, 30 May 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/232316">r232316</a>) \
[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitLegacywinChangeLog">trunk/Source/WebKitLegacy/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacywinWebActionPropertyBagcpp">trunk/Source/WebKitLegacy/win/WebActionPropertyBag.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitLegacywinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/win/ChangeLog (232335 => \
232336)</h4> <pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2018-05-27 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r232198) [WinCairo] cannot convert from \
'WTF::StringView' to 'const WTF::String' </span></span></pre></div>
<a id="trunkSourceWebKitLegacywinWebActionPropertyBagcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKitLegacy/win/WebActionPropertyBag.cpp (232335 => 232336)</h4> <pre \
class="diff"><span> <span class="info">--- \
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) </span><span class="lines">@@ -98,14 +98,6 @@
</span><span class="cx"> return !wcscmp(s1, s2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> HRESULT WebActionPropertyBag::Read(LPCOLESTR pszPropName, \
VARIANT *pVar, IErrorLog * /*pErrorLog*/) </span><span class="cx"> {
</span><span class="cx"> if (!pszPropName)
</span><span class="lines">@@ -119,16 +111,16 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> if (isEqual(pszPropName, WebActionElementKey)) {
</span><del>- if (const MouseEvent* mouseEvent = \
findMouseEvent(m_action.event())) { </del><ins>+ if (auto mouseEvent = \
m_action.mouseEventData()) { </ins><span class="cx"> V_VT(pVar) = \
VT_UNKNOWN; </span><del>- V_UNKNOWN(pVar) = \
WebElementPropertyBag::createInstance(m_frame->eventHandler().hitTestResultAtPoint(mouseEvent->absoluteLocation()));
</del><ins>+ V_UNKNOWN(pVar) = \
WebElementPropertyBag::createInstance(m_frame->eventHandler().hitTestResultAtPoint(mouseEvent->absoluteLocation));
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (isEqual(pszPropName, WebActionButtonKey)) {
</span><del>- if (const MouseEvent* mouseEvent = \
findMouseEvent(m_action.event())) { </del><ins>+ if (auto mouseEvent = \
m_action.mouseEventData()) { </ins><span class="cx"> V_VT(pVar) = VT_I4;
</span><del>- V_I4(pVar) = mouseEvent->button();
</del><ins>+ V_I4(pVar) = mouseEvent->button;
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -138,14 +130,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> if (isEqual(pszPropName, WebActionModifierFlagsKey)) {
</span><del>- if (const UIEventWithKeyState* keyEvent = \
findEventWithKeyState(const_cast<Event*>(m_action.event()))) { </del><ins>+ \
if (auto keyEvent = m_action.keyStateEventData()) { </ins><span class="cx"> \
unsigned modifiers = 0; </span><span class="cx">
</span><del>- if (keyEvent->ctrlKey())
</del><ins>+ if (keyEvent->ctrlKey)
</ins><span class="cx"> modifiers |= MK_CONTROL;
</span><del>- if (keyEvent->shiftKey())
</del><ins>+ if (keyEvent->shiftKey)
</ins><span class="cx"> modifiers |= MK_SHIFT;
</span><del>- if (keyEvent->altKey())
</del><ins>+ if (keyEvent->altKey)
</ins><span class="cx"> modifiers |= MK_ALT;
</span><span class="cx">
</span><span class="cx"> V_VT(pVar) = VT_UI4;
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic