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/bitmap.h> | |
7 #include <sys/system_properties.h> | 8 #include <sys/system_properties.h> |
8 | 9 |
9 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
10 #include "android_webview/browser/net_disk_cache_remover.h" | 11 #include "android_webview/browser/net_disk_cache_remover.h" |
11 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 12 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
12 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" | 13 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" |
13 #include "android_webview/common/aw_hit_test_data.h" | 14 #include "android_webview/common/aw_hit_test_data.h" |
14 #include "android_webview/common/renderer_picture_map.h" | 15 #include "android_webview/common/renderer_picture_map.h" |
15 #include "android_webview/native/aw_browser_dependency_factory.h" | 16 #include "android_webview/native/aw_browser_dependency_factory.h" |
16 #include "android_webview/native/aw_contents_io_thread_client_impl.h" | 17 #include "android_webview/native/aw_contents_io_thread_client_impl.h" |
(...skipping 13 matching lines...) Expand all Loading... | |
30 #include "content/components/navigation_interception/intercept_navigation_delega te.h" | 31 #include "content/components/navigation_interception/intercept_navigation_delega te.h" |
31 #include "content/public/browser/android/content_view_core.h" | 32 #include "content/public/browser/android/content_view_core.h" |
32 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
33 #include "content/public/browser/cert_store.h" | 34 #include "content/public/browser/cert_store.h" |
34 #include "content/public/browser/navigation_entry.h" | 35 #include "content/public/browser/navigation_entry.h" |
35 #include "content/public/browser/render_process_host.h" | 36 #include "content/public/browser/render_process_host.h" |
36 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
37 #include "content/public/common/ssl_status.h" | 38 #include "content/public/common/ssl_status.h" |
38 #include "jni/AwContents_jni.h" | 39 #include "jni/AwContents_jni.h" |
39 #include "net/base/x509_certificate.h" | 40 #include "net/base/x509_certificate.h" |
40 #include "skia/ext/refptr.h" | |
41 #include "third_party/skia/include/core/SkBitmap.h" | 41 #include "third_party/skia/include/core/SkBitmap.h" |
42 #include "third_party/skia/include/core/SkCanvas.h" | 42 #include "third_party/skia/include/core/SkCanvas.h" |
43 #include "third_party/skia/include/core/SkDevice.h" | 43 #include "third_party/skia/include/core/SkDevice.h" |
44 #include "third_party/skia/include/core/SkPicture.h" | 44 #include "third_party/skia/include/core/SkGraphics.h" |
45 #include "ui/gfx/transform.h" | 45 #include "ui/gfx/transform.h" |
46 #include "ui/gl/gl_bindings.h" | 46 #include "ui/gl/gl_bindings.h" |
47 | 47 |
48 // TODO(leandrogracia): remove when crbug.com/164140 is closed. | 48 // TODO(leandrogracia): remove when crbug.com/164140 is closed. |
49 // Borrowed from gl2ext.h. Cannot be included due to conflicts with | 49 // Borrowed from gl2ext.h. Cannot be included due to conflicts with |
50 // gl_bindings.h and the EGL library methods (eglGetCurrentContext). | 50 // gl_bindings.h and the EGL library methods (eglGetCurrentContext). |
51 #ifndef GL_TEXTURE_EXTERNAL_OES | 51 #ifndef GL_TEXTURE_EXTERNAL_OES |
52 #define GL_TEXTURE_EXTERNAL_OES 0x8D65 | 52 #define GL_TEXTURE_EXTERNAL_OES 0x8D65 |
53 #endif | 53 #endif |
54 | 54 |
(...skipping 24 matching lines...) Expand all Loading... | |
79 reinterpret_cast<android_webview::AwContents*>(view_context)->DrawGL( | 79 reinterpret_cast<android_webview::AwContents*>(view_context)->DrawGL( |
80 draw_info); | 80 draw_info); |
81 } | 81 } |
82 } | 82 } |
83 | 83 |
84 namespace android_webview { | 84 namespace android_webview { |
85 | 85 |
86 namespace { | 86 namespace { |
87 | 87 |
88 AwDrawSWFunctionTable* g_draw_sw_functions = NULL; | 88 AwDrawSWFunctionTable* g_draw_sw_functions = NULL; |
89 bool g_is_skia_version_compatible = false; | |
89 | 90 |
90 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey; | 91 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey; |
91 | 92 |
92 class AwContentsUserData : public base::SupportsUserData::Data { | 93 class AwContentsUserData : public base::SupportsUserData::Data { |
93 public: | 94 public: |
94 AwContentsUserData(AwContents* ptr) : contents_(ptr) {} | 95 AwContentsUserData(AwContents* ptr) : contents_(ptr) {} |
95 | 96 |
96 static AwContents* GetContents(WebContents* web_contents) { | 97 static AwContents* GetContents(WebContents* web_contents) { |
97 if (!web_contents) | 98 if (!web_contents) |
98 return NULL; | 99 return NULL; |
(...skipping 15 matching lines...) Expand all Loading... | |
114 | 115 |
115 AwContents::AwContents(JNIEnv* env, | 116 AwContents::AwContents(JNIEnv* env, |
116 jobject obj, | 117 jobject obj, |
117 jobject web_contents_delegate) | 118 jobject web_contents_delegate) |
118 : java_ref_(env, obj), | 119 : java_ref_(env, obj), |
119 web_contents_delegate_( | 120 web_contents_delegate_( |
120 new AwWebContentsDelegate(env, web_contents_delegate)), | 121 new AwWebContentsDelegate(env, web_contents_delegate)), |
121 view_visible_(false), | 122 view_visible_(false), |
122 compositor_visible_(false), | 123 compositor_visible_(false), |
123 is_composite_pending_(false), | 124 is_composite_pending_(false), |
125 on_new_picture_enabled_(false), | |
126 on_new_picture_invalidation_only_(false), | |
124 last_frame_context_(NULL) { | 127 last_frame_context_(NULL) { |
125 RendererPictureMap::CreateInstance(); | 128 RendererPictureMap::CreateInstance(); |
126 android_webview::AwBrowserDependencyFactory* dependency_factory = | 129 android_webview::AwBrowserDependencyFactory* dependency_factory = |
127 android_webview::AwBrowserDependencyFactory::GetInstance(); | 130 android_webview::AwBrowserDependencyFactory::GetInstance(); |
128 | 131 |
129 // TODO(joth): rather than create and set the WebContents here, expose the | 132 // TODO(joth): rather than create and set the WebContents here, expose the |
130 // factory method to java side and have that orchestrate the construction | 133 // factory method to java side and have that orchestrate the construction |
131 // order. | 134 // order. |
132 SetWebContents(dependency_factory->CreateWebContents()); | 135 SetWebContents(dependency_factory->CreateWebContents()); |
133 } | 136 } |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
372 | 375 |
373 glScissor(scissor_box[0], scissor_box[1], scissor_box[2], | 376 glScissor(scissor_box[0], scissor_box[1], scissor_box[2], |
374 scissor_box[3]); | 377 scissor_box[3]); |
375 | 378 |
376 glUseProgram(current_program); | 379 glUseProgram(current_program); |
377 } | 380 } |
378 // --------------------------------------------------------------------------- | 381 // --------------------------------------------------------------------------- |
379 } | 382 } |
380 | 383 |
381 bool AwContents::DrawSW(JNIEnv* env, jobject obj, jobject java_canvas) { | 384 bool AwContents::DrawSW(JNIEnv* env, jobject obj, jobject java_canvas) { |
382 skia::RefPtr<SkPicture> picture = | 385 // TODO(leandrogracia): once Ubercompositor is ready and we support software |
383 RendererPictureMap::GetInstance()->GetRendererPicture( | 386 // rendering mode, we should avoid this as much as we can, ideally always. |
384 web_contents_->GetRoutingID()); | 387 // This includes finding a proper replacement for onDraw calls in hardware |
388 // mode with software canvases. | |
389 skia::RefPtr<SkPicture> picture = GetLastCapturedPicture(); | |
385 if (!picture) | 390 if (!picture) |
386 return false; | 391 return false; |
387 | 392 |
388 AwPixelInfo* pixels; | 393 AwPixelInfo* pixels; |
389 if (!g_draw_sw_functions || | 394 if (!g_draw_sw_functions || |
390 (pixels = g_draw_sw_functions->access_pixels(env, java_canvas)) == NULL) { | 395 (pixels = g_draw_sw_functions->access_pixels(env, java_canvas)) == NULL) { |
391 // TODO(joth): Fall back to slow path rendering via temporary bitmap. | 396 // TODO(joth): Fall back to slow path rendering via temporary bitmap. |
392 return false; | 397 return false; |
393 } | 398 } |
394 | 399 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
455 } | 460 } |
456 | 461 |
457 void AwContents::Destroy(JNIEnv* env, jobject obj) { | 462 void AwContents::Destroy(JNIEnv* env, jobject obj) { |
458 delete this; | 463 delete this; |
459 } | 464 } |
460 | 465 |
461 // static | 466 // static |
462 void SetAwDrawSWFunctionTable(JNIEnv* env, jclass, jint function_table) { | 467 void SetAwDrawSWFunctionTable(JNIEnv* env, jclass, jint function_table) { |
463 g_draw_sw_functions = | 468 g_draw_sw_functions = |
464 reinterpret_cast<AwDrawSWFunctionTable*>(function_table); | 469 reinterpret_cast<AwDrawSWFunctionTable*>(function_table); |
470 g_is_skia_version_compatible = | |
Leandro Graciá Gil
2013/01/10 19:52:47
This needs to be temporarily commented out until t
Leandro Graciá Gil
2013/01/12 17:59:14
Done.
| |
471 g_draw_sw_functions->is_skia_version_compatible(&SkGraphics::GetVersion); | |
472 if (!g_is_skia_version_compatible) | |
473 LOG(WARNING) << "Skia native versions are not compatible."; | |
465 } | 474 } |
466 | 475 |
467 // static | 476 // static |
468 jint GetAwDrawGLFunction(JNIEnv* env, jclass) { | 477 jint GetAwDrawGLFunction(JNIEnv* env, jclass) { |
469 return reinterpret_cast<jint>(&DrawGLFunction); | 478 return reinterpret_cast<jint>(&DrawGLFunction); |
470 } | 479 } |
471 | 480 |
472 namespace { | 481 namespace { |
473 // |message| is passed as base::Owned, so it will automatically be deleted | 482 // |message| is passed as base::Owned, so it will automatically be deleted |
474 // when the callback goes out of scope. | 483 // when the callback goes out of scope. |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
689 is_composite_pending_ = true; | 698 is_composite_pending_ = true; |
690 Invalidate(); | 699 Invalidate(); |
691 } | 700 } |
692 | 701 |
693 void AwContents::Invalidate() { | 702 void AwContents::Invalidate() { |
694 JNIEnv* env = AttachCurrentThread(); | 703 JNIEnv* env = AttachCurrentThread(); |
695 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 704 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
696 if (obj.is_null()) | 705 if (obj.is_null()) |
697 return; | 706 return; |
698 | 707 |
699 Java_AwContents_invalidate(env, obj.obj()); | 708 if (view_visible_) |
709 Java_AwContents_invalidate(env, obj.obj()); | |
710 | |
711 if (on_new_picture_enabled_ && on_new_picture_invalidation_only_) | |
joth
2013/01/12 02:36:28
comment where we do the callback if it's !invalida
Leandro Graciá Gil
2013/01/12 17:59:14
Done.
| |
712 Java_AwContents_onNewPicture(env, obj.obj(), NULL); | |
700 } | 713 } |
701 | 714 |
702 void AwContents::SetCompositorVisibility(bool visible) { | 715 void AwContents::SetCompositorVisibility(bool visible) { |
703 if (compositor_visible_ != visible) { | 716 if (compositor_visible_ != visible) { |
704 compositor_visible_ = visible; | 717 compositor_visible_ = visible; |
705 compositor_->SetVisible(compositor_visible_); | 718 compositor_->SetVisible(compositor_visible_); |
706 } | 719 } |
707 } | 720 } |
708 | 721 |
709 void AwContents::OnSwapBuffersCompleted() { | 722 void AwContents::OnSwapBuffersCompleted() { |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
841 } | 854 } |
842 | 855 |
843 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { | 856 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) { |
844 web_contents_->FocusThroughTabTraversal(false); | 857 web_contents_->FocusThroughTabTraversal(false); |
845 } | 858 } |
846 | 859 |
847 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { | 860 jint AwContents::ReleasePopupWebContents(JNIEnv* env, jobject obj) { |
848 return reinterpret_cast<jint>(pending_contents_.release()); | 861 return reinterpret_cast<jint>(pending_contents_.release()); |
849 } | 862 } |
850 | 863 |
864 ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env, | |
865 jobject obj) { | |
866 skia::RefPtr<SkPicture> picture = GetLastCapturedPicture(); | |
867 if (!picture || !g_draw_sw_functions) | |
868 return ScopedJavaLocalRef<jobject>(); | |
869 | |
870 if (g_is_skia_version_compatible) | |
871 return ScopedJavaLocalRef<jobject>(env, | |
872 g_draw_sw_functions->create_picture(env, picture->clone())); | |
873 | |
874 // If Skia versions are not compatible, workaround it by rasterizing the | |
875 // picture into a bitmap and drawing it into a new Java picture. | |
876 return ScopedJavaLocalRef<jobject>( | |
877 Java_AwContents_rasterizeIntoPicture(env, obj, | |
878 reinterpret_cast<jint>(picture.get()), | |
879 picture->width(), picture->height())); | |
880 } | |
881 | |
882 // static | |
883 jboolean RasterizePicture(JNIEnv* env, | |
884 jclass clazz, | |
885 jobject jbitmap, | |
886 jint native_picture) { | |
887 DCHECK(jbitmap); | |
888 DCHECK(native_picture); | |
889 | |
890 AndroidBitmapInfo bitmap_info; | |
891 if (AndroidBitmap_getInfo(env, jbitmap, &bitmap_info) < 0) { | |
892 LOG(WARNING) << "Error getting java bitmap info."; | |
893 return false; | |
894 } | |
895 | |
896 void* pixels = NULL; | |
897 if (AndroidBitmap_lockPixels(env, jbitmap, &pixels) < 0) { | |
898 LOG(WARNING) << "Error locking java bitmap pixels."; | |
899 return false; | |
900 } | |
901 | |
902 { | |
903 SkBitmap bitmap; | |
904 bitmap.setConfig(SkBitmap::kARGB_8888_Config, | |
905 bitmap_info.width, | |
906 bitmap_info.height, | |
907 bitmap_info.stride); | |
908 bitmap.setPixels(pixels); | |
909 | |
910 SkDevice device(bitmap); | |
911 SkCanvas canvas(&device); | |
912 SkPicture* picture = reinterpret_cast<SkPicture*>(native_picture); | |
913 picture->draw(&canvas); | |
914 } | |
915 | |
916 if (AndroidBitmap_unlockPixels(env, jbitmap) < 0) { | |
917 LOG(WARNING) << "Error unlocking java bitmap pixels."; | |
918 return false; | |
919 } | |
920 | |
921 return true; | |
922 } | |
923 | |
924 void AwContents::EnableOnNewPicture(JNIEnv* env, | |
925 jobject obj, | |
926 jboolean enabled, | |
927 jboolean invalidation_only) { | |
928 on_new_picture_enabled_ = enabled; | |
929 on_new_picture_invalidation_only_ = invalidation_only; | |
joth
2013/01/12 02:36:28
I'm wondering if these two would be better as an e
Leandro Graciá Gil
2013/01/12 17:59:14
Done.
| |
930 | |
931 // If onNewPicture is triggered only on invalidation do not capture | |
932 // pictures on every new frame. | |
933 if (on_new_picture_invalidation_only_) | |
934 return; | |
935 | |
936 // TODO(leandrogracia): uncomment when sw rendering uses Ubercompositor. | |
937 // Until then we need the callback enabled for SW mode invalidation. | |
938 // render_view_host_ext_->EnableCapturePictureCallback(enabled); | |
939 } | |
940 | |
851 void AwContents::OnPictureUpdated(int process_id, int render_view_id) { | 941 void AwContents::OnPictureUpdated(int process_id, int render_view_id) { |
852 CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id); | 942 CHECK_EQ(web_contents_->GetRenderProcessHost()->GetID(), process_id); |
853 if (render_view_id != web_contents_->GetRoutingID()) | 943 if (render_view_id != web_contents_->GetRoutingID()) |
854 return; | 944 return; |
855 | 945 |
946 // TODO(leandrogracia): this can be made unconditional once software rendering | |
947 // uses Ubercompositor. Until then this path is required for SW invalidations. | |
948 if (on_new_picture_enabled_ && !on_new_picture_invalidation_only_) { | |
949 JNIEnv* env = AttachCurrentThread(); | |
950 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | |
951 if (!obj.is_null()) { | |
952 ScopedJavaLocalRef<jobject> picture = CapturePicture(env, obj.obj()); | |
953 Java_AwContents_onNewPicture(env, obj.obj(), picture.obj()); | |
954 } | |
955 } | |
956 | |
856 // TODO(leandrogracia): delete when sw rendering uses Ubercompositor. | 957 // TODO(leandrogracia): delete when sw rendering uses Ubercompositor. |
857 // Invalidation should be provided by the compositor only. | 958 // Invalidation should be provided by the compositor only. |
858 Invalidate(); | 959 Invalidate(); |
859 } | 960 } |
860 | 961 |
962 skia::RefPtr<SkPicture> AwContents::GetLastCapturedPicture() { | |
963 // Use the latest available picture if the listener callback is enabled. | |
964 skia::RefPtr<SkPicture> picture; | |
965 if (on_new_picture_enabled_) | |
966 picture = RendererPictureMap::GetInstance()->GetRendererPicture( | |
967 web_contents_->GetRoutingID()); | |
968 | |
969 // If not available or not in listener mode get it synchronously. | |
970 if (!picture) { | |
971 render_view_host_ext_->CapturePictureSync(); | |
972 picture = RendererPictureMap::GetInstance()->GetRendererPicture( | |
973 web_contents_->GetRoutingID()); | |
974 } | |
975 | |
976 return picture; | |
977 } | |
978 | |
861 } // namespace android_webview | 979 } // namespace android_webview |
OLD | NEW |