diff options
| -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); |