diff options
25 files changed, 120 insertions, 849 deletions
@@ -1,146 +1,2 @@ -<<<<<<< HEAD WebKitBuild/* WebCore/WebCore.xcodeproj/* -======= -*.mode* -*.pbxuser -*.perspective* -*.pyc -.DS_Store -build/ -/WebKitBuild/ -autoinstall.cache.d -Tools/Scripts/webkitpy/thirdparty/autoinstalled - -# Ignore common tool auto-generated files. -.gdb_history -tags -*~ - -# Ignore Chromium projects auto-generated from .gyp files: -JavaScriptCore/JavaScriptCore.gyp/*.Makefile -JavaScriptCore/JavaScriptCore.gyp/*.mk -JavaScriptCore/JavaScriptCore.gyp/*.sln -JavaScriptCore/JavaScriptCore.gyp/*.vcproj* -JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj -WebCore/WebCore.gyp/*.Makefile -WebCore/WebCore.gyp/*.mk -WebCore/WebCore.gyp/*.rules -WebCore/WebCore.gyp/*.sln -WebCore/WebCore.gyp/*.tmp -WebCore/WebCore.gyp/*.vcproj* -WebCore/WebCore.gyp/WebCore.xcodeproj -WebKit/chromium/*.Makefile -WebKit/chromium/*.mk -WebKit/chromium/*.sln -WebKit/chromium/*.vcproj* -WebKit/chromium/WebKit.xcodeproj -Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj - -# Ignore status files that manage Chromium dependencies. -WebKit/chromium/.gclient -WebKit/chromium/.gclient_entries - -# Ignore Chromium dependencies -WebKit/chromium/base/ -WebKit/chromium/gfx/ -WebKit/chromium/googleurl/ -WebKit/chromium/ipc/ -WebKit/chromium/net/ -WebKit/chromium/ppapi/ -WebKit/chromium/sdch/ -WebKit/chromium/skia/ -WebKit/chromium/testing/ -WebKit/chromium/third_party/ -WebKit/chromium/tools/ -WebKit/chromium/v8/ -WebKit/chromium/xcodebuild/ -WebKit/chromium/.gclient -WebKit/chromium/.gclient_entries -WebKit/chromium/app/ -WebKit/chromium/chromium_deps/ -WebKit/chromium/gpu/ -WebKit/chromium/media/ -WebKit/chromium/webkit/ -WebKit/chromium/printing/ -WebKit/chromium/depot_tools/ - -# Ignore files that Chromium port generates -/Makefile.chromium -/out - -# Ignore compiled java tests: -LayoutTests/java/*.class - -# Though the GTK build builds in a subdirectory, autogen.sh still deposits -# a few files into the source tree. -/aclocal.m4 -/autom4te.cache -/autotools/compile -/autotools/config.guess -/autotools/config.sub -/autotools/depcomp -/autotools/gtk-doc.m4 -/autotools/install-sh -/autotools/libtool.m4 -/autotools/ltmain.sh -/autotools/ltoptions.m4 -/autotools/ltsugar.m4 -/autotools/ltversion.m4 -/autotools/lt~obsolete.m4 -/autotools/missing -/autotoolsconfig.h.in -/configure -/GNUmakefile.in -/WebKit/gtk/docs/GNUmakefile.in -/WebKit/gtk/po/*.pot -/gtk-doc.make -/INSTALL -/README - -# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary -/WebKitSupportLibrary.zip -/WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf -/WebKitLibraries/win/WebKitChangesToPthreads.diff -/WebKitLibraries/win/include/ApplicationServices/ -/WebKitLibraries/win/include/AssertMacros.h -/WebKitLibraries/win/include/Availability.h -/WebKitLibraries/win/include/AvailabilityInternal.h -/WebKitLibraries/win/include/AvailabilityMacros.h -/WebKitLibraries/win/include/CFNetwork/ -/WebKitLibraries/win/include/ColorSync/ -/WebKitLibraries/win/include/ConditionalMacros.h -/WebKitLibraries/win/include/CoreFoundation/ -/WebKitLibraries/win/include/CoreGraphics/ -/WebKitLibraries/win/include/CoreServices/ -/WebKitLibraries/win/include/ImageIO/ -/WebKitLibraries/win/include/QuartzCore/ -/WebKitLibraries/win/include/SQLite/ -/WebKitLibraries/win/include/SafariTheme/ -/WebKitLibraries/win/include/TargetConditionals.h -/WebKitLibraries/win/include/checkint.h -/WebKitLibraries/win/include/dispatch/ -/WebKitLibraries/win/include/inttypes.h -/WebKitLibraries/win/include/libxml/ -/WebKitLibraries/win/include/libxslt/ -/WebKitLibraries/win/include/pthreads/ -/WebKitLibraries/win/include/stdbool.h -/WebKitLibraries/win/include/stdint.h -/WebKitLibraries/win/include/unicode/ -/WebKitLibraries/win/include/unistd.h -/WebKitLibraries/win/include/xlocale.h -/WebKitLibraries/win/include/zlib/ -/WebKitLibraries/win/lib/CFNetwork.lib -/WebKitLibraries/win/lib/CoreFoundation.lib -/WebKitLibraries/win/lib/CoreGraphics.lib -/WebKitLibraries/win/lib/QuartzCore.lib -/WebKitLibraries/win/lib/SQLite3.lib -/WebKitLibraries/win/lib/SafariTheme.lib -/WebKitLibraries/win/lib/icuin.lib -/WebKitLibraries/win/lib/icuuc.lib -/WebKitLibraries/win/lib/libdispatch.lib -/WebKitLibraries/win/lib/libxml2.lib -/WebKitLibraries/win/lib/libxslt.lib -/WebKitLibraries/win/lib/pthreadVC2.lib -/WebKitLibraries/win/lib/zdll.lib ->>>>>>> webkit.org at r74534 (trunk) diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 98f22df..f077738 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,12 +172,8 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ -<<<<<<< HEAD - wtf/PageAllocation.cpp \ -======= wtf/PageAllocationAligned.cpp\ wtf/PageBlock.cpp\ ->>>>>>> webkit.org at r74534 (trunk) wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ wtf/StackBounds.cpp \ diff --git a/JavaScriptCore/parser/Parser.cpp b/JavaScriptCore/parser/Parser.cpp index ffe3867..b203b21 100644 --- a/JavaScriptCore/parser/Parser.cpp +++ b/JavaScriptCore/parser/Parser.cpp @@ -35,14 +35,10 @@ namespace JSC { void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg) { -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); #endif - ASSERT(lexicalGlobalObject); -======= ASSERT(globalData); ->>>>>>> webkit.org at r74534 (trunk) m_sourceElements = 0; int defaultErrLine; diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 62974dc..b25525b 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -389,14 +389,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/parser/TextDocumentParser.cpp \ html/parser/TextViewSourceParser.cpp \ \ -<<<<<<< HEAD - inspector/InspectorFileSystemAgent.cpp \ - inspector/ScriptArguments.cpp \ - inspector/ScriptCallFrame.cpp \ - inspector/ScriptCallStack.cpp \ -======= html/shadow/SliderThumbElement.cpp \ ->>>>>>> webkit.org at r74534 (trunk) \ loader/cache/CachedCSSStyleSheet.cpp \ loader/cache/CachedFont.cpp \ @@ -427,11 +420,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/PolicyCallback.cpp \ loader/PolicyChecker.cpp \ loader/ProgressTracker.cpp \ -<<<<<<< HEAD - loader/Request.cpp \ -======= loader/NavigationScheduler.cpp \ ->>>>>>> webkit.org at r74534 (trunk) loader/ResourceLoadNotifier.cpp \ loader/ResourceLoadScheduler.cpp \ loader/ResourceLoader.cpp \ diff --git a/WebCore/bindings/v8/V8NPUtils.cpp b/WebCore/bindings/v8/V8NPUtils.cpp index a716730..250ee5b 100644 --- a/WebCore/bindings/v8/V8NPUtils.cpp +++ b/WebCore/bindings/v8/V8NPUtils.cpp @@ -63,15 +63,10 @@ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NP VOID_TO_NPVARIANT(*result); else if (object->IsString()) { v8::String::Utf8Value utf8(object); -<<<<<<< HEAD int length = utf8.length() + 1; char* utf8Chars = reinterpret_cast<char*>(malloc(length)); memcpy(utf8Chars, *utf8, length); STRINGN_TO_NPVARIANT(utf8Chars, utf8.length(), *result); -======= - char* utf8_chars = strdup(*utf8); - STRINGN_TO_NPVARIANT(utf8_chars, utf8.length(), *result); ->>>>>>> webkit.org at r74534 (trunk) } else if (object->IsObject()) { DOMWindow* window = V8Proxy::retrieveWindow(V8Proxy::currentContext()); NPObject* npobject = npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(object), window); diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp index dbc5877..65d90e5 100644 --- a/WebCore/css/CSSParser.cpp +++ b/WebCore/css/CSSParser.cpp @@ -1855,7 +1855,9 @@ bool CSSParser::parseValue(int propId, bool important) validPrimitive = true; break; -<<<<<<< HEAD + case CSSPropertyWebkitTextEmphasisStyle: + return parseTextEmphasisStyle(important); + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1893,10 +1895,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - case CSSPropertyWebkitTextEmphasisStyle: - return parseTextEmphasisStyle(important); ->>>>>>> webkit.org at r74534 (trunk) #if ENABLE(SVG) default: diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp index 492047d..e442b17 100644 --- a/WebCore/css/CSSStyleSelector.cpp +++ b/WebCore/css/CSSStyleSelector.cpp @@ -5562,7 +5562,56 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textCombine, TextCombine) return; -<<<<<<< HEAD + case CSSPropertyWebkitTextEmphasisPosition: + HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textEmphasisPosition, TextEmphasisPosition) + return; + + case CSSPropertyWebkitTextEmphasisStyle: + HANDLE_INHERIT_AND_INITIAL(textEmphasisFill, TextEmphasisFill) + HANDLE_INHERIT_AND_INITIAL(textEmphasisMark, TextEmphasisMark) + HANDLE_INHERIT_AND_INITIAL(textEmphasisCustomMark, TextEmphasisCustomMark) + if (isInherit || isInitial) + return; + + if (value->isValueList()) { + CSSValueList* list = static_cast<CSSValueList*>(value); + ASSERT(list->length() == 2); + if (list->length() != 2) + return; + for (unsigned i = 0; i < 2; ++i) { + ASSERT(list->itemWithoutBoundsCheck(i)->isPrimitiveValue()); + CSSPrimitiveValue* value = static_cast<CSSPrimitiveValue*>(list->itemWithoutBoundsCheck(i)); + if (value->getIdent() == CSSValueFilled || value->getIdent() == CSSValueOpen) + m_style->setTextEmphasisFill(*value); + else + m_style->setTextEmphasisMark(*value); + } + m_style->setTextEmphasisCustomMark(nullAtom); + return; + } + + if (!primitiveValue) + return; + + if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_STRING) { + m_style->setTextEmphasisFill(TextEmphasisFillFilled); + m_style->setTextEmphasisMark(TextEmphasisMarkCustom); + m_style->setTextEmphasisCustomMark(primitiveValue->getStringValue()); + return; + } + + m_style->setTextEmphasisCustomMark(nullAtom); + + if (primitiveValue->getIdent() == CSSValueFilled || primitiveValue->getIdent() == CSSValueOpen) { + m_style->setTextEmphasisFill(*primitiveValue); + m_style->setTextEmphasisMark(TextEmphasisMarkAuto); + } else { + m_style->setTextEmphasisFill(TextEmphasisFillFilled); + m_style->setTextEmphasisMark(*primitiveValue); + } + + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -5706,57 +5755,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - case CSSPropertyWebkitTextEmphasisPosition: - HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(textEmphasisPosition, TextEmphasisPosition) - return; - - case CSSPropertyWebkitTextEmphasisStyle: - HANDLE_INHERIT_AND_INITIAL(textEmphasisFill, TextEmphasisFill) - HANDLE_INHERIT_AND_INITIAL(textEmphasisMark, TextEmphasisMark) - HANDLE_INHERIT_AND_INITIAL(textEmphasisCustomMark, TextEmphasisCustomMark) - if (isInherit || isInitial) - return; - - if (value->isValueList()) { - CSSValueList* list = static_cast<CSSValueList*>(value); - ASSERT(list->length() == 2); - if (list->length() != 2) - return; - for (unsigned i = 0; i < 2; ++i) { - ASSERT(list->itemWithoutBoundsCheck(i)->isPrimitiveValue()); - CSSPrimitiveValue* value = static_cast<CSSPrimitiveValue*>(list->itemWithoutBoundsCheck(i)); - if (value->getIdent() == CSSValueFilled || value->getIdent() == CSSValueOpen) - m_style->setTextEmphasisFill(*value); - else - m_style->setTextEmphasisMark(*value); - } - m_style->setTextEmphasisCustomMark(nullAtom); - return; - } - - if (!primitiveValue) - return; - - if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_STRING) { - m_style->setTextEmphasisFill(TextEmphasisFillFilled); - m_style->setTextEmphasisMark(TextEmphasisMarkCustom); - m_style->setTextEmphasisCustomMark(primitiveValue->getStringValue()); - return; - } - - m_style->setTextEmphasisCustomMark(nullAtom); - - if (primitiveValue->getIdent() == CSSValueFilled || primitiveValue->getIdent() == CSSValueOpen) { - m_style->setTextEmphasisFill(*primitiveValue); - m_style->setTextEmphasisMark(TextEmphasisMarkAuto); - } else { - m_style->setTextEmphasisFill(TextEmphasisFillFilled); - m_style->setTextEmphasisMark(*primitiveValue); - } - - return; ->>>>>>> webkit.org at r74534 (trunk) #if ENABLE(SVG) default: diff --git a/WebCore/html/HTMLLinkElement.cpp b/WebCore/html/HTMLLinkElement.cpp index b28c3e0..414ba6c 100644 --- a/WebCore/html/HTMLLinkElement.cpp +++ b/WebCore/html/HTMLLinkElement.cpp @@ -465,7 +465,6 @@ void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const styleSheet->addSubresourceStyleURLs(urls); } -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT void* HTMLLinkElement::operator new(size_t size) { @@ -487,7 +486,7 @@ void HTMLLinkElement::operator delete[](void* p, size_t size) Node::operator delete[](p, size); } #endif -======= + void HTMLLinkElement::addPendingSheet(PendingSheetType type) { if (type <= m_pendingSheetType) @@ -513,6 +512,5 @@ void HTMLLinkElement::removePendingSheet() } document()->removePendingSheet(); } ->>>>>>> webkit.org at r74534 (trunk) } diff --git a/WebCore/html/shadow/SliderThumbElement.cpp b/WebCore/html/shadow/SliderThumbElement.cpp index 55301c1..d29d257 100644 --- a/WebCore/html/shadow/SliderThumbElement.cpp +++ b/WebCore/html/shadow/SliderThumbElement.cpp @@ -38,11 +38,19 @@ #include "MouseEvent.h" #include "RenderSlider.h" +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) +#include "TouchEvent.h" +#endif + namespace WebCore { void SliderThumbElement::defaultEventHandler(Event* event) { - if (!event->isMouseEvent()) { + if (!event->isMouseEvent() +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) + && !event->isTouchEvent() +#endif + ) { ShadowBlockElement::defaultEventHandler(event); return; } @@ -51,7 +59,11 @@ void SliderThumbElement::defaultEventHandler(Event* event) bool isLeftButton = mouseEvent->button() == LeftButton; const AtomicString& eventType = event->type(); - if (eventType == eventNames().mousedownEvent && isLeftButton) { + if (eventType == eventNames().mousedownEvent && isLeftButton +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) + || eventType == eventNames().touchstartEvent +#endif + ) { if (document()->frame() && renderer()) { RenderSlider* slider = toRenderSlider(renderer()->parent()); if (slider) { @@ -72,7 +84,11 @@ void SliderThumbElement::defaultEventHandler(Event* event) return; } } - } else if (eventType == eventNames().mouseupEvent && isLeftButton) { + } else if (eventType == eventNames().mouseupEvent && isLeftButton +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) + || eventType == eventNames().touchendEvent +#endif + ) { if (m_inDragMode) { if (Frame* frame = document()->frame()) frame->eventHandler()->setCapturingMouseEventsNode(0); @@ -80,11 +96,28 @@ void SliderThumbElement::defaultEventHandler(Event* event) event->setDefaultHandled(); return; } - } else if (eventType == eventNames().mousemoveEvent) { + } else if (eventType == eventNames().mousemoveEvent +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) + || eventType == eventNames().touchmoveEvent +#endif + ) { if (m_inDragMode && renderer() && renderer()->parent()) { RenderSlider* slider = toRenderSlider(renderer()->parent()); if (slider) { FloatPoint curPoint = slider->absoluteToLocal(mouseEvent->absoluteLocation(), false, true); +#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) + // Update the position when it is a touch event + if (event->isTouchEvent()) { + TouchEvent* touchEvent = static_cast<TouchEvent*>(event); + if (touchEvent && touchEvent->touches() && touchEvent->touches()->item(0)) { + curPoint.setX(touchEvent->touches()->item(0)->pageX()); + curPoint.setY(touchEvent->touches()->item(0)->pageY()); + curPoint = slider->absoluteToLocal(curPoint, false, true); + } + } + // Tell the webview that webkit will handle the following move events + event->setDefaultPrevented(true); +#endif IntPoint eventOffset(curPoint.x() + m_offsetToThumb.x(), curPoint.y() + m_offsetToThumb.y()); slider->setValueForPosition(slider->positionForOffset(eventOffset)); event->setDefaultHandled(); diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index ea7d9ce..d4b65a9 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -927,11 +927,13 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer, { ASSERT(childFrame); +#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName()); if (subframeArchive) { childFrame->loader()->loadArchive(subframeArchive.release()); return; } +#endif HistoryItem* parentItem = history()->currentItem(); // If we're moving in the back/forward list, we might want to replace the content @@ -944,18 +946,7 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer, } } -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName()); - - if (subframeArchive) - childFrame->loader()->loadArchive(subframeArchive.release()); - else -#endif - childFrame->loader()->loadURL(workingURL, referer, String(), false, childLoadType, 0, 0); -======= childFrame->loader()->loadURL(url, referer, String(), false, FrameLoadTypeRedirectWithLockedBackForwardList, 0, 0); ->>>>>>> webkit.org at r74534 (trunk) } #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size @@ -2230,13 +2221,8 @@ void FrameLoader::finishedLoadingDocument(DocumentLoader* loader) if (m_stateMachine.creatingInitialEmptyDocument()) return; #endif -<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - // If loading a webarchive, run through webarchive machinery - const String& responseMIMEType = loader->responseMIMEType(); -======= ->>>>>>> webkit.org at r74534 (trunk) // Give archive machinery a crack at this document. If the MIME type is not an archive type, it will return 0. RefPtr<Archive> archive = ArchiveFactory::create(loader->mainResourceData().get(), loader->responseMIMEType()); diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp index db8fb5e..bc56000 100644 --- a/WebCore/loader/ResourceLoader.cpp +++ b/WebCore/loader/ResourceLoader.cpp @@ -146,16 +146,7 @@ void ResourceLoader::start() ASSERT(!m_request.isNull()); ASSERT(m_deferredRequest.isNull()); -<<<<<<< HEAD - willSendRequest(m_request, ResourceResponse()); - if (m_request.isNull()) { - didFail(frameLoader()->cancelledError(m_request)); - return; - } - #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= ->>>>>>> webkit.org at r74534 (trunk) if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url())) return; #endif diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp deleted file mode 100644 index 1f2ced3..0000000 --- a/WebCore/loader/loader.cpp +++ /dev/null @@ -1,354 +0,0 @@ -/* - Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) - Copyright (C) 2001 Dirk Mueller (mueller@kde.org) - Copyright (C) 2002 Waldo Bastian (bastian@kde.org) - Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) - Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" -#include "loader.h" - -#include "MemoryCache.h" -#include "CachedImage.h" -#include "CachedResource.h" -#include "CachedResourceLoader.h" -#include "Frame.h" -#include "FrameLoader.h" -#include "Logging.h" -#include "Request.h" -#include "ResourceHandle.h" -#include "ResourceLoadScheduler.h" -#include "ResourceRequest.h" -#include "ResourceResponse.h" -#include "SharedBuffer.h" -#include <wtf/Assertions.h> -#include <wtf/Vector.h> -#include <wtf/text/CString.h> - -namespace WebCore { - -Loader::~Loader() -{ - ASSERT_NOT_REACHED(); -} - -static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource::Type type) -{ - switch (type) { - case CachedResource::CSSStyleSheet: -#if ENABLE(XSLT) - case CachedResource::XSLStyleSheet: -#endif - return ResourceRequest::TargetIsStyleSheet; - case CachedResource::Script: - return ResourceRequest::TargetIsScript; - case CachedResource::FontResource: - return ResourceRequest::TargetIsFontResource; - case CachedResource::ImageResource: - return ResourceRequest::TargetIsImage; -#if ENABLE(LINK_PREFETCH) - case CachedResource::LinkPrefetch: - return ResourceRequest::TargetIsPrefetch; -#endif - } - ASSERT_NOT_REACHED(); - return ResourceRequest::TargetIsSubresource; -} - -static ResourceLoadScheduler::Priority determinePriority(const CachedResource* resource) -{ - switch (resource->type()) { - case CachedResource::CSSStyleSheet: -#if ENABLE(XSLT) - case CachedResource::XSLStyleSheet: -#endif - return ResourceLoadScheduler::High; - case CachedResource::Script: - case CachedResource::FontResource: - return ResourceLoadScheduler::Medium; - case CachedResource::ImageResource: - return ResourceLoadScheduler::Low; -#if ENABLE(LINK_PREFETCH) - case CachedResource::LinkPrefetch: - return ResourceLoadScheduler::VeryLow; -#endif - } - ASSERT_NOT_REACHED(); - return ResourceLoadScheduler::Low; -} - -void Loader::load(CachedResourceLoader* cachedResourceLoader, CachedResource* resource, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks) -{ - - ASSERT(cachedResourceLoader); - Request* request = new Request(cachedResourceLoader, resource, incremental, securityCheck, sendResourceLoadCallbacks); - - cachedResourceLoader->incrementRequestCount(request->cachedResource()); - - ResourceRequest resourceRequest(request->cachedResource()->url()); - resourceRequest.setTargetType(cachedResourceTypeToTargetType(request->cachedResource()->type())); - - if (!request->cachedResource()->accept().isEmpty()) - resourceRequest.setHTTPAccept(request->cachedResource()->accept()); - - if (request->cachedResource()->isCacheValidator()) { - CachedResource* resourceToRevalidate = request->cachedResource()->resourceToRevalidate(); - ASSERT(resourceToRevalidate->canUseCacheValidator()); - ASSERT(resourceToRevalidate->isLoaded()); - const String& lastModified = resourceToRevalidate->response().httpHeaderField("Last-Modified"); - const String& eTag = resourceToRevalidate->response().httpHeaderField("ETag"); - if (!lastModified.isEmpty() || !eTag.isEmpty()) { - ASSERT(cachedResourceLoader->cachePolicy() != CachePolicyReload); - if (cachedResourceLoader->cachePolicy() == CachePolicyRevalidate) - resourceRequest.setHTTPHeaderField("Cache-Control", "max-age=0"); - if (!lastModified.isEmpty()) - resourceRequest.setHTTPHeaderField("If-Modified-Since", lastModified); - if (!eTag.isEmpty()) - resourceRequest.setHTTPHeaderField("If-None-Match", eTag); - } - } - -#if ENABLE(LINK_PREFETCH) - if (request->cachedResource()->type() == CachedResource::LinkPrefetch) - resourceRequest.setHTTPHeaderField("X-Purpose", "prefetch"); -#endif - - RefPtr<SubresourceLoader> loader = resourceLoadScheduler()->scheduleSubresourceLoad(cachedResourceLoader->document()->frame(), - this, resourceRequest, determinePriority(resource), request->shouldDoSecurityCheck(), request->sendResourceLoadCallbacks()); - if (loader && !loader->reachedTerminalState()) - m_requestsLoading.add(loader.release(), request); - else { - // FIXME: What if resources in other frames were waiting for this revalidation? - LOG(ResourceLoading, "Cannot start loading '%s'", request->cachedResource()->url().latin1().data()); - cachedResourceLoader->decrementRequestCount(request->cachedResource()); - cachedResourceLoader->setLoadInProgress(true); - if (resource->resourceToRevalidate()) - cache()->revalidationFailed(resource); - resource->error(CachedResource::LoadError); - cachedResourceLoader->setLoadInProgress(false); - delete request; - } -} - -void Loader::cancelRequests(CachedResourceLoader* cachedResourceLoader) -{ - cachedResourceLoader->clearPendingPreloads(); - - Vector<SubresourceLoader*, 256> loadersToCancel; - RequestMap::iterator end = m_requestsLoading.end(); - for (RequestMap::iterator i = m_requestsLoading.begin(); i != end; ++i) { - Request* r = i->second; - if (r->cachedResourceLoader() == cachedResourceLoader) - loadersToCancel.append(i->first.get()); - } - - for (unsigned i = 0; i < loadersToCancel.size(); ++i) { - SubresourceLoader* loader = loadersToCancel[i]; - didFail(loader, true); - } -} - -void Loader::willSendRequest(SubresourceLoader* loader, ResourceRequest&, const ResourceResponse&) -{ - RequestMap::iterator i = m_requestsLoading.find(loader); - if (i == m_requestsLoading.end()) - return; - - Request* request = i->second; - request->cachedResource()->setRequestedFromNetworkingLayer(); -} - -void Loader::didFinishLoading(SubresourceLoader* loader) -{ - RequestMap::iterator i = m_requestsLoading.find(loader); - if (i == m_requestsLoading.end()) - return; - - Request* request = i->second; - m_requestsLoading.remove(i); - CachedResourceLoader* cachedResourceLoader = request->cachedResourceLoader(); - // Prevent the document from being destroyed before we are done with - // the cachedResourceLoader that it will delete when the document gets deleted. - RefPtr<Document> protector(cachedResourceLoader->document()); - if (!request->isMultipart()) - cachedResourceLoader->decrementRequestCount(request->cachedResource()); - - CachedResource* resource = request->cachedResource(); - ASSERT(!resource->resourceToRevalidate()); - - LOG(ResourceLoading, "Received '%s'.", resource->url().latin1().data()); - - // If we got a 4xx response, we're pretending to have received a network - // error, so we can't send the successful data() and finish() callbacks. - if (!resource->errorOccurred()) { - cachedResourceLoader->setLoadInProgress(true); - resource->data(loader->resourceData(), true); - if (!resource->errorOccurred()) - resource->finish(); - } - - delete request; - cachedResourceLoader->setLoadInProgress(false); - cachedResourceLoader->checkForPendingPreloads(); -} - -void Loader::didFail(SubresourceLoader* loader, const ResourceError&) -{ - didFail(loader); -} - -void Loader::didFail(SubresourceLoader* loader, bool cancelled) -{ - loader->clearClient(); - - RequestMap::iterator i = m_requestsLoading.find(loader); - if (i == m_requestsLoading.end()) - return; - - Request* request = i->second; - m_requestsLoading.remove(i); - CachedResourceLoader* cachedResourceLoader = request->cachedResourceLoader(); - // Prevent the document from being destroyed before we are done with - // the cachedResourceLoader that it will delete when the document gets deleted. - RefPtr<Document> protector(cachedResourceLoader->document()); - if (!request->isMultipart()) - cachedResourceLoader->decrementRequestCount(request->cachedResource()); - - CachedResource* resource = request->cachedResource(); - - LOG(ResourceLoading, "Failed to load '%s' (cancelled=%d).\n", resource->url().latin1().data(), cancelled); - - if (resource->resourceToRevalidate()) - cache()->revalidationFailed(resource); - - if (!cancelled) { - cachedResourceLoader->setLoadInProgress(true); - resource->error(CachedResource::LoadError); - } - - cachedResourceLoader->setLoadInProgress(false); - if (cancelled || !resource->isPreloaded()) - cache()->remove(resource); - - delete request; - - cachedResourceLoader->checkForPendingPreloads(); -} - -void Loader::didReceiveResponse(SubresourceLoader* loader, const ResourceResponse& response) -{ - Request* request = m_requestsLoading.get(loader); - - // FIXME: This is a workaround for <rdar://problem/5236843> - // If a load starts while the frame is still in the provisional state - // (this can be the case when loading the user style sheet), committing the load then causes all - // requests to be removed from the m_requestsLoading map. This means that request might be null here. - // In that case we just return early. - // ASSERT(request); - if (!request) - return; - - CachedResource* resource = request->cachedResource(); - - if (resource->isCacheValidator()) { - if (response.httpStatusCode() == 304) { - // 304 Not modified / Use local copy - m_requestsLoading.remove(loader); - loader->clearClient(); - request->cachedResourceLoader()->decrementRequestCount(request->cachedResource()); - - // Existing resource is ok, just use it updating the expiration time. - cache()->revalidationSucceeded(resource, response); - - if (request->cachedResourceLoader()->frame()) - request->cachedResourceLoader()->frame()->loader()->checkCompleted(); - - delete request; - - return; - } - // Did not get 304 response, continue as a regular resource load. - cache()->revalidationFailed(resource); - } - - resource->setResponse(response); - - String encoding = response.textEncodingName(); - if (!encoding.isNull()) - resource->setEncoding(encoding); - - if (request->isMultipart()) { - ASSERT(resource->isImage()); - static_cast<CachedImage*>(resource)->clear(); - if (request->cachedResourceLoader()->frame()) - request->cachedResourceLoader()->frame()->loader()->checkCompleted(); - } else if (response.isMultipart()) { - request->setIsMultipart(true); - - // We don't count multiParts in a CachedResourceLoader's request count - request->cachedResourceLoader()->decrementRequestCount(request->cachedResource()); - - // If we get a multipart response, we must have a handle - ASSERT(loader->handle()); - if (!resource->isImage()) - loader->handle()->cancel(); - } -} - -void Loader::didReceiveData(SubresourceLoader* loader, const char* data, int size) -{ - Request* request = m_requestsLoading.get(loader); - if (!request) - return; - - CachedResource* resource = request->cachedResource(); - ASSERT(!resource->isCacheValidator()); - - if (resource->errorOccurred()) - return; - - if (resource->response().httpStatusCode() >= 400) { - if (!resource->shouldIgnoreHTTPStatusCodeErrors()) - resource->error(CachedResource::LoadError); - return; - } - - // Set the data. - if (request->isMultipart()) { - // The loader delivers the data in a multipart section all at once, send eof. - // The resource data will change as the next part is loaded, so we need to make a copy. - RefPtr<SharedBuffer> copiedData = SharedBuffer::create(data, size); - resource->data(copiedData.release(), true); - } else if (request->isIncremental()) - resource->data(loader->resourceData(), false); -} - -void Loader::didReceiveCachedMetadata(SubresourceLoader* loader, const char* data, int size) -{ - Request* request = m_requestsLoading.get(loader); - if (!request) - return; - - CachedResource* resource = request->cachedResource(); - ASSERT(!resource->isCacheValidator()); - - resource->setSerializedCachedMetadata(data, size); -} - -} //namespace WebCore diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index b609508..bec0f9e 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -1634,7 +1634,6 @@ void DOMWindow::revokeObjectURL(const String& blobURLString) } #endif -<<<<<<< HEAD #if ENABLE(DOM_STORAGE) && defined(ANDROID) void DOMWindow::clearDOMStorage() { @@ -1647,7 +1646,7 @@ void DOMWindow::clearDOMStorage() m_localStorage = 0; } #endif -======= + void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow) { Frame* activeFrame = activeWindow->frame(); @@ -1853,6 +1852,5 @@ void DOMWindow::showModalDialog(const String& urlString, const String& dialogFea dialogFrame->page()->chrome()->runModal(); } ->>>>>>> webkit.org at r74534 (trunk) } // namespace WebCore diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 5c1f680..4889a13 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -203,27 +203,8 @@ namespace WebCore { PassRefPtr<CSSRuleList> getMatchedCSSRules(Element*, const String& pseudoElt, bool authorOnly = true) const; double devicePixelRatio() const; -<<<<<<< HEAD - PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node* node, const WebKitPoint* p) const; - PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node* node, const WebKitPoint* p) const; - -#if ENABLE(DATABASE) - // HTML 5 client-side database - PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); -#endif - -#if ENABLE(DOM_STORAGE) - // HTML 5 key/value storage - Storage* sessionStorage(ExceptionCode&) const; - Storage* localStorage(ExceptionCode&) const; -#ifdef ANDROID - void clearDOMStorage(); -#endif -#endif -======= PassRefPtr<WebKitPoint> webkitConvertPointFromPageToNode(Node*, const WebKitPoint*) const; PassRefPtr<WebKitPoint> webkitConvertPointFromNodeToPage(Node*, const WebKitPoint*) const; ->>>>>>> webkit.org at r74534 (trunk) Console* console() const; @@ -379,6 +360,9 @@ namespace WebCore { Storage* localStorage(ExceptionCode&) const; Storage* optionalSessionStorage() const { return m_sessionStorage.get(); } Storage* optionalLocalStorage() const { return m_localStorage.get(); } +#ifdef ANDROID + void clearDOMStorage(); +#endif #endif #if ENABLE(FILE_SYSTEM) diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h index 2d29010..64d9e4b 100644 --- a/WebCore/platform/ContextMenuItem.h +++ b/WebCore/platform/ContextMenuItem.h @@ -184,28 +184,7 @@ namespace WebCore { bool enabled; }; #elif PLATFORM(GTK) -<<<<<<< HEAD - struct PlatformMenuItemDescription { - PlatformMenuItemDescription() - : type(ActionType) - , action(ContextMenuItemTagNoAction) - , subMenu(0) - , checked(false) - , enabled(true) - {} - - ContextMenuItemType type; - ContextMenuAction action; - String title; - GtkMenu* subMenu; - bool checked; - bool enabled; - }; -#elif defined ANDROID - typedef void* PlatformMenuItemDescription; -======= typedef GtkMenuItem* PlatformMenuItemDescription; ->>>>>>> webkit.org at r74534 (trunk) #elif PLATFORM(WX) struct PlatformMenuItemDescription { PlatformMenuItemDescription() diff --git a/WebCore/platform/graphics/GraphicsContext.cpp b/WebCore/platform/graphics/GraphicsContext.cpp index 49a7a9c..4c907d0 100644 --- a/WebCore/platform/graphics/GraphicsContext.cpp +++ b/WebCore/platform/graphics/GraphicsContext.cpp @@ -583,9 +583,6 @@ void GraphicsContext::fillRect(const FloatRect& rect, Generator& generator) generator.fill(this, rect); } -<<<<<<< HEAD -#if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) -======= void GraphicsContext::setCompositeOperation(CompositeOperator compositeOperation) { m_state.compositeOperator = compositeOperation; @@ -597,8 +594,7 @@ CompositeOperator GraphicsContext::compositeOperation() const return m_state.compositeOperator; } -#if !PLATFORM(SKIA) ->>>>>>> webkit.org at r74534 (trunk) +#if !(PLATFORM(SKIA) && !PLATFORM(ANDROID)) void GraphicsContext::setPlatformFillGradient(Gradient*) { } diff --git a/WebCore/platform/image-decoders/ImageDecoder.cpp b/WebCore/platform/image-decoders/ImageDecoder.cpp index cc23b2a..8491da9 100644 --- a/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -53,15 +53,11 @@ static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const return bytesExtracted; } -<<<<<<< HEAD #if !OS(ANDROID) // This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and // JPEGDecoder, which aren't used on Android, and which don't all compile. // TODO: Find a better fix. -ImageDecoder* ImageDecoder::create(const SharedBuffer& data, bool premultiplyAlpha, bool ignoreGammaAndColorProfile) -======= ImageDecoder* ImageDecoder::create(const SharedBuffer& data, ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption) ->>>>>>> webkit.org at r74534 (trunk) { // We need at least 4 bytes to figure out what kind of image we're dealing // with. diff --git a/WebCore/rendering/InlineTextBox.cpp b/WebCore/rendering/InlineTextBox.cpp index 73107a8..e357e82 100644 --- a/WebCore/rendering/InlineTextBox.cpp +++ b/WebCore/rendering/InlineTextBox.cpp @@ -1203,12 +1203,8 @@ int InlineTextBox::offsetForPosition(int lineOffset, bool includePartialGlyphs) return f->offsetForPosition(textRun, lineOffset - logicalLeft(), includePartialGlyphs); #else return f->offsetForPosition(TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()), -<<<<<<< HEAD - lineOffset - logicalLeft(), includePartialGlyphs); -#endif -======= lineOffset - logicalLeft(), includePartialGlyphs); ->>>>>>> webkit.org at r74534 (trunk) +#endif } int InlineTextBox::positionForOffset(int offset) const diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h index 3dd7c23..53a4cfe 100644 --- a/WebCore/rendering/RenderBox.h +++ b/WebCore/rendering/RenderBox.h @@ -380,16 +380,14 @@ public: void flipForWritingMode(IntRect&) const; IntSize locationOffsetIncludingFlipping() const; -<<<<<<< HEAD -#ifdef ANDROID_LAYOUT - int getVisibleWidth() const { return m_visibleWidth; } -#endif -======= IntRect logicalVisualOverflowRectForPropagation(RenderStyle*) const; IntRect visualOverflowRectForPropagation(RenderStyle*) const; IntRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const; IntRect layoutOverflowRectForPropagation(RenderStyle*) const; ->>>>>>> webkit.org at r74534 (trunk) + +#ifdef ANDROID_LAYOUT + int getVisibleWidth() const { return m_visibleWidth; } +#endif protected: virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); diff --git a/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/WebCore/rendering/RenderSVGResourceSolidColor.cpp index 105723f..9fbda40 100644 --- a/WebCore/rendering/RenderSVGResourceSolidColor.cpp +++ b/WebCore/rendering/RenderSVGResourceSolidColor.cpp @@ -86,20 +86,6 @@ void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsConte else if (resourceMode & ApplyToStrokeMode) context->strokePath(*path); } -<<<<<<< HEAD - -#if PLATFORM(SKIA) && !PLATFORM(ANDROID) - // FIXME: Move this into the GraphicsContext - // WebKit implicitly expects us to reset the path. - // For example in fillAndStrokePath() of RenderSVGPath.cpp the path is - // added back to the context after filling. This is because internally it - // calls CGContextFillPath() which closes the path. - context->beginPath(); - context->platformContext()->setFillShader(0); - context->platformContext()->setStrokeShader(0); -#endif -======= ->>>>>>> webkit.org at r74534 (trunk) } } diff --git a/WebCore/rendering/RenderSlider.cpp b/WebCore/rendering/RenderSlider.cpp index cf8c29b..b73a1ac 100644 --- a/WebCore/rendering/RenderSlider.cpp +++ b/WebCore/rendering/RenderSlider.cpp @@ -40,14 +40,6 @@ #include "StepRange.h" #include <wtf/MathExtras.h> -#ifdef ANDROID_LAYOUT -#include "Settings.h" -#endif - -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) -#include "TouchEvent.h" -#endif - using std::min; namespace WebCore { @@ -61,130 +53,6 @@ static double sliderPosition(HTMLInputElement* element) return range.proportionFromValue(range.valueFromElement(element)); } -<<<<<<< HEAD -class SliderThumbElement : public ShadowBlockElement { -public: - static PassRefPtr<SliderThumbElement> create(HTMLElement* shadowParent); - - bool inDragMode() const { return m_inDragMode; } - - virtual void defaultEventHandler(Event*); - virtual void detach(); - -private: - SliderThumbElement(HTMLElement* shadowParent); - - FloatPoint m_offsetToThumb; - bool m_inDragMode; -}; - -inline SliderThumbElement::SliderThumbElement(HTMLElement* shadowParent) - : ShadowBlockElement(shadowParent) - , m_inDragMode(false) -{ -} - -inline PassRefPtr<SliderThumbElement> SliderThumbElement::create(HTMLElement* shadowParent) -{ - return adoptRef(new SliderThumbElement(shadowParent)); -} - -void SliderThumbElement::defaultEventHandler(Event* event) -{ - if (!event->isMouseEvent() -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) - && !event->isTouchEvent() -#endif - ) { - ShadowBlockElement::defaultEventHandler(event); - return; - } - - MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); - bool isLeftButton = mouseEvent->button() == LeftButton; - const AtomicString& eventType = event->type(); - - if (eventType == eventNames().mousedownEvent && isLeftButton -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) - || eventType == eventNames().touchstartEvent -#endif - ) { - if (document()->frame() && renderer()) { - RenderSlider* slider = toRenderSlider(renderer()->parent()); - if (slider) { - if (slider->mouseEventIsInThumb(mouseEvent)) { - // We selected the thumb, we want the cursor to always stay at - // the same position relative to the thumb. - m_offsetToThumb = slider->mouseEventOffsetToThumb(mouseEvent); - } else { - // We are outside the thumb, move the thumb to the point were - // we clicked. We'll be exactly at the center of the thumb. - m_offsetToThumb.setX(0); - m_offsetToThumb.setY(0); - } - - m_inDragMode = true; - document()->frame()->eventHandler()->setCapturingMouseEventsNode(shadowParent()); - event->setDefaultHandled(); - return; - } - } - } else if (eventType == eventNames().mouseupEvent && isLeftButton -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) - || eventType == eventNames().touchendEvent -#endif - ) { - if (m_inDragMode) { - if (Frame* frame = document()->frame()) - frame->eventHandler()->setCapturingMouseEventsNode(0); - m_inDragMode = false; - event->setDefaultHandled(); - return; - } - } else if (eventType == eventNames().mousemoveEvent -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) - || eventType == eventNames().touchmoveEvent -#endif - ) { - if (m_inDragMode && renderer() && renderer()->parent()) { - RenderSlider* slider = toRenderSlider(renderer()->parent()); - if (slider) { - FloatPoint curPoint = slider->absoluteToLocal(mouseEvent->absoluteLocation(), false, true); -#if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) - // Update the position when it is a touch event - if (event->isTouchEvent()) { - TouchEvent* touchEvent = static_cast<TouchEvent*>(event); - if (touchEvent && touchEvent->touches() && touchEvent->touches()->item(0)) { - curPoint.setX(touchEvent->touches()->item(0)->pageX()); - curPoint.setY(touchEvent->touches()->item(0)->pageY()); - curPoint = slider->absoluteToLocal(curPoint, false, true); - } - } - // Tell the webview that webkit will handle the following move events - event->setDefaultPrevented(true); -#endif - IntPoint eventOffset(curPoint.x() + m_offsetToThumb.x(), curPoint.y() + m_offsetToThumb.y()); - slider->setValueForPosition(slider->positionForOffset(eventOffset)); - event->setDefaultHandled(); - return; - } - } - } - - ShadowBlockElement::defaultEventHandler(event); -} - -void SliderThumbElement::detach() -{ - if (m_inDragMode) { - if (Frame* frame = document()->frame()) - frame->eventHandler()->setCapturingMouseEventsNode(0); - } - ShadowBlockElement::detach(); -} - -======= ->>>>>>> webkit.org at r74534 (trunk) RenderSlider::RenderSlider(HTMLInputElement* element) : RenderBlock(element) { diff --git a/WebCore/rendering/RenderView.h b/WebCore/rendering/RenderView.h index dc81b63..2915998 100644 --- a/WebCore/rendering/RenderView.h +++ b/WebCore/rendering/RenderView.h @@ -97,14 +97,11 @@ public: void updateWidgetPositions(); void addWidget(RenderWidget*); void removeWidget(RenderWidget*); -<<<<<<< HEAD + + void notifyWidgets(WidgetNotification); #ifdef ANDROID_PLUGINS const HashSet<RenderWidget*>& widgets() const { return m_widgets; } #endif -======= - - void notifyWidgets(WidgetNotification); ->>>>>>> webkit.org at r74534 (trunk) // layoutDelta is used transiently during layout to store how far an object has moved from its // last layout location, in order to repaint correctly. diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp index 1fdf0b2..6138df2 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -71,7 +71,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) , textStrokeColor(o.textStrokeColor) , textStrokeWidth(o.textStrokeWidth) , textFillColor(o.textFillColor) -<<<<<<< HEAD + , textEmphasisColor(o.textEmphasisColor) #ifdef ANDROID_CSS_RING , ringFillColor(o.ringFillColor) , ringInnerWidth(o.ringInnerWidth) @@ -86,9 +86,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR , tapHighlightColor(o.tapHighlightColor) #endif -======= - , textEmphasisColor(o.textEmphasisColor) ->>>>>>> webkit.org at r74534 (trunk) , textShadow(o.textShadow ? new ShadowData(*o.textShadow) : 0) , highlight(o.highlight) , cursorData(o.cursorData) diff --git a/WebCore/rendering/style/StyleRareInheritedData.h b/WebCore/rendering/style/StyleRareInheritedData.h index e488909..a370934 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.h +++ b/WebCore/rendering/style/StyleRareInheritedData.h @@ -55,7 +55,8 @@ public: Color textStrokeColor; float textStrokeWidth; Color textFillColor; -<<<<<<< HEAD + Color textEmphasisColor; + #ifdef ANDROID_CSS_RING Color ringFillColor; Length ringInnerWidth; @@ -70,9 +71,6 @@ public: #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR Color tapHighlightColor; #endif -======= - Color textEmphasisColor; ->>>>>>> webkit.org at r74534 (trunk) ShadowData* textShadow; // Our text shadow information for shadowed text drawing. AtomicString highlight; // Apple-specific extension for custom highlight rendering. diff --git a/WebCore/svg/SVGFontFaceUriElement.h b/WebCore/svg/SVGFontFaceUriElement.h index 2de98e3..ad9ba97 100644 --- a/WebCore/svg/SVGFontFaceUriElement.h +++ b/WebCore/svg/SVGFontFaceUriElement.h @@ -45,27 +45,23 @@ private: virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0); virtual void insertedIntoDocument(); -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT - void* operator new(size_t size) { - return SVGElement::operator new(size); - } - void* operator new[](size_t size) { - return SVGElement::operator new[](size); - } + void* operator new(size_t size) { + return SVGElement::operator new(size); + } + void* operator new[](size_t size) { + return SVGElement::operator new[](size); + } - void operator delete(void* p, size_t size) { - SVGElement::operator delete(p, size); - } - void operator delete[](void* p, size_t size) { - SVGElement::operator delete[](p, size); - } + void operator delete(void* p, size_t size) { + SVGElement::operator delete(p, size); + } + void operator delete[](void* p, size_t size) { + SVGElement::operator delete[](p, size); + } #endif - void loadFont(); -======= void loadFont(); ->>>>>>> webkit.org at r74534 (trunk) CachedResourceHandle<CachedFont> m_cachedFont; }; |