summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/LayoutTests/platform/linux/http/tests
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org>2015-01-13 23:46:12 +0000
committerjaphet@chromium.org <japhet@chromium.org>2015-01-13 23:46:12 +0000
commita1013d40447425cb579c5e9f05ab3bdd29789f7b (patch)
treef2857e62916fa1dcb5681c60506327d45915ba44 /third_party/WebKit/LayoutTests/platform/linux/http/tests
parent77bc430276c242af358f376eced642f483c217de (diff)
downloadchromium_src-a1013d40447425cb579c5e9f05ab3bdd29789f7b.zip
chromium_src-a1013d40447425cb579c5e9f05ab3bdd29789f7b.tar.gz
chromium_src-a1013d40447425cb579c5e9f05ab3bdd29789f7b.tar.bz2
Remove FrameLoader's checkLoadComplete and checkLoadCompleteForThisFrame
Merge the logic that is still necessary into checkCompleted() BUG=426520 Review URL: https://codereview.chromium.org/806183005 git-svn-id: svn://svn.chromium.org/blink/trunk@188339 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/platform/linux/http/tests')
-rw-r--r--third_party/WebKit/LayoutTests/platform/linux/http/tests/loading/simple-subframe-expected.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/loading/simple-subframe-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/http/tests/loading/simple-subframe-expected.txt
index 2d8ac80..eebb3c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/http/tests/loading/simple-subframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/loading/simple-subframe-expected.txt
@@ -5,8 +5,8 @@ main frame - didFinishDocumentLoadForFrame
frame "f1" - didCommitLoadForFrame
frame "f1" - didFinishDocumentLoadForFrame
frame "f1" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
frame "f1" - didFinishLoadForFrame
+main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600