<!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>[182589] trunk</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/182589">182589</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-08 22:38:02 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Unreviewed test fix after <a href="http://trac.webkit.org/projects/webkit/changeset/182584">r182584</a>
https://bugs.webkit.org/show_bug.cgi?id=143452
Source/WebCore:
Correct bit comparison to use the correct value for the Control-key
* platform/mac/PlatformEventFactoryMac.mm:
(WebCore::typeForEvent):
Source/WebKit2:
Correct bit comparison to use the correct value for the Control-key
* Shared/mac/WebEventFactory.mm:
(WebKit::typeForEvent):
Tools:
Put both of these tests back to their original state now that the underlying
problem is fixed.
* TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm">trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebEventFactorymm">trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2MenuTypesForMouseEventscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsmacMenuTypesForMouseEventsmm">trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Source/WebCore/ChangeLog 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unreviewed test fix after r182584
+ https://bugs.webkit.org/show_bug.cgi?id=143452
+
+ Correct bit comparison to use the correct value for the Control-key
+
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::typeForEvent):
+
</ins><span class="cx"> 2015-04-08 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a debug assertion that will fire if we try to paint layer contents on a background thread
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformEventFactoryMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> if (mouseButtonForEvent(event) == RightButton)
</span><span class="cx"> return static_cast<int>(NSMenuTypeContextMenu);
</span><span class="cx">
</span><del>- if (mouseButtonForEvent(event) == LeftButton && (modifiersForEvent(event) & NSControlKeyMask))
</del><ins>+ if (mouseButtonForEvent(event) == LeftButton && (modifiersForEvent(event) & PlatformEvent::CtrlKey))
</ins><span class="cx"> return static_cast<int>(NSMenuTypeContextMenu);
</span><span class="cx">
</span><span class="cx"> return static_cast<int>(NSMenuTypeNone);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unreviewed test fix after r182584
+ https://bugs.webkit.org/show_bug.cgi?id=143452
+
+ Correct bit comparison to use the correct value for the Control-key
+
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::typeForEvent):
+
</ins><span class="cx"> 2015-04-08 Jaehun Lim <ljaehun.lim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Create PageUIClientEfl after sending CreateWebPage message
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebEventFactorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> if (mouseButtonForEvent(event) == WebMouseEvent::RightButton)
</span><span class="cx"> return static_cast<int>(NSMenuTypeContextMenu);
</span><span class="cx">
</span><del>- if (mouseButtonForEvent(event) == WebMouseEvent::LeftButton && (modifiersForEvent(event) & NSControlKeyMask))
</del><ins>+ if (mouseButtonForEvent(event) == WebMouseEvent::LeftButton && (modifiersForEvent(event) & WebEvent::ControlKey))
</ins><span class="cx"> return static_cast<int>(NSMenuTypeContextMenu);
</span><span class="cx">
</span><span class="cx"> return static_cast<int>(NSMenuTypeNone);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Tools/ChangeLog 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-08 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unreviewed test fix after r182584
+ https://bugs.webkit.org/show_bug.cgi?id=143452
+
+ Put both of these tests back to their original state now that the underlying
+ problem is fixed.
+
+ * TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2015-04-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> run-jsc-benchmarks geomean of preferred means shouldn't print the VMs header twice
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2MenuTypesForMouseEventscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/MenuTypesForMouseEvents.cpp 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, MenuAndButtonForControlLeftClick)
</span><span class="cx"> {
</span><del>- // Note: This is controlled by a Mouse system preference. Check settings if this is failing.
- buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersControlKey, "0", "none");
</del><ins>+ buildAndPerformTest(kWKEventMouseButtonLeftButton, kWKEventModifiersControlKey, "0", "context");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, MenuAndButtonForControlRightClick)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsmacMenuTypesForMouseEventsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm (182588 => 182589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm 2015-04-09 05:22:49 UTC (rev 182588)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm 2015-04-09 05:38:02 UTC (rev 182589)
</span><span class="lines">@@ -78,8 +78,7 @@
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForControlLeftClick)
</span><span class="cx"> {
</span><del>- // Note: This is controlled by a Mouse system preference. Check settings if this is failing.
- buildAndPerformTest(NSLeftMouseDown, NSControlKeyMask, WebCore::LeftButton, NSMenuTypeNone);
</del><ins>+ buildAndPerformTest(NSLeftMouseDown, NSControlKeyMask, WebCore::LeftButton, NSMenuTypeContextMenu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit1, MenuAndButtonForControlRightClick)
</span></span></pre>
</div>
</div>
</body>
</html>