commit 190904f3c647cbe5a394b1fb69d84d3b688bd40c Author: Georg Koppen gk@torproject.org Date: Sat Jun 27 18:29:41 2015 +0000

fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/base/nsContentUtils.h | 2 +- dom/events/KeyCodeConsensus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index e8cb432..d4fff09 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2401,7 +2401,7 @@ private: static bool sIsExperimentalAutocompleteEnabled; static bool sEncodeDecodeURLHash; static bool sPrivacyResistFingerprinting; - + static nsHtml5StringParser* sHTMLFragmentParser; static nsIParser* sXMLFragmentParser; static nsIFragmentContentSink* sXMLFragmentSink; diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h index 8d66d19..5493c36 100644 --- a/dom/events/KeyCodeConsensus.h +++ b/dom/events/KeyCodeConsensus.h @@ -4,7 +4,7 @@ // the numpad, right modifer keys, and any non-QWERTY US English keyboard.

#include "nsString.h" -#include "nsClassHashTable.h" +#include "nsDataHashtable.h"

// KEY_INTERNAL is called by KEY or SHIFT. #define KEY_INTERNAL(key, code, keyCode, shift) \