wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 912244: Correct screenshot with element highlighting in Marionette; r=jgriffin

Browse Source
This commit is contained in:
David Burns 2013-09-04 09:05:43 +01:00
parent c4ac327d42
commit cf39aea60b
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/marionette/client/marionette/marionette.py
View File

@ -1255,4 +1255,7 @@ class Marionette(object):
'''
if element is not None:
element = element.id
return self._send_message("screenShot", 'value', element=element, highlights=highlights)
lights = None
if highlights is not None:
lights = [highlight.id for highlight in highlights if highlights]
return self._send_message("screenShot", 'value', element=element, highlights=lights)

7
testing/marionette/client/marionette/tests/unit/test_screenshot.py
View File

@ -10,6 +10,13 @@ class ScreenshotTests(MarionetteTestCase):
self.assertEqual('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAVUlEQVRoge3PsQ0AIAzAsI78fzBwBhHykD2ePev80LweAAGJB1ILpBZILZBaILVAaoHUAqkFUgukFkgtkFogtUBqgdQCqQVSC6QWSC2QWiC1QGp9A7ma+7nyXgOpzQAAAABJRU5ErkJggg==',
self.marionette.screenshot(element=el))
def testWeCanTakeAScreenShotWithHighlightOfAnElement(self):
test_url = self.marionette.absolute_url('html5Page.html')
self.marionette.navigate(test_url)
el = self.marionette.find_element('id', 'green')
self.assertEqual('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAV0lEQVRoge3PQRGAQAwAsWINvXgsNnI3+4iAzM7sDWZn9vneoxXRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNEU0RTRFNHcF7nBD/Ha5Ye4BbsYAAAAAElFTkSuQmCC',
self.marionette.screenshot(element=el, highlights=[el]))
def testWeCanTakeAScreenShotEntireCanvas(self):
test_url = self.marionette.absolute_url('html5Page.html')
self.marionette.navigate(test_url)

20
testing/marionette/marionette-listener.js
View File

@ -1789,7 +1789,7 @@ function screenShot(msg) {
let highlights = msg.json.highlights;
var document = curWindow.document;
var rect, win, width, height, left, top, needsOffset;
var rect, win, width, height, left, top;
// node can be either a window or an arbitrary DOM node
if (node == curWindow) {
// node is a window
@ -1798,8 +1798,6 @@ function screenShot(msg) {
height = win.innerHeight;
top = 0;
left = 0;
// offset needed for highlights to take 'outerHeight' of window into account
needsOffset = true;
}
else {
// node is an arbitrary DOM node
@ -1809,8 +1807,6 @@ function screenShot(msg) {
height = rect.height;
top = rect.top;
left = rect.left;
// offset for highlights not needed as they will be relative to this node
needsOffset = false;
}
var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
@ -1827,19 +1823,11 @@ function screenShot(msg) {
ctx.save();
for (var i = 0; i < highlights.length; ++i) {
var elem = highlights[i];
var elem = elementManager.getKnownElement(highlights[i], curWindow)
rect = elem.getBoundingClientRect();
var offsetY = 0, offsetX = 0;
if (needsOffset) {
var offset = getChromeOffset(elem);
offsetX = offset.x;
offsetY = offset.y;
} else {
// Don't need to offset the window chrome, just make relative to containing node
offsetY = -top;
offsetX = -left;
}
var offsetY = -top;
var offsetX = -left;
// Draw the rectangle
ctx.strokeRect(rect.left + offsetX, rect.top + offsetY, rect.width, rect.height);