diff options
| -rw-r--r-- | WebCore/page/Settings.cpp | 6 | ||||
| -rw-r--r-- | WebKit/android/jni/DeviceMotionAndOrientationManager.cpp | 3 | ||||
| -rw-r--r-- | WebKit/android/nav/FindCanvas.h | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 8e8d43b..aa758c4 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -160,12 +160,12 @@ Settings::Settings(Page* page) , m_interactiveFormValidation(false) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) -#if ENABLE(WEB_AUTOFILL) - , m_autoFillEnabled(false) -#endif #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif +#if ENABLE(WEB_AUTOFILL) + , m_autoFillEnabled(false) +#endif { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. diff --git a/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp index 9db83a3..8beb372 100644 --- a/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp +++ b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp @@ -53,8 +53,7 @@ void DeviceMotionAndOrientationManager::useMock() void DeviceMotionAndOrientationManager::setMockMotion(PassRefPtr<DeviceMotionData> motion) { - if (m_useMock) - ; // TODO: There is not yet a DeviceMotion mock. + // TODO: There is not yet a DeviceMotion mock. } void DeviceMotionAndOrientationManager::onMotionChange(PassRefPtr<DeviceMotionData> motion) diff --git a/WebKit/android/nav/FindCanvas.h b/WebKit/android/nav/FindCanvas.h index 903279c..2aba8e0 100644 --- a/WebKit/android/nav/FindCanvas.h +++ b/WebKit/android/nav/FindCanvas.h @@ -33,8 +33,9 @@ #include "SkPicture.h" #include "SkRegion.h" #include "SkTDArray.h" -#include "icu/unicode/umachine.h" -#include "wtf/Vector.h" + +#include <unicode/umachine.h> +#include <wtf/Vector.h> namespace android { |