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/html | |
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/html')
-rw-r--r-- | Source/WebCore/html/HTMLCanvasElement.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/html/HTMLInputElement.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/html/RangeInputType.h | 8 |
3 files changed, 5 insertions, 17 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp index 1747273..ff94b76 100644 --- a/Source/WebCore/html/HTMLCanvasElement.cpp +++ b/Source/WebCore/html/HTMLCanvasElement.cpp @@ -342,12 +342,8 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, const double* qualit if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(lowercaseMimeType)) lowercaseMimeType = "image/png"; -<<<<<<< HEAD -#if PLATFORM(CG) || (USE(SKIA) && !PLATFORM(ANDROID)) +#if USE(CG) || (USE(SKIA) && !PLATFORM(ANDROID)) // FIXME: Consider using this code path on Android. http://b/4572024 -======= -#if USE(CG) || USE(SKIA) ->>>>>>> WebKit.org at r84325 // Try to get ImageData first, as that may avoid lossy conversions. RefPtr<ImageData> imageData = getImageData(); diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp index 83e8c7d..d5d0aee 100644 --- a/Source/WebCore/html/HTMLInputElement.cpp +++ b/Source/WebCore/html/HTMLInputElement.cpp @@ -443,21 +443,15 @@ void HTMLInputElement::setType(const String& type) void HTMLInputElement::updateType() { -<<<<<<< HEAD - const AtomicString& typeString = fastGetAttribute(typeAttr); - - OwnPtr<InputType> newType = InputType::create(this, typeString); + OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr)); #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS if (newType->isPasswordField() && document()->focusedNode() == this) PlatformBridge::updateTextfield(document()->view(), this, true, String()); #endif -======= - OwnPtr<InputType> newType = InputType::create(this, fastGetAttribute(typeAttr)); bool hadType = m_hasType; m_hasType = true; if (m_inputType->formControlType() == newType->formControlType()) return; ->>>>>>> WebKit.org at r84325 if (hadType && !newType->canChangeFromAnotherType()) { // Set the attribute back to the old value. diff --git a/Source/WebCore/html/RangeInputType.h b/Source/WebCore/html/RangeInputType.h index b7af291..358a638 100644 --- a/Source/WebCore/html/RangeInputType.h +++ b/Source/WebCore/html/RangeInputType.h @@ -69,14 +69,12 @@ private: virtual String fallbackValue(); virtual String sanitizeValue(const String& proposedValue); virtual bool shouldRespectListAttribute(); -<<<<<<< HEAD + + SliderThumbElement* shadowSliderThumb() const; + #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) virtual void handleTouchStartEvent(TouchEvent*); #endif -======= - - SliderThumbElement* shadowSliderThumb() const; ->>>>>>> WebKit.org at r84325 }; } // namespace WebCore |