Rename devicePixelRatio to pixelRatio in ol.FrameState

This commit is contained in:
Tom Payne
2014-01-14 15:30:49 +01:00
parent 50a322208a
commit 4667dec7c3
12 changed files with 36 additions and 39 deletions
@@ -118,7 +118,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
var image_ = imageSource.getImage(frameState.extent, viewResolution,
frameState.devicePixelRatio, view2DState.projection);
frameState.pixelRatio, view2DState.projection);
if (!goog.isNull(image_)) {
var imageState = image_.getState();
if (imageState == ol.ImageState.IDLE) {
+1 -2
View File
@@ -238,8 +238,7 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ =
function(type, context, frameState) {
var layer = this.getLayer();
if (layer.hasListener(type)) {
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var render = new ol.render.webgl.Immediate(context, frameState.pixelRatio);
var composeEvent = new ol.render.Event(
type, layer, render, frameState, null, context);
layer.dispatchEvent(composeEvent);
+1 -2
View File
@@ -285,8 +285,7 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
var map = this.getMap();
if (map.hasListener(type)) {
var context = this.getContext();
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var render = new ol.render.webgl.Immediate(context, frameState.pixelRatio);
var composeEvent = new ol.render.Event(
type, map, render, frameState, null, context);
map.dispatchEvent(composeEvent);