Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Testcase big document #180 #194

Merged
merged 20 commits into from
Apr 8, 2018
Merged

Testcase big document #180 #194

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cf8509a
Created a test for a very big document.
rototor Apr 6, 2018
4a425a0
Whitespace changes
rototor Apr 6, 2018
2769b23
Generate less pages, as this exceeds the memory limits of the
rototor Apr 6, 2018
3df7386
Integrated the sample of @dilworks. Now some bottlenecks become
rototor Apr 6, 2018
26edcbd
Make loggingEnabled in XRLog volatile. This will cause a memory barrier,
rototor Apr 6, 2018
324b36a
Generify LOGGER_NAMES, its just a list of strings...
rototor Apr 6, 2018
97f62a2
Avoid the unneeded boxing which does only a (float) cast internally. The
rototor Apr 6, 2018
6edf6b4
Generify the _childCache
rototor Apr 6, 2018
d945ee4
Disable the logging while generating this PDF, as it takes ages anywa…
rototor Apr 6, 2018
cdc71cc
Replaced StringBuffer with StringBuilder
rototor Apr 6, 2018
94e0a54
Generfied some stuff, replaced some StringBuffer with StringBuilder, we
rototor Apr 6, 2018
14f4b94
Replace the ancient StringBuffer with StringBuilder, as we never need
rototor Apr 6, 2018
948f57a
We don't need synchronized maps and sets anymore, as we are no longer
rototor Apr 6, 2018
eaee674
Generifying stuff all over the place.
rototor Apr 6, 2018
a6b50c6
Generifying stuff all over the place.
rototor Apr 6, 2018
003f455
Comment out all this synchronized blocks, as we are not doing any
rototor Apr 6, 2018
d0757ef
Future generifing, and replacing of LinkedList with ArrayList
rototor Apr 6, 2018
06eb185
Future removed some LinkedList and replaced them with ArrayList<>()
rototor Apr 6, 2018
2a0b883
Ups, why did this import sneak in?!
rototor Apr 6, 2018
93623a9
Reduce page count and sub rows to get Travis working
danfickle Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions openhtmltopdf-core/src/main/java/com/openhtmltopdf/context/ContentFunctionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,7 @@ protected boolean isCounter(FSFunction function, String counterName) {

if (parameters.size() == 2) {
param = (PropertyValue)parameters.get(1);
if (param.getPrimitiveType() != CSSPrimitiveValue.CSS_IDENT) {
return false;
}
return param.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT;
}

return true;
Expand Down Expand Up @@ -175,18 +173,14 @@ public boolean canHandle(LayoutContext c, FSFunction function) {
FSFunction f = ((PropertyValue)parameters.get(0)).getFunction();
if (f == null ||
f.getParameters().size() != 1 ||
((PropertyValue)f.getParameters().get(0)).getPrimitiveType() != CSSPrimitiveValue.CSS_IDENT ||
! ((PropertyValue)f.getParameters().get(0)).getStringValue().equals("href")) {
f.getParameters().get(0).getPrimitiveType() != CSSPrimitiveValue.CSS_IDENT ||
! f.getParameters().get(0).getStringValue().equals("href")) {
return false;
}

PropertyValue param = (PropertyValue)parameters.get(1);
if (param.getPrimitiveType() != CSSPrimitiveValue.CSS_IDENT ||
! param.getStringValue().equals("page")) {
return false;
}

return true;
return param.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT &&
param.getStringValue().equals("page");
}
}

Expand Down Expand Up @@ -226,7 +220,7 @@ public String calculate(RenderingContext c, FSFunction function, InlineText text
}

// Get leader value and value width
PropertyValue param = (PropertyValue)function.getParameters().get(0);
PropertyValue param = function.getParameters().get(0);
String value = param.getStringValue();
if (param.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) {
if (value.equals("dotted")) {
Expand All @@ -241,7 +235,7 @@ public String calculate(RenderingContext c, FSFunction function, InlineText text
// Compute value width using 100x string to get more precise width.
// Otherwise there might be a small gap at the right side. This is
// necessary because a TextRenderer usually use double/float for width.
StringBuffer tmp = new StringBuffer(100 * value.length());
StringBuilder tmp = new StringBuilder(100 * value.length());
for (int i = 0; i < 100; i++) {
tmp.append(value);
}
Expand All @@ -255,7 +249,7 @@ public String calculate(RenderingContext c, FSFunction function, InlineText text
int count = (int) ((leaderWidth - (2 * spaceWidth)) / valueWidth);

// build leader string
StringBuffer buf = new StringBuffer(count * value.length() + 2);
StringBuilder buf = new StringBuilder(count * value.length() + 2);
buf.append(' ');
for (int i = 0; i < count; i++) {
buf.append(value);
Expand Down Expand Up @@ -284,15 +278,11 @@ public boolean canHandle(LayoutContext c, FSFunction function) {
List parameters = function.getParameters();
if (parameters.size() == 1) {
PropertyValue param = (PropertyValue)parameters.get(0);
if (param.getPrimitiveType() != CSSPrimitiveValue.CSS_STRING &&
(param.getPrimitiveType() != CSSPrimitiveValue.CSS_IDENT ||
(!param.getStringValue().equals("dotted") &&
!param.getStringValue().equals("solid") &&
!param.getStringValue().equals("space")))) {
return false;
}

return true;
return param.getPrimitiveType() == CSSPrimitiveValue.CSS_STRING ||
(param.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT &&
(param.getStringValue().equals("dotted") ||
param.getStringValue().equals("solid") ||
param.getStringValue().equals("space")));
}
}

Expand Down
32 changes: 15 additions & 17 deletions openhtmltopdf-core/src/main/java/com/openhtmltopdf/context/StyleReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,10 @@ public boolean isHoverStyled(Element e) {
* @param e The DOM Element for which to find properties
* @return Map of CSS property names to CSSValue instance assigned to it.
*/
public java.util.Map getCascadedPropertiesMap(Element e) {
public java.util.Map<String, org.w3c.dom.css.CSSPrimitiveValue> getCascadedPropertiesMap(Element e) {
CascadedStyle cs = _matcher.getCascadedStyle(e, false);//this is only for debug, I think
java.util.LinkedHashMap props = new java.util.LinkedHashMap();
for (java.util.Iterator i = cs.getCascadedPropertyDeclarations(); i.hasNext();) {
PropertyDeclaration pd = (PropertyDeclaration) i.next();

java.util.Map<String, org.w3c.dom.css.CSSPrimitiveValue> props = new java.util.LinkedHashMap<String, org.w3c.dom.css.CSSPrimitiveValue>();
for (PropertyDeclaration pd : cs.getCascadedPropertyDeclarations()) {
String propName = pd.getPropertyName();
CSSName cssName = CSSName.getByPropertyName(propName);
props.put(propName, cs.propertyByName(cssName).getValue());
Expand Down Expand Up @@ -239,8 +237,8 @@ public void flushAllStyleSheets() {
*
* @return The stylesheets value
*/
private List getStylesheets() {
List infos = new LinkedList();
private List<StylesheetInfo> getStylesheets() {
List<StylesheetInfo> infos = new ArrayList<StylesheetInfo>();
long st = System.currentTimeMillis();

StylesheetInfo defaultStylesheet = _nsh.getDefaultStylesheet(_stylesheetFactory);
Expand All @@ -251,22 +249,22 @@ private List getStylesheets() {
StylesheetInfo[] refs = _nsh.getStylesheets(_doc);
int inlineStyleCount = 0;
if (refs != null) {
for (int i = 0; i < refs.length; i++) {
for (StylesheetInfo ref : refs) {
String uri;
if (! refs[i].isInline()) {
uri = _uac.resolveURI(refs[i].getUri());
refs[i].setUri(uri);

if (!ref.isInline()) {
uri = _uac.resolveURI(ref.getUri());
ref.setUri(uri);
} else {
refs[i].setUri(_uac.getBaseURL() + "#inline_style_" + (++inlineStyleCount));
ref.setUri(_uac.getBaseURL() + "#inline_style_" + (++inlineStyleCount));
Stylesheet sheet = _stylesheetFactory.parse(
new StringReader(refs[i].getContent()), refs[i]);
refs[i].setStylesheet(sheet);
refs[i].setUri(null);
new StringReader(ref.getContent()), ref);
ref.setStylesheet(sheet);
ref.setUri(null);
}
}
infos.addAll(Arrays.asList(refs));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is something IDEA cached ... if refs == null, the addAll would throw an NPE...

}
infos.addAll(Arrays.asList(refs));

// TODO: here we should also get user stylesheet from userAgent

Expand Down
5 changes: 2 additions & 3 deletions ...-core/src/main/java/com/openhtmltopdf/css/extend/lib/DOMStaticXhtmlAttributeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String getLang(Object e) {

public String getElementStyling(Object el) {
Element e = ((Element) el);
StringBuffer style = new StringBuffer();
StringBuilder style = new StringBuilder();
if (e.getNodeName().equals("td")) {
String s;
if (!(s = e.getAttribute("colspan")).equals("")) {
Expand Down Expand Up @@ -114,8 +114,7 @@ public boolean isHover(Object e) {

public boolean isLink(Object el) {
Element e = ((Element) el);
if (e.getNodeName().equalsIgnoreCase("a") && !e.getAttribute("href").equals("")) return true;
return false;
return e.getNodeName().equalsIgnoreCase("a") && !e.getAttribute("href").equals("");
}

public boolean isVisited(Object e) {
Expand Down
130 changes: 62 additions & 68 deletions openhtmltopdf-core/src/main/java/com/openhtmltopdf/css/newmatch/CascadedStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,26 @@ public class CascadedStyle {
/**
* Map of PropertyDeclarations, keyed by {@link CSSName}
*/
private Map cascadedProperties;
private Map<CSSName, PropertyDeclaration> cascadedProperties;

private String fingerprint;

/**
* Creates a <code>CascadedStyle</code>, setting the display property to
* to the value of the <code>display</code> parameter.
* Constructs a new CascadedStyle, given an {@link java.util.Iterator} of
* {@link com.openhtmltopdf.css.sheet.PropertyDeclaration}s already sorted
* by specificity of the CSS selector they came from. The Iterator can have
* multiple PropertyDeclarations with the same name; the property cascade
* will be resolved during instantiation, resulting in a set of
* PropertyDeclarations. Once instantiated, properties may be retrieved
* using the normal API for the class.
*
* @param iter An Iterator containing PropertyDeclarations in order of
* specificity.
*/
public static CascadedStyle createAnonymousStyle(IdentValue display) {
CSSPrimitiveValue val = new PropertyValue(display);

List props = Collections.singletonList(
new PropertyDeclaration(CSSName.DISPLAY, val, true, StylesheetInfo.USER));

return new CascadedStyle(props.iterator());
CascadedStyle(java.util.Iterator<PropertyDeclaration> iter) {
this();

addProperties(iter);
}

/**
Expand Down Expand Up @@ -118,60 +123,59 @@ public static PropertyDeclaration createLayoutPropertyDeclaration(
return new PropertyDeclaration(cssName, val, true, StylesheetInfo.USER);
}

private CascadedStyle(CascadedStyle startingPoint, Iterator<PropertyDeclaration> props) {
cascadedProperties = new TreeMap<CSSName, PropertyDeclaration>(startingPoint.cascadedProperties);

addProperties(props);
}

/**
* Constructs a new CascadedStyle, given an {@link java.util.Iterator} of
* {@link com.openhtmltopdf.css.sheet.PropertyDeclaration}s already sorted
* by specificity of the CSS selector they came from. The Iterator can have
* multiple PropertyDeclarations with the same name; the property cascade
* will be resolved during instantiation, resulting in a set of
* PropertyDeclarations. Once instantiated, properties may be retrieved
* using the normal API for the class.
*
* @param iter An Iterator containing PropertyDeclarations in order of
* specificity.
* Default constructor with no initialization. Don't use this to instantiate
* the class, as the class is immutable and this will leave it without any
* properties.
*/
CascadedStyle(java.util.Iterator iter) {
this();
private CascadedStyle() {
cascadedProperties = new TreeMap<CSSName, PropertyDeclaration>();
}
/**
* Creates a <code>CascadedStyle</code>, setting the display property to
* to the value of the <code>display</code> parameter.
*/
public static CascadedStyle createAnonymousStyle(IdentValue display) {
CSSPrimitiveValue val = new PropertyValue(display);

addProperties(iter);
List<PropertyDeclaration> props = Collections.singletonList(
new PropertyDeclaration(CSSName.DISPLAY, val, true, StylesheetInfo.USER));

return new CascadedStyle(props.iterator());
}

private void addProperties(java.util.Iterator iter) {
//do a bucket-sort on importance and origin
//properties should already be in order of specificity
java.util.List[] buckets = new java.util.List[PropertyDeclaration.IMPORTANCE_AND_ORIGIN_COUNT];
for (int i = 0; i < buckets.length; i++) {
buckets[i] = new java.util.LinkedList();
}
private void addProperties(java.util.Iterator<PropertyDeclaration> iter) {
/*
* do a bucket-sort on importance and origin /properties should already be in
* order of specificity
*/
//noinspection unchecked
java.util.List<PropertyDeclaration>[] buckets = (java.util.List<PropertyDeclaration>[])new java.util.List[PropertyDeclaration.IMPORTANCE_AND_ORIGIN_COUNT];

while (iter.hasNext()) {
PropertyDeclaration prop = (PropertyDeclaration) iter.next();
buckets[prop.getImportanceAndOrigin()].add(prop);
PropertyDeclaration prop = iter.next();
List<PropertyDeclaration> bucket = buckets[prop.getImportanceAndOrigin()];
if (bucket == null) {
bucket = new ArrayList<PropertyDeclaration>();
buckets[prop.getImportanceAndOrigin()] = bucket;
}
bucket.add(prop);
}

for (int i = 0; i < buckets.length; i++) {
for (java.util.Iterator it = buckets[i].iterator(); it.hasNext();) {
PropertyDeclaration prop = (PropertyDeclaration) it.next();
for (List<PropertyDeclaration> bucket : buckets) {
if (bucket == null)
continue;
for (PropertyDeclaration prop : bucket) {
cascadedProperties.put(prop.getCSSName(), prop);
}
}
}

private CascadedStyle(CascadedStyle startingPoint, Iterator props) {
cascadedProperties = new TreeMap(startingPoint.cascadedProperties);

addProperties(props);
}


/**
* Default constructor with no initialization. Don't use this to instantiate
* the class, as the class is immutable and this will leave it without any
* properties.
*/
private CascadedStyle() {
cascadedProperties = new TreeMap();
}

/**
* Get an empty singleton, used to negate inheritance of properties
Expand All @@ -186,10 +190,8 @@ private CascadedStyle() {
* @return True if the property is defined in this set.
*/
public boolean hasProperty(CSSName cssName) {
return cascadedProperties.get( cssName ) != null;
return cascadedProperties.get(cssName) != null;
}


/**
* Returns a {@link com.openhtmltopdf.css.sheet.PropertyDeclaration} by CSS
* property name, e.g. "font-family". Properties are already cascaded during
Expand All @@ -201,9 +203,7 @@ public boolean hasProperty(CSSName cssName) {
* if not found.
*/
public PropertyDeclaration propertyByName(CSSName cssName) {
PropertyDeclaration prop = (PropertyDeclaration)cascadedProperties.get(cssName);

return prop;
return cascadedProperties.get(cssName);
}

/**
Expand All @@ -227,23 +227,17 @@ public IdentValue getIdent(CSSName cssName) {
*
* @return Iterator over a set of properly cascaded PropertyDeclarations.
*/
public java.util.Iterator getCascadedPropertyDeclarations() {
List list = new ArrayList(cascadedProperties.size());
Iterator iter = cascadedProperties.values().iterator();
while ( iter.hasNext()) {
list.add(iter.next());
}
return list.iterator();
public java.util.Collection<PropertyDeclaration> getCascadedPropertyDeclarations() {
return cascadedProperties.values();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This collection here is always directly consumed and iterated over. There was no sense in copying this...

}

public int countAssigned() { return cascadedProperties.size(); }

public String getFingerprint() {
if (this.fingerprint == null) {
StringBuffer sb = new StringBuffer();
Iterator iter = cascadedProperties.values().iterator();
while (iter.hasNext()) {
sb.append(((PropertyDeclaration)iter.next()).getFingerprint());
StringBuilder sb = new StringBuilder();
for (PropertyDeclaration o : cascadedProperties.values()) {
sb.append(o.getFingerprint());
}
this.fingerprint = sb.toString();
}
Expand Down
Loading