| 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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 609 item.setDocumentSequenceNumber(current_item.documentSequenceNumber()); | 609 item.setDocumentSequenceNumber(current_item.documentSequenceNumber()); |
| 610 | 610 |
| 611 impl->GetMainRenderFrame()->didNavigateWithinPage( | 611 impl->GetMainRenderFrame()->didNavigateWithinPage( |
| 612 frame, item, is_new_navigation ? blink::WebStandardCommit | 612 frame, item, is_new_navigation ? blink::WebStandardCommit |
| 613 : blink::WebHistoryInertCommit, | 613 : blink::WebHistoryInertCommit, |
| 614 content_initiated); | 614 content_initiated); |
| 615 } | 615 } |
| 616 | 616 |
| 617 blink::WebWidget* RenderViewTest::GetWebWidget() { | 617 blink::WebWidget* RenderViewTest::GetWebWidget() { |
| 618 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); | 618 RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_); |
| 619 return impl->webwidget(); | 619 return impl->GetWebWidget(); |
| 620 } | 620 } |
| 621 | 621 |
| 622 | |
| 623 ContentClient* RenderViewTest::CreateContentClient() { | 622 ContentClient* RenderViewTest::CreateContentClient() { |
| 624 return new TestContentClient; | 623 return new TestContentClient; |
| 625 } | 624 } |
| 626 | 625 |
| 627 ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() { | 626 ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() { |
| 628 return new ContentBrowserClient; | 627 return new ContentBrowserClient; |
| 629 } | 628 } |
| 630 | 629 |
| 631 ContentRendererClient* RenderViewTest::CreateContentRendererClient() { | 630 ContentRendererClient* RenderViewTest::CreateContentRendererClient() { |
| 632 return new ContentRendererClient; | 631 return new ContentRendererClient; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 662 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); | 661 static_cast<TestRenderFrame*>(impl->GetMainRenderFrame()); |
| 663 frame->Navigate(common_params, StartNavigationParams(), request_params); | 662 frame->Navigate(common_params, StartNavigationParams(), request_params); |
| 664 | 663 |
| 665 // The load actually happens asynchronously, so we pump messages to process | 664 // The load actually happens asynchronously, so we pump messages to process |
| 666 // the pending continuation. | 665 // the pending continuation. |
| 667 FrameLoadWaiter(frame).Wait(); | 666 FrameLoadWaiter(frame).Wait(); |
| 668 view_->GetWebView()->updateAllLifecyclePhases(); | 667 view_->GetWebView()->updateAllLifecyclePhases(); |
| 669 } | 668 } |
| 670 | 669 |
| 671 } // namespace content | 670 } // namespace content |
| OLD | NEW |