diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:55:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:03 +0100 |
| commit | 4aac085d417cce1ecefcf0553724beede7a9670b (patch) | |
| tree | 7ae50965eae46f970ff818e80be1ee7e75ad699f /Source/WebCore | |
| parent | a2c606d1d8312a5d063e4a11e5911d9c8e4a3d19 (diff) | |
| download | external_webkit-4aac085d417cce1ecefcf0553724beede7a9670b.zip external_webkit-4aac085d417cce1ecefcf0553724beede7a9670b.tar.gz external_webkit-4aac085d417cce1ecefcf0553724beede7a9670b.tar.bz2 | |
Merge WebKit at r75993: Fix Makefiles
Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 9 | ||||
| -rw-r--r-- | Source/WebCore/Android.mk | 33 |
2 files changed, 3 insertions, 39 deletions
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index eb00a64..d708f63 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -149,7 +149,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) GEN := \ $(intermediates)/bindings/V8Blob.h \ $(intermediates)/bindings/V8BlobBuilder.h \ -<<<<<<< HEAD $(intermediates)/bindings/V8DOMFileSystem.h \ $(intermediates)/bindings/V8DOMFileSystemSync.h \ $(intermediates)/bindings/V8DirectoryEntry.h \ @@ -163,13 +162,6 @@ GEN := \ $(intermediates)/bindings/V8EntryCallback.h \ $(intermediates)/bindings/V8EntrySync.h \ $(intermediates)/bindings/V8ErrorCallback.h \ -======= - $(intermediates)/bindings/V8DOMTokenList.h \ - $(intermediates)/bindings/V8DOMSettableTokenList.h \ - $(intermediates)/bindings/V8DOMURL.h \ - $(intermediates)/bindings/V8DataGridColumn.h \ - $(intermediates)/bindings/V8DataGridColumnList.h \ ->>>>>>> WebKit.org @ r75993 $(intermediates)/bindings/V8File.h \ $(intermediates)/bindings/V8FileCallback.h \ $(intermediates)/bindings/V8FileEntry.h \ @@ -201,6 +193,7 @@ GEN := \ $(intermediates)/bindings/V8DOMFormData.h \ $(intermediates)/bindings/V8DOMSettableTokenList.h \ $(intermediates)/bindings/V8DOMTokenList.h \ + $(intermediates)/bindings/V8DOMURL.h \ $(intermediates)/bindings/V8DataGridColumn.h \ $(intermediates)/bindings/V8DataGridColumnList.h \ $(intermediates)/bindings/V8HTMLAllCollection.h \ diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index 7ae9c44..a0e56de 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -303,11 +303,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/DOMFormData.cpp \ html/DOMSettableTokenList.cpp \ html/DOMTokenList.cpp \ -<<<<<<< HEAD - html/DateComponents.cpp \ -======= html/DOMURL.cpp \ ->>>>>>> WebKit.org @ r75993 + html/DateComponents.cpp \ html/DateInputType.cpp \ html/DateTimeInputType.cpp \ html/DateTimeLocalInputType.cpp \ @@ -830,38 +827,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ -<<<<<<< HEAD - rendering/RenderSVGBlock.cpp \ - rendering/RenderSVGContainer.cpp \ - rendering/RenderSVGGradientStop.cpp \ - rendering/RenderSVGHiddenContainer.cpp \ - rendering/RenderSVGImage.cpp \ - rendering/RenderSVGModelObject.cpp \ - rendering/RenderSVGResource.cpp \ - rendering/RenderSVGResourceClipper.cpp \ - rendering/RenderSVGResourceContainer.cpp \ - rendering/RenderSVGResourceFilter.cpp \ - rendering/RenderSVGResourceFilterPrimitive.cpp \ - rendering/RenderSVGResourceGradient.cpp \ - rendering/RenderSVGResourceLinearGradient.cpp \ - rendering/RenderSVGResourceMarker.cpp \ - rendering/RenderSVGResourceMasker.cpp \ - rendering/RenderSVGResourcePattern.cpp \ - rendering/RenderSVGResourceRadialGradient.cpp \ - rendering/RenderSVGResourceSolidColor.cpp \ - rendering/RenderSVGRoot.cpp \ - rendering/RenderSVGShadowTreeRootContainer.cpp \ - rendering/RenderSVGTransformableContainer.cpp \ - rendering/RenderSVGViewportContainer.cpp \ - \ -======= rendering/svg/RenderSVGBlock.cpp \ rendering/svg/RenderSVGContainer.cpp \ rendering/svg/RenderSVGForeignObject.cpp \ rendering/svg/RenderSVGGradientStop.cpp \ rendering/svg/RenderSVGHiddenContainer.cpp \ rendering/svg/RenderSVGImage.cpp \ ->>>>>>> WebKit.org @ r75993 rendering/svg/RenderSVGInline.cpp \ rendering/svg/RenderSVGInlineText.cpp \ rendering/svg/RenderSVGModelObject.cpp \ @@ -895,7 +866,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/svg/SVGResourcesCache.cpp \ rendering/svg/SVGResourcesCycleSolver.cpp \ rendering/svg/SVGRootInlineBox.cpp \ - rendering/svg/SVGShadowTreeElements.cpp + rendering/svg/SVGShadowTreeElements.cpp \ rendering/svg/SVGTextChunk.cpp \ rendering/svg/SVGTextChunkBuilder.cpp \ rendering/svg/SVGTextLayoutAttributes.cpp \ |