<!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>[209924] 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/209924">209924</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 10:32:27 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Arguments called in wrong order
https://bugs.webkit.org/show_bug.cgi?id=165923
Reviewed by Simon Fraser.
Source/WebCore:
Correct the ordering of several function calls.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample): The 'nearestToPresentationStartTime'
argument is being checked for validity, but 'nearestToPresentationEndTime' is being used in the
calculation. This seems like a copy/paste error.
* page/PrintContext.cpp:
(WebCore::PrintContext::outputLinkedDestinations): FloatPoint::expandedTo returns a new object that
has been expanded. This code continued using the 'unexpanded' point.
* platform/graphics/GraphicsContext3D.cpp:
(WebCore::GraphicsContext3D::computeImageSizeInBytes): The 'bytesPerComponent' and 'componentsPerPixel'
variables were being passed in the wrong order.
* platform/network/CacheValidation.cpp: The 'last-modified' header string was being concatenated with
the following string, resulting in an incorrect 'last-modifiedproxy-authenticate' string value.
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::firstGlyph): The ASSERT was assigning to the (by-value) input
parameter 'codePoint', rather than comparing it to the firstGlyph value's codePoint.
Tools:
The 'audioDeviceUIDs' array is being passed to the argument that expects video devices,
and the 'videoDeviceUIDs' array is being passed to the audo device argument. Fix this.
* TestWebKitAPI/Tests/WebKit2/UserMedia.cpp:
(TestWebKitAPI::decidePolicyForUserMediaPermissionRequestCallBack): The
order of arguments to WKUserMediaPermissionRequestAllow are flipped.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePrintContextcpp">trunk/Source/WebCore/page/PrintContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCacheValidationcpp">trunk/Source/WebCore/platform/network/CacheValidation.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2UserMediacpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-15 Brent Fulgham <bfulgham@apple.com>
+
+ Arguments called in wrong order
+ https://bugs.webkit.org/show_bug.cgi?id=165923
+
+ Reviewed by Simon Fraser.
+
+ Correct the ordering of several function calls.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample): The 'nearestToPresentationStartTime'
+ argument is being checked for validity, but 'nearestToPresentationEndTime' is being used in the
+ calculation. This seems like a copy/paste error.
+ * page/PrintContext.cpp:
+ (WebCore::PrintContext::outputLinkedDestinations): FloatPoint::expandedTo returns a new object that
+ has been expanded. This code continued using the 'unexpanded' point.
+ * platform/graphics/GraphicsContext3D.cpp:
+ (WebCore::GraphicsContext3D::computeImageSizeInBytes): The 'bytesPerComponent' and 'componentsPerPixel'
+ variables were being passed in the wrong order.
+ * platform/network/CacheValidation.cpp: The 'last-modified' header string was being concatenated with
+ the following string, resulting in an incorrect 'last-modifiedproxy-authenticate' string value.
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::firstGlyph): The ASSERT was assigning to the (by-value) input
+ parameter 'codePoint', rather than comparing it to the firstGlyph value's codePoint.
+
</ins><span class="cx"> 2016-12-16 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Improve resource loading console logging
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -1638,7 +1638,7 @@
</span><span class="cx"> presentationTimestamp = nearestToPresentationStartTime;
</span><span class="cx">
</span><span class="cx"> auto nearestToPresentationEndTime = trackBuffer.buffered.nearest(presentationEndTime);
</span><del>- if (nearestToPresentationStartTime.isValid() && (nearestToPresentationEndTime - presentationEndTime).isBetween(MediaTime::zeroTime(), MediaSource::currentTimeFudgeFactor()))
</del><ins>+ if (nearestToPresentationEndTime.isValid() && (nearestToPresentationEndTime - presentationEndTime).isBetween(MediaTime::zeroTime(), MediaSource::currentTimeFudgeFactor()))
</ins><span class="cx"> presentationEndTime = nearestToPresentationEndTime;
</span><span class="cx">
</span><span class="cx"> trackBuffer.buffered.add(presentationTimestamp, presentationEndTime);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/page/PrintContext.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2007 Alp Toker <alp@atoker.com>
</span><del>- * Copyright (C) 2007 Apple Inc.
</del><ins>+ * Copyright (C) 2007, 2016 Apple Inc.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> FloatPoint point = renderer->absoluteAnchorRect().minXMinYCorner();
</span><del>- point.expandedTo(FloatPoint());
</del><ins>+ point = point.expandedTo(FloatPoint());
</ins><span class="cx">
</span><span class="cx"> if (!pageRect.contains(roundedIntPoint(point)))
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2010 Mozilla Corporation. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> if (width < 0 || height < 0)
</span><span class="cx"> return GraphicsContext3D::INVALID_VALUE;
</span><span class="cx"> unsigned int bytesPerComponent, componentsPerPixel;
</span><del>- if (!computeFormatAndTypeParameters(format, type, &bytesPerComponent, &componentsPerPixel))
</del><ins>+ if (!computeFormatAndTypeParameters(format, type, &componentsPerPixel, &bytesPerComponent))
</ins><span class="cx"> return GraphicsContext3D::INVALID_ENUM;
</span><span class="cx"> if (!width || !height) {
</span><span class="cx"> *imageSizeInBytes = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCacheValidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CacheValidation.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/platform/network/CacheValidation.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> "connection",
</span><span class="cx"> "etag",
</span><span class="cx"> "keep-alive",
</span><del>- "last-modified"
</del><ins>+ "last-modified",
</ins><span class="cx"> "proxy-authenticate",
</span><span class="cx"> "proxy-connection",
</span><span class="cx"> "trailer",
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> auto codePoints = StringView(m_glyphs[v[0]].codepoints).codePoints();
</span><span class="cx"> auto codePointsIterator = codePoints.begin();
</span><span class="cx"> ASSERT(codePointsIterator != codePoints.end());
</span><del>- ASSERT(codepoint = *codePointsIterator);
</del><ins>+ ASSERT(codepoint == *codePointsIterator);
</ins><span class="cx"> #endif
</span><span class="cx"> return v[0];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Tools/ChangeLog 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-15 Brent Fulgham <bfulgham@apple.com>
+
+ Arguments called in wrong order
+ https://bugs.webkit.org/show_bug.cgi?id=165923
+
+ Reviewed by Simon Fraser.
+
+ The 'audioDeviceUIDs' array is being passed to the argument that expects video devices,
+ and the 'videoDeviceUIDs' array is being passed to the audo device argument. Fix this.
+
+ * TestWebKitAPI/Tests/WebKit2/UserMedia.cpp:
+ (TestWebKitAPI::decidePolicyForUserMediaPermissionRequestCallBack): The
+ order of arguments to WKUserMediaPermissionRequestAllow are flipped.
+
</ins><span class="cx"> 2016-12-16 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Disable non-srcdir builds for failing libraries
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2UserMediacpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (209923 => 209924)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2016-12-16 17:53:26 UTC (rev 209923)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2016-12-16 18:32:27 UTC (rev 209924)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2014 Igalia S.L
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> else
</span><span class="cx"> audioDeviceUID = WKStringCreateWithUTF8CString("");
</span><span class="cx">
</span><del>- WKUserMediaPermissionRequestAllow(permissionRequest, videoDeviceUID.get(), audioDeviceUID.get());
</del><ins>+ WKUserMediaPermissionRequestAllow(permissionRequest, audioDeviceUID.get(), videoDeviceUID.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> done = true;
</span></span></pre>
</div>
</div>
</body>
</html>