Merge pull request #2377 from Leaflet/accel

Smarter hardware acceleration

dist/leaflet.css

@@ -26,6 +26,16 @@
 	        user-select: none;
 	-webkit-user-drag: none;
 	}
+/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
+.leaflet-safari .leaflet-tile {
+	image-rendering: -webkit-optimize-contrast;
+	}
+/* hack that prevents hw layers "stretching" when loading new tiles */
+.leaflet-safari .leaflet-tile-container {
+	width: 1600px;
+	height: 1600px;
+	-webkit-transform-origin: 0 0;
+	}
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
 	display: block;

src/core/Browser.js

@@ -12,6 +12,7 @@
 	    webkit    = ua.indexOf('webkit') !== -1,
 	    phantomjs = ua.indexOf('phantom') !== -1,
 	    android23 = ua.search('android [23]') !== -1,
+	    chrome    = ua.indexOf('chrome') !== -1,
 
 	    mobile = typeof orientation !== 'undefined',
 	    msPointer = navigator.msPointerEnabled && navigator.msMaxTouchPoints && !window.PointerEvent,
@@ -40,7 +41,8 @@
 		gecko: (ua.indexOf('gecko') !== -1) && !webkit && !window.opera && !ie,
 		android: ua.indexOf('android') !== -1,
 		android23: android23,
-		chrome: ua.indexOf('chrome') !== -1,
+		chrome: chrome,
+		safari: !chrome && ua.indexOf('safari') !== -1,
 
 		ie3d: ie3d,
 		webkit3d: webkit3d,

src/dom/DomUtil.js

@@ -131,22 +131,18 @@ L.DomUtil = {
 	},
 
 	setTransform: function (el, offset, scale) {
-		var is3d = L.Browser.webkit3d,
-		    pos = offset || new L.Point(0, 0);
+		var pos = offset || new L.Point(0, 0);
 
 		el.style[L.DomUtil.TRANSFORM] =
-			'translate' + (is3d ? '3d(' : '(') + pos.x + 'px,' + pos.y + 'px' + (is3d ? ',0)' : ')') +
-			(scale ? ' scale(' + scale + ')' : '');
+			'translate3d(' + pos.x + 'px,' + pos.y + 'px' + ',0)' + (scale ? ' scale(' + scale + ')' : '');
 	},
 
-	setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
+	setPosition: function (el, point, no3d) { // (HTMLElement, Point[, Boolean])
 
 		// jshint camelcase: false
 		el._leaflet_pos = point;
 
-		if (!disable3D && L.Browser.any3d) {
-			// on WebKit browsers, using translate3d instead of translate makes animation smoother
-			// as it ensures HW acceleration is used. Firefox doesn't care (same speed either way).
+		if (L.Browser.any3d && !no3d) {
 			L.DomUtil.setTransform(el, point);
 		} else {
 			el.style.left = point.x + 'px';

src/layer/tile/GridLayer.js

@@ -171,6 +171,8 @@ L.GridLayer = L.Layer.extend({
 			this._bgBuffer = L.DomUtil.create('div', className, this._container);
 			this._tileContainer = L.DomUtil.create('div', className, this._container);
 
+			L.DomUtil.setTransform(this._tileContainer);
+
 		} else {
 			this._tileContainer = this._container;
 		}
@@ -297,6 +299,7 @@ L.GridLayer = L.Layer.extend({
 		for (i = 0; i < tilesToLoad; i++) {
 			this._addTile(queue[i], fragment);
 		}
+
 		this._tileContainer.appendChild(fragment);
 	},
 
@@ -383,7 +386,7 @@ L.GridLayer = L.Layer.extend({
 
 		// without this hack, tiles disappear after zoom on Chrome for Android
 		// https://github.com/Leaflet/Leaflet/issues/2078
-		if (L.Browser.mobileWebkit3d) {
+		if (L.Browser.android && !L.Browser.android23) {
 			tile.style.WebkitBackfaceVisibility = 'hidden';
 		}
 	},
@@ -405,10 +408,9 @@ L.GridLayer = L.Layer.extend({
 			setTimeout(L.bind(this._tileReady, this, null, tile), 0);
 		}
 
-		// Chrome 20 layouts much faster with top/left (verify with timeline, frames)
-		// Android 4 browser has display issues with top/left and requires transform instead
-		// (other browsers don't currently care) - see debug/hacks/jitter.html for an example
-		L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome);
+		// we prefer top/left over translate3d so that we don't create a HW-accelerated layer from each tile
+		// which is slow, and it also fixes gaps between tiles in Safari
+		L.DomUtil.setPosition(tile, tilePos, true);
 
 		// save tile in cache
 		this._tiles[this._tileCoordsToKey(coords)] = tile;

src/map/Map.js

@@ -435,6 +435,7 @@ L.Map = L.Evented.extend({
 			(L.Browser.touch ? ' leaflet-touch' : '') +
 			(L.Browser.retina ? ' leaflet-retina' : '') +
 			(L.Browser.ielt9 ? ' leaflet-oldie' : '') +
+			(L.Browser.safari ? ' leaflet-safari' : '') +
 			(this._fadeAnimated ? ' leaflet-fade-anim' : ''));
 
 		var position = L.DomUtil.getStyle(container, 'position');