mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Use correct document context for canvas render

Browse Source
This commit is contained in:
Niklas von Hertzen 2014-09-14 20:14:38 +03:00
parent 9220eb6def
commit 6347e7f043
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/html2canvas.js vendored
View File

@ -604,7 +604,7 @@ function renderDocument(document, options, windowWidth, windowHeight) {
var bounds = getBounds(node); var bounds = getBounds(node);
var width = options.type === "view" ? Math.min(bounds.width, windowWidth) : documentWidth(); var width = options.type === "view" ? Math.min(bounds.width, windowWidth) : documentWidth();
var height = options.type === "view" ? Math.min(bounds.height, windowHeight) : documentHeight(); var height = options.type === "view" ? Math.min(bounds.height, windowHeight) : documentHeight();
var renderer = new CanvasRenderer(width, height, imageLoader, options); var renderer = new CanvasRenderer(width, height, imageLoader, options, document);
var parser = new NodeParser(node, renderer, support, imageLoader, options); var parser = new NodeParser(node, renderer, support, imageLoader, options);
return parser.ready.then(function() { return parser.ready.then(function() {
log("Finished rendering"); log("Finished rendering");
@ -1521,7 +1521,6 @@ NodeParser.prototype.getPseudoElement = function(container, type) {
var pseudoNode = document.createElement(isImage ? 'img' : 'html2canvaspseudoelement'); var pseudoNode = document.createElement(isImage ? 'img' : 'html2canvaspseudoelement');
var pseudoContainer = new NodeContainer(pseudoNode, container); var pseudoContainer = new NodeContainer(pseudoNode, container);
for (var i = style.length-1; i >= 0; i--) { for (var i = style.length-1; i >= 0; i--) {
var property = toCamelCase(style.item(i)); var property = toCamelCase(style.item(i));
pseudoNode.style[property] = style[property]; pseudoNode.style[property] = style[property];
@ -2178,11 +2177,12 @@ function ProxyImageContainer(src, proxy) {
var proxyImageCount = 0; var proxyImageCount = 0;
function Renderer(width, height, images, options) { function Renderer(width, height, images, options, document) {
this.width = width; this.width = width;
this.height = height; this.height = height;
this.images = images; this.images = images;
this.options = options; this.options = options;
this.document = document;
} }
Renderer.prototype.renderImage = function(container, bounds, borderData, imageContainer) { Renderer.prototype.renderImage = function(container, bounds, borderData, imageContainer) {
@ -2508,11 +2508,11 @@ function XHR(url) {
function CanvasRenderer(width, height) { function CanvasRenderer(width, height) {
Renderer.apply(this, arguments); Renderer.apply(this, arguments);
this.canvas = document.createElement("canvas"); this.canvas = this.document.createElement("canvas");
this.canvas.width = width; this.canvas.width = width;
this.canvas.height = height; this.canvas.height = height;
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
this.taintCtx = document.createElement("canvas").getContext("2d"); this.taintCtx = this.document.createElement("canvas").getContext("2d");
this.ctx.textBaseline = "bottom"; this.ctx.textBaseline = "bottom";
this.variables = {}; this.variables = {};
log("Initialized CanvasRenderer"); log("Initialized CanvasRenderer");

4
dist/html2canvas.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/core.js
View File

@ -36,7 +36,7 @@ function renderDocument(document, options, windowWidth, windowHeight) {
var bounds = getBounds(node); var bounds = getBounds(node);
var width = options.type === "view" ? Math.min(bounds.width, windowWidth) : documentWidth(); var width = options.type === "view" ? Math.min(bounds.width, windowWidth) : documentWidth();
var height = options.type === "view" ? Math.min(bounds.height, windowHeight) : documentHeight(); var height = options.type === "view" ? Math.min(bounds.height, windowHeight) : documentHeight();
var renderer = new CanvasRenderer(width, height, imageLoader, options); var renderer = new CanvasRenderer(width, height, imageLoader, options, document);
var parser = new NodeParser(node, renderer, support, imageLoader, options); var parser = new NodeParser(node, renderer, support, imageLoader, options);
return parser.ready.then(function() { return parser.ready.then(function() {
log("Finished rendering"); log("Finished rendering");

3
src/renderer.js
View File

@ -1,8 +1,9 @@
function Renderer(width, height, images, options) { function Renderer(width, height, images, options, document) {
this.width = width; this.width = width;
this.height = height; this.height = height;
this.images = images; this.images = images;
this.options = options; this.options = options;
this.document = document;
} }
Renderer.prototype.renderImage = function(container, bounds, borderData, imageContainer) { Renderer.prototype.renderImage = function(container, bounds, borderData, imageContainer) {

4
src/renderers/canvas.js
View File

@ -1,10 +1,10 @@
function CanvasRenderer(width, height) { function CanvasRenderer(width, height) {
Renderer.apply(this, arguments); Renderer.apply(this, arguments);
this.canvas = document.createElement("canvas"); this.canvas = this.document.createElement("canvas");
this.canvas.width = width; this.canvas.width = width;
this.canvas.height = height; this.canvas.height = height;
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
this.taintCtx = document.createElement("canvas").getContext("2d"); this.taintCtx = this.document.createElement("canvas").getContext("2d");
this.ctx.textBaseline = "bottom"; this.ctx.textBaseline = "bottom";
this.variables = {}; this.variables = {};
log("Initialized CanvasRenderer"); log("Initialized CanvasRenderer");