From 234e8c2fdef488f3632f281185e8f2a6e5b729f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Harrtell?= Date: Sat, 19 Mar 2016 23:12:56 +0100 Subject: [PATCH] Get rid of goog.log --- src/ol/map.js | 12 ------------ src/ol/webgl/context.js | 20 -------------------- 2 files changed, 32 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index 6738fa03d3..f3159e73c9 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -7,12 +7,9 @@ goog.provide('ol.MapProperty'); goog.require('goog.asserts'); goog.require('goog.async.nextTick'); -goog.require('goog.debug.Console'); goog.require('goog.dom'); goog.require('goog.dom.classlist'); goog.require('goog.functions'); -goog.require('goog.log'); -goog.require('goog.log.Level'); goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Collection'); @@ -1603,12 +1600,3 @@ ol.Map.createOptionsInternal = function(options) { ol.proj.common.add(); - - -if (goog.DEBUG) { - (function() { - goog.debug.Console.autoInstall(); - var logger = goog.log.getLogger('ol'); - logger.setLevel(goog.log.Level.FINEST); - })(); -} diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js index b84ee12dd5..75db57638e 100644 --- a/src/ol/webgl/context.js +++ b/src/ol/webgl/context.js @@ -1,7 +1,6 @@ goog.provide('ol.webgl.Context'); goog.require('goog.asserts'); -goog.require('goog.log'); goog.require('ol'); goog.require('ol.Disposable'); goog.require('ol.array'); @@ -229,12 +228,6 @@ ol.webgl.Context.prototype.getShader = function(shaderObject) { var shader = gl.createShader(shaderObject.getType()); gl.shaderSource(shader, shaderObject.getSource()); gl.compileShader(shader); - if (goog.DEBUG) { - if (!gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) && - !gl.isContextLost()) { - goog.log.error(this.logger_, gl.getShaderInfoLog(shader)); - } - } goog.asserts.assert( gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) || gl.isContextLost(), @@ -265,12 +258,6 @@ ol.webgl.Context.prototype.getProgram = function( gl.attachShader(program, this.getShader(fragmentShaderObject)); gl.attachShader(program, this.getShader(vertexShaderObject)); gl.linkProgram(program); - if (goog.DEBUG) { - if (!gl.getProgramParameter(program, goog.webgl.LINK_STATUS) && - !gl.isContextLost()) { - goog.log.error(this.logger_, gl.getProgramInfoLog(program)); - } - } goog.asserts.assert( gl.getProgramParameter(program, goog.webgl.LINK_STATUS) || gl.isContextLost(), @@ -348,13 +335,6 @@ ol.webgl.Context.prototype.useProgram = function(program) { }; -/** - * @private - * @type {goog.log.Logger} - */ -ol.webgl.Context.prototype.logger_ = goog.log.getLogger('ol.webgl.Context'); - - /** * @param {WebGLRenderingContext} gl WebGL rendering context. * @param {number=} opt_wrapS wrapS.