DevTools: Screencast view scaling

Source/devtools/front_end/ScreencastView.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 133 matching lines @@
         this._target.domModel.setHighlighter(null);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _screencastFrame: function(event)
     {
         var metadata = /** type {PageAgent.ScreencastFrameMetadata} */(event.data.metadata);
 
-        if (!metadata.deviceScaleFactor) {
-          console.log(event.data.data);
+        if (!metadata || !metadata.deviceScaleFactor) {
+          console.error(event.data.data);

[pfeldman, 2014/06/20 17:59:52]

Lets remove this message.

[vkuzkokov, 2014/06/23 10:57:12]

Done.

           return;
         }
 
         var base64Data = /** type {string} */(event.data.data);
         this._imageElement.src = "data:image/jpg;base64," + base64Data;
         this._deviceScaleFactor = metadata.deviceScaleFactor;
         this._pageScaleFactor = metadata.pageScaleFactor;
         this._viewport = metadata.viewport;
         if (!this._viewport)
             return;
         var offsetTop = metadata.offsetTop || 0;
         var offsetBottom = metadata.offsetBottom || 0;
 
-        var screenWidthDIP = this._viewport.width * this._pageScaleFactor;
-        var screenHeightDIP = this._viewport.height * this._pageScaleFactor + offsetTop + offsetBottom;
+        // Physical device size.
+        var screenWidthDIP = Math.round(this._viewport.width * this._pageScaleFactor);
+        var screenHeightDIP = Math.round(this._viewport.height * this._pageScaleFactor + offsetTop + offsetBottom);
+        this._screenZoom = this._imageElement.naturalWidth / screenWidthDIP;
         this._screenOffsetTop = offsetTop;
-        this._resizeViewport(screenWidthDIP, screenHeightDIP);
 
-        this._imageZoom = this._imageElement.naturalWidth ? this._canvasElement.offsetWidth / this._imageElement.naturalWidth : 1;
+        var bordersSize = WebInspector.ScreencastView._bordersSize;
+        this._viewportElement.classList.remove("hidden");
+        this._viewportElement.style.width = this._imageElement.naturalWidth + bordersSize + "px";
+        this._viewportElement.style.height = this._imageElement.naturalHeight + Math.floor((offsetTop + offsetBottom) * this._screenZoom) + bordersSize + "px";
+
+        this._imageZoom = 1;// this._imageElement.naturalWidth ? this._canvasElement.offsetWidth / this._imageElement.naturalWidth : 1;

[pfeldman, 2014/06/20 17:59:52]

Please remove this.

[pfeldman, 2014/06/23 06:44:38]

Note that we also need to make this work with devicePixelRatio > 1 on the
client.

[vkuzkokov, 2014/06/23 10:57:12]

Done.

         this.highlightDOMNode(this._highlightNode, this._highlightConfig);
     },
 
     _isGlassPaneActive: function()
     {
         return !this._glassPaneElement.classList.contains("hidden");
     },
 
     /**
      * @param {!WebInspector.Event} event
@@ skipping 42 matching lines @@
             this._glassPaneElement.classList.remove("hidden");
         } else if (this._profilerActive) {
             this._glassPaneElement.textContent = WebInspector.UIString("CPU profiler is active");
             this._glassPaneElement.classList.remove("hidden");
         } else {
             this._glassPaneElement.classList.add("hidden");
         }
     },
 
     /**
-     * @param {number} screenWidthDIP
-     * @param {number} screenHeightDIP
-     */
-    _resizeViewport: function(screenWidthDIP, screenHeightDIP)
-    {
-        var dimensions = this._viewportDimensions();
-        this._screenZoom = Math.min(dimensions.width / screenWidthDIP, dimensions.height / screenHeightDIP);
-
-        var bordersSize = WebInspector.ScreencastView._bordersSize;
-        this._viewportElement.classList.remove("hidden");
-        this._viewportElement.style.width = screenWidthDIP * this._screenZoom + bordersSize + "px";
-        this._viewportElement.style.height = screenHeightDIP * this._screenZoom + bordersSize + "px";
-    },
-
-    /**
      * @param {?Event} event
      */
     _handleMouseEvent: function(event)
     {
         if (this._isGlassPaneActive()) {
           event.consume();
           return;
         }
 
         if (!this._viewport)
@@ skipping 12 matching lines @@
 
         /**
          * @param {?WebInspector.DOMNode} node
          * @this {WebInspector.ScreencastView}
          */
         function callback(node)
         {
             if (!node)
                 return;
             if (event.type === "mousemove")
-                node.highlight(this._inspectModeConfig);
+                this.highlightDOMNode(node, this._inspectModeConfig);
             else if (event.type === "click")
                 node.reveal();
         }
     },
 
     /**
      * @param {?Event} event
      */
     _handleKeyEvent: function(event)
     {
@@ skipping 266 matching lines @@
 
         this._node = node;
         node.boxModel(callback.bind(this));
 
         /**
          * @param {?DOMAgent.BoxModel} model
          * @this {WebInspector.ScreencastView}
          */
         function callback(model)
         {
             if (!model) {

[pfeldman, 2014/06/20 17:59:52]

if (!model || !this._viewport)

[vkuzkokov, 2014/06/23 10:57:12]

Done.

                 this._repaint();
                 return;
             }
             this._model = this._scaleModel(model);
             this._config = config;
             this._repaint();
         }
     },
 
     /**
@@ skipping 228 matching lines @@
         this._titleElement.style.left = (boxX + 3) + "px";
     },
 
     /**
      * @return {!{width: number, height: number}}
      */
     _viewportDimensions: function()
     {
         const gutterSize = 30;
         const bordersSize = WebInspector.ScreencastView._bordersSize;
-        return { width: this.element.offsetWidth - bordersSize - gutterSize,
-                 height: this.element.offsetHeight - bordersSize - gutterSize - WebInspector.ScreencastView._navBarHeight};
+        var width = Math.floor(this.element.offsetWidth - bordersSize - gutterSize);
+        var height = Math.floor(this.element.offsetHeight - bordersSize - gutterSize - WebInspector.ScreencastView._navBarHeight);
+        return { width: width, height: height };
     },
 
     /**
      * @param {boolean} enabled
      * @param {boolean} inspectUAShadowDOM
      * @param {!DOMAgent.HighlightConfig} config
      * @param {function(?Protocol.Error)=} callback
      */
     setInspectModeEnabled: function(enabled, inspectUAShadowDOM, config, callback)
     {
@@ skipping 182 matching lines @@
           return;
         this._maxDisplayedProgress = progress;
         this._displayProgress(progress);
     },
 
     _displayProgress: function(progress)
     {
         this._element.style.width = (100 * progress) + "%";
     }
 };