Changeset 209924 in webkit

Timestamp:

Dec 16, 2016 10:32:27 AM (7 years ago)

Author:

Brent Fulgham

Message:

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.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/SourceBuffer.cpp (modified) (2 diffs)
• Source/WebCore/page/PrintContext.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/GraphicsContext3D.cpp (modified) (2 diffs)
• Source/WebCore/platform/network/CacheValidation.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGToOTFFontConversion.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2016-12-16  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
- * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1639 +1639 @@
 
         auto nearestToPresentationEndTime = trackBuffer.buffered.nearest(presentationEndTime);
-        if (nearestToPresentationStartTime.isValid() && (nearestToPresentationEndTime - presentationEndTime).isBetween(MediaTime::zeroTime(), MediaSource::currentTimeFudgeFactor()))
+        if (nearestToPresentationEndTime.isValid() && (nearestToPresentationEndTime - presentationEndTime).isBetween(MediaTime::zeroTime(), MediaSource::currentTimeFudgeFactor()))
             presentationEndTime = nearestToPresentationEndTime;
 

trunk/Source/WebCore/page/PrintContext.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- * Copyright (C) 2007 Apple Inc.
+ * Copyright (C) 2007, 2016 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -276 +276 @@
 
         FloatPoint point = renderer->absoluteAnchorRect().minXMinYCorner();
-        point.expandedTo(FloatPoint());
+        point = point.expandedTo(FloatPoint());
 
         if (!pageRect.contains(roundedIntPoint(point)))

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2016 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Mozilla Corporation. All rights reserved.
@@ -330 +330 @@
         return GraphicsContext3D::INVALID_VALUE;
     unsigned int bytesPerComponent, componentsPerPixel;
-    if (!computeFormatAndTypeParameters(format, type, &bytesPerComponent, &componentsPerPixel))
+    if (!computeFormatAndTypeParameters(format, type, &componentsPerPixel, &bytesPerComponent))
         return GraphicsContext3D::INVALID_ENUM;
     if (!width || !height) {

trunk/Source/WebCore/platform/network/CacheValidation.cpp

@@ -47 +47 @@
     "etag",
     "keep-alive",
-    "last-modified"
+    "last-modified",
     "proxy-authenticate",
     "proxy-connection",

trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -734 +734 @@
     auto codePointsIterator = codePoints.begin();
     ASSERT(codePointsIterator != codePoints.end());
-    ASSERT(codepoint = *codePointsIterator);
+    ASSERT(codepoint == *codePointsIterator);
 #endif
     return v[0];

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2016-12-16  Hunseop Jeong  <hs85.jeong@samsung.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2014 Igalia S.L
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -51 +52 @@
             audioDeviceUID = WKStringCreateWithUTF8CString("");
 
-        WKUserMediaPermissionRequestAllow(permissionRequest, videoDeviceUID.get(), audioDeviceUID.get());
+        WKUserMediaPermissionRequestAllow(permissionRequest, audioDeviceUID.get(), videoDeviceUID.get());
     }