From 6dd48eeb5ed0cb01f1af5fc157b88892c8deaa24 Mon Sep 17 00:00:00 2001 From: Georg Koppen Date: Thu, 5 Oct 2017 12:08:28 +0000 Subject: [PATCH] Revert "bug 23104 - Add a default line height compensation" This reverts commit 722fd293451de0859106949d64dc2cb16c22a780. Backing out due to #23701: We should make sure this defense only applies to content and not the browser chrome. --- layout/generic/ReflowInput.cpp | 6 ---- tbb-tests/mochitest.ini | 1 - tbb-tests/test_tor_bug23104.html | 51 -------------------------------- 3 files changed, 58 deletions(-) delete mode 100644 tbb-tests/test_tor_bug23104.html diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index e219ae032cc64..42f4a24b53149 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -30,7 +30,6 @@ #include "CounterStyleManager.h" #include #include "mozilla/dom/HTMLInputElement.h" -#include "nsContentUtils.h" #ifdef DEBUG #undef NOISY_VERTICAL_ALIGN @@ -2769,11 +2768,6 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics) nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - - if (nsContentUtils::ShouldResistFingerprinting()) { - return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR); - } - switch (GetNormalLineHeightCalcControl()) { case eIncludeExternalLeading: normalLineHeight = emHeight+ internalLeading + externalLeading; diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index fca972a512111..3d2e7c9db8036 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -10,4 +10,3 @@ support-files = [test_tor_bug2875.html] [test_tor_bug4755.html] [test_tor_bug5856.html] -[test_tor_bug23104.html] diff --git a/tbb-tests/test_tor_bug23104.html b/tbb-tests/test_tor_bug23104.html deleted file mode 100644 index 77d7d190d7c8a..0000000000000 --- a/tbb-tests/test_tor_bug23104.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running - - - - - -Test1 -كلمة -ação - - - -- GitLab