jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent access to sensitive display variables 

These should not be directly accessed. Instead use drawing operation
and Display.resize().
This commit is contained in:
Pierre Ossman 2016-11-11 14:01:42 +01:00
parent 84cd0e719e
commit e549ae074f
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/display.js
View File

@ -566,24 +566,13 @@
}, },
// Overridden getters/setters // Overridden getters/setters
get_context: function () {
return this._drawCtx;
},
set_scale: function (scale) { set_scale: function (scale) {
this._rescale(scale); this._rescale(scale);
}, },
set_width: function (w) {
this._fb_width = w;
},
get_width: function () { get_width: function () {
return this._fb_width; return this._fb_width;
}, },
set_height: function (h) {
this._fb_height = h;
},
get_height: function () { get_height: function () {
return this._fb_height; return this._fb_height;
}, },
@ -785,8 +774,8 @@
['colourMap', 'rw', 'arr'], // Colour map array (when not true-color) ['colourMap', 'rw', 'arr'], // Colour map array (when not true-color)
['scale', 'rw', 'float'], // Display area scale factor 0.0 - 1.0 ['scale', 'rw', 'float'], // Display area scale factor 0.0 - 1.0
['viewport', 'rw', 'bool'], // Use viewport clipping ['viewport', 'rw', 'bool'], // Use viewport clipping
['width', 'rw', 'int'], // Display area width ['width', 'ro', 'int'], // Display area width
['height', 'rw', 'int'], // Display area height ['height', 'ro', 'int'], // Display area height
['maxWidth', 'rw', 'int'], // Viewport max width (0 if disabled) ['maxWidth', 'rw', 'int'], // Viewport max width (0 if disabled)
['maxHeight', 'rw', 'int'], // Viewport max height (0 if disabled) ['maxHeight', 'rw', 'int'], // Viewport max height (0 if disabled)

3
tests/test.display.js
View File

@ -71,8 +71,7 @@ describe('Display/Canvas Helper', function () {
}); });
it('should take viewport location into consideration when drawing images', function () { it('should take viewport location into consideration when drawing images', function () {
display.set_width(4); display.resize(4, 4);
display.set_height(4);
display.viewportChangeSize(2, 2); display.viewportChangeSize(2, 2);
display.drawImage(make_image_canvas(basic_data), 1, 1); display.drawImage(make_image_canvas(basic_data), 1, 1);
display.flip(); display.flip();