Commit 7f5e2711 authored by Marian-Vasile Laza's avatar Marian-Vasile Laza
Browse files

Backed out 3 changesets (bug 1784265) for causing reftest failures on... 

Backed out 3 changesets (bug 1784265) for causing reftest failures on flex-emulation-1.xhtml. CLOSED TREE

Backed out changeset 415da4b53bdd (bug 1784265)
Backed out changeset e27b21c54b1f (bug 1784265)
Backed out changeset fcb1a053fbe2 (bug 1784265)
parent 40c85ae2

browser/base/content/browser-box.inc.xhtml

+8 −4
Original line number Diff line number Diff line
@@ -5,16 +5,20 @@ 
<hbox flex="1" id="browser">

  <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">

    <box id="sidebar-header" align="center">

      <toolbarbutton id="sidebar-switcher-target" class="tabbable">

      <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">

        <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>

        <label id="sidebar-title" crop="end" control="sidebar"/>

        <label id="sidebar-title" crop="end" flex="1" control="sidebar"/>

        <image id="sidebar-switcher-arrow"/>

      </toolbarbutton>

      <image id="sidebar-throbber"/>

      <spacer id="sidebar-spacer"/>

# To ensure the button label's intrinsic width doesn't expand the sidebar

# if the label is long, the button needs flex=1.

# To ensure the button doesn't expand unnecessarily for short labels, the

# spacer should significantly out-flex the button.

      <spacer flex="1000"/>

      <toolbarbutton id="sidebar-close" class="close-icon tabbable" data-l10n-id="sidebar-close-button" oncommand="SidebarUI.hide();"/>

    </box>

    <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true"

    <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"

              style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>

  </vbox>

browser/base/content/browser.css

+1 −14
Original line number Diff line number Diff line
@@ -32,21 +32,8 @@ body { 
  min-width: -moz-fit-content;

}



/* We set large flex on both containers to allow the devtools toolbox to

 * set a flex value itself. We don't want the toolbox to actually take up free

 * space, but we do want it to collapse when the window shrinks, and with

 * flex: 0 it can't.

 *

 * When the toolbox is on the bottom it's a sibling of browserStack, and when

 * it's on the side it's a sibling of browserContainer.

 */

.browserContainer {

  -moz-box-flex: 10000;

}



.browserStack {

  -moz-box-flex: 10000;

/* Prevent shrinking the page content to 0 height and width */

.browserStack {

  min-height: 25px;

  min-width: 25px;

}

browser/base/content/navigator-toolbox.inc.xhtml

+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
        </toolbarbutton>

      </toolbaritem>

      <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>

      <toolbaritem id="urlbar-container" persist="width"

      <toolbaritem id="urlbar-container" flex="400" persist="width"

                   removable="false"

                   class="chromeclass-location" overflows="false">

        <toolbartabstop/>
@@ -654,6 +654,7 @@ 
                 class="chromeclass-toolbar-additional"

                 data-l10n-id="navbar-search"

                 align="center"

                 flex="175"

                 persist="width">

      <toolbartabstop/>

      <searchbar id="searchbar" flex="1"/>

browser/base/content/pageinfo/pageInfo.js

+3 −3
Original line number Diff line number Diff line
@@ -833,17 +833,17 @@ function onImageSelect() { 
    previewBox.collapsed = true;

    mediaSaveBox.collapsed = true;

    splitter.collapsed = true;

    tree.setAttribute("flex", "1");

    tree.flex = 1;

  } else if (count > 1) {

    splitter.collapsed = true;

    previewBox.collapsed = true;

    mediaSaveBox.collapsed = false;

    tree.setAttribute("flex", "1");

    tree.flex = 1;

  } else {

    mediaSaveBox.collapsed = true;

    splitter.collapsed = false;

    previewBox.collapsed = false;

    tree.setAttribute("flex", "0");

    tree.flex = 0;

    makePreview(getSelectedRows(tree)[0]);

  }

}

browser/base/content/pageinfo/pageInfo.xhtml

+8 −8
Original line number Diff line number Diff line
@@ -152,11 +152,11 @@ 
        <tree id="metatree" flex="1" hidecolumnpicker="true" contextmenu="picontext">

          <treecols>

            <treecol id="meta-name"    data-l10n-id="general-meta-name"

                     persist="width" style="-moz-box-flex: 1"

                     persist="width" flex="1"

                     onclick="gMetaView.onPageMediaSort('meta-name');"/>

            <splitter class="tree-splitter"/>

            <treecol id="meta-content" data-l10n-id="general-meta-content"

                     persist="width" style="-moz-box-flex: 4"

                     persist="width" flex="4"

                     onclick="gMetaView.onPageMediaSort('meta-content');"/>

          </treecols>

          <treechildren id="metatreechildren" flex="1"/>
@@ -172,23 +172,23 @@ 
      <tree id="imagetree" onselect="onImageSelect();" contextmenu="picontext"

            ondragstart="onBeginLinkDrag(event, 'image-address', 'image-alt')">

        <treecols>

          <treecol primary="true" persist="width" style="-moz-box-flex: 10"

          <treecol primary="true" persist="width" flex="10"

                        width="10" id="image-address" data-l10n-id="media-address"

                        onclick="gImageView.onPageMediaSort('image-address');"/>

          <splitter class="tree-splitter"/>

          <treecol persist="hidden width" style="-moz-box-flex: 2"

          <treecol persist="hidden width" flex="2"

                        width="2"  id="image-type"    data-l10n-id="media-type"

                        onclick="gImageView.onPageMediaSort('image-type');"/>

          <splitter class="tree-splitter"/>

          <treecol hidden="true" persist="hidden width" style="-moz-box-flex: 2"

          <treecol hidden="true" persist="hidden width" flex="2"

                        width="2"  id="image-size"  data-l10n-id="media-size" value="size"

                        onclick="gImageView.onPageMediaSort('image-size');"/>

          <splitter class="tree-splitter"/>

          <treecol hidden="true" persist="hidden width" style="-moz-box-flex: 4"

          <treecol hidden="true" persist="hidden width" flex="4"

                        width="4"  id="image-alt"    data-l10n-id="media-alt-header"

                        onclick="gImageView.onPageMediaSort('image-alt');"/>

          <splitter class="tree-splitter"/>

          <treecol hidden="true" persist="hidden width" style="-moz-box-flex: 1"

          <treecol hidden="true" persist="hidden width" flex="1"

                        width="1"  id="image-count"    data-l10n-id="media-count"

                        onclick="gImageView.onPageMediaSort('image-count');"/>

        </treecols>