Skip to content

Commit 80158d6

Browse files
committed
A couple perf tweaks
1 parent 5dab7a2 commit 80158d6

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/main/java/org/jsoup/parser/CharacterReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ boolean isEmpty() {
3030
}
3131

3232
char current() {
33-
return isEmpty() ? EOF : input[pos];
33+
return pos >= length ? EOF : input[pos];
3434
}
3535

3636
char consume() {
37-
char val = isEmpty() ? EOF : input[pos];
37+
char val = pos >= length ? EOF : input[pos];
3838
pos++;
3939
return val;
4040
}

src/main/java/org/jsoup/parser/HtmlTreeBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ void insert(Token.Comment commentToken) {
230230
void insert(Token.Character characterToken) {
231231
Node node;
232232
// characters in script and style go in as datanodes, not text nodes
233-
if (StringUtil.in(currentElement().tagName(), TagsScriptStyle))
233+
String tagName = currentElement().tagName();
234+
if (tagName.equals("script") || tagName.equals("style"))
234235
node = new DataNode(characterToken.getData(), baseUri);
235236
else
236237
node = new TextNode(characterToken.getData(), baseUri);

src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ boolean process(Token t, HtmlTreeBuilder tb) {
252252
// todo confirm that check
253253
tb.error(this);
254254
return false;
255-
} else if (isWhitespace(c)) {
255+
} else if (tb.framesetOk() && isWhitespace(c)) { // don't check if whitespace if frames already closed
256256
tb.reconstructFormattingElements();
257257
tb.insert(c);
258258
} else {

0 commit comments

Comments
 (0)