| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 } | 321 } |
| 322 | 322 |
| 323 void WebViewHelper::Reset() { | 323 void WebViewHelper::Reset() { |
| 324 if (web_view_) { | 324 if (web_view_) { |
| 325 DCHECK(!TestWebFrameClient::IsLoading()); | 325 DCHECK(!TestWebFrameClient::IsLoading()); |
| 326 web_view_->Close(); | 326 web_view_->Close(); |
| 327 web_view_ = nullptr; | 327 web_view_ = nullptr; |
| 328 } | 328 } |
| 329 } | 329 } |
| 330 | 330 |
| 331 WebLocalFrameBase* WebViewHelper::LocalMainFrame() { | 331 WebLocalFrameBase* WebViewHelper::LocalMainFrame() const { |
| 332 return ToWebLocalFrameBase(web_view_->MainFrame()); | 332 return ToWebLocalFrameBase(web_view_->MainFrame()); |
| 333 } | 333 } |
| 334 | 334 |
| 335 WebRemoteFrameBase* WebViewHelper::RemoteMainFrame() { | 335 WebRemoteFrameBase* WebViewHelper::RemoteMainFrame() const { |
| 336 return ToWebRemoteFrameBase(web_view_->MainFrame()); | 336 return ToWebRemoteFrameBase(web_view_->MainFrame()); |
| 337 } | 337 } |
| 338 | 338 |
| 339 void WebViewHelper::Resize(WebSize size) { | 339 void WebViewHelper::Resize(WebSize size) { |
| 340 test_web_view_client_->ClearAnimationScheduled(); | 340 test_web_view_client_->ClearAnimationScheduled(); |
| 341 WebView()->Resize(size); | 341 WebView()->Resize(size); |
| 342 EXPECT_FALSE(test_web_view_client_->AnimationScheduled()); | 342 EXPECT_FALSE(test_web_view_client_->AnimationScheduled()); |
| 343 test_web_view_client_->ClearAnimationScheduled(); | 343 test_web_view_client_->ClearAnimationScheduled(); |
| 344 } | 344 } |
| 345 | 345 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 test_web_view_client_.ScheduleAnimation(); | 445 test_web_view_client_.ScheduleAnimation(); |
| 446 } | 446 } |
| 447 | 447 |
| 448 void TestWebViewWidgetClient::DidMeaningfulLayout( | 448 void TestWebViewWidgetClient::DidMeaningfulLayout( |
| 449 WebMeaningfulLayout layout_type) { | 449 WebMeaningfulLayout layout_type) { |
| 450 test_web_view_client_.DidMeaningfulLayout(layout_type); | 450 test_web_view_client_.DidMeaningfulLayout(layout_type); |
| 451 } | 451 } |
| 452 | 452 |
| 453 } // namespace FrameTestHelpers | 453 } // namespace FrameTestHelpers |
| 454 } // namespace blink | 454 } // namespace blink |
| OLD | NEW |