Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1581)

Side by Side Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2533683002: Move the code in ResourceFetcher handling calls from WebURLLoaderImpl to ResourceLoader (Closed)
Patch Set: Fix test Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 9679 matching lines...) Expand 10 before | Expand all | Expand 10 after
9690 } 9690 }
9691 EXPECT_FALSE(page->suspended()); 9691 EXPECT_FALSE(page->suspended());
9692 9692
9693 // Repeat this for a page with a local child frame, and ensure that the 9693 // Repeat this for a page with a local child frame, and ensure that the
9694 // child frame's loads are also suspended. 9694 // child frame's loads are also suspended.
9695 WebLocalFrame* webLocalChild = FrameTestHelpers::createLocalChild(remoteRoot); 9695 WebLocalFrame* webLocalChild = FrameTestHelpers::createLocalChild(remoteRoot);
9696 registerMockedHttpURLLoad("foo.html"); 9696 registerMockedHttpURLLoad("foo.html");
9697 FrameTestHelpers::loadFrame(webLocalChild, m_baseURL + "foo.html"); 9697 FrameTestHelpers::loadFrame(webLocalChild, m_baseURL + "foo.html");
9698 LocalFrame* localChild = toWebLocalFrameImpl(webLocalChild)->frame(); 9698 LocalFrame* localChild = toWebLocalFrameImpl(webLocalChild)->frame();
9699 EXPECT_FALSE(page->suspended()); 9699 EXPECT_FALSE(page->suspended());
9700 EXPECT_FALSE(localChild->document()->fetcher()->defersLoading()); 9700 EXPECT_FALSE(localChild->document()->fetcher()->context().defersLoading());
9701 { 9701 {
9702 ScopedPageSuspender suspender; 9702 ScopedPageSuspender suspender;
9703 EXPECT_TRUE(page->suspended()); 9703 EXPECT_TRUE(page->suspended());
9704 EXPECT_TRUE(localChild->document()->fetcher()->defersLoading()); 9704 EXPECT_TRUE(localChild->document()->fetcher()->context().defersLoading());
9705 } 9705 }
9706 EXPECT_FALSE(page->suspended()); 9706 EXPECT_FALSE(page->suspended());
9707 EXPECT_FALSE(localChild->document()->fetcher()->defersLoading()); 9707 EXPECT_FALSE(localChild->document()->fetcher()->context().defersLoading());
9708 9708
9709 view->close(); 9709 view->close();
9710 } 9710 }
9711 9711
9712 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient { 9712 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient {
9713 public: 9713 public:
9714 MOCK_METHOD4(didOverscroll, 9714 MOCK_METHOD4(didOverscroll,
9715 void(const WebFloatSize&, 9715 void(const WebFloatSize&,
9716 const WebFloatSize&, 9716 const WebFloatSize&,
9717 const WebFloatPoint&, 9717 const WebFloatPoint&,
(...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
11084 11084
11085 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached()); 11085 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
11086 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading()); 11086 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
11087 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad()); 11087 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
11088 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents()); 11088 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
11089 11089
11090 webViewHelper.reset(); 11090 webViewHelper.reset();
11091 } 11091 }
11092 11092
11093 } // namespace blink 11093 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698