diff options
author | Ben Murdoch <benm@google.com> | 2011-06-09 13:37:59 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:52:58 +0100 |
commit | bbcce278be9be6a85f47928c38a74c8d36a13a85 (patch) | |
tree | fe640d64b3947c079408a69bec6dfa431be9dd39 /Source/WebCore/page | |
parent | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (diff) | |
download | external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.zip external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.tar.gz external_webkit-bbcce278be9be6a85f47928c38a74c8d36a13a85.tar.bz2 |
Merge WebKit at r84325: Fix conflicts.
Platform.h
ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997)
WTF_USE_SKIA (http://trac.webkit.org/changeset/84106)
JSNavigatorCustom.cpp
V8NavigatorCustom.cpp
ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287)
CSSStyleSelector.cpp
ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986)
Document.cpp
ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349)
ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992)
HTMLInputElement.cpp
ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534)
RangeInputType.cpp
ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/)
ChromeClient.h
ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375)
EventHandler.cpp
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522)
Settings
ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201)
ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628)
Gradient.cpp
Graphicscontext.cpp
HTMLCanvasElement.cpp
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088)
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101)
PluginView.h
ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071)
RenderBox.h
ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611)
RenderIframe.cpp (moved code to RenderPart.cpp)
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518)
RenderLayer.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899)
RenderLayer.h
RenderLayerBacking.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820)
Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
Diffstat (limited to 'Source/WebCore/page')
-rw-r--r-- | Source/WebCore/page/ChromeClient.h | 10 | ||||
-rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 11 | ||||
-rw-r--r-- | Source/WebCore/page/Settings.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/page/Settings.h | 17 |
4 files changed, 12 insertions, 31 deletions
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h index 4e6b45e..ce664ac 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -308,11 +308,6 @@ namespace WebCore { virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } -<<<<<<< HEAD -#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) - virtual void webAppCanBeInstalled() = 0; -#endif -======= enum DialogType { AlertDialog = 0, ConfirmDialog = 1, @@ -321,7 +316,10 @@ namespace WebCore { NumDialogTypes = 4 }; virtual void willRunModalDialogDuringPageDismissal(const DialogType&) const { } ->>>>>>> WebKit.org at r84325 + +#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) + virtual void webAppCanBeInstalled() = 0; +#endif protected: virtual ~ChromeClient() { } diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index d5ba4de..e77809c 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -2905,18 +2905,9 @@ void EventHandler::defaultTextInputEventHandler(TextEvent* event) event->setDefaultHandled(); } -<<<<<<< HEAD -#if PLATFORM(QT) || PLATFORM(MAC) || PLATFORM(ANDROID) - -// These two platforms handle the space event in the platform-specific WebKit code. -// Eventually it would be good to eliminate that and use the code here instead, but -// the Qt version is inside an ifdef and the Mac version has some extra behavior -// so we can't unify everything yet. -======= -#if PLATFORM(QT) +#if PLATFORM(QT) || PLATFORM(ANDROID) // Qt handles the space event in platform-specific WebKit code. // Eventually it would be good to eliminate that and use the code here instead. ->>>>>>> WebKit.org at r84325 void EventHandler::defaultSpaceEventHandler(KeyboardEvent*) { } diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index f272325..1136371 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -176,7 +176,7 @@ Settings::Settings(Page* page) , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) , m_useQuickLookResourceCachingQuirks(false) , m_forceCompositingMode(false) -<<<<<<< HEAD + , m_shouldInjectUserScriptsInInitialEmptyDocument(false) #ifdef ANDROID_LAYOUT , m_useWideViewport(false) #endif @@ -192,9 +192,6 @@ Settings::Settings(Page* page) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif -======= - , m_shouldInjectUserScriptsInInitialEmptyDocument(false) ->>>>>>> WebKit.org at r84325 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h index 8aedd77..31a5ad9 100644 --- a/Source/WebCore/page/Settings.h +++ b/Source/WebCore/page/Settings.h @@ -109,18 +109,11 @@ namespace WebCore { void setLoadsImagesAutomatically(bool); bool loadsImagesAutomatically() const { return m_loadsImagesAutomatically; } -<<<<<<< HEAD -#ifdef ANDROID_BLOCK_NETWORK_IMAGE - void setBlockNetworkImage(bool); - bool blockNetworkImage() const { return m_blockNetworkImage; } -#endif -======= // This setting only affects site icon image loading if loadsImagesAutomatically setting is false and this setting is true. // All other permutations still heed loadsImagesAutomatically setting. void setLoadsSiteIconsIgnoringImageLoadingSetting(bool); bool loadsSiteIconsIgnoringImageLoadingSetting() const { return m_loadsSiteIconsIgnoringImageLoadingSetting; } ->>>>>>> WebKit.org at r84325 void setJavaScriptEnabled(bool); // Instead of calling isJavaScriptEnabled directly, please consider calling // ScriptController::canExecuteScripts, which takes things like the @@ -470,6 +463,11 @@ namespace WebCore { bool autoFillEnabled() { return m_autoFillEnabled; } #endif +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + void setBlockNetworkImage(bool); + bool blockNetworkImage() const { return m_blockNetworkImage; } +#endif + private: Page* m_page; @@ -589,7 +587,7 @@ namespace WebCore { bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1; bool m_useQuickLookResourceCachingQuirks : 1; bool m_forceCompositingMode : 1; -<<<<<<< HEAD + bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1; #ifdef ANDROID_META_SUPPORT // default is yes bool m_viewport_user_scalable : 1; @@ -619,9 +617,6 @@ namespace WebCore { #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif -======= - bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1; ->>>>>>> WebKit.org at r84325 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; |