Cleanup embedlite branch from obsolete changes

browser/themes/shared/devtools/toolbars.inc.css

@@ -549,24 +549,21 @@
 #toolbox-tabs .devtools-tab[selected=true] {
   color: #f5f7fa;
   background-color: #1a4666;
+  border-width: 0;
   box-shadow: 0 2px 0 #d7f1ff inset,
               0 8px 3px -5px #2b82bf inset,
               0 -2px 0 rgba(0,0,0,.2) inset;
 }
 
-.devtools-tab[selected=true]:not(:first-child),
-.devtools-tab.highlighted:not(:first-child) {
-  border-width: 0;
+.devtools-tab[selected=true]:not(:first-child) {
   -moz-padding-start: 1px;
 }
 
-.devtools-tab[selected=true]:last-child,
-.devtools-tab.highlighted:last-child {
+.devtools-tab[selected=true]:last-child {
   -moz-padding-end: 1px;
 }
 
-.devtools-tab[selected=true] + .devtools-tab,
-.devtools-tab.highlighted + .devtools-tab {
+.devtools-tab[selected=true] + .devtools-tab {
   -moz-border-start-width: 0;
   -moz-padding-start: 1px;
 }

configure.in

@@ -6195,7 +6195,7 @@ MOZ_ARG_DISABLE_BOOL(webapp-runtime,
 [  --disable-webapp-runtime  Disable Web App Runtime],
     MOZ_WEBAPP_RUNTIME=,
     MOZ_WEBAPP_RUNTIME=1)
-if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a "$MOZ_WIDGET_TOOLKIT" != "gtk2" -a "$MOZ_WIDGET_TOOLKIT" != "qt"; then
+if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a "$MOZ_WIDGET_TOOLKIT" != "gtk2"; then
     MOZ_WEBAPP_RUNTIME=
 fi
 if test "$OS_ARCH" = "WINNT" -a -z "$MAKENSISU" -a -n "$CROSS_COMPILE"; then

content/media/MP3FrameParser.cpp

@@ -511,10 +511,6 @@ int64_t MP3FrameParser::GetDuration()
     return -1;
   }
 
-  if (mSamplesPerSecond == 0) {
-    return -1; // Not a single frame decoded yet
-  }
-
   double frames;
   if (mNumFrames < 0) {
     // Estimate the number of frames in the stream based on the average frame

debian/rules

@@ -99,7 +99,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs -s
 
         # Add here commands to install the package into debian/tmp
@@ -124,9 +124,6 @@ install: build
 	rm -f $(CURDIR)/debian/tmp/$(prefix)/lib/xulrunner-devel-$(GREVERSION)/sdk/lib/libxul.so
 	ln -s sdk/lib $(CURDIR)/debian/tmp/$(prefix)/lib/xulrunner-devel-$(GREVERSION)/lib
 	ln -s /$(prefix)/lib/xulrunner-$(GREVERSION)/libxul.so $(CURDIR)/debian/tmp/$(prefix)/lib/xulrunner-devel-$(GREVERSION)/sdk/lib/libxul.so
-
-#	MOZCONFIG=$(CURDIR)/$(MOZCONFIG_FILE) $(MAKE) -f client.mk install DESTDIR=$(CURDIR)/debian/tmp
-
 	dh_install --sourcedir=debian/tmp
 
 # Build architecture-independent files here.
@@ -149,4 +146,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install

embedding/embedlite/Makefile.in

@@ -1,4 +1,3 @@
-# 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

embedding/embedlite/config/mozconfig.gtkdesktop

@@ -1,6 +1,6 @@
 export ac_cv_have_usable_wchar_option_v2="no"
 
-export CXXFLAGS="-DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="-DUSE_ANDROID_OMTC_HACKS=1 "
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-default-toolkit=cairo-gtk2
 # Would help to get rid of X interactions and use shared image surfaces

embedding/embedlite/config/mozconfig.merqtxulfennec

@@ -9,7 +9,7 @@ mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 mk_add_options MOZ_MAKE_FLAGS="-j2"
 mk_add_options MOZ_OBJDIR="@TOPSRCDIR@/obj-build-mer-qt-fn"
 
-export CXXFLAGS=" -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS=" -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --enable-application=mobile/xul
 ac_add_options --enable-update-channel=nightly

embedding/embedlite/config/mozconfig.merqtxulrunner

@@ -9,7 +9,7 @@ mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 mk_add_options MOZ_MAKE_FLAGS="-j8"
 mk_add_options MOZ_OBJDIR="@TOPSRCDIR@/obj-build-mer-qt-xr"
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --prefix=/usr
 

embedding/embedlite/config/mozconfig.qtN9-qt

@@ -15,7 +15,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS=" -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS=" -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --enable-optimize
 mk_add_options MOZ_MAKE_FLAGS="-j4"

embedding/embedlite/config/mozconfig.qtN9-qt-cross

@@ -62,7 +62,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/config/mozconfig.qtN900-qt

@@ -12,7 +12,7 @@ ac_add_options --enable-debug-symbols="-ggdb"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="-mthumb -mtune=cortex-a8 -mcpu=cortex-a8 -fpermissive -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1"
+export CXXFLAGS="-mthumb -mtune=cortex-a8 -mcpu=cortex-a8 -fpermissive -DUSE_ANDROID_OMTC_HACKS=1"
 export CFLAGS="-mthumb -mtune=cortex-a8 -mcpu=cortex-a8"
 
 ac_add_options --enable-optimize="-O2 -Wno-psabi"

embedding/embedlite/config/mozconfig.qtN900-qt-cross

@@ -62,7 +62,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/config/mozconfig.qtdesktop

@@ -1,6 +1,6 @@
 export ac_cv_have_usable_wchar_option_v2="no"
 
-export CXXFLAGS="-DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="-DUSE_ANDROID_OMTC_HACKS=1 "
 ac_add_options --enable-application=xulrunner
 ac_add_options --enable-default-toolkit=cairo-qt
 # Would help to get rid of X interactions and use shared image surfaces

embedding/embedlite/config/mozconfig.rsppi-gtk

@@ -61,7 +61,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/config/mozconfig.rsppi-gtk-sb2

@@ -31,7 +31,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/config/mozconfig.rsppi-qt

@@ -36,7 +36,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/config/mozconfig.rsppi-qt-sb2

@@ -36,7 +36,7 @@ ac_add_options --enable-debug-symbols="-gdwarf-2"
 export MOZILLA_OFFICIAL=1
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 
-export CXXFLAGS="$CXXFLAGS -DFORCE_BASICTILEDTHEBESLAYER=1 -DEGL_HAS_BACKING_SURFACE=1 -DUSE_ANDROID_OMTC_HACKS=1 "
+export CXXFLAGS="$CXXFLAGS -DUSE_ANDROID_OMTC_HACKS=1 "
 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-libjpeg-turbo

embedding/embedlite/modules/nsIEmbedAppService.idl

@@ -2,7 +2,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+
 #include "nsISupports.idl"
 #include "nsIDOMWindow.idl"
 #include "nsIBaseWindow.idl"

embedding/embedlite/modules/nsIEmbedLiteJSON.idl

@@ -2,7 +2,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
+
 #include "nsISupports.idl"
 #include "nsIPropertyBag2.idl"
 #include "nsIWritablePropertyBag2.idl"

embedding/embedlite/tests/Makefile.in

@@ -1,4 +1,3 @@
-# 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

embedding/embedlite/tests/htmltests/footer.html

@@ -81,4 +81,4 @@
 
 <div class="footer">some random footer text</div>
 </body>
-</html> 
+</html>

embedding/embedlite/tests/htmltests/heater.html

@@ -81,5 +81,5 @@
 
 <div class="footer">some random footer text</div>
 
- 
-</body></html>
+
+</body></html>

embedding/embedlite/tests/htmltests/input_bottom.html

@@ -19,4 +19,4 @@
 <input>
 <br><br>
 </body>
-</html> 
+</html>

embedding/embedlite/tests/htmltests/mouse_events.html

@@ -7,7 +7,7 @@
       border:solid black 1px;
     }
   </style>
-  
+
   <script>
     var ongoingTouches = new Array;
     var offX = 0;
@@ -23,17 +23,17 @@
             do {
                 x += el.offsetLeft - el.scrollLeft;
                 y += el.offsetTop - el.scrollTop;
-            } 
+            }
             while (el = el.offsetParent);
 
             return { "left": x, "top": y }
-        }      
+        }
     }
 
     function colorForTouch(touch) {
       return "#FF00FF";
     }
-    
+
     function ongoingTouchIndexById(idToFind) {
       for (var i=0; i<ongoingTouches.length; i++) {
         var id = ongoingTouches[i].identifier;
@@ -57,7 +57,7 @@
         prevX = evt.clientX;
         prevY = evt.clientY;
     }
- 
+
     function handleMove(evt) {
       evt.preventDefault();
       var el = document.getElementById("canvas");
@@ -95,7 +95,7 @@
       }
     }
 
-  
+
     function startup() {
       var el = document.getElementById("canvas");
       el.addEventListener("mousedown", handleStart, false);

embedding/embedlite/tests/htmltests/newwin.html

@@ -12,4 +12,4 @@
 <input type="button" value="Open Window" onclick="open_win()">
 
 </body>
-</html> 
+</html>

embedding/embedlite/tests/htmltests/touch.html

@@ -7,7 +7,7 @@
       border:solid black 1px;
     }
   </style>
-  
+
   <script>
     var ongoingTouches = new Array;
     var offX = 0;
@@ -21,30 +21,30 @@
             do {
                 x += el.offsetLeft - el.scrollLeft;
                 y += el.offsetTop - el.scrollTop;
-            } 
+            }
             while (el = el.offsetParent);
 
             return { "left": x, "top": y }
-        }      
+        }
     }
 
     function colorForTouch(touch) {
       var id = touch.identifier;
       id = id.toString(16); // make it a hex digit
       return "#" + id + id + id;
     }
-    
+
     function ongoingTouchIndexById(idToFind) {
       for (var i=0; i<ongoingTouches.length; i++) {
         var id = ongoingTouches[i].identifier;
-        
+
         if (id == idToFind) {
           return i;
         }
       }
       return -1;    // not found
     }
-    
+
     function handleStart(evt) {
       evt.preventDefault();
       var el = document.getElementById("canvas");
@@ -53,23 +53,22 @@
       offY = -off.top;
       var ctx = el.getContext("2d");
       var touches = evt.changedTouches;
-            
+
       for (var i=0; i<touches.length; i++) {
         ongoingTouches.push(touches[i]);
         var color = colorForTouch(touches[i]);
         ctx.fillStyle = color;
         ctx.fillRect(touches[i].pageX-2 + offX - window.scrollX, touches[i].pageY-2 + offY - window.scrollY, 4, 4);
       }
     }
-  
+
     function handleMove(evt) {
       evt.preventDefault();
       var el = document.getElementById("canvas");
       var ctx = el.getContext("2d");
       var touches = evt.changedTouches;
-
       ctx.lineWidth = 4;
-            
+
       for (var i=0; i<touches.length; i++) {
         var color = colorForTouch(touches[i]);
         var idx = ongoingTouchIndexById(touches[i].identifier);
@@ -90,32 +89,32 @@
       var el = document.getElementById("canvas");
       var ctx = el.getContext("2d");
       var touches = evt.changedTouches;
-      
+
       ctx.lineWidth = 4;
-            
+
       for (var i=0; i<touches.length; i++) {
         var color = colorForTouch(touches[i]);
         var idx = ongoingTouchIndexById(touches[i].identifier);
-        
+
         ctx.fillStyle = color;
         ctx.beginPath();
         ctx.moveTo(ongoingTouches[i].pageX + offY - window.scrollX, ongoingTouches[i].pageY + offY - window.scrollY);
         ctx.lineTo(touches[i].pageX + offY - window.scrollX, touches[i].pageY + offY - window.scrollY);
         ongoingTouches.splice(i, 1);  // remove it; we're done
       }
     }
-    
+
     function handleCancel(evt) {
       window.dump("handleCancel\n");
       evt.preventDefault();
       var touches = evt.changedTouches;
-      
+
       for (var i=0; i<touches.length; i++) {
         ongoingTouches.splice(i, 1);  // remove it; we're done
       }
     }
 
-  
+
     function startup() {
       var el = document.getElementById("canvas");
       el.addEventListener("touchstart", handleStart, false);

embedding/embedlite/tests/htmltests/two_input.html

@@ -24,4 +24,4 @@
 <br><br>
 <br><br>
 </body>
-</html> 
+</html>