diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-09 18:17:50 +0000 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:22 -0800 |
| commit | e02b67f8cfa87b8e952bcae834e4f3d3937fcc98 (patch) | |
| tree | 0971d84e250a354d4f741f0b42fc284d21da9ca0 /WebKit/Android.mk | |
| parent | 1c7e3f51abb8590ac714e6ceeb9a5931365053ea (diff) | |
| download | external_webkit-e02b67f8cfa87b8e952bcae834e4f3d3937fcc98.zip external_webkit-e02b67f8cfa87b8e952bcae834e4f3d3937fcc98.tar.gz external_webkit-e02b67f8cfa87b8e952bcae834e4f3d3937fcc98.tar.bz2 | |
Merge WebKit at r72274: Implement PlatformBridge memory management methods for WebKit change 71639
Get device class specific memory constraints for V8.
V8 can be more efficient in terms of memory management but to do
so needs to know about what resources are available to it.
This varies device to device on Android so add implement the functions
that the the PlatformBridge needs to query the relevant values from
Java.
MemoryUsage.cpp will compile for JSC, but needs tuning to report
correct JSC stats. It's currently a non-issue, as this routine is only
used with V8, at present.
Requires a frameworks/base change:
https://android-git.corp.google.com/g/#change,78690
Bug: 3075565
Requires a previously upstreamed webkit change:
http://trac.webkit.org/changeset/71639
Change-Id: I25ff54b5c8e25f5de5380e0d43e56551587adc5d
Diffstat (limited to 'WebKit/Android.mk')
| -rw-r--r-- | WebKit/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/Android.mk b/WebKit/Android.mk index 25e7be3..49fc13c 100644 --- a/WebKit/Android.mk +++ b/WebKit/Android.mk @@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \ android/WebCoreSupport/FrameNetworkingContextAndroid.cpp \ android/WebCoreSupport/GeolocationPermissions.cpp \ android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp \ + android/WebCoreSupport/MemoryUsage.cpp \ android/WebCoreSupport/PlatformBridge.cpp \ android/WebCoreSupport/ResourceLoaderAndroid.cpp \ android/WebCoreSupport/UrlInterceptResponse.cpp \ |