third_party/WebKit/Source/platform/audio/HRTFElevation.cpp - Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/audio/HRTFElevation.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)

Patch Set: Rebasing... Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.cpp ('k') | third_party/WebKit/Source/platform/audio/HRTFKernel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/audio/HRTFElevation.cpp

diff --git a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp

index f43e910f04fc106b9ae713cbf3b4bfef8f65cf40..63c39f4c689344342b1674e8f035332aed5f8cc8 100644

--- a/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp

+++ b/third_party/WebKit/Source/platform/audio/HRTFElevation.cpp

@@ -261,9 +261,9 @@ std::unique_ptr<HRTFElevation> HRTFElevation::createForSubject(

return nullptr;

std::unique_ptr<HRTFKernelList> kernelListL =

- makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

+ WTF::makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

std::unique_ptr<HRTFKernelList> kernelListR =

- makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

+ WTF::makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

// Load convolution kernels from HRTF files.

int interpolatedIndex = 0;

@@ -297,8 +297,9 @@ std::unique_ptr<HRTFElevation> HRTFElevation::createForSubject(

}

- std::unique_ptr<HRTFElevation> hrtfElevation = wrapUnique(new HRTFElevation(

- std::move(kernelListL), std::move(kernelListR), elevation, sampleRate));

+ std::unique_ptr<HRTFElevation> hrtfElevation = WTF::wrapUnique(

+ new HRTFElevation(std::move(kernelListL), std::move(kernelListR),

+ elevation, sampleRate));

return hrtfElevation;

}

@@ -314,9 +315,9 @@ std::unique_ptr<HRTFElevation> HRTFElevation::createByInterpolatingSlices(

ASSERT(x >= 0.0 && x < 1.0);

std::unique_ptr<HRTFKernelList> kernelListL =

- makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

+ WTF::makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

std::unique_ptr<HRTFKernelList> kernelListR =

- makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

+ WTF::makeUnique<HRTFKernelList>(NumberOfTotalAzimuths);

HRTFKernelList* kernelListL1 = hrtfElevation1->kernelListL();

HRTFKernelList* kernelListR1 = hrtfElevation1->kernelListR();

@@ -335,7 +336,7 @@ std::unique_ptr<HRTFElevation> HRTFElevation::createByInterpolatingSlices(

double angle = (1.0 - x) * hrtfElevation1->elevationAngle() +

x * hrtfElevation2->elevationAngle();

- std::unique_ptr<HRTFElevation> hrtfElevation = wrapUnique(

+ std::unique_ptr<HRTFElevation> hrtfElevation = WTF::wrapUnique(

new HRTFElevation(std::move(kernelListL), std::move(kernelListR),

static_cast<int>(angle), sampleRate));

return hrtfElevation;