| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/test/render_view_test.h" | 5 #include "content/public/test/render_view_test.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cctype> | 9 #include <cctype> |
| 10 | 10 |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 EXPECT_EQ(new_value, input->value().utf8().substr(0, new_value.length())); | 593 EXPECT_EQ(new_value, input->value().utf8().substr(0, new_value.length())); |
| 594 | 594 |
| 595 base::RunLoop().RunUntilIdle(); | 595 base::RunLoop().RunUntilIdle(); |
| 596 } | 596 } |
| 597 | 597 |
| 598 bool RenderViewTest::OnMessageReceived(const IPC::Message& msg) { | 598 bool RenderViewTest::OnMessageReceived(const IPC::Message& msg) { |
| 599 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); | 599 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
| 600 return impl->OnMessageReceived(msg); | 600 return impl->OnMessageReceived(msg); |
| 601 } | 601 } |
| 602 | 602 |
| 603 void RenderViewTest::DidNavigateWithinPage(blink::WebLocalFrame* frame, | 603 void RenderViewTest::OnSameDocumentNavigation(blink::WebLocalFrame* frame, |
| 604 bool is_new_navigation, | 604 bool is_new_navigation, |
| 605 bool content_initiated) { | 605 bool content_initiated) { |
| 606 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); | 606 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
| 607 blink::WebHistoryItem item; | 607 blink::WebHistoryItem item; |
| 608 item.initialize(); | 608 item.initialize(); |
| 609 | 609 |
| 610 // Set the document sequence number to be the same as the current page. | 610 // Set the document sequence number to be the same as the current page. |
| 611 const blink::WebHistoryItem& current_item = | 611 const blink::WebHistoryItem& current_item = |
| 612 impl->GetMainRenderFrame()->current_history_item(); | 612 impl->GetMainRenderFrame()->current_history_item(); |
| 613 DCHECK(!current_item.isNull()); | 613 DCHECK(!current_item.isNull()); |
| 614 item.setDocumentSequenceNumber(current_item.documentSequenceNumber()); | 614 item.setDocumentSequenceNumber(current_item.documentSequenceNumber()); |
| 615 | 615 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 667 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); |
| 668 frame->Navigate(common_params, StartNavigationParams(), request_params); | 668 frame->Navigate(common_params, StartNavigationParams(), request_params); |
| 669 | 669 |
| 670 // The load actually happens asynchronously, so we pump messages to process | 670 // The load actually happens asynchronously, so we pump messages to process |
| 671 // the pending continuation. | 671 // the pending continuation. |
| 672 FrameLoadWaiter(frame).Wait(); | 672 FrameLoadWaiter(frame).Wait(); |
| 673 view_->GetWebView()->updateAllLifecyclePhases(); | 673 view_->GetWebView()->updateAllLifecyclePhases(); |
| 674 } | 674 } |
| 675 | 675 |
| 676 } // namespace content | 676 } // namespace content |
| OLD | NEW |