Commit b98488aa authored by Henri Sivonen's avatar Henri Sivonen
Browse files

Bug 673087 - Honor encoding declared via XML declaration in text/html. r=emk 

Differential Revision: https://phabricator.services.mozilla.com/D107806
parent 03eae2c9

.cargo/config.in

+5 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ git = "https://github.com/jfkthame/mapped_hyph.git" 
replace-with = "vendored-sources"

rev = "578d7058a638c955a597f035ce1a11049c3021d7"



[source."https://github.com/hsivonen/xmldecl"]

git = "https://github.com/hsivonen/xmldecl"

replace-with = "vendored-sources"

rev = "a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"



[source."https://github.com/hsivonen/packed_simd"]

git = "https://github.com/hsivonen/packed_simd"

replace-with = "vendored-sources"

Cargo.lock

+9 −0
Original line number Diff line number Diff line
@@ -1281,6 +1281,7 @@ dependencies = [ 
 "encoding_rs",

 "nserror",

 "nsstring",

 "xmldecl",

]



[[package]]
@@ -6093,6 +6094,14 @@ version = "0.8.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"



[[package]]

name = "xmldecl"

version = "0.1.1"

source = "git+https://github.com/hsivonen/xmldecl?rev=a74f7df5bf6cb11194fb74daa0c3cf42f326fd90#a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"

dependencies = [

 "encoding_rs",

]



[[package]]

name = "xpcom"

version = "0.1.0"

Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" } 
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }

failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }

minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" }

xmldecl = { git = "https://github.com/hsivonen/xmldecl", rev="a74f7df5bf6cb11194fb74daa0c3cf42f326fd90" }



[patch.crates-io.cranelift-codegen]

git = "https://github.com/mozilla-spidermonkey/wasmtime"

config/makefiles/rust.mk

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ endif 


ifndef RUSTC_BOOTSTRAP

ifeq (,$(filter 1.47.% 1.48.% 1.49.%,$(RUSTC_VERSION)))

RUSTC_BOOTSTRAP := gkrust_shared,qcms

RUSTC_BOOTSTRAP := gkrust_shared,qcms,xmldecl

ifdef MOZ_RUST_SIMD

RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd

endif

docshell/base/nsDocShell.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,7 @@ nsDocShell::GatherCharsetMenuTelemetry() { 
            Telemetry::LABELS_ENCODING_OVERRIDE_SITUATION_2::ChannelNonUtf8);

      }

      break;

    case kCharsetFromXmlDeclaration:

    case kCharsetFromMetaPrescan:

    case kCharsetFromMetaTag:

      if (isFileURL) {