diff options
17 files changed, 45 insertions, 59 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@5714", + "/trunk/deps/third_party/WebKit@5752", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5749", @@ -21,7 +21,7 @@ deps = { "http://v8.googlecode.com/svn/trunk@768", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38389", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38450", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 7ddd635..ce71dcb 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38389
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@38450
\ No newline at end of file diff --git a/webkit/SConscript.port b/webkit/SConscript.port index d2ef872..9b82339 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -96,7 +96,6 @@ input_files = [ '$PORT_DIR/platform/graphics/svg/SVGPaintServerPatternSkia.cpp', '$PORT_DIR/platform/graphics/svg/SVGPaintServerSkia.cpp', '$PORT_DIR/platform/graphics/svg/SVGPaintServerSolidSkia.cpp', - '$PORT_DIR/platform/graphics/svg/SVGResourceClipperSkia.cpp', '$PORT_DIR/platform/graphics/svg/SVGResourceFilterSkia.cpp', '$PORT_DIR/platform/graphics/svg/SVGResourceMaskerSkia.cpp', diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 768d3af..38f2fd0 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -148,6 +148,7 @@ if env['PLATFORM'] == 'win32': wtf_inputs = [ '$WTF_DIR/Assertions.cpp', + '$WTF_DIR/dtoa.cpp', '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', '$WTF_DIR/MainThread.cpp', diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 0dc5ef0..c4636de 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -150,6 +150,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\FastMalloc.cpp" > </File> @@ -269,6 +277,10 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StdLibExtras.h" + > + </File> <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StringExtras.h" > diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj index 579d049..fad9723 100644 --- a/webkit/build/port/port.vcproj +++ b/webkit/build/port/port.vcproj @@ -1034,10 +1034,6 @@ > </File> <File - RelativePath="..\..\port\platform\graphics\svg\SVGResourceClipperSkia.cpp" - > - </File> - <File RelativePath="..\..\port\platform\graphics\svg\SVGResourceFilterSkia.cpp" > </File> diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum index 8e65fd6..49cf8a6 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.checksum @@ -1 +1 @@ -2ef33614e712873179b5e370bd6c60d1
\ No newline at end of file +8ed9b4188a30f92384e9030565bae8f2
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png Binary files differindex 464b9e1..0d2d9fb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/filters-offset-01-b-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.checksum index d18e1c9..aa0224c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.checksum @@ -1 +1 @@ -aca507ded8dcdc6d8d59f2d653cf7af8
\ No newline at end of file +8d88853f33c68659dcce03b5027cf6aa
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.png Binary files differindex 2d11117..0bcc9b0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/masking-path-05-f-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.checksum index a236ad3..6b642ca 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.checksum @@ -1 +1 @@ -bfe244d55ffa1ac3aba36ef34997ac9b
\ No newline at end of file +5b37e8f341ec98b2d9067c256f3720f6
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png Binary files differindex 84ae4f4..8e44f3c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/W3C-SVG-1.1/painting-fill-05-b-expected.png diff --git a/webkit/glue/localized_strings.cc b/webkit/glue/localized_strings.cc index cc3053f..5b4e277 100644 --- a/webkit/glue/localized_strings.cc +++ b/webkit/glue/localized_strings.cc @@ -183,6 +183,7 @@ String WebCore::contextMenuItemTagItalic() { return String(); } String WebCore::contextMenuItemTagUnderline() { return String(); } String WebCore::contextMenuItemTagOutline() { return String(); } String WebCore::contextMenuItemTagWritingDirectionMenu() { return String(); } +String WebCore::contextMenuItemTagTextDirectionMenu() { return String(); } String WebCore::contextMenuItemTagDefaultDirection() { return String(); } String WebCore::contextMenuItemTagLeftToRight() { return String(); } String WebCore::contextMenuItemTagRightToLeft() { return String(); } diff --git a/webkit/port/history/HistoryItem.h b/webkit/port/history/HistoryItem.h index a5c1707..7d86f0c 100644 --- a/webkit/port/history/HistoryItem.h +++ b/webkit/port/history/HistoryItem.h @@ -102,6 +102,7 @@ public: String rssFeedReferrer() const; int visitCount() const; + bool lastVisitWasFailure() const { return m_lastVisitWasFailure; } void mergeAutoCompleteHints(HistoryItem* otherItem); @@ -124,6 +125,7 @@ public: void setRSSFeedReferrer(const String&); void setVisitCount(int); + void setLastVisitWasFailure(bool wasFailure) { m_lastVisitWasFailure = wasFailure; } void addChildItem(PassRefPtr<HistoryItem>); HistoryItem* childItemWithName(const String&) const; @@ -175,6 +177,7 @@ private: HistoryItemVector m_subItems; + bool m_lastVisitWasFailure; bool m_isInPageCache; bool m_isTargetItem; int m_visitCount; diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp index c85a6e1..5579170 100644 --- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp +++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp @@ -392,6 +392,17 @@ void GraphicsContext::clipOutEllipseInRect(const IntRect& rect) platformContext()->canvas()->clipPath(path, SkRegion::kDifference_Op); } +void GraphicsContext::clipPath(WindRule clipRule) +{ + if (paintingDisabled()) + return; + + const SkPath* oldPath = platformContext()->currentPath(); + SkPath path(*oldPath); + path.setFillType(clipRule == RULE_EVENODD ? SkPath::kEvenOdd_FillType : SkPath::kWinding_FillType); + platformContext()->canvas()->clipPath(path); +} + void GraphicsContext::clipToImageBuffer(const FloatRect& rect, const ImageBuffer* imageBuffer) { diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt index 4effb76..8e87cec 100644 --- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt @@ -373,45 +373,12 @@ LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.html = FAIL // ----------------------------------------------------------------- // BUG: 992321 -// SVG layout tests have just been enabled. The failures are listed -// below, and need to be investigated, categorized, and (one hopes) -// fixed. - -// Keep score here! -// -// P: Passes -// S: Pass simplified diff (probable nonbugs) -// F: Failures (in simplified as well as full text) -// X: Crashes/hangs -// T: Total # of tests -// -// (note 5-22-08: there should probably be a column for image diff -// failures as well. Some of the font tests seem to be flaky and -// return inconsistent image results.) -// -// P S F X T -// 1-18-08 473 87 125 3 688 -// 1-29-08 492 86 106 4 688 -// 2-05-08 513 97 83 1 694 -// 4-17-08 520 88 85 0 :) 693 -// 4-21-08 526 87 80 0 693 -// 4-22-08 540 138 29 0 707 -// 5-05-08 551 138 15 0 707 -// 5-09-08 554 139 16 0 712 -// 5-16-08 587 111 14 0 712 -// 5-22-08 641 58 7 0 712 -// +// The failures listed below have never passed in Chromium and need to be +// investigated, categorized, and (one hopes) fixed. // The following tests fail because SVG animation is not yet implemented -LayoutTests/svg/W3C-SVG-1.1/animate-elem-28-t.svg = FAIL LayoutTests/svg/W3C-SVG-1.1/animate-elem-36-t.svg = FAIL -LayoutTests/svg/W3C-SVG-1.1/animate-elem-37-t.svg = FAIL LayoutTests/svg/W3C-SVG-1.1/animate-elem-78-t.svg = FAIL -LayoutTests/svg/W3C-SVG-1.1/animate-elem-80-t.svg = FAIL -LayoutTests/svg/W3C-SVG-1.1/animate-elem-83-t.svg = FAIL - -// This test fails because SVG filters are not implemented -LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b.svg = FAIL // These test fail full text diff (but not simplified diff) most likely due // to differing implementations of SVG fonts. They may or may not represent real @@ -445,19 +412,7 @@ LayoutTests/svg/custom/stroke-width-click.svg = FAIL // positions and/or widths that deviate from Apple's expectations by varying // degrees. These are almost certainly nonbugs, but won't be rebased until // we can say for sure. -LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f.svg = FAIL // 12 numbers differ, by an absolute total of 73.93 LayoutTests/svg/W3C-SVG-1.1/fonts-glyph-02-t.svg = FAIL // 1 numbers differ, by an absolute total of 10.00 -LayoutTests/svg/W3C-SVG-1.1/metadata-example-01-b.svg = FAIL // 11 numbers differ, by an absolute total of 1.08 -LayoutTests/svg/W3C-SVG-1.1/paths-data-01-t.svg = FAIL // 10 numbers differ, by an absolute total of 15.39 -LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t.svg = FAIL // 20 numbers differ, by an absolute total of 327.17 -LayoutTests/svg/W3C-SVG-1.1/paths-data-03-f.svg = FAIL // 14 numbers differ, by an absolute total of 58.82 -LayoutTests/svg/W3C-SVG-1.1/paths-data-10-t.svg = FAIL // 21 numbers differ, by an absolute total of 23.96 -LayoutTests/svg/W3C-SVG-1.1/paths-data-12-t.svg = FAIL // 8 numbers differ, by an absolute total of 119.28 -LayoutTests/svg/W3C-SVG-1.1/paths-data-15-t.svg = FAIL // 6 numbers differ, by an absolute total of 21.34 -LayoutTests/svg/W3C-SVG-1.1/struct-group-03-t.svg = FAIL // 8 numbers differ, by an absolute total of 3.48 -LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t.svg = FAIL // 3 numbers differ, by an absolute total of 42.00 -LayoutTests/svg/W3C-SVG-1.1/text-intro-05-t.svg = FAIL // 18 numbers differ, by an absolute total of 237.00 -LayoutTests/svg/W3C-SVG-1.1/text-path-01-b.svg = FAIL // 16 numbers differ, by an absolute total of 67.92 LayoutTests/svg/custom/control-points-for-S-and-T.svg = FAIL // 6 numbers differ, by an absolute total of 31.36 LayoutTests/svg/custom/dasharrayOrigin.svg = FAIL // 2 numbers differ, by an absolute total of 0.20 LayoutTests/svg/custom/linking-a-03-b-all.svg = FAIL // 4 numbers differ, by an absolute total of 0.06 @@ -500,7 +455,6 @@ LayoutTests/svg/batik/text/textStyles.svg = FAIL LayoutTests/svg/text/text-text-03-b.svg = FAIL // These consistently fail with image diffs. LayoutTests/svg/text/text-deco-01-b.svg = FAIL -LayoutTests/svg/W3C-SVG-1.1/text-deco-01-b.svg = FAIL // // ----------------------------------------------------------------- @@ -1145,3 +1099,6 @@ LayoutTests/transforms/2d/zoom-menulist.html = FAIL // Issue http://code.google.com/p/chromium/issues/detail?id=4432) LayoutTests/fast/dom/HTMLImageElement/image-loading-gc.html = TIMEOUT LayoutTests/fast/events/message-channel-gc-3.html = TIMEOUT + +// MERGE 38389:38450 +LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-4.html = FAIL diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index 2bc4dec..af91e4e 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -78,6 +78,7 @@ 4D35546E0ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D3554660ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp */; }; 4D35546F0ED499E000FB28B1 /* PlatformCanvasMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D3554690ED499E000FB28B1 /* PlatformCanvasMac.cpp */; }; 4D3554700ED499E000FB28B1 /* PlatformDeviceMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35546C0ED499E000FB28B1 /* PlatformDeviceMac.cpp */; }; + 4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */; }; 4D7B071F0E9DAE56009A6919 /* GraphicsContextStub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7B071E0E9DAE56009A6919 /* GraphicsContextStub.cpp */; }; 4DB043A40EB1577900A5633C /* webcursor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405300D92E3DA0006B936 /* webcursor.cc */; }; 4DB044230EB161D600A5633C /* IconMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB044220EB161D600A5633C /* IconMac.cpp */; }; @@ -1564,6 +1565,8 @@ 4D3554720ED499EF00FB28B1 /* VectorCanvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorCanvas.h; sourceTree = "<group>"; }; 4D3554730ED499EF00FB28B1 /* VectorDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VectorDevice.cpp; sourceTree = "<group>"; }; 4D3554740ED499EF00FB28B1 /* VectorDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorDevice.h; sourceTree = "<group>"; }; + 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; }; + 4D35557C0ED4ACF600FB28B1 /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; }; 4D7B071E0E9DAE56009A6919 /* GraphicsContextStub.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsContextStub.cpp; sourceTree = "<group>"; }; 4DB044220EB161D600A5633C /* IconMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconMac.cpp; sourceTree = "<group>"; }; 4DB044420EB1639E00A5633C /* ImageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageMac.cpp; sourceTree = "<group>"; }; @@ -4662,6 +4665,8 @@ 4DB7F51F0E9BD3FB00C66CE0 /* AVLTree.h */, 7B5E85B80D7F28F5001ECF42 /* Deque.h */, 7B5E85B90D7F28F5001ECF42 /* DisallowCType.h */, + 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */, + 4D35557C0ED4ACF600FB28B1 /* dtoa.h */, 7B5E85BA0D7F28F5001ECF42 /* FastMalloc.cpp */, 7B5E85BB0D7F28F5001ECF42 /* FastMalloc.h */, 7B5E85BC0D7F28F5001ECF42 /* Forward.h */, @@ -8157,6 +8162,7 @@ files = ( 7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */, E40054B10E9BCC5C0055B38E /* CollatorICU.cpp in Sources */, + 4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */, 7B5E862C0D7F2B56001ECF42 /* FastMalloc.cpp in Sources */, 7B5E85F40D7F28F5001ECF42 /* HashTable.cpp in Sources */, 4DB7F5290E9BD3FB00C66CE0 /* MainThread.cpp in Sources */, |
