Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.h

Issue 10113009: Set Android/V8 memory limits from dalvik.vm.heapsize. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, rebase Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/sys_info_android.cc ('k') | webkit/glue/webkitplatformsupport_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 5 #ifndef WEBKIT_PLATFORM_SUPPORT_IMPL_H_
6 #define WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 6 #define WEBKIT_PLATFORM_SUPPORT_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/threading/thread_local_storage.h" 10 #include "base/threading/thread_local_storage.h"
11 #include "base/timer.h" 11 #include "base/timer.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h"
13 #include "ui/base/layout.h" 13 #include "ui/base/layout.h"
14 #include "webkit/glue/resource_loader_bridge.h" 14 #include "webkit/glue/resource_loader_bridge.h"
15 #include "webkit/glue/webkit_glue_export.h" 15 #include "webkit/glue/webkit_glue_export.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "webkit/glue/webthemeengine_impl_win.h" 18 #include "webkit/glue/webthemeengine_impl_win.h"
19 #elif defined(OS_MACOSX) 19 #elif defined(OS_MACOSX)
20 #include "webkit/glue/webthemeengine_impl_mac.h" 20 #include "webkit/glue/webthemeengine_impl_mac.h"
21 #elif defined(OS_POSIX) 21 #elif defined(OS_ANDROID)
22 #include "webkit/glue/webthemeengine_impl_android.h"
23 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
22 #include "webkit/glue/webthemeengine_impl_linux.h" 24 #include "webkit/glue/webthemeengine_impl_linux.h"
23 #endif 25 #endif
24 26
25 27
26 class MessageLoop; 28 class MessageLoop;
27 29
28 namespace webkit { 30 namespace webkit {
29 struct WebPluginInfo; 31 struct WebPluginInfo;
30 } 32 }
31 33
(...skipping 22 matching lines...) Expand all
54 virtual long databaseGetFileAttributes( 56 virtual long databaseGetFileAttributes(
55 const WebKit::WebString& vfs_file_name); 57 const WebKit::WebString& vfs_file_name);
56 virtual long long databaseGetFileSize(const WebKit::WebString& vfs_file_name); 58 virtual long long databaseGetFileSize(const WebKit::WebString& vfs_file_name);
57 virtual long long databaseGetSpaceAvailableForOrigin( 59 virtual long long databaseGetSpaceAvailableForOrigin(
58 const WebKit::WebString& origin_identifier); 60 const WebKit::WebString& origin_identifier);
59 virtual WebKit::WebString signedPublicKeyAndChallengeString( 61 virtual WebKit::WebString signedPublicKeyAndChallengeString(
60 unsigned key_size_index, const WebKit::WebString& challenge, 62 unsigned key_size_index, const WebKit::WebString& challenge,
61 const WebKit::WebURL& url); 63 const WebKit::WebURL& url);
62 virtual size_t memoryUsageMB(); 64 virtual size_t memoryUsageMB();
63 virtual size_t actualMemoryUsageMB(); 65 virtual size_t actualMemoryUsageMB();
66 #if defined(OS_ANDROID) // Other OSes just use the default values.
67 virtual size_t lowMemoryUsageMB() OVERRIDE;
68 virtual size_t highMemoryUsageMB() OVERRIDE;
69 virtual size_t highUsageDeltaMB() OVERRIDE;
70 #endif
64 virtual WebKit::WebURLLoader* createURLLoader(); 71 virtual WebKit::WebURLLoader* createURLLoader();
65 virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle(); 72 virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
66 virtual WebKit::WebString userAgent(const WebKit::WebURL& url); 73 virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
67 virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*); 74 virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*);
68 virtual void decrementStatsCounter(const char* name); 75 virtual void decrementStatsCounter(const char* name);
69 virtual void incrementStatsCounter(const char* name); 76 virtual void incrementStatsCounter(const char* name);
70 virtual void histogramCustomCounts( 77 virtual void histogramCustomCounts(
71 const char* name, int sample, int min, int max, int bucket_count); 78 const char* name, int sample, int min, int max, int bucket_count);
72 virtual void histogramEnumeration( 79 virtual void histogramEnumeration(
73 const char* name, int sample, int boundary_value); 80 const char* name, int sample, int boundary_value);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 void (*shared_timer_func_)(); 162 void (*shared_timer_func_)();
156 double shared_timer_fire_time_; 163 double shared_timer_fire_time_;
157 int shared_timer_suspended_; // counter 164 int shared_timer_suspended_; // counter
158 WebThemeEngineImpl theme_engine_; 165 WebThemeEngineImpl theme_engine_;
159 base::ThreadLocalStorage::Slot current_thread_slot_; 166 base::ThreadLocalStorage::Slot current_thread_slot_;
160 }; 167 };
161 168
162 } // namespace webkit_glue 169 } // namespace webkit_glue
163 170
164 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 171 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_
OLDNEW
« no previous file with comments | « base/sys_info_android.cc ('k') | webkit/glue/webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698