Skip to content

GitLab

T
tangled
Commit 310fe06a authored by ap's avatar ap
Browse files
Options

Reviewed by Darin. 

        http://bugs.webkit.org/show_bug.cgi?id=12258
        fast/tokenizer/002 test broken

WebCore:
        * loader/FrameLoader.h: Added a flush parameter to write().
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::write): Ditto.
        (WebCore::FrameLoader::endIfNotLoading): Instead of poorly duplicating the logic in write(),
        call it directly.

LayoutTests:
        * editing/selection/designmode-no-caret-expected.txt:
        * fast/dom/HTMLHeadElement/textInHead4-expected.txt:
        * fast/parser/broken-comments-vs-parsing-mode-expected.txt:
        * fast/parser/tabs-in-scripts-expected.txt:
        * fast/tokenizer/external-script-document-write-expected.txt:
        * fast/tokenizer/missing-title-end-tag-1-expected.txt:
        * tables/mozilla/images/adforce_imgis_com-expected.txt:
        * tables/mozilla_expected_failures/images/adforce_imgis_com-expected.txt:
        Updated the results (inconsequential changes only).



git-svn-id: svn://svn.chromium.org/blink/trunk@18844 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f3b8edb2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 35 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 310fe06a
2007-01-14 Alexey Proskuryakov <ap@webkit.org>
http://bugs.webkit.org/show_bug.cgi?id=12258
fast/tokenizer/002 test broken
* editing/selection/designmode-no-caret-expected.txt:
* fast/dom/HTMLHeadElement/textInHead4-expected.txt:
* fast/parser/broken-comments-vs-parsing-mode-expected.txt:
* fast/parser/tabs-in-scripts-expected.txt:
* fast/tokenizer/external-script-document-write-expected.txt:
* fast/tokenizer/missing-title-end-tag-1-expected.txt:
* tables/mozilla/images/adforce_imgis_com-expected.txt:
* tables/mozilla_expected_failures/images/adforce_imgis_com-expected.txt:
Updated the results (inconsequential changes only).
2007-01-14 Adam Roben <aroben@apple.com>
Reviewed by Maciej.
third_party/WebKit/LayoutTests/editing/selection/designmode-no-caret-expected.txt
View file @ 310fe06a
......@@ -3,9 +3,9 @@ EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x70
RenderBlock {HTML} at (0,0) size 800x70
RenderBody {BODY} at (8,8) size 784x54
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 784x54
text run at (0,0) width 759: "This tests to see that a caret is placed inside an editable document that is entirely editable even when no caret is requested"
text run at (0,18) width 118: "programmatically. "
......
third_party/WebKit/LayoutTests/fast/dom/HTMLHeadElement/textInHead4-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 23x18
text run at (0,0) width 23: "text"
RenderText {#text} at (23,0) size 4x18
......
third_party/WebKit/LayoutTests/fast/parser/broken-comments-vs-parsing-mode-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x84
RenderBlock {HTML} at (0,0) size 800x84
RenderBody {BODY} at (8,16) size 784x52
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderInline {A} at (0,0) size 60x18 [color=#0000EE]
RenderText {#text} at (0,0) size 60x18
......
third_party/WebKit/LayoutTests/fast/parser/tabs-in-scripts-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 8x18
text run at (0,0) width 8: "1"
third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-write-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderInline {SPAN} at (0,0) size 0x0
RenderText {#text} at (0,0) size 295x18
text run at (0,0) width 295: "This should be a span: [object HTMLElement]"
third_party/WebKit/LayoutTests/fast/tokenizer/missing-title-end-tag-1-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x52
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x36
RenderText {#text} at (0,0) size 773x36
text run at (0,0) width 326: "This document is missing its </title> tag in its head. "
......
third_party/WebKit/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 665x18
text run at (0,0) width 665: "GIF89a\x{D4}\x{1}<\x{0}\x{20AC}\x{0}\x{0}\x{0}\x{0}\x{7F}\x{0}\x{0}\x{0}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}\x{0}\x{0}\x{0}!\x{F9}\x{4}\x{4}<\x{0}\x{0}\x{0},\x{0}\x{0}\x{0}\x{0}\x{D4}\x{1}<\x{0}\x{201A}\x{0}\x{0}\x{7F}\x{FF}\x{FF}\x{0}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{0}\x{0}\x{0}\x{0}\x{0}\x{0}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"
third_party/WebKit/LayoutTests/tables/mozilla_expected_failures/images/adforce_imgis_com-expected.txt
View file @ 310fe06a
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x34
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (0,0) size 665x18
text run at (0,0) width 665: "GIF89a\x{D4}\x{1}<\x{0}\x{20AC}\x{0}\x{0}\x{0}\x{0}\x{7F}\x{0}\x{0}\x{0}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}\x{0}\x{0}\x{0}!\x{F9}\x{4}\x{4}<\x{0}\x{0}\x{0},\x{0}\x{0}\x{0}\x{0}\x{D4}\x{1}<\x{0}\x{201A}\x{0}\x{0}\x{7F}\x{FF}\x{FF}\x{0}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{0}\x{0}\x{0}\x{0}\x{0}\x{0}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"
third_party/WebKit/WebCore/ChangeLog
View file @ 310fe06a
2007-01-14 Alexey Proskuryakov <ap@webkit.org>
Reviewed by Darin.
http://bugs.webkit.org/show_bug.cgi?id=12258
fast/tokenizer/002 test broken
* loader/FrameLoader.h: Added a flush parameter to write().
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::write): Ditto.
(WebCore::FrameLoader::endIfNotLoading): Instead of poorly duplicating the logic in write(),
call it directly.
2007-01-14 Adam Roben <aroben@apple.com>
Reviewed by Maciej.
......
third_party/WebKit/WebCore/loader/FrameLoader.cpp
View file @ 310fe06a
......@@ -842,9 +842,9 @@ void FrameLoader::begin(const KURL& url)
m_frame->view()->resizeContents(0, 0);
}
void FrameLoader::write(const char* str, int len)
void FrameLoader::write(const char* str, int len, bool flush)
{
if (len == 0)
if (len == 0 && !flush)
return;
if (len == -1)
......@@ -866,6 +866,8 @@ void FrameLoader::write(const char* str, int len)
}
String decoded = m_decoder->decode(str, len);
if (flush)
decoded += m_decoder->flush();
if (decoded.isEmpty())
return;
......@@ -915,14 +917,7 @@ void FrameLoader::endIfNotLoading()
// make sure nothing's left in there
if (m_frame->document()) {
if (m_decoder) {
String decoded = m_decoder->flush();
if (!m_receivedData) {
m_receivedData = true;
m_frame->document()->determineParseMode(decoded);
}
write(decoded);
}
write(0, 0, true);
m_frame->document()->finishParsing();
} else
// WebKit partially uses WebCore when loading non-HTML docs. In these cases doc==nil, but
......
third_party/WebKit/WebCore/loader/FrameLoader.h
View file @ 310fe06a
......@@ -316,7 +316,7 @@ namespace WebCore {
void begin();
void begin(const KURL&);
void write(const char* str, int len = -1);
void write(const char* str, int len = -1, bool flush = false);
void write(const String&);
void end();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment