Back out 0ed1ae70d922 (bug 1171357) for b2g emulator-l warnings-as-errors
authorPhil Ringnalda <philringnalda@gmail.com>
Thu, 04 Jun 2015 22:25:00 -0700
changeset 247283 f822eea62404c9c60f9b02ecda3ca08b406847cf
parent 247282 ca87dfad14cfb10a0025655f18dc2094c2884a7f
child 247284 4064fc7834989f7569261f346420ed07e9fec378
push id60664
push userphilringnalda@gmail.com
push dateFri, 05 Jun 2015 05:25:08 +0000
treeherdermozilla-inbound@f822eea62404 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1171357
milestone41.0a1
backs out0ed1ae70d92286c2006b29e954e6c8a14b0c94a8
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
Back out 0ed1ae70d922 (bug 1171357) for b2g emulator-l warnings-as-errors CLOSED TREE
gfx/thebes/gfxTextRun.cpp
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -2981,53 +2981,26 @@ void gfxFontGroup::ComputeRanges(nsTArra
                     prevFont = font;
                 }
             }
         }
     }
 
     aRanges[lastRangeIndex].end = aLength;
 
-#ifndef RELEASE_BUILD
-    PRLogModuleInfo *log = (mStyle.systemFont ?
-                            gfxPlatform::GetLog(eGfxLog_textrunui) :
-                            gfxPlatform::GetLog(eGfxLog_textrun));
-
-    if (MOZ_UNLIKELY(MOZ_LOG_TEST(log, LogLevel::Debug))) {
-        nsAutoCString lang;
-        mStyle.language->ToUTF8String(lang);
-        nsAutoString families;
-        mFamilyList.ToString(families);
-
-        // collect the font matched for each range
-        nsAutoCString fontMatches;
-        for (size_t i = 0, i_end = aRanges.Length(); i < i_end; i++) {
-            char match[256];
-            const gfxTextRange& r = aRanges[i];
-            sprintf(match, " [%u:%u] %.200s (%s)",
-                    r.start, r.end,
-                    (r.font.get() ?
-                     NS_ConvertUTF16toUTF8(r.font->GetName()).get() : "<null>"),
-                    (r.matchType == gfxTextRange::kFontGroup ?
-                         "list" :
-                         (r.matchType == gfxTextRange::kPrefsFallback) ?
-                              "prefs" : "sys"));
-            fontMatches.Append(match);
-        }
-        MOZ_LOG(log, LogLevel::Debug,\
-               ("(%s-fontmatching) fontgroup: [%s] default: %s lang: %s script: %d"
-                "%s\n",
-                (mStyle.systemFont ? "textrunui" : "textrun"),
-                NS_ConvertUTF16toUTF8(families).get(),
-                (mFamilyList.GetDefaultFontType() == eFamily_serif ?
-                 "serif" :
-                 (mFamilyList.GetDefaultFontType() == eFamily_sans_serif ?
-                  "sans-serif" : "none")),
-                lang.get(), aRunScript,
-                fontMatches.get()));
+#if 0
+    // dump out font matching info
+    if (mStyle.systemFont) return;
+    for (size_t i = 0, i_end = aRanges.Length(); i < i_end; i++) {
+        const gfxTextRange& r = aRanges[i];
+        printf("fontmatch %zd:%zd font: %s (%d)\n",
+               r.start, r.end,
+               (r.font.get() ?
+                    NS_ConvertUTF16toUTF8(r.font->GetName()).get() : "<null>"),
+               r.matchType);
     }
 #endif
 }
 
 gfxUserFontSet*
 gfxFontGroup::GetUserFontSet()
 {
     return mUserFontSet;