summaryrefslogtreecommitdiffstats
path: root/perf/main.cpp
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2009-05-12 11:43:16 -0400
committerPatrick Scott <phanna@android.com>2009-05-12 13:55:25 -0400
commiteb0d79a86d66f3b4ae7bb422a57b7abe82878d5a (patch)
tree187f72ad28b8be399d9d0c42d7ddb7f726078a6c /perf/main.cpp
parentb1f12fcd97f02fccc9c9e3582281eae09dd5a211 (diff)
downloadexternal_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.zip
external_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.tar.gz
external_webkit-eb0d79a86d66f3b4ae7bb422a57b7abe82878d5a.tar.bz2
Shave ~60k off of libwebcore.so and make webcore_test always build.
Build libwebcore as a static library first. Then build it as a shared library using the jni entry point as the single source file. This strips uneeded code out of the final library. Have webcore_test link against the static library so that the symbols are all visible. Update webcore_test to link against the new webkit drop as well. Rearrange the main makefile to create WEBKIT_* variables that a sub-makefile like webcore_test can use to define includes, cflags, and libraries. Manually add a dependency on the generated webkit source files. Verified that svg and v8 work as well as the simulator.
Diffstat (limited to 'perf/main.cpp')
-rw-r--r--perf/main.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/perf/main.cpp b/perf/main.cpp
index 9314e42..927f55e 100644
--- a/perf/main.cpp
+++ b/perf/main.cpp
@@ -39,7 +39,11 @@
#include "FrameView.h"
#include "GraphicsContext.h"
#include "HistoryItem.h"
+#if USE(JSC)
#include "InitializeThreading.h"
+#elif USE(V8)
+#include "V8InitializeThreading.h"
+#endif
#include "InspectorClientAndroid.h"
#include "Intercept.h"
#include "IntRect.h"
@@ -117,8 +121,11 @@ int main(int argc, char** argv) {
LOGE("Please supply a file to read\n");
return 1;
}
-
+#if USE(JSC)
JSC::initializeThreading();
+#elif USE(V8)
+ V8::initializeThreading();
+#endif
// Setting this allows data: urls to load from a local file.
FrameLoader::setLocalLoadPolicy(FrameLoader::AllowLocalLoadsForAll);
@@ -169,7 +176,6 @@ int main(int argc, char** argv) {
// assertion in the Cache code)
frame->init();
frame->selection()->setFocused(true);
- frame->loader()->setUseLowBandwidthDisplay(false);
// Set all the default settings the Browser normally uses.
Settings* s = frame->settings();