Commit 2118316b authored by Dorel Luca's avatar Dorel Luca
Browse files

Backed out changeset 4891a17c55e2 (bug 1713627) for Browser-chrome failures in... 

Backed out changeset 4891a17c55e2 (bug 1713627) for Browser-chrome failures in docshell/test/browser/browser_bug673087-1.js. CLOSED TREE
parent 72925126

Cargo.lock

+21 −0
Original line number Diff line number Diff line
@@ -2025,6 +2025,7 @@ dependencies = [ 
 "rusqlite",

 "rust_minidump_writer_linux",

 "rustc_version",

 "shift_or_euc_c",

 "static_prefs",

 "storage",

 "unic-langid",
@@ -4631,6 +4632,26 @@ dependencies = [ 
 "opaque-debug",

]



[[package]]

name = "shift_or_euc"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f930dea4685b9803954b9d74cdc175c6d946a22f2eafe5aa2e9a58cdcae7da8c"

dependencies = [

 "encoding_rs",

 "memchr",

]



[[package]]

name = "shift_or_euc_c"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c81ec08c8a68c45c48d8ef58b80ce038cc9945891c4a4996761e2ec5cba05abc"

dependencies = [

 "encoding_rs",

 "shift_or_euc",

]



[[package]]

name = "shlex"

version = "0.1.1"

browser/actors/BrowserTabChild.jsm

+3 −2
Original line number Diff line number Diff line
@@ -98,8 +98,9 @@ class BrowserTabChild extends JSWindowActorChild { 
        } catch (e) {}

        break;



      case "ForceEncodingDetection":

        docShell.forceEncodingDetection();

      case "UpdateCharacterSet":

        docShell.charset = message.data.value;

        docShell.gatherCharsetMenuTelemetry();

        break;

    }

  }

browser/base/content/appmenu-viewcache.inc.xhtml

+15 −0
Original line number Diff line number Diff line
@@ -547,6 +547,16 @@ 
    </vbox>

  </panelview>



  <panelview id="PanelUI-characterEncodingView" flex="1">

    <vbox class="panel-subview-body">

      <vbox id="PanelUI-characterEncodingView-pinned"

            class="PanelUI-characterEncodingView-list"/>

      <toolbarseparator/>

      <vbox id="PanelUI-characterEncodingView-charsets"

            class="PanelUI-characterEncodingView-list"/>

    </vbox>

  </panelview>



  <panelview id="PanelUI-panicView" flex="1"

             descriptionheightworkaround="true">

    <vbox class="panel-subview-body">
@@ -585,6 +595,11 @@ 
                     class="subviewbutton subviewbutton-iconic"

                     data-l10n-id="appmenu-taskmanager"

                     oncommand="switchToTabHavingURI('about:performance', true)"/>

      <toolbarbutton id="appMenu-characterencoding-button"

                     class="subviewbutton subviewbutton-nav"

                     label="&charsetMenu2.label;"

                     closemenu="none"

                     oncommand="PanelUI.showSubView('PanelUI-characterEncodingView', this)"/>

      <toolbarbutton id="appMenu-workoffline-button"

                     class="subviewbutton"

                     data-l10n-id="more-menu-go-offline"

browser/base/content/browser-doctype.inc

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
%brandDTD;

<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >

%browserDTD;

<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd" >

%charsetDTD;

<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >

%textcontextDTD;

<!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">

browser/base/content/browser-menubar.inc

+3 −2
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ 
            </menu>



            <menu id="view-menu" data-l10n-id="menu-view">

              <menupopup id="menu_viewPopup">

              <menupopup id="menu_viewPopup"

                         onpopupshowing="updateCharacterEncodingMenuState();">

                <menu id="viewToolbarsMenu" data-l10n-id="menu-view-toolbars-menu">

                  <menupopup id="view-menu-popup" onpopupshowing="onViewToolbarsPopupShowing(event);">

                    <menuseparator/>
@@ -202,7 +203,7 @@ 
                </menu>

                <menuitem id="repair-text-encoding"

                          disabled="true"

                          oncommand="BrowserForceEncodingDetection();"

                          oncommand="BrowserSetForcedCharacterSet('_autodetect_all')"

                          data-l10n-id="menu-view-repair-text-encoding"/>

                <menuseparator/>

#ifdef XP_MACOSX