Bug 1114363 - Mac default: Rely on '-moz-window-dragging: drag;' instead of suite's toolbar.xml bindings. r=Mnyromyr, a=Ratty for checkin to a CLOSED TREE.
authorstefanh@inbox.com
Sat, 10 Jan 2015 19:05:53 +0100
changeset 21624 f5d850dad82754e1afdca2b3b33cc4192352ae74
parent 21623 756da409acdbb96e3bd90bc3764d0a910f1aa6cc
child 21625 cdc3b6b7b4afcd7aea7b68f3ea2fa70a0d45b293
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMnyromyr, Ratty
bugs1114363
Bug 1114363 - Mac default: Rely on '-moz-window-dragging: drag;' instead of suite's toolbar.xml bindings. r=Mnyromyr, a=Ratty for checkin to a CLOSED TREE.
suite/common/bindings/toolbar.xml
suite/themes/classic/mac/communicator/communicator.css
suite/themes/classic/mac/communicator/toolbar.css
--- a/suite/common/bindings/toolbar.xml
+++ b/suite/common/bindings/toolbar.xml
@@ -229,40 +229,16 @@
               }
             } catch (e) {}
           }
         ]]>
       </constructor>
     </implementation>
   </binding>
 
-  <binding id="grippytoolbar-primary-drag"
-           extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
-    <implementation>
-    <field name="_dragBindingAlive">true</field>
-      <constructor>
-        <![CDATA[
-          if (!this._draggableStarted) {
-            this._draggableStarted = true;
-            try {
-              let tmp = {};
-              Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm", tmp);
-              let draggableThis = new tmp.WindowDraggingElement(this);
-              draggableThis.mouseDownCheck = function(e) {
-                // Don't move while customizing.
-                return this._dragBindingAlive &&
-                       this.getAttribute("customizing") != "true";
-              }
-            } catch (e) {}
-          }
-        ]]>
-      </constructor>
-    </implementation>
-  </binding>
-
   <binding id="grippytoolbar-menubar"
            extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar"
            display="xul:menubar"/>
 
   <binding id="grippymenubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
     <content>
       <xul:hbox flex="1" class="toolbar-box">
         <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
--- a/suite/themes/classic/mac/communicator/communicator.css
+++ b/suite/themes/classic/mac/communicator/communicator.css
@@ -15,17 +15,17 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #titlebar:not(:-moz-lwtheme) {
   display: none;
 }
 
 #titlebar {
   height: 22px;
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+  -moz-window-dragging: drag;
 }
 
 /* ::::: toolbar-primary ::::: */
 
 .toolbar-primary {
   -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
 }
 
--- a/suite/themes/classic/mac/communicator/toolbar.css
+++ b/suite/themes/classic/mac/communicator/toolbar.css
@@ -3,28 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== toolbar.css ====================================================
   == Styles used by XUL grippytoolbar in addition to general toolbar styles.
   ======================================================================= */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbar:not([nowindowdrag="true"]):not([type="menubar"]) {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag");
-}
-
-.toolbar-primary:not([nowindowdrag="true"]):not([type="menubar"]) {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary-drag");
-}
-
-toolbox[xpfe="false"] > toolbar:not([nowindowdrag="true"]) {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
-}
-
 toolbargrippy {
   display: none;
   -moz-box-orient: vertical;
   -moz-box-align: center;
   width: 10px;
   padding: 2px 1px;
   list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
 }