OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/browser_view_renderer.h" | 5 #include "android_webview/browser/browser_view_renderer.h" |
6 | 6 |
7 #include "android_webview/browser/browser_view_renderer_client.h" | 7 #include "android_webview/browser/browser_view_renderer_client.h" |
8 #include "android_webview/browser/child_frame.h" | 8 #include "android_webview/browser/child_frame.h" |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 namespace { | 29 namespace { |
30 | 30 |
31 const double kEpsilon = 1e-8; | 31 const double kEpsilon = 1e-8; |
32 | 32 |
33 const int64 kFallbackTickTimeoutInMilliseconds = 100; | 33 const int64 kFallbackTickTimeoutInMilliseconds = 100; |
34 | 34 |
35 // Used to calculate memory allocation. Determined experimentally. | 35 // Used to calculate memory allocation. Determined experimentally. |
36 const size_t kMemoryMultiplier = 20; | 36 const size_t kMemoryMultiplier = 20; |
37 const size_t kBytesPerPixel = 4; | 37 const size_t kBytesPerPixel = 4; |
38 const size_t kMemoryAllocationStep = 5 * 1024 * 1024; | 38 const size_t kMemoryAllocationStep = 5 * 1024 * 1024; |
39 uint64 g_memory_override_in_bytes = 0u; | 39 uint64_t g_memory_override_in_bytes = 0u; |
40 | 40 |
41 const void* kBrowserViewRendererUserDataKey = &kBrowserViewRendererUserDataKey; | 41 const void* const kBrowserViewRendererUserDataKey = |
| 42 &kBrowserViewRendererUserDataKey; |
42 | 43 |
43 class BrowserViewRendererUserData : public base::SupportsUserData::Data { | 44 class BrowserViewRendererUserData : public base::SupportsUserData::Data { |
44 public: | 45 public: |
45 BrowserViewRendererUserData(BrowserViewRenderer* ptr) : bvr_(ptr) {} | 46 explicit BrowserViewRendererUserData(BrowserViewRenderer* ptr) : bvr_(ptr) {} |
46 | 47 |
47 static BrowserViewRenderer* GetBrowserViewRenderer( | 48 static BrowserViewRenderer* GetBrowserViewRenderer( |
48 content::WebContents* web_contents) { | 49 content::WebContents* web_contents) { |
49 if (!web_contents) | 50 if (!web_contents) |
50 return NULL; | 51 return NULL; |
51 BrowserViewRendererUserData* data = | 52 BrowserViewRendererUserData* data = |
52 static_cast<BrowserViewRendererUserData*>( | 53 static_cast<BrowserViewRendererUserData*>( |
53 web_contents->GetUserData(kBrowserViewRendererUserDataKey)); | 54 web_contents->GetUserData(kBrowserViewRendererUserDataKey)); |
54 return data ? data->bvr_ : NULL; | 55 return data ? data->bvr_ : NULL; |
55 } | 56 } |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 base::StringAppendF(&str, | 740 base::StringAppendF(&str, |
740 "overscroll_rounding_error_: %s ", | 741 "overscroll_rounding_error_: %s ", |
741 overscroll_rounding_error_.ToString().c_str()); | 742 overscroll_rounding_error_.ToString().c_str()); |
742 base::StringAppendF( | 743 base::StringAppendF( |
743 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); | 744 &str, "on_new_picture_enable: %d ", on_new_picture_enable_); |
744 base::StringAppendF(&str, "clear_view: %d ", clear_view_); | 745 base::StringAppendF(&str, "clear_view: %d ", clear_view_); |
745 return str; | 746 return str; |
746 } | 747 } |
747 | 748 |
748 } // namespace android_webview | 749 } // namespace android_webview |
OLD | NEW |