diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-11-05 18:06:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-05 18:06:20 -0700 |
| commit | 9934d5d8bbc7e1f13e620eac325528f9e92d67ee (patch) | |
| tree | bb3fbe53f8143e234b740c1ae8ee14f363b0ebb1 | |
| parent | 32ccb9477579647ebaa1cf4489cd3846ad99c82a (diff) | |
| parent | 84ebbd1fa3feaf3979b8f4576ae6434cd8812013 (diff) | |
| download | external_webkit-9934d5d8bbc7e1f13e620eac325528f9e92d67ee.zip external_webkit-9934d5d8bbc7e1f13e620eac325528f9e92d67ee.tar.gz external_webkit-9934d5d8bbc7e1f13e620eac325528f9e92d67ee.tar.bz2 | |
Merge "Fix compilation error when ANDROID_LAYOUT is not defined."
| -rw-r--r-- | WebCore/rendering/RenderView.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebCoreJniOnLoad.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp index 260a081..0538d99 100644 --- a/WebCore/rendering/RenderView.cpp +++ b/WebCore/rendering/RenderView.cpp @@ -39,7 +39,7 @@ #include "RenderLayerCompositor.h" #endif -#ifdef ANDROID_LAYOUT +#if defined(ANDROID_LAYOUT) || defined(ANDROID_FIXED_ELEMENTS) #include "Settings.h" #endif diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index aaf4003..6790e42 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -243,7 +243,9 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) { // Set all the default settings the Browser normally uses. Settings* s = frame->settings(); +#ifdef ANDROID_LAYOUT s->setLayoutAlgorithm(Settings::kLayoutNormal); // Normal layout for now +#endif s->setStandardFontFamily("sans-serif"); s->setFixedFontFamily("monospace"); s->setSansSerifFontFamily("sans-serif"); @@ -259,7 +261,9 @@ EXPORT void benchmark(const char* url, int reloadCount, int width, int height) { s->setDefaultTextEncodingName("latin1"); s->setPluginsEnabled(false); s->setShrinksStandaloneImagesToFit(false); +#ifdef ANDROID_LAYOUT s->setUseWideViewport(false); +#endif // Finally, load the actual data ResourceRequest req(url); |