From 00186413f8eb42c5d222a4a5898db96074659f18 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 19 Nov 2013 16:20:11 +0100
Subject: [PATCH 1/2] Remove canvasSize_ property

---
 src/ol/renderer/canvas/canvasmaprenderer.js | 10 +---------
 src/ol/renderer/webgl/webglmaprenderer.js   | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 751a87192f..18bc9b46fb 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -7,7 +7,6 @@ goog.require('goog.dom');
 goog.require('goog.dom.TagName');
 goog.require('goog.style');
 goog.require('goog.vec.Mat4');
-goog.require('ol.Size');
 goog.require('ol.css');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
@@ -48,12 +47,6 @@ ol.renderer.canvas.Map = function(container, map) {
    */
   this.renderedVisible_ = true;
 
-  /**
-   * @private
-   * @type {ol.Size}
-   */
-  this.canvasSize_ = [container.clientHeight, container.clientWidth];
-
   /**
    * @private
    * @type {CanvasRenderingContext2D}
@@ -104,10 +97,9 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
   }
 
   var size = frameState.size;
-  if (!ol.size.equals(this.canvasSize_, size)) {
+  if (!ol.size.equals([this.canvas_.width, this.canvas_.height], size)) {
     this.canvas_.width = size[0];
     this.canvas_.height = size[1];
-    this.canvasSize_ = size;
   }
 
   var context = this.context_;
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 9ddf72163a..88a4dc73c3 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -14,7 +14,6 @@ goog.require('goog.object');
 goog.require('goog.style');
 goog.require('goog.webgl');
 goog.require('ol.FrameState');
-goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.css');
 goog.require('ol.layer.Image');
@@ -83,12 +82,6 @@ ol.renderer.webgl.Map = function(container, map) {
    */
   this.renderedVisible_ = true;
 
-  /**
-   * @private
-   * @type {ol.Size}
-   */
-  this.canvasSize_ = [container.clientHeight, container.clientWidth];
-
   /**
    * @private
    * @type {WebGLRenderingContext}
@@ -564,10 +557,9 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
   }
 
   var size = frameState.size;
-  if (!ol.size.equals(this.canvasSize_, size)) {
+  if (!ol.size.equals([this.canvas_.width, this.canvas_.height], size)) {
     this.canvas_.width = size[0];
     this.canvas_.height = size[1];
-    this.canvasSize_ = size;
   }
 
   gl.bindFramebuffer(goog.webgl.FRAMEBUFFER, null);

From 1816d8d16084dc8c5e69959af3705c20ffcb78a3 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 19 Nov 2013 16:20:44 +0100
Subject: [PATCH 2/2] Don't set the canvas size too early

---
 src/ol/renderer/canvas/canvasmaprenderer.js | 2 --
 src/ol/renderer/webgl/webglmaprenderer.js   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 18bc9b46fb..27a8c15073 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -36,8 +36,6 @@ ol.renderer.canvas.Map = function(container, map) {
    */
   this.canvas_ = /** @type {HTMLCanvasElement} */
       (goog.dom.createElement(goog.dom.TagName.CANVAS));
-  this.canvas_.height = container.clientHeight;
-  this.canvas_.width = container.clientWidth;
   this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
   goog.dom.insertChildAt(container, this.canvas_, 0);
 
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 88a4dc73c3..320fd60bf4 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -71,8 +71,6 @@ ol.renderer.webgl.Map = function(container, map) {
    */
   this.canvas_ = /** @type {HTMLCanvasElement} */
       (goog.dom.createElement(goog.dom.TagName.CANVAS));
-  this.canvas_.height = container.clientHeight;
-  this.canvas_.width = container.clientWidth;
   this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
   goog.dom.insertChildAt(container, this.canvas_, 0);