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

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: Remove redundant includes 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
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 "webkit/glue/resource_loader_bridge.h" 13 #include "webkit/glue/resource_loader_bridge.h"
14 #include "webkit/glue/webkit_glue_export.h" 14 #include "webkit/glue/webkit_glue_export.h"
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include "webkit/glue/webthemeengine_impl_win.h" 17 #include "webkit/glue/webthemeengine_impl_win.h"
18 #elif defined(OS_MACOSX) 18 #elif defined(OS_MACOSX)
19 #include "webkit/glue/webthemeengine_impl_mac.h" 19 #include "webkit/glue/webthemeengine_impl_mac.h"
20 #elif defined(OS_POSIX) 20 #elif defined(OS_ANDROID)
21 #include "webkit/glue/webthemeengine_impl_android.h"
22 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
21 #include "webkit/glue/webthemeengine_impl_linux.h" 23 #include "webkit/glue/webthemeengine_impl_linux.h"
22 #endif 24 #endif
23 25
24 26
25 class MessageLoop; 27 class MessageLoop;
26 28
27 namespace webkit { 29 namespace webkit {
28 struct WebPluginInfo; 30 struct WebPluginInfo;
29 } 31 }
30 32
(...skipping 22 matching lines...) Expand all
53 virtual long databaseGetFileAttributes( 55 virtual long databaseGetFileAttributes(
54 const WebKit::WebString& vfs_file_name); 56 const WebKit::WebString& vfs_file_name);
55 virtual long long databaseGetFileSize(const WebKit::WebString& vfs_file_name); 57 virtual long long databaseGetFileSize(const WebKit::WebString& vfs_file_name);
56 virtual long long databaseGetSpaceAvailableForOrigin( 58 virtual long long databaseGetSpaceAvailableForOrigin(
57 const WebKit::WebString& origin_identifier); 59 const WebKit::WebString& origin_identifier);
58 virtual WebKit::WebString signedPublicKeyAndChallengeString( 60 virtual WebKit::WebString signedPublicKeyAndChallengeString(
59 unsigned key_size_index, const WebKit::WebString& challenge, 61 unsigned key_size_index, const WebKit::WebString& challenge,
60 const WebKit::WebURL& url); 62 const WebKit::WebURL& url);
61 virtual size_t memoryUsageMB(); 63 virtual size_t memoryUsageMB();
62 virtual size_t actualMemoryUsageMB(); 64 virtual size_t actualMemoryUsageMB();
65 #if defined(OS_ANDROID) // Other OSes just use the default values.
66 virtual size_t lowMemoryUsageMB() OVERRIDE;
67 virtual size_t highMemoryUsageMB() OVERRIDE;
68 virtual size_t highUsageDeltaMB() OVERRIDE;
69 #endif
63 virtual WebKit::WebURLLoader* createURLLoader(); 70 virtual WebKit::WebURLLoader* createURLLoader();
64 virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle(); 71 virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
65 virtual WebKit::WebString userAgent(const WebKit::WebURL& url); 72 virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
66 virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*); 73 virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*);
67 virtual void decrementStatsCounter(const char* name); 74 virtual void decrementStatsCounter(const char* name);
68 virtual void incrementStatsCounter(const char* name); 75 virtual void incrementStatsCounter(const char* name);
69 virtual void histogramCustomCounts( 76 virtual void histogramCustomCounts(
70 const char* name, int sample, int min, int max, int bucket_count); 77 const char* name, int sample, int min, int max, int bucket_count);
71 virtual void histogramEnumeration( 78 virtual void histogramEnumeration(
72 const char* name, int sample, int boundary_value); 79 const char* name, int sample, int boundary_value);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 void (*shared_timer_func_)(); 160 void (*shared_timer_func_)();
154 double shared_timer_fire_time_; 161 double shared_timer_fire_time_;
155 int shared_timer_suspended_; // counter 162 int shared_timer_suspended_; // counter
156 WebThemeEngineImpl theme_engine_; 163 WebThemeEngineImpl theme_engine_;
157 base::ThreadLocalStorage::Slot current_thread_slot_; 164 base::ThreadLocalStorage::Slot current_thread_slot_;
158 }; 165 };
159 166
160 } // namespace webkit_glue 167 } // namespace webkit_glue
161 168
162 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_ 169 #endif // WEBKIT_PLATFORM_SUPPORT_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698