Bug 1184402 - Part 1: Rename GetInfo() to GetUsage() for obtaining FormatUsageInfo. r=jgilbert
authorDan Glastonbury <dglastonbury@mozilla.com>
Fri, 17 Jul 2015 10:24:34 +1000
changeset 287017 631e78da4e3deb91b7ca83cf74f5607a6cf45d19
parent 287016 69b3b57895914bb082331c9567581c1c399cc390
child 287018 5fe2bb2c7656d76619a34fb96152e49a6e514532
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1184402
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1184402 - Part 1: Rename GetInfo() to GetUsage() for obtaining FormatUsageInfo. r=jgilbert
dom/canvas/WebGLFormats.cpp
dom/canvas/WebGLFormats.h
--- a/dom/canvas/WebGLFormats.cpp
+++ b/dom/canvas/WebGLFormats.cpp
@@ -742,17 +742,17 @@ FormatUsageAuthority::CreateForWebGL2()
     ret->AddUnpackOption(LOCAL_GL_ALPHA          , LOCAL_GL_UNSIGNED_BYTE, EffectiveFormat::Alpha8          );
 
     return Move(ret);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
 FormatUsageInfo*
-FormatUsageAuthority::GetInfo(EffectiveFormat format)
+FormatUsageAuthority::GetUsage(EffectiveFormat format)
 {
     auto itr = mInfoMap.find(format);
 
     if (itr == mInfoMap.end())
         return nullptr;
 
     return &(itr->second);
 }
@@ -772,17 +772,17 @@ FormatUsageAuthority::AddFormat(Effectiv
     AlwaysInsert(mInfoMap, format, usage);
 }
 
 void
 FormatUsageAuthority::AddUnpackOption(GLenum unpackFormat, GLenum unpackType,
                                       EffectiveFormat effectiveFormat)
 {
     const UnpackTuple unpack = { unpackFormat, unpackType };
-    FormatUsageInfo* usage = GetInfo(effectiveFormat);
+    FormatUsageInfo* usage = GetUsage(effectiveFormat);
     MOZ_RELEASE_ASSERT(usage);
     if (!usage)
         return;
 
     MOZ_RELEASE_ASSERT(usage->asTexture);
 
     auto res = usage->validUnpacks.insert(unpack);
     bool didInsert = res.second;
--- a/dom/canvas/WebGLFormats.h
+++ b/dom/canvas/WebGLFormats.h
@@ -236,21 +236,21 @@ private:
 
 public:
     void AddFormat(EffectiveFormat format, bool asRenderbuffer, bool isRenderable,
                    bool asTexture, bool isFilterable);
 
     void AddUnpackOption(GLenum unpackFormat, GLenum unpackType,
                          EffectiveFormat effectiveFormat);
 
-    FormatUsageInfo* GetInfo(EffectiveFormat format);
+    FormatUsageInfo* GetUsage(EffectiveFormat format);
 
-    FormatUsageInfo* GetInfo(const FormatInfo* format)
+    FormatUsageInfo* GetUsage(const FormatInfo* format)
     {
-        return GetInfo(format->effectiveFormat);
+        return GetUsage(format->effectiveFormat);
     }
 };
 
 ////////////////////////////////////////
 
 } // namespace webgl
 } // namespace mozilla