Merge branch 'master' of github.com:openlayers/ol3 into vector

Conflicts:
	src/ol/renderer/canvas/canvasrenderer.js
	test/ol.html

src/ol/renderer/canvas/canvaslayerrenderer.js

@@ -1,5 +1,6 @@
 goog.provide('ol.renderer.canvas.Layer');
 
+goog.require('ol.layer.Layer');
 goog.require('ol.renderer.Layer');
 
 

src/ol/renderer/canvas/canvasrenderer.js

@@ -1,4 +1,5 @@
 goog.provide('ol.renderer.canvas');
+goog.provide('ol.renderer.canvas.isSupported');
 goog.provide('ol.renderer.canvas.Renderer');
 
 goog.require('goog.asserts');

src/ol/renderer/canvas/canvastilelayerrenderer.js

@@ -6,10 +6,11 @@ goog.provide('ol.renderer.canvas.TileLayer');
 
 goog.require('goog.array');
 goog.require('goog.dom');
-goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Size');
-goog.require('ol.TileRange');
+goog.require('ol.Tile');
+goog.require('ol.TileCoord');
+goog.require('ol.TileState');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');

src/ol/renderer/dom/domlayerrenderer.js

@@ -1,6 +1,5 @@
 goog.provide('ol.renderer.dom.Layer');
 
-goog.require('ol.Coordinate');
 goog.require('ol.layer.Layer');
 goog.require('ol.renderer.Layer');
 

src/ol/renderer/dom/dommaprenderer.js

@@ -4,11 +4,7 @@ goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
-goog.require('goog.events');
-goog.require('goog.events.Event');
 goog.require('goog.style');
-goog.require('ol.Coordinate');
-goog.require('ol.FrameState');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.dom.TileLayer');

src/ol/renderer/dom/domrenderer.js

@@ -1,4 +1,4 @@
-goog.provide('ol.renderer.dom');
+goog.provide('ol.renderer.dom.isSupported');
 
 goog.require('goog.functions');
 

src/ol/renderer/dom/domtilelayerrenderer.js

@@ -5,17 +5,16 @@ goog.provide('ol.renderer.dom.TileLayer');
 
 goog.require('goog.asserts');
 goog.require('goog.dom');
-goog.require('goog.math.Vec2');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Coordinate');
 goog.require('ol.Extent');
-goog.require('ol.Size');
+goog.require('ol.Tile');
 goog.require('ol.TileCoord');
-goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.ViewHint');
 goog.require('ol.dom');
+goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.dom.Layer');
 goog.require('ol.tilegrid.TileGrid');
 

src/ol/renderer/layerrenderer.js

@@ -8,6 +8,7 @@ goog.require('ol.TileRange');
 goog.require('ol.layer.Layer');
 goog.require('ol.layer.LayerProperty');
 goog.require('ol.layer.LayerState');
+goog.require('ol.source.Source');
 goog.require('ol.source.TileSource');
 
 

src/ol/renderer/maprenderer.js

@@ -6,9 +6,12 @@ goog.require('goog.asserts');
 goog.require('goog.events');
 goog.require('goog.functions');
 goog.require('goog.vec.Mat4');
+goog.require('ol.CollectionEvent');
+goog.require('ol.CollectionEventType');
 goog.require('ol.FrameState');
-goog.require('ol.View2D');
-goog.require('ol.View2DProperty');
+goog.require('ol.Object');
+goog.require('ol.layer.Layer');
+goog.require('ol.renderer.Layer');
 
 
 

src/ol/renderer/webgl/webglmaprenderer.js

@@ -5,16 +5,15 @@ goog.provide('ol.renderer.webgl.map.shader');
 
 goog.require('goog.array');
 goog.require('goog.debug.Logger');
-goog.require('goog.dispose');
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.events.Event');
-goog.require('goog.events.EventType');
 goog.require('goog.style');
 goog.require('goog.webgl');
+goog.require('ol.FrameState');
+goog.require('ol.Size');
 goog.require('ol.Tile');
-goog.require('ol.layer.Layer');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.webgl.FragmentShader');

src/ol/renderer/webgl/webglrenderer.js

@@ -1,4 +1,4 @@
-goog.provide('ol.renderer.webgl');
+goog.provide('ol.renderer.webgl.isSupported');
 
 goog.require('ol.webgl');
 

src/ol/renderer/webgl/webgltilelayerrenderer.js

@@ -7,16 +7,17 @@ goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Fragment');
 goog.provide('ol.renderer.webgl.tilelayerrenderer.shader.Vertex');
 
 goog.require('goog.array');
-goog.require('goog.asserts');
-goog.require('goog.events.EventType');
 goog.require('goog.object');
 goog.require('goog.structs.PriorityQueue');
 goog.require('goog.vec.Mat4');
 goog.require('goog.vec.Vec4');
 goog.require('goog.webgl');
-goog.require('ol.Coordinate');
+goog.require('ol.Extent');
 goog.require('ol.FrameState');
 goog.require('ol.Size');
+goog.require('ol.Tile');
+goog.require('ol.TileCoord');
+goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.layer.TileLayer');
 goog.require('ol.renderer.webgl.FragmentShader');