diff options
| -rw-r--r-- | .gitignore | 145 | ||||
| -rw-r--r-- | Source/WebCore/dom/StyleElement.cpp | 8 | ||||
| -rw-r--r-- | Source/WebCore/html/shadow/SliderThumbElement.cpp | 5 | ||||
| -rw-r--r-- | Source/WebCore/page/DOMWindow.cpp | 15 | ||||
| -rw-r--r-- | Source/WebCore/page/Page.cpp | 7 | ||||
| -rw-r--r-- | Source/WebCore/platform/DragData.h | 4 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderBox.cpp | 10 | ||||
| -rw-r--r-- | Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp | 93 | ||||
| -rw-r--r-- | Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp | 2 |
9 files changed, 6 insertions, 283 deletions
@@ -1,147 +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: -Source/JavaScriptCore/JavaScriptCore.gyp/*.Makefile -Source/JavaScriptCore/JavaScriptCore.gyp/*.mk -Source/JavaScriptCore/JavaScriptCore.gyp/*.sln -Source/JavaScriptCore/JavaScriptCore.gyp/*.vcproj* -Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj -Source/WebCore/WebCore.gyp/*.Makefile -Source/WebCore/WebCore.gyp/*.mk -Source/WebCore/WebCore.gyp/*.rules -Source/WebCore/WebCore.gyp/*.sln -Source/WebCore/WebCore.gyp/*.tmp -Source/WebCore/WebCore.gyp/*.vcproj* -Source/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/.gclient -WebKit/chromium/.gclient_entries -WebKit/chromium/app/ -WebKit/chromium/base/ -WebKit/chromium/chromium_deps/ -WebKit/chromium/depot_tools/ -WebKit/chromium/gfx/ -WebKit/chromium/googleurl/ -WebKit/chromium/gpu/ -WebKit/chromium/ipc/ -WebKit/chromium/media/ -WebKit/chromium/net/ -WebKit/chromium/ppapi/ -WebKit/chromium/printing/ -WebKit/chromium/sdch/ -WebKit/chromium/skia/ -WebKit/chromium/testing/ -WebKit/chromium/third_party/ -WebKit/chromium/tools/ -WebKit/chromium/ui/ -WebKit/chromium/v8/ -WebKit/chromium/webkit/ -WebKit/chromium/xcodebuild/ - -# 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 -/Source/autotools/compile -/Source/autotools/config.guess -/Source/autotools/config.sub -/Source/autotools/depcomp -/Source/autotools/gtk-doc.m4 -/Source/autotools/install-sh -/Source/autotools/libtool.m4 -/Source/autotools/ltmain.sh -/Source/autotools/ltoptions.m4 -/Source/autotools/ltsugar.m4 -/Source/autotools/ltversion.m4 -/Source/autotools/lt~obsolete.m4 -/Source/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 @ r75993 diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp index 8f37275..f984fda 100644 --- a/Source/WebCore/dom/StyleElement.cpp +++ b/Source/WebCore/dom/StyleElement.cpp @@ -101,18 +101,12 @@ void StyleElement::process(Element* e) unsigned resultLength = 0; for (Node* c = e->firstChild(); c; c = c->nextSibling()) { -<<<<<<< HEAD - Node::NodeType nodeType = c->nodeType(); - if (nodeType == Node::TEXT_NODE || nodeType == Node::CDATA_SECTION_NODE || nodeType == Node::COMMENT_NODE) { + if (isValidStyleChild(c)) { unsigned length = c->nodeValue().length(); if (length > std::numeric_limits<unsigned>::max() - resultLength) CRASH(); resultLength += length; } -======= - if (isValidStyleChild(c)) - resultLength += c->nodeValue().length(); ->>>>>>> WebKit.org @ r75993 } UChar* text; String sheetText = String::createUninitialized(resultLength, text); diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index 0402e89..d598da9 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -86,17 +86,12 @@ RenderObject* SliderThumbElement::createRenderer(RenderArena* arena, RenderStyle void SliderThumbElement::defaultEventHandler(Event* event) { -<<<<<<< HEAD if (!event->isMouseEvent() #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) && !event->isTouchEvent() #endif ) { - ShadowBlockElement::defaultEventHandler(event); -======= - if (!event->isMouseEvent()) { HTMLDivElement::defaultEventHandler(event); ->>>>>>> WebKit.org @ r75993 return; } diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp index 99c8fcd..9c29071 100644 --- a/Source/WebCore/page/DOMWindow.cpp +++ b/Source/WebCore/page/DOMWindow.cpp @@ -1612,19 +1612,6 @@ EventTargetData* DOMWindow::ensureEventTargetData() return &m_eventTargetData; } -<<<<<<< HEAD -#if ENABLE(BLOB) -String DOMWindow::createObjectURL(Blob* blob) -{ - return scriptExecutionContext()->createPublicBlobURL(blob).string(); -} - -void DOMWindow::revokeObjectURL(const String& blobURLString) -{ - scriptExecutionContext()->revokePublicBlobURL(KURL(KURL(), blobURLString)); -} -#endif - #if ENABLE(DOM_STORAGE) && defined(ANDROID) void DOMWindow::clearDOMStorage() { @@ -1638,8 +1625,6 @@ void DOMWindow::clearDOMStorage() } #endif -======= ->>>>>>> WebKit.org @ r75993 void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking) { Frame* activeFrame = activeWindow->frame(); diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp index b864aa2..c4d5ca4 100644 --- a/Source/WebCore/page/Page.cpp +++ b/Source/WebCore/page/Page.cpp @@ -95,17 +95,10 @@ #include "GeolocationController.h" #endif -<<<<<<< HEAD -#if ENABLE(INSPECTOR) && ENABLE(OFFLINE_WEB_APPLICATIONS) -#include "InspectorApplicationCacheAgent.h" -#endif - #if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED) #include "PackageNotifier.h" #endif -======= ->>>>>>> WebKit.org @ r75993 namespace WebCore { static HashSet<Page*>* allPages; diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h index 3bd27fc..42d0d3a 100644 --- a/Source/WebCore/platform/DragData.h +++ b/Source/WebCore/platform/DragData.h @@ -123,9 +123,5 @@ private: } -<<<<<<< HEAD -#endif //!DragData_h -======= #endif // !DragData_h ->>>>>>> WebKit.org @ r75993 diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index 93228e1..e218d85 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -39,13 +39,7 @@ #include "FloatQuad.h" #include "Frame.h" #include "Page.h" -<<<<<<< HEAD -#if PLATFORM(ANDROID) -#include "PlatformBridge.h" -#endif -======= #include "PaintInfo.h" ->>>>>>> WebKit.org @ r75993 #include "RenderArena.h" #include "RenderFlexibleBox.h" #include "RenderInline.h" @@ -64,6 +58,10 @@ #include "WMLNames.h" #endif +#if PLATFORM(ANDROID) +#include "PlatformBridge.h" +#endif + using namespace std; namespace WebCore { diff --git a/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp deleted file mode 100644 index 9fbda40..0000000 --- a/Source/WebCore/rendering/RenderSVGResourceSolidColor.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) Research In Motion Limited 2010. 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" - -#if ENABLE(SVG) -#include "RenderSVGResourceSolidColor.h" - -#include "GraphicsContext.h" -#include "RenderStyle.h" -#include "SVGRenderSupport.h" - -#if PLATFORM(SKIA) && !PLATFORM(ANDROID) -#include "PlatformContextSkia.h" -#endif - -namespace WebCore { - -RenderSVGResourceType RenderSVGResourceSolidColor::s_resourceType = SolidColorResourceType; - -RenderSVGResourceSolidColor::RenderSVGResourceSolidColor() -{ -} - -RenderSVGResourceSolidColor::~RenderSVGResourceSolidColor() -{ -} - -bool RenderSVGResourceSolidColor::applyResource(RenderObject* object, RenderStyle* style, GraphicsContext*& context, unsigned short resourceMode) -{ - // We are NOT allowed to ASSERT(object) here, unlike all other resources. - // RenderSVGResourceSolidColor is the only resource which may be used from HTML, when rendering - // SVG Fonts for a HTML document. This will be indicated by a null RenderObject pointer. - ASSERT(context); - ASSERT(resourceMode != ApplyToDefaultMode); - - const SVGRenderStyle* svgStyle = style ? style->svgStyle() : 0; - ColorSpace colorSpace = style ? style->colorSpace() : ColorSpaceDeviceRGB; - - if (resourceMode & ApplyToFillMode) { - context->setAlpha(svgStyle ? svgStyle->fillOpacity() : 1.0f); - context->setFillColor(m_color, colorSpace); - context->setFillRule(svgStyle ? svgStyle->fillRule() : RULE_NONZERO); - - if (resourceMode & ApplyToTextMode) - context->setTextDrawingMode(TextModeFill); - } else if (resourceMode & ApplyToStrokeMode) { - context->setAlpha(svgStyle ? svgStyle->strokeOpacity() : 1.0f); - context->setStrokeColor(m_color, colorSpace); - - if (style) - SVGRenderSupport::applyStrokeStyleToContext(context, style, object); - - if (resourceMode & ApplyToTextMode) - context->setTextDrawingMode(TextModeStroke); - } - - return true; -} - -void RenderSVGResourceSolidColor::postApplyResource(RenderObject*, GraphicsContext*& context, unsigned short resourceMode, const Path* path) -{ - ASSERT(context); - ASSERT(resourceMode != ApplyToDefaultMode); - - if (path && !(resourceMode & ApplyToTextMode)) { - if (resourceMode & ApplyToFillMode) - context->fillPath(*path); - else if (resourceMode & ApplyToStrokeMode) - context->strokePath(*path); - } -} - -} - -#endif diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp index 9f6c063..99ea763 100644 --- a/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp +++ b/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp @@ -26,7 +26,7 @@ #include "RenderStyle.h" #include "SVGRenderSupport.h" -#if PLATFORM(SKIA) +#if PLATFORM(SKIA) && !PLATFORM(ANDROID) #include "PlatformContextSkia.h" #endif |