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

added performance boost for text rendering for Chrome & Firefox,

Browse Source 
while retainining compatibility with Opera & custom text settings.
This commit is contained in:
Niklas von Hertzen
2011-07-18 15:57:21 +03:00
parent f1f15bb92d
commit f8012224f9
4 changed files with 91 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core.js
View File

@ -18,6 +18,7 @@ function html2canvas(el, userOptions) {
renderViewport: false,
reorderZ: true,
throttle:true,
letterRendering:false,
renderOrder: "canvas flash html"
});

48
src/Text.js
View File

@ -10,11 +10,14 @@ html2canvas.prototype.newText = function(el,textNode,ctx){
var font_variant = this.getCSS(el,"font-variant");
var text_decoration = this.getCSS(el,"text-decoration");
var text_align = this.getCSS(el,"text-align");
var letter_spacing = this.getCSS(el,"letter-spacing");
// apply text-transform:ation to the text
textNode.nodeValue = this.textTransform(textNode.nodeValue,this.getCSS(el,"text-transform"));
var text = textNode.nodeValue;
var text = this.trim(textNode.nodeValue);
//text = $.trim(text);
if (text.length>0){
@ -30,15 +33,34 @@ html2canvas.prototype.newText = function(el,textNode,ctx){
}
var font = font_variant+" "+bold+" "+font_style+" "+size+" "+family,
renderList,
renderWords = false;
text_align = text_align.replace(["-webkit-auto"],["auto"])
if (this.opts.letterRendering == false && /^(left|right|justify|center|auto)$/.test(text_align) && /^(normal|none)$/.test(letter_spacing)){
// this.setContextVariable(ctx,"textAlign",text_align);
renderWords = true;
renderList = textNode.nodeValue.split(/\b/);
}else{
this.setContextVariable(ctx,"textAlign","left");
renderList = textNode.nodeValue.split("");
}
this.setContextVariable(ctx,"fillStyle",color);
this.setContextVariable(ctx,"font",font_variant+" "+bold+" "+font_style+" "+size+" "+family);
//ctx.font = bold+" "+font_style+" "+size+" "+family;
//ctx.fillStyle = color;
this.setContextVariable(ctx,"font",font);
var oldTextNode = textNode;
for(var c=0;c<text.length;c++){
var newTextNode = oldTextNode.splitText(1);
for(var c=0;c<renderList.length;c++){
var newTextNode = oldTextNode.splitText(renderList[c].length);
if (this.support.rangeBounds){
// getBoundingClientRect is supported for ranges
@ -56,16 +78,13 @@ html2canvas.prototype.newText = function(el,textNode,ctx){
}
}else{
// it isn't supported, so let's wrap it inside an element instead and the bounds there
var parent = oldTextNode.parentNode;
var wrapElement = document.createElement('wrapper');
var backupText = oldTextNode.cloneNode(true);
wrapElement.appendChild(oldTextNode.cloneNode(true));
parent.replaceChild(wrapElement,oldTextNode);
var bounds = this.getBounds(wrapElement);
@ -182,6 +201,9 @@ html2canvas.prototype.fontMetrics = function(font,fontSize){
}
/*
* Function to apply text-transform attribute to text
*/