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 <android/bitmap.h> |
8 #include <sys/system_properties.h> | 8 #include <sys/system_properties.h> |
9 | 9 |
10 #include "android_webview/browser/aw_browser_context.h" | 10 #include "android_webview/browser/aw_browser_context.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } | 547 } |
548 | 548 |
549 void AwContents::Destroy(JNIEnv* env, jobject obj) { | 549 void AwContents::Destroy(JNIEnv* env, jobject obj) { |
550 delete this; | 550 delete this; |
551 } | 551 } |
552 | 552 |
553 // static | 553 // static |
554 void SetAwDrawSWFunctionTable(JNIEnv* env, jclass, jint function_table) { | 554 void SetAwDrawSWFunctionTable(JNIEnv* env, jclass, jint function_table) { |
555 g_draw_sw_functions = | 555 g_draw_sw_functions = |
556 reinterpret_cast<AwDrawSWFunctionTable*>(function_table); | 556 reinterpret_cast<AwDrawSWFunctionTable*>(function_table); |
557 g_is_skia_version_compatible = | 557 // TODO(leandrogracia): uncomment once the glue layer implements this method. |
558 g_draw_sw_functions->is_skia_version_compatible(&SkGraphics::GetVersion); | 558 //g_is_skia_version_compatible = |
| 559 // g_draw_sw_functions->is_skia_version_compatible(&SkGraphics::GetVersion); |
559 LOG_IF(WARNING, !g_is_skia_version_compatible) << | 560 LOG_IF(WARNING, !g_is_skia_version_compatible) << |
560 "Skia native versions are not compatible."; | 561 "Skia native versions are not compatible."; |
561 } | 562 } |
562 | 563 |
563 // static | 564 // static |
564 jint GetAwDrawGLFunction(JNIEnv* env, jclass) { | 565 jint GetAwDrawGLFunction(JNIEnv* env, jclass) { |
565 return reinterpret_cast<jint>(&DrawGLFunction); | 566 return reinterpret_cast<jint>(&DrawGLFunction); |
566 } | 567 } |
567 | 568 |
568 namespace { | 569 namespace { |
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1094 if (!picture) { | 1095 if (!picture) { |
1095 render_view_host_ext_->CapturePictureSync(); | 1096 render_view_host_ext_->CapturePictureSync(); |
1096 picture = RendererPictureMap::GetInstance()->GetRendererPicture( | 1097 picture = RendererPictureMap::GetInstance()->GetRendererPicture( |
1097 web_contents_->GetRoutingID()); | 1098 web_contents_->GetRoutingID()); |
1098 } | 1099 } |
1099 | 1100 |
1100 return picture; | 1101 return picture; |
1101 } | 1102 } |
1102 | 1103 |
1103 } // namespace android_webview | 1104 } // namespace android_webview |
OLD | NEW |