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

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: Fixed a bug in resource timing population 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
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 9537 matching lines...) Expand 10 before | Expand all | Expand 10 after
9548 } 9548 }
9549 EXPECT_FALSE(page->suspended()); 9549 EXPECT_FALSE(page->suspended());
9550 9550
9551 // Repeat this for a page with a local child frame, and ensure that the 9551 // Repeat this for a page with a local child frame, and ensure that the
9552 // child frame's loads are also suspended. 9552 // child frame's loads are also suspended.
9553 WebLocalFrame* webLocalChild = FrameTestHelpers::createLocalChild(remoteRoot); 9553 WebLocalFrame* webLocalChild = FrameTestHelpers::createLocalChild(remoteRoot);
9554 registerMockedHttpURLLoad("foo.html"); 9554 registerMockedHttpURLLoad("foo.html");
9555 FrameTestHelpers::loadFrame(webLocalChild, m_baseURL + "foo.html"); 9555 FrameTestHelpers::loadFrame(webLocalChild, m_baseURL + "foo.html");
9556 LocalFrame* localChild = toWebLocalFrameImpl(webLocalChild)->frame(); 9556 LocalFrame* localChild = toWebLocalFrameImpl(webLocalChild)->frame();
9557 EXPECT_FALSE(page->suspended()); 9557 EXPECT_FALSE(page->suspended());
9558 EXPECT_FALSE(localChild->document()->fetcher()->defersLoading()); 9558 EXPECT_FALSE(localChild->document()->fetcher()->context().defersLoading());
9559 { 9559 {
9560 ScopedPageSuspender suspender; 9560 ScopedPageSuspender suspender;
9561 EXPECT_TRUE(page->suspended()); 9561 EXPECT_TRUE(page->suspended());
9562 EXPECT_TRUE(localChild->document()->fetcher()->defersLoading()); 9562 EXPECT_TRUE(localChild->document()->fetcher()->context().defersLoading());
9563 } 9563 }
9564 EXPECT_FALSE(page->suspended()); 9564 EXPECT_FALSE(page->suspended());
9565 EXPECT_FALSE(localChild->document()->fetcher()->defersLoading()); 9565 EXPECT_FALSE(localChild->document()->fetcher()->context().defersLoading());
9566 9566
9567 view->close(); 9567 view->close();
9568 } 9568 }
9569 9569
9570 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient { 9570 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient {
9571 public: 9571 public:
9572 MOCK_METHOD4(didOverscroll, 9572 MOCK_METHOD4(didOverscroll,
9573 void(const WebFloatSize&, 9573 void(const WebFloatSize&,
9574 const WebFloatSize&, 9574 const WebFloatSize&,
9575 const WebFloatPoint&, 9575 const WebFloatPoint&,
(...skipping 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
10943 10943
10944 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached()); 10944 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
10945 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading()); 10945 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
10946 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad()); 10946 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
10947 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents()); 10947 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
10948 10948
10949 webViewHelper.reset(); 10949 webViewHelper.reset();
10950 } 10950 }
10951 10951
10952 } // namespace blink 10952 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698