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 "android_webview/native/aw_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
6 | 6 |
7 #include "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
9 #include "android_webview/browser/browser_view_renderer_impl.h" | 9 #include "android_webview/browser/browser_view_renderer_impl.h" |
10 #include "android_webview/browser/net_disk_cache_remover.h" | 10 #include "android_webview/browser/net_disk_cache_remover.h" |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 } | 658 } |
659 | 659 |
660 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { | 660 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { |
661 web_contents_->FocusThroughTabTraversal(false); | 661 web_contents_->FocusThroughTabTraversal(false); |
662 } | 662 } |
663 | 663 |
664 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { | 664 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { |
665 return reinterpret_cast<jint>(pending_contents_.release()); | 665 return reinterpret_cast<jint>(pending_contents_.release()); |
666 } | 666 } |
667 | 667 |
| 668 void AwContents::ResetScrollAndScaleState(JNIEnv* env, jobject obj) { |
| 669 render_view_host_ext_->ResetScrollAndScaleState(); |
| 670 } |
| 671 |
668 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env, | 672 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env, |
669 jobject obj) { | 673 jobject obj) { |
670 return browser_view_renderer_->CapturePicture(); | 674 return browser_view_renderer_->CapturePicture(); |
671 } | 675 } |
672 | 676 |
673 void AwContents::EnableOnNewPicture(JNIEnv* env, | 677 void AwContents::EnableOnNewPicture(JNIEnv* env, |
674 jobject obj, | 678 jobject obj, |
675 jboolean enabled, | 679 jboolean enabled, |
676 jboolean invalidation_only) { | 680 jboolean invalidation_only) { |
677 BrowserViewRenderer::OnNewPictureMode mode = | 681 BrowserViewRenderer::OnNewPictureMode mode = |
678 BrowserViewRenderer::kOnNewPictureDisabled; | 682 BrowserViewRenderer::kOnNewPictureDisabled; |
679 if (enabled) { | 683 if (enabled) { |
680 mode = invalidation_only ? | 684 mode = invalidation_only ? |
681 BrowserViewRenderer::kOnNewPictureInvalidationOnly : | 685 BrowserViewRenderer::kOnNewPictureInvalidationOnly : |
682 BrowserViewRenderer::kOnNewPictureEnabled; | 686 BrowserViewRenderer::kOnNewPictureEnabled; |
683 } | 687 } |
684 | 688 |
685 browser_view_renderer_->EnableOnNewPicture(mode); | 689 browser_view_renderer_->EnableOnNewPicture(mode); |
686 } | 690 } |
687 | 691 |
688 } // namespace android_webview | 692 } // namespace android_webview |
OLD | NEW |