[webkit-changes] [193680] branches/safari-601-branch

[matthew_hanson]

Title: [193680] branches/safari-601-branch








Revision 193680
Author matthew_han...@apple.com
Date 2015-12-07 18:38:24 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r192732. rdar://problem/23769794

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h


Added Paths

branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html
branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193679 => 193680)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 02:14:29 UTC (rev 193679)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 02:38:24 UTC (rev 193680)
@@ -1,3 +1,13 @@
+2015-11-22  Myles C. Maxfield  
+
+Font selection should not consult font-variant property
+https://bugs.webkit.org/show_bug.cgi?id=151537
+
+Reviewed by Simon Fraser.
+
+* fast/text/font-selection-font-variant-expected.html: Added.
+* fast/text/font-selection-font-variant.html: Added.
+
 2015-10-17  Myles C. Maxfield  
 
 Delete FontPlatformData::allowsLigatures()


Added: branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html (0 => 193680)

--- branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html	2015-12-08 02:38:24 UTC (rev 193680)
@@ -0,0 +1,36 @@
+
+
+
+
+@font-face {
+font-family: "Test1";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test2";
+src: url("../../resources/Ahem.ttf") format("truetype");
+}
+.test {
+display: inline-block;
+font-size: 40px;
+}
+
+
+
+This test makes sure that font-variant is not consulted when performing font selection.
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+
+
\ No newline at end of file


Added: branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant.html (0 => 193680)

--- branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-selection-font-variant.html	2015-12-08 02:38:24 UTC (rev 193680)
@@ -0,0 +1,55 @@
+
+
+
+
+@font-face {
+font-family: "Test1";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test1";
+src: url("../../resources/Ahem.ttf") format("truetype");
+font-variant: small-caps;
+}
+@font-face {
+font-family: "Test2";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+font-variant: small-caps;
+}
+@font-face {
+font-family: "Test2";
+src: url("../../resources/Ahem.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test3";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test3SmallCaps";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+font-variant: small-caps;
+}
+.test {
+display: inline-block;
+font-size: 40px;
+}
+
+
+
+This test makes sure that font-variant is not consulted when performing font selection.
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+
+
\ No newline at end of file


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193679 => 193680)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 02:14:29 UTC (rev 193679)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 02:38:24 UTC (rev 193680)
@@ -1,3 +1,43 @@
+2015-11-22  Myles C. Maxfield  
+
+Font selection should not consult font-variant property
+https://bugs.webkit.org/show_bug.cgi?id=151537
+
+Reviewed by Simon Fraser.
+
+In section 4.7 of the CSS Fonts Level 3 spec, it says "[The font-variant and
+font-feature-settings] do not affect font selection."
+
+All the other browsers (Chrome, Firefox, and Edge) all obey the spec here. We
+are the only one who misbehaves. This 

[webkit-changes] [193666] branches/safari-601-branch

[matthew_hanson]

Title: [193666] branches/safari-601-branch








Revision 193666
Author matthew_han...@apple.com
Date 2015-12-07 16:23:25 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191331. rdar://problem/23769766

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/Font.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp
branches/safari-601-branch/Source/WebCore/svg/SVGFontData.h




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193665 => 193666)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:20 UTC (rev 193665)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:25 UTC (rev 193666)
@@ -1,3 +1,13 @@
+2015-10-19  Myles C. Maxfield  
+
+FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+https://bugs.webkit.org/show_bug.cgi?id=149775
+
+Reviewed by Darin Adler.
+
+* fast/text/multiple-feature-properties-expected.html: Added.
+* fast/text/multiple-feature-properties.html: Added.
+
 2015-12-06  David Kilzer  
 
 REGRESSION (r193575): Conflict markers left in test files


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193665 => 193666)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:20 UTC (rev 193665)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:25 UTC (rev 193666)
@@ -1,3 +1,65 @@
+2015-10-19  Myles C. Maxfield  
+
+FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+https://bugs.webkit.org/show_bug.cgi?id=149775
+
+Reviewed by Darin Adler.
+
+This patch has two pieces:
+
+We used to have a boolean, enableLigatures, which affected how we perform shaping in both our
+simple and complex text codepaths. However, in this brave new world of font-feature-settings
+and font-variant-*, there are many properties which may affect shaping (and multiple kinds
+of ligatures). This patch renames this boolean to requiresShaping, and teaches it about all
+the various properties which affect text shaping.
+
+Similarly, one of the places which used this enableLigatures boolean was to tell CoreText
+if it should disable ligatures. However, we now have much finer-grained control over
+ligatures during font creation. This patch moves the responsibility of dictating which
+font features should be enabled entirely to the Font. Therefore, getCFStringAttributes()
+doesn't know anything about ligatures anymore; the logic inside font creation is used
+instead.
+
+An added benefit of moving all the font feature logic to one place is that we can implement
+the feature resolution algorithm described in the CSS3 fonts spec. This patch adds a test to
+makes sure that text-rendering, font-feature-settings, and font-variant-* play together
+nicely.
+
+Test: fast/text/multiple-feature-properties.html
+
+* platform/graphics/Font.cpp:
+(WebCore::Font::applyTransforms):
+* platform/graphics/Font.h:
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::FontCascade):
+(WebCore::FontCascade::operator=):
+(WebCore::FontCascade::update):
+(WebCore::FontCascade::drawText):
+(WebCore::FontCascade::drawEmphasisMarks):
+(WebCore::FontCascade::width):
+(WebCore::FontCascade::adjustSelectionRectForText):
+(WebCore::FontCascade::offsetForPosition):
+(WebCore::FontCascade::codePath):
+(WebCore::FontCascade::floatWidthForSimpleText):
+* platform/graphics/FontCascade.h:
+(WebCore::FontCascade::requiresShaping):
+(WebCore::FontCascade::computeRequiresShaping):
+(WebCore::FontCascade::enableLigatures): Deleted.
+(WebCore::FontCascade::computeEnableLigatures): Deleted.
+* platform/graphics/WidthIterator.cpp:
+(WebCore::WidthIterator::WidthIterator):
+

[webkit-changes] [193665] branches/safari-601-branch/Source

[matthew_hanson]

Title: [193665] branches/safari-601-branch/Source








Revision 193665
Author matthew_han...@apple.com
Date 2015-12-07 16:23:20 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191014. rdar://problem/23769801

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h
branches/safari-601-branch/Source/WebCore/platform/graphics/Font.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.h
branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp
branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h
branches/safari-601-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp
branches/safari-601-branch/Source/WebCore/rendering/line/BreakingContext.h
branches/safari-601-branch/Source/WebCore/svg/SVGFontData.h
branches/safari-601-branch/Source/WebKit/mac/ChangeLog
branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
branches/safari-601-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h
branches/safari-601-branch/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
branches/safari-601-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm


Removed Paths

branches/safari-601-branch/Source/WebCore/platform/graphics/TypesettingFeatures.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193664 => 193665)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:22:16 UTC (rev 193664)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:20 UTC (rev 193665)
@@ -1,3 +1,91 @@
+2015-10-13  Myles C. Maxfield  
+
+Split TypesettingFeatures into kerning and ligatures bools
+https://bugs.webkit.org/show_bug.cgi?id=150074
+
+Reviewed by Simon Fraser.
+
+Our TypesettingFeatures type represents whether kerning or ligatures are enabled
+when laying out text. However, now that I have implemented font-feature-settings
+and font-variant-*, this type is wildly inadequate. There are now multiple kinds
+of ligatures, and many other features which are neither kerning nor ligatures.
+Adding tons of information to this type doesn't make sense because 1) We already
+have a FontVariantSettings struct which contains this information, and 2) None
+of the users of TypesettingFeatures care about most of these new features.
+
+In this new world of font features, the font-kerning property isn't changing.
+Therefore, all the code which relies only on the Kerning value in
+TypesettingFeatures doesn't need to change. The places which rely on Ligatures,
+however, need to be updated to understand that there are many different kinds
+of ligatures.
+
+Indeed, after inspection, all of the places which inspect ligatures are more
+interested in a high-level concept of whether or not we can trust some simple
+computation. Therefore, we really have two things we care about: Kerning, and
+this high-level concept.
+
+This patch is the second step to update our view of the world to include
+font-feature-settings and font-variant-*. In particular, this patch simply
+splits TypesettingFeatures into two Booleans, one for Kerning, and one for
+Ligatures (which has no behavior change). Then, once they are separated, I can
+migrate the Ligatures Boolean to take on its new meaning.
+
+This change is purely mechanical.
+
+No new tests because there is no behavior change.
+
+* WebCore.xcodeproj/project.pbxproj:
+* css/CSSPrimitiveValueMappings.h:
+(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+(WebCore::CSSPrimitiveValue::operator FontCascadeDescription::Kerning):
+* platform/graphics/Font.cpp:
+(WebCore::Font::applyTransforms):
+* platform/graphics/Font.h:
+* platform/graphics/FontCascade.cpp:
+

[webkit-changes] [193668] branches/safari-601-branch/LayoutTests

[matthew_hanson]

Title: [193668] branches/safari-601-branch/LayoutTests








Revision 193668
Author matthew_han...@apple.com
Date 2015-12-07 16:23:36 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191986. rdar://problem/23769775

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/platform/win/TestExpectations




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193667 => 193668)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:33 UTC (rev 193667)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:36 UTC (rev 193668)
@@ -1,3 +1,12 @@
+2015-11-03  Ryan Haddad  
+
+Skipping tests added with r191968 on win.
+https://bugs.webkit.org/show_bug.cgi?id=149771
+
+Unreviewed test gardening.
+
+* platform/win/TestExpectations:
+
 2015-11-03  Myles C. Maxfield  
 
 font-variant-* properties in @font-face declarations should be honored


Modified: branches/safari-601-branch/LayoutTests/platform/win/TestExpectations (193667 => 193668)

--- branches/safari-601-branch/LayoutTests/platform/win/TestExpectations	2015-12-08 00:23:33 UTC (rev 193667)
+++ branches/safari-601-branch/LayoutTests/platform/win/TestExpectations	2015-12-08 00:23:36 UTC (rev 193668)
@@ -459,6 +459,10 @@
 # Font feature settings is not implemented.
 css3/font-feature-settings-rendering.html [ Skip ]
 
+webkit.org/b/149771 css3/font-feature-settings-font-face-rendering.html [ Skip ] # WontFix
+webkit.org/b/149771 css3/font-variant-font-face-all.html [ Skip ] # WontFix
+webkit.org/b/149771 css3/font-variant-font-face-override.html [ Skip ] # WontFix
+
 # TODO HiDPI tests require test infrastructure enhancements (e.g. testRunner.setBackingScaleFactor)
 # https://bugs.webkit.org/show_bug.cgi?id=87919
 webkit.org/b/87919 compositing/tiled-layers-hidpi.html






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193667] branches/safari-601-branch

[matthew_hanson]

Title: [193667] branches/safari-601-branch








Revision 193667
Author matthew_han...@apple.com
Date 2015-12-07 16:23:33 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191968. rdar://problem/23769775

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/css/CSSFontFace.cpp
branches/safari-601-branch/Source/WebCore/css/CSSFontFace.h
branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp
branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h
branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp
branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h
branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp
branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h
branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp
branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h
branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193666 => 193667)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:33 UTC (rev 193667)
@@ -1,3 +1,17 @@
+2015-11-03  Myles C. Maxfield  
+
+font-variant-* properties in @font-face declarations should be honored
+https://bugs.webkit.org/show_bug.cgi?id=149771
+
+Reviewed by Simon Fraser.
+
+* css3/font-variant-font-face-override-expected.html: Added
+* css3/font-variant-font-face-override.html: Added
+* css3/font-feature-settings-font-face-rendering-expected.html: Added.
+* css3/font-feature-settings-font-face-rendering.html: Added.
+* css3/font-variant-font-face-all-expected.html: Added.
+* css3/font-variant-font-face-all.html: Added.
+
 2015-10-19  Myles C. Maxfield  
 
 FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193666 => 193667)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:33 UTC (rev 193667)
@@ -1,3 +1,89 @@
+2015-11-03  Myles C. Maxfield  
+
+font-variant-* properties in @font-face declarations should be honored
+https://bugs.webkit.org/show_bug.cgi?id=149771
+
+Reviewed by Simon Fraser.
+
+According to the CSS Fonts Level 3 spec, web authors are allowed to put
+font-feature-settings / font-variant-* inside @font-face blocks. These
+properties are supposed to be applied at a specific time during the
+font selection algorithm.
+
+This patch gives a FontFeatureSettings object and a FontVariantSettings
+object to CSSFontFace, and moves common parsing logic from
+StyleBuilderCustom to a shared location. Then, once the two properties
+are parsed from the @font-face block, the relevant data structures are
+passed down into the font selection algorithm. This algorithm then
+consults with these values at the correct time (inside
+preparePlatformFont()).
+
+Tests: css3/font-feature-settings-font-face-rendering.html
+   css3/font-variant-font-face-all.html
+   css3/font-variant-font-face-override.html
+
+* WebCore.xcodeproj/project.pbxproj: Add a header for the common
+location of parsing font-variant-ligatures, font-variant-numeric,
+and font-variant-east-asian.
+* css/CSSFontFace.cpp:
+(WebCore::CSSFontFace::font): Pass the relevant data structures
+into the font selection algorithm.
+* css/CSSFontFace.h: Add FontFeatureSettings and FontVariantSettings
+member variables.
+(WebCore::CSSFontFace::insertFeature):
+(WebCore::CSSFontFace::setVariantCommonLigatures):
+(WebCore::CSSFontFace::setVariantDiscretionaryLigatures):
+(WebCore::CSSFontFace::setVariantHistoricalLigatures):
+(WebCore::CSSFontFace::setVariantContextualAlternates):
+

[webkit-changes] [193669] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193669] branches/safari-601-branch/Source/WebCore








Revision 193669
Author matthew_han...@apple.com
Date 2015-12-07 16:23:38 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r192367. rdar://problem/23769775

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193668 => 193669)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:36 UTC (rev 193668)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:38 UTC (rev 193669)
@@ -1,3 +1,12 @@
+2015-11-12  Csaba Osztrogonác  
+
+Fix build failure due to missing forward declaration of FontVariantSettings after r191968
+https://bugs.webkit.org/show_bug.cgi?id=151185
+
+Reviewed by Myles C. Maxfield.
+
+* css/CSSFontFaceSource.h:
+
 2015-11-03  Myles C. Maxfield  
 
 font-variant-* properties in @font-face declarations should be honored


Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h (193668 => 193669)

--- branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h	2015-12-08 00:23:36 UTC (rev 193668)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h	2015-12-08 00:23:38 UTC (rev 193669)
@@ -45,6 +45,7 @@
 class Font;
 class FontDescription;
 class FontFeatureSettings;
+struct FontVariantSettings;
 
 class CSSFontFaceSource final : public CachedFontClient {
 WTF_MAKE_FAST_ALLOCATED;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193671] branches/safari-601-branch

[matthew_hanson]

Title: [193671] branches/safari-601-branch








Revision 193671
Author matthew_han...@apple.com
Date 2015-12-07 16:23:44 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191251. rdar://problem/23769811

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193670 => 193671)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:44 UTC (rev 193671)
@@ -1,3 +1,15 @@
+2015-10-17  Myles C. Maxfield  
+
+Delete FontPlatformData::allowsLigatures()
+https://bugs.webkit.org/show_bug.cgi?id=150286
+
+Reviewed by Dan Bernstein.
+
+Make sure it's impossible to turn off required ligatures with CSS.
+
+* fast/text/required-ligatures-expected.html: Added.
+* fast/text/required-ligatures.html: Added.
+
 2015-10-12  Myles C. Maxfield  
 
 Test font-variant-* and font-feature-settings on Yosemite and Mavericks


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193670 => 193671)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:44 UTC (rev 193671)
@@ -1,3 +1,25 @@
+2015-10-17  Myles C. Maxfield  
+
+Delete FontPlatformData::allowsLigatures()
+https://bugs.webkit.org/show_bug.cgi?id=150286
+
+Reviewed by Dan Bernstein.
+
+This function is only used to force ligatures on for complex fonts (where "complex"
+means "does not support the letter 'a'"). However, ligatures are turned on for all
+fonts by default, which means that this function is unnecessary.
+
+Required ligatures, such as those which make these complex scripts legible, are always
+enabled, no matter what.
+
+Test: fast/text/required-ligatures.html
+
+* platform/graphics/FontPlatformData.h:
+* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+(WebCore::FontPlatformData::allowsLigatures): Deleted.
+* platform/graphics/mac/SimpleFontDataCoreText.cpp:
+(WebCore::Font::getCFStringAttributes):
+
 2015-10-12  Myles C. Maxfield  
 
 Test font-variant-* and font-feature-settings on Yosemite and Mavericks


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h (193670 => 193671)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h	2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontPlatformData.h	2015-12-08 00:23:44 UTC (rev 193671)
@@ -115,8 +115,6 @@
 static RetainPtr objectForEqualityCheck(CTFontRef);
 RetainPtr objectForEqualityCheck() const;
 
-bool allowsLigatures() const;
-
 #if USE(APPKIT)
 // FIXME: Remove this when all NSFont usage is removed.
 NSFont *nsFont() const { return (NSFont *)m_font.get(); }


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (193670 => 193671)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm	2015-12-08 00:23:41 UTC (rev 193670)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm	2015-12-08 00:23:44 UTC (rev 193671)
@@ -118,15 +118,6 @@
 m_ctFont = nullptr;
 }
 
-bool FontPlatformData::allowsLigatures() const
-{
-if (!m_font)
-return false;
-
-RetainPtr characterSet = adoptCF(CTFontCopyCharacterSet(ctFont()));
-return !(characterSet.get() && CFCharacterSetIsCharacterMember(characterSet.get(), 'a'));
-}
-
 inline int mapFontWidthVariantToCTFeatureSelector(FontWidthVariant variant)
 {
 switch(variant) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193670] branches/safari-601-branch

[matthew_hanson]

Title: [193670] branches/safari-601-branch








Revision 193670
Author matthew_han...@apple.com
Date 2015-12-07 16:23:41 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r190876. rdar://problem/23769786

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193669 => 193670)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-08 00:23:41 UTC (rev 193670)
@@ -1,3 +1,13 @@
+2015-10-12  Myles C. Maxfield  
+
+Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+https://bugs.webkit.org/show_bug.cgi?id=149778
+
+Reviewed by Simon Fraser.
+
+* platform/mac-wk1/TestExpectations:
+* platform/mac/TestExpectations:
+
 2015-11-03  Ryan Haddad  
 
 Skipping tests added with r191968 on win.


Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html (193669 => 193670)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html	2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html	2015-12-08 00:23:41 UTC (rev 193670)
@@ -16,6 +16,8 @@
 This tests that font features are able to be turned on and off as desired. It uses a special font
 designed specifically for this purpose. The test passes if you see a sequence of alternating check
 marks and X below.
+AB
+AB
 
 
 


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193669 => 193670)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:41 UTC (rev 193670)
@@ -1,3 +1,16 @@
+2015-10-12  Myles C. Maxfield  
+
+Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+https://bugs.webkit.org/show_bug.cgi?id=149778
+
+Reviewed by Simon Fraser.
+
+We can simply call the function which enables features on Yosemite and Mavericks.
+
+* platform/graphics/cocoa/FontCacheCoreText.cpp:
+(WebCore::platformFontLookupWithFamily):
+(WebCore::fontWithFamily):
+
 2015-11-12  Csaba Osztrogonác  
 
 Fix build failure due to missing forward declaration of FontVariantSettings after r191968


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193669 => 193670)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-08 00:23:38 UTC (rev 193669)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-08 00:23:41 UTC (rev 193670)
@@ -380,6 +380,8 @@
 return nil;
 
 font = [NSFont fontWithName:chosenFullName size:size];
+auto foundFont = applyFontFeatureSettings((CTFontRef)font, nullptr, nullptr, featureSettings, variantSettings);
+font = CFBridgingRelease(CFRetain(foundFont.get()));
 
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193673] branches/safari-601-branch/Source/WebKit/mac

[matthew_hanson]

Title: [193673] branches/safari-601-branch/Source/WebKit/mac








Revision 193673
Author matthew_han...@apple.com
Date 2015-12-07 16:23:51 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191261. rdar://problem/23769808

Modified Paths

branches/safari-601-branch/Source/WebKit/mac/ChangeLog
branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (193672 => 193673)

--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2015-12-08 00:23:49 UTC (rev 193672)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog	2015-12-08 00:23:51 UTC (rev 193673)
@@ -1,3 +1,12 @@
+2015-10-17  Myles C. Maxfield  
+
+Build fix after r191260
+
+Unreviewed.
+
+* WebView/WebView.mm:
+(+[WebView initialize]):
+
 2015-10-18  Myles C. Maxfield  
 
 Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"


Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm (193672 => 193673)

--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm	2015-12-08 00:23:49 UTC (rev 193672)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm	2015-12-08 00:23:51 UTC (rev 193673)
@@ -4686,18 +4686,15 @@
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_cacheModelChangedNotification:) name:WebPreferencesCacheModelChangedInternalNotification object:nil];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];
 
-NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
 #if PLATFORM(IOS)
 continuousSpellCheckingEnabled = NO;
-#endif
 
-#if !PLATFORM(IOS)
+#else
+
+NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 continuousSpellCheckingEnabled = [defaults boolForKey:WebContinuousSpellCheckingEnabled];
 grammarCheckingEnabled = [defaults boolForKey:WebGrammarCheckingEnabled];
-#endif
 
-#if !PLATFORM(IOS)
 automaticQuoteSubstitutionEnabled = [self _shouldAutomaticQuoteSubstitutionBeEnabled];
 automaticLinkDetectionEnabled = [defaults boolForKey:WebAutomaticLinkDetectionEnabled];
 automaticDashSubstitutionEnabled = [self _shouldAutomaticDashSubstitutionBeEnabled];






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193672] branches/safari-601-branch/Source

[matthew_hanson]

Title: [193672] branches/safari-601-branch/Source








Revision 193672
Author matthew_han...@apple.com
Date 2015-12-07 16:23:49 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191260. rdar://problem/23769808

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601-branch/Source/WebKit/mac/ChangeLog
branches/safari-601-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
branches/safari-601-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h
branches/safari-601-branch/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
branches/safari-601-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193671 => 193672)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:44 UTC (rev 193671)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 00:23:49 UTC (rev 193672)
@@ -1,3 +1,32 @@
+2015-10-18  Myles C. Maxfield  
+
+Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"
+https://bugs.webkit.org/show_bug.cgi?id=150287
+
+Reviewed by Simon Fraser.
+
+This user default is currently on by default. Therefore, by setting the user default,
+users can only disable kerning / ligatures (rather than enable it).
+
+There are a few reasons why we should stop honoring it:
+
+1. In the brave new world of font-feature-settings and font-variant-ligatures, there
+are many different kinds of ligatures which may be enabled at will. The simplistic
+statement of "turn on ligatures" no longer has any meaning.
+
+2. If a user wants to disable kerning / ligatures, he/she can do it with a user
+stylesheet.
+
+3. The default isn't able to be tested with DumpRenderTree or WebKitTestRunner.
+
+4. I have never heard of anyone actually using this user default.
+
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::setDefaultKerning): Deleted.
+(WebCore::FontCascade::setDefaultLigatures): Deleted.
+* platform/graphics/FontCascade.h:
+(WebCore::FontCascade::advancedTextRenderingMode):
+
 2015-10-17  Myles C. Maxfield  
 
 Delete FontPlatformData::allowsLigatures()


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193671 => 193672)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 00:23:44 UTC (rev 193671)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 00:23:49 UTC (rev 193672)
@@ -91,9 +91,6 @@
 
 FontCascade::CodePath FontCascade::s_codePath = Auto;
 
-bool FontCascade::s_defaultKerning = false;
-bool FontCascade::s_defaultLigatures = false;
-
 // 
 // FontCascade Implementation (Cross-Platform Portion)
 // 
@@ -602,16 +599,6 @@
 return s_codePath;
 }
 
-void FontCascade::setDefaultKerning(bool enable)
-{
-s_defaultKerning = enable;
-}
-
-void FontCascade::setDefaultLigatures(bool enable)
-{
-s_defaultLigatures = enable;
-}
-
 FontCascade::CodePath FontCascade::codePath(const TextRun& run) const
 {
 if (s_codePath != Auto)


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h (193671 => 193672)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h	2015-12-08 00:23:44 UTC (rev 193671)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h	2015-12-08 00:23:49 UTC (rev 193672)
@@ -270,8 +270,6 @@
 static CodePath codePath();
 static CodePath s_codePath;
 
-WEBCORE_EXPORT static void setDefaultKerning(bool);
-WEBCORE_EXPORT static void setDefaultLigatures(bool);
 static const uint8_t s_roundingHackCharacterTable[256];
 static bool isRoundingHackCharacter(UChar32 c)
 {
@@ -311,7 +309,11 @@
 return true;
 if (textRenderingMode == OptimizeSpeed)
 return false;
-return s_defaultKerning;
+#if PLATFORM(COCOA)
+return true;
+#else
+return false;
+#endif
 }
 
 bool computeEnableKerning() const
@@ -333,9 +335,6 @@
 return advancedTextRenderingMode();
 }
 
-static bool s_defaultKerning;
-static bool s_defaultLigatures;
-
 FontDescription m_fontDescription;
 mutable RefPtr m_fonts;
 WeakPtrFactory m_weakPtrFactory;


Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (193671 => 193672)

[webkit-changes] [193678] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193678] branches/safari-601-branch/Source/WebCore








Revision 193678
Author matthew_han...@apple.com
Date 2015-12-07 17:53:21 -0800 (Mon, 07 Dec 2015)


Log Message
Follow-up merge of r191014. rdar://problem/23769801

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193677 => 193678)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 01:42:46 UTC (rev 193677)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-08 01:53:21 UTC (rev 193678)
@@ -1,3 +1,13 @@
+2015-12-07  Matthew Hanson  
+
+Follow-up merge of r191014. rdar://problem/23769801
+
+Complete the merge of r191014. The missing change was iOS only, but if that ever
+changes we don't want to expose a known compile error.
+
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::FontCascade):
+
 2015-10-18  Myles C. Maxfield  
 
 Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193677 => 193678)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 01:42:46 UTC (rev 193677)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 01:53:21 UTC (rev 193678)
@@ -141,7 +141,8 @@
 : m_weakPtrFactory(this)
 , m_letterSpacing(0)
 , m_wordSpacing(0)
-, m_typesettingFeatures(computeTypesettingFeatures())
+, m_enableKerning(computeEnableKerning())
+, m_requiresShaping(computeRequiresShaping())
 {
 CTFontRef primaryFont = fontData.font();
 m_fontDescription.setSpecifiedSize(CTFontGetSize(primaryFont));






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193691] branches/safari-601.1.46-branch/Source/WebCore

[matthew_hanson]

Title: [193691] branches/safari-601.1.46-branch/Source/WebCore








Revision 193691
Author matthew_han...@apple.com
Date 2015-12-07 21:37:57 -0800 (Mon, 07 Dec 2015)


Log Message
Build fix.

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193690 => 193691)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:05:32 UTC (rev 193690)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:37:57 UTC (rev 193691)
@@ -1,3 +1,11 @@
+2015-12-07  Matthew Hanson  
+
+Build fix.
+
+* platform/graphics/ios/FontCacheIOS.mm:
+(WebCore::FontCache::createFontPlatformData):
+Pass two nullptrs to match function signature.
+
 2015-12-07  David Kilzer  
 
 Merge r193635. rdar://problem/23785592


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (193690 => 193691)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm	2015-12-08 05:05:32 UTC (rev 193690)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm	2015-12-08 05:37:57 UTC (rev 193691)
@@ -86,7 +86,7 @@
 if (!substituteFont)
 return nullptr;
 
-substituteFont = applyFontFeatureSettings(substituteFont.get(), description.featureSettings(), description.variantSettings());
+substituteFont = applyFontFeatureSettings(substituteFont.get(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
 
 CTFontSymbolicTraits originalTraits = CTFontGetSymbolicTraits(ctFont);
 CTFontSymbolicTraits actualTraits = 0;
@@ -719,7 +719,7 @@
 if (!ctFont)
 return nullptr;
 
-ctFont = applyFontFeatureSettings(ctFont.get(), fontDescription.featureSettings(), fontDescription.variantSettings());
+ctFont = applyFontFeatureSettings(ctFont.get(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings());
 
 CTFontSymbolicTraits actualTraits = 0;
 if (isFontWeightBold(fontDescription.weight()) || fontDescription.italic())






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193696] branches/safari-601.1.46-branch/Source/WebCore

[matthew_hanson]

Title: [193696] branches/safari-601.1.46-branch/Source/WebCore








Revision 193696
Author matthew_han...@apple.com
Date 2015-12-07 21:40:52 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r192367. rdar://problem/23769708

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.h




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193695 => 193696)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:49 UTC (rev 193695)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:52 UTC (rev 193696)
@@ -1,3 +1,12 @@
+2015-11-12  Csaba Osztrogonác  
+
+Fix build failure due to missing forward declaration of FontVariantSettings after r191968
+https://bugs.webkit.org/show_bug.cgi?id=151185
+
+Reviewed by Myles C. Maxfield.
+
+* css/CSSFontFaceSource.h:
+
 2015-11-03  Myles C. Maxfield  
 
 font-variant-* properties in @font-face declarations should be honored


Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.h (193695 => 193696)

--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.h	2015-12-08 05:40:49 UTC (rev 193695)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.h	2015-12-08 05:40:52 UTC (rev 193696)
@@ -45,6 +45,7 @@
 class Font;
 class FontDescription;
 class FontFeatureSettings;
+struct FontVariantSettings;
 
 class CSSFontFaceSource final : public CachedFontClient {
 WTF_MAKE_FAST_ALLOCATED;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193697] branches/safari-601.1.46-branch

[matthew_hanson]

Title: [193697] branches/safari-601.1.46-branch








Revision 193697
Author matthew_han...@apple.com
Date 2015-12-07 21:40:54 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r190876. rdar://problem/23769722

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193696 => 193697)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:52 UTC (rev 193696)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:54 UTC (rev 193697)
@@ -1,3 +1,13 @@
+2015-10-12  Myles C. Maxfield  
+
+Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+https://bugs.webkit.org/show_bug.cgi?id=149778
+
+Reviewed by Simon Fraser.
+
+* platform/mac-wk1/TestExpectations:
+* platform/mac/TestExpectations:
+
 2015-11-03  Ryan Haddad  
 
 Skipping tests added with r191968 on win.


Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html (193696 => 193697)

--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html	2015-12-08 05:40:52 UTC (rev 193696)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html	2015-12-08 05:40:54 UTC (rev 193697)
@@ -16,6 +16,8 @@
 This tests that font features are able to be turned on and off as desired. It uses a special font
 designed specifically for this purpose. The test passes if you see a sequence of alternating check
 marks and X below.
+AB
+AB
 
 
 


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193696 => 193697)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:52 UTC (rev 193696)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:54 UTC (rev 193697)
@@ -1,3 +1,16 @@
+2015-10-12  Myles C. Maxfield  
+
+Test font-variant-* and font-feature-settings on Yosemite and Mavericks
+https://bugs.webkit.org/show_bug.cgi?id=149778
+
+Reviewed by Simon Fraser.
+
+We can simply call the function which enables features on Yosemite and Mavericks.
+
+* platform/graphics/cocoa/FontCacheCoreText.cpp:
+(WebCore::platformFontLookupWithFamily):
+(WebCore::fontWithFamily):
+
 2015-11-12  Csaba Osztrogonác  
 
 Fix build failure due to missing forward declaration of FontVariantSettings after r191968


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193696 => 193697)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-08 05:40:52 UTC (rev 193696)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-08 05:40:54 UTC (rev 193697)
@@ -380,6 +380,8 @@
 return nil;
 
 font = [NSFont fontWithName:chosenFullName size:size];
+auto foundFont = applyFontFeatureSettings((CTFontRef)font, nullptr, nullptr, featureSettings, variantSettings);
+font = CFBridgingRelease(CFRetain(foundFont.get()));
 
 #endif
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193693] branches/safari-601.1.46-branch

[matthew_hanson]

Title: [193693] branches/safari-601.1.46-branch








Revision 193693
Author matthew_han...@apple.com
Date 2015-12-07 21:40:37 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191331. rdar://problem/23769700

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp
branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h


Added Paths

branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html
branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193692 => 193693)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:37 UTC (rev 193693)
@@ -1,3 +1,13 @@
+2015-10-19  Myles C. Maxfield  
+
+FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+https://bugs.webkit.org/show_bug.cgi?id=149775
+
+Reviewed by Darin Adler.
+
+* fast/text/multiple-feature-properties-expected.html: Added.
+* fast/text/multiple-feature-properties.html: Added.
+
 2015-12-06  Matthew Hanson  
 
 Merge r190999. rdar://problem/23770070


Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html (0 => 193693)

--- branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties-expected.html	2015-12-08 05:40:37 UTC (rev 193693)
@@ -0,0 +1,20 @@
+
+
+
+
+
+This test makes sure that feature resolution order is honored. For more information, click 
+B
+B
+A
+B
+A
+B
+A
+B
+B
+A
+
+
+


Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html (0 => 193693)

--- branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/multiple-feature-properties.html	2015-12-08 05:40:37 UTC (rev 193693)
@@ -0,0 +1,20 @@
+
+
+
+
+
+This test makes sure that feature resolution order is honored. For more information, click 
+C
+C
+C
+C
+C
+C
+C
+C
+C
+C
+
+
+


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193692 => 193693)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:29 UTC (rev 193692)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:37 UTC (rev 193693)
@@ -1,3 +1,65 @@
+2015-10-19  Myles C. Maxfield  
+
+FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
+https://bugs.webkit.org/show_bug.cgi?id=149775
+
+Reviewed by Darin Adler.
+
+This patch has two pieces:
+
+We used to have a boolean, enableLigatures, which affected how we perform shaping in both our
+simple and complex text codepaths. However, in this brave new world of font-feature-settings
+and font-variant-*, there are many properties which may affect shaping (and multiple kinds
+of ligatures). This patch renames this boolean to requiresShaping, and teaches it about all
+the various properties which affect text shaping.
+
+Similarly, one of the places which used this enableLigatures boolean was to tell CoreText
+if it should disable ligatures. However, we now have much finer-grained control over
+ligatures during font creation. This patch moves the responsibility of dictating which
+font features should be enabled entirely to the Font. Therefore, getCFStringAttributes()
+doesn't know anything about ligatures anymore; the logic inside font creation is used
+instead.
+
+An added benefit of moving all the font 

[webkit-changes] [193694] branches/safari-601.1.46-branch

[matthew_hanson]

Title: [193694] branches/safari-601.1.46-branch








Revision 193694
Author matthew_han...@apple.com
Date 2015-12-07 21:40:47 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191968. rdar://problem/23769708

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFace.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFace.h
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontFaceSource.h
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontSelector.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/StyleBuilderCustom.h
branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedFont.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedFont.h
branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp
branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedSVGFont.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCache.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextFlags.h
branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeIOS.mm


Added Paths

branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html
branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html
branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-font-face-all-expected.html
branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-font-face-all.html
branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-font-face-override-expected.html
branches/safari-601.1.46-branch/LayoutTests/css3/font-variant-font-face-override.html
branches/safari-601.1.46-branch/Source/WebCore/css/FontVariantBuilder.h




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193693 => 193694)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:37 UTC (rev 193693)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:47 UTC (rev 193694)
@@ -1,3 +1,17 @@
+2015-11-03  Myles C. Maxfield  
+
+font-variant-* properties in @font-face declarations should be honored
+https://bugs.webkit.org/show_bug.cgi?id=149771
+
+Reviewed by Simon Fraser.
+
+* css3/font-variant-font-face-override-expected.html: Added
+* css3/font-variant-font-face-override.html: Added
+* css3/font-feature-settings-font-face-rendering-expected.html: Added.
+* css3/font-feature-settings-font-face-rendering.html: Added.
+* css3/font-variant-font-face-all-expected.html: Added.
+* css3/font-variant-font-face-all.html: Added.
+
 2015-10-19  Myles C. Maxfield  
 
 FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings


Added: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html (0 => 193694)

--- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering-expected.html	2015-12-08 05:40:47 UTC (rev 193694)
@@ -0,0 +1,85 @@
+
+
+
+
+@font-face {
+font-family: "FontFeaturesTestOTF";
+src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+@font-face {
+font-family: "FontFeaturesTestTTF";
+src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
+
+
+
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+BBAA
+
+
+


Added: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-font-face-rendering.html (0 => 193694)

--- 

[webkit-changes] [193692] branches/safari-601.1.46-branch/Source

[matthew_hanson]

Title: [193692] branches/safari-601.1.46-branch/Source








Revision 193692
Author matthew_han...@apple.com
Date 2015-12-07 21:40:29 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191014. rdar://problem/23769740

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601.1.46-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontDescription.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextFlags.h
branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp
branches/safari-601.1.46-branch/Source/WebCore/rendering/line/BreakingContext.h
branches/safari-601.1.46-branch/Source/WebCore/svg/SVGFontData.h
branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h
branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm


Removed Paths

branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/TypesettingFeatures.h




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193691 => 193692)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:37:57 UTC (rev 193691)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:29 UTC (rev 193692)
@@ -1,3 +1,91 @@
+2015-10-13  Myles C. Maxfield  
+
+Split TypesettingFeatures into kerning and ligatures bools
+https://bugs.webkit.org/show_bug.cgi?id=150074
+
+Reviewed by Simon Fraser.
+
+Our TypesettingFeatures type represents whether kerning or ligatures are enabled
+when laying out text. However, now that I have implemented font-feature-settings
+and font-variant-*, this type is wildly inadequate. There are now multiple kinds
+of ligatures, and many other features which are neither kerning nor ligatures.
+Adding tons of information to this type doesn't make sense because 1) We already
+have a FontVariantSettings struct which contains this information, and 2) None
+of the users of TypesettingFeatures care about most of these new features.
+
+In this new world of font features, the font-kerning property isn't changing.
+Therefore, all the code which relies only on the Kerning value in
+TypesettingFeatures doesn't need to change. The places which rely on Ligatures,
+however, need to be updated to understand that there are many different kinds
+of ligatures.
+
+Indeed, after inspection, all of the places which inspect ligatures are more
+interested in a high-level concept of whether or not we can trust some simple
+computation. Therefore, we really have two things we care about: Kerning, and
+this high-level concept.
+
+This patch is the second step to update our view of the world to include
+font-feature-settings and font-variant-*. In particular, this patch simply
+splits TypesettingFeatures into two Booleans, one for Kerning, and one for
+Ligatures (which has no behavior change). Then, once they are separated, I can
+migrate the Ligatures Boolean to take on its new meaning.
+
+This change is purely mechanical.
+
+No new tests because there is no behavior change.
+
+* WebCore.xcodeproj/project.pbxproj:
+* css/CSSPrimitiveValueMappings.h:
+(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+(WebCore::CSSPrimitiveValue::operator FontCascadeDescription::Kerning):
+* platform/graphics/Font.cpp:
+

[webkit-changes] [193699] branches/safari-601.1.46-branch/Source

[matthew_hanson]

Title: [193699] branches/safari-601.1.46-branch/Source








Revision 193699
Author matthew_han...@apple.com
Date 2015-12-07 21:41:02 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191260. rdar://problem/23769749

Modified Paths

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h
branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebProcessCreationParameters.h
branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193698 => 193699)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:57 UTC (rev 193698)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:41:02 UTC (rev 193699)
@@ -1,3 +1,32 @@
+2015-10-18  Myles C. Maxfield  
+
+Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"
+https://bugs.webkit.org/show_bug.cgi?id=150287
+
+Reviewed by Simon Fraser.
+
+This user default is currently on by default. Therefore, by setting the user default,
+users can only disable kerning / ligatures (rather than enable it).
+
+There are a few reasons why we should stop honoring it:
+
+1. In the brave new world of font-feature-settings and font-variant-ligatures, there
+are many different kinds of ligatures which may be enabled at will. The simplistic
+statement of "turn on ligatures" no longer has any meaning.
+
+2. If a user wants to disable kerning / ligatures, he/she can do it with a user
+stylesheet.
+
+3. The default isn't able to be tested with DumpRenderTree or WebKitTestRunner.
+
+4. I have never heard of anyone actually using this user default.
+
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::setDefaultKerning): Deleted.
+(WebCore::FontCascade::setDefaultLigatures): Deleted.
+* platform/graphics/FontCascade.h:
+(WebCore::FontCascade::advancedTextRenderingMode):
+
 2015-10-17  Myles C. Maxfield  
 
 Delete FontPlatformData::allowsLigatures()


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193698 => 193699)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 05:40:57 UTC (rev 193698)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-08 05:41:02 UTC (rev 193699)
@@ -91,9 +91,6 @@
 
 FontCascade::CodePath FontCascade::s_codePath = Auto;
 
-bool FontCascade::s_defaultKerning = false;
-bool FontCascade::s_defaultLigatures = false;
-
 // 
 // FontCascade Implementation (Cross-Platform Portion)
 // 
@@ -603,16 +600,6 @@
 return s_codePath;
 }
 
-void FontCascade::setDefaultKerning(bool enable)
-{
-s_defaultKerning = enable;
-}
-
-void FontCascade::setDefaultLigatures(bool enable)
-{
-s_defaultLigatures = enable;
-}
-
 FontCascade::CodePath FontCascade::codePath(const TextRun& run) const
 {
 if (s_codePath != Auto)


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h (193698 => 193699)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h	2015-12-08 05:40:57 UTC (rev 193698)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.h	2015-12-08 05:41:02 UTC (rev 193699)
@@ -270,8 +270,6 @@
 static CodePath codePath();
 static CodePath s_codePath;
 
-WEBCORE_EXPORT static void setDefaultKerning(bool);
-WEBCORE_EXPORT static void setDefaultLigatures(bool);
 static const uint8_t s_roundingHackCharacterTable[256];
 static bool isRoundingHackCharacter(UChar32 c)
 {
@@ -311,7 +309,11 @@
 return true;
 if (textRenderingMode == OptimizeSpeed)
 return false;
-return s_defaultKerning;
+#if PLATFORM(COCOA)
+return true;
+#else
+return false;
+#endif
 }
 
 bool computeEnableKerning() const
@@ -333,9 +335,6 @@
 return advancedTextRenderingMode();
 }
 
-static bool s_defaultKerning;
-static bool s_defaultLigatures;
-
 FontDescription m_fontDescription;
 mutable RefPtr m_fonts;
 WeakPtrFactory 

[webkit-changes] [193695] branches/safari-601.1.46-branch/LayoutTests

[matthew_hanson]

Title: [193695] branches/safari-601.1.46-branch/LayoutTests








Revision 193695
Author matthew_han...@apple.com
Date 2015-12-07 21:40:49 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191986. rdar://problem/23769708

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193694 => 193695)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:47 UTC (rev 193694)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:49 UTC (rev 193695)
@@ -1,3 +1,12 @@
+2015-11-03  Ryan Haddad  
+
+Skipping tests added with r191968 on win.
+https://bugs.webkit.org/show_bug.cgi?id=149771
+
+Unreviewed test gardening.
+
+* platform/win/TestExpectations:
+
 2015-11-03  Myles C. Maxfield  
 
 font-variant-* properties in @font-face declarations should be honored


Modified: branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations (193694 => 193695)

--- branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations	2015-12-08 05:40:47 UTC (rev 193694)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/win/TestExpectations	2015-12-08 05:40:49 UTC (rev 193695)
@@ -459,6 +459,10 @@
 # Font feature settings is not implemented.
 css3/font-feature-settings-rendering.html [ Skip ]
 
+webkit.org/b/149771 css3/font-feature-settings-font-face-rendering.html [ Skip ] # WontFix
+webkit.org/b/149771 css3/font-variant-font-face-all.html [ Skip ] # WontFix
+webkit.org/b/149771 css3/font-variant-font-face-override.html [ Skip ] # WontFix
+
 # TODO HiDPI tests require test infrastructure enhancements (e.g. testRunner.setBackingScaleFactor)
 # https://bugs.webkit.org/show_bug.cgi?id=87919
 webkit.org/b/87919 compositing/tiled-layers-hidpi.html






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193701] branches/safari-601.1.46-branch

[matthew_hanson]

Title: [193701] branches/safari-601.1.46-branch








Revision 193701
Author matthew_han...@apple.com
Date 2015-12-07 21:41:09 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r192732. rdar://problem/23769731

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/css/CSSFontSelector.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontDescription.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/win/FontCacheWin.cpp
branches/safari-601.1.46-branch/Source/WebCore/platform/text/TextFlags.h


Added Paths

branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html
branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant.html




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193700 => 193701)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:41:05 UTC (rev 193700)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:41:09 UTC (rev 193701)
@@ -1,3 +1,13 @@
+2015-11-22  Myles C. Maxfield  
+
+Font selection should not consult font-variant property
+https://bugs.webkit.org/show_bug.cgi?id=151537
+
+Reviewed by Simon Fraser.
+
+* fast/text/font-selection-font-variant-expected.html: Added.
+* fast/text/font-selection-font-variant.html: Added.
+
 2015-10-17  Myles C. Maxfield  
 
 Delete FontPlatformData::allowsLigatures()


Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html (0 => 193701)

--- branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant-expected.html	2015-12-08 05:41:09 UTC (rev 193701)
@@ -0,0 +1,36 @@
+
+
+
+
+@font-face {
+font-family: "Test1";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test2";
+src: url("../../resources/Ahem.ttf") format("truetype");
+}
+.test {
+display: inline-block;
+font-size: 40px;
+}
+
+
+
+This test makes sure that font-variant is not consulted when performing font selection.
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+
+
\ No newline at end of file


Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant.html (0 => 193701)

--- branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant.html	(rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/font-selection-font-variant.html	2015-12-08 05:41:09 UTC (rev 193701)
@@ -0,0 +1,55 @@
+
+
+
+
+@font-face {
+font-family: "Test1";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test1";
+src: url("../../resources/Ahem.ttf") format("truetype");
+font-variant: small-caps;
+}
+@font-face {
+font-family: "Test2";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+font-variant: small-caps;
+}
+@font-face {
+font-family: "Test2";
+src: url("../../resources/Ahem.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test3";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+}
+@font-face {
+font-family: "Test3SmallCaps";
+src: url("../writing-mode/resources/MakibaFont13.ttf") format("truetype");
+font-variant: small-caps;
+}
+.test {
+display: inline-block;
+font-size: 40px;
+}
+
+
+
+This test makes sure that font-variant is not consulted when performing font selection.
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+Hello
+
+
\ No newline at end of file


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193700 => 193701)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:41:05 UTC (rev 193700)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:41:09 UTC (rev 193701)
@@ -1,3 +1,43 @@
+2015-11-22  Myles C. Maxfield  
+
+Font selection should not consult font-variant property
+https://bugs.webkit.org/show_bug.cgi?id=151537
+
+Reviewed by Simon Fraser.
+
+In section 4.7 of the CSS Fonts Level 3 spec, it says "[The font-variant and
+font-feature-settings] do not affect font selection."
+
+

[webkit-changes] [193700] branches/safari-601.1.46-branch/Source/WebKit/mac

[matthew_hanson]

Title: [193700] branches/safari-601.1.46-branch/Source/WebKit/mac








Revision 193700
Author matthew_han...@apple.com
Date 2015-12-07 21:41:05 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191261. rdar://problem/23769749

Modified Paths

branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog (193699 => 193700)

--- branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog	2015-12-08 05:41:02 UTC (rev 193699)
+++ branches/safari-601.1.46-branch/Source/WebKit/mac/ChangeLog	2015-12-08 05:41:05 UTC (rev 193700)
@@ -1,3 +1,12 @@
+2015-10-17  Myles C. Maxfield  
+
+Build fix after r191260
+
+Unreviewed.
+
+* WebView/WebView.mm:
+(+[WebView initialize]):
+
 2015-10-18  Myles C. Maxfield  
 
 Stop honoring the user default "WebKitKerningAndLigaturesEnabledByDefault"


Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm (193699 => 193700)

--- branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm	2015-12-08 05:41:02 UTC (rev 193699)
+++ branches/safari-601.1.46-branch/Source/WebKit/mac/WebView/WebView.mm	2015-12-08 05:41:05 UTC (rev 193700)
@@ -4686,18 +4686,15 @@
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_cacheModelChangedNotification:) name:WebPreferencesCacheModelChangedInternalNotification object:nil];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];
 
-NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-
 #if PLATFORM(IOS)
 continuousSpellCheckingEnabled = NO;
-#endif
 
-#if !PLATFORM(IOS)
+#else
+
+NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 continuousSpellCheckingEnabled = [defaults boolForKey:WebContinuousSpellCheckingEnabled];
 grammarCheckingEnabled = [defaults boolForKey:WebGrammarCheckingEnabled];
-#endif
 
-#if !PLATFORM(IOS)
 automaticQuoteSubstitutionEnabled = [self _shouldAutomaticQuoteSubstitutionBeEnabled];
 automaticLinkDetectionEnabled = [defaults boolForKey:WebAutomaticLinkDetectionEnabled];
 automaticDashSubstitutionEnabled = [self _shouldAutomaticDashSubstitutionBeEnabled];






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193698] branches/safari-601.1.46-branch

[matthew_hanson]

Title: [193698] branches/safari-601.1.46-branch








Revision 193698
Author matthew_han...@apple.com
Date 2015-12-07 21:40:57 -0800 (Mon, 07 Dec 2015)


Log Message
Merge r191251. rdar://problem/23769757

Modified Paths

branches/safari-601.1.46-branch/LayoutTests/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontPlatformData.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm




Diff

Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193697 => 193698)

--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:54 UTC (rev 193697)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog	2015-12-08 05:40:57 UTC (rev 193698)
@@ -1,3 +1,15 @@
+2015-10-17  Myles C. Maxfield  
+
+Delete FontPlatformData::allowsLigatures()
+https://bugs.webkit.org/show_bug.cgi?id=150286
+
+Reviewed by Dan Bernstein.
+
+Make sure it's impossible to turn off required ligatures with CSS.
+
+* fast/text/required-ligatures-expected.html: Added.
+* fast/text/required-ligatures.html: Added.
+
 2015-10-12  Myles C. Maxfield  
 
 Test font-variant-* and font-feature-settings on Yosemite and Mavericks


Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193697 => 193698)

--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:54 UTC (rev 193697)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-12-08 05:40:57 UTC (rev 193698)
@@ -1,3 +1,25 @@
+2015-10-17  Myles C. Maxfield  
+
+Delete FontPlatformData::allowsLigatures()
+https://bugs.webkit.org/show_bug.cgi?id=150286
+
+Reviewed by Dan Bernstein.
+
+This function is only used to force ligatures on for complex fonts (where "complex"
+means "does not support the letter 'a'"). However, ligatures are turned on for all
+fonts by default, which means that this function is unnecessary.
+
+Required ligatures, such as those which make these complex scripts legible, are always
+enabled, no matter what.
+
+Test: fast/text/required-ligatures.html
+
+* platform/graphics/FontPlatformData.h:
+* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+(WebCore::FontPlatformData::allowsLigatures): Deleted.
+* platform/graphics/mac/SimpleFontDataCoreText.cpp:
+(WebCore::Font::getCFStringAttributes):
+
 2015-10-12  Myles C. Maxfield  
 
 Test font-variant-* and font-feature-settings on Yosemite and Mavericks


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontPlatformData.h (193697 => 193698)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontPlatformData.h	2015-12-08 05:40:54 UTC (rev 193697)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontPlatformData.h	2015-12-08 05:40:57 UTC (rev 193698)
@@ -114,8 +114,6 @@
 static RetainPtr objectForEqualityCheck(CTFontRef);
 RetainPtr objectForEqualityCheck() const;
 
-bool allowsLigatures() const;
-
 #if USE(APPKIT)
 // FIXME: Remove this when all NSFont usage is removed.
 NSFont *nsFont() const { return reinterpret_cast(const_cast<__CTFont*>(m_font.get())); }


Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (193697 => 193698)

--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm	2015-12-08 05:40:54 UTC (rev 193697)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm	2015-12-08 05:40:57 UTC (rev 193698)
@@ -109,15 +109,6 @@
 m_ctFont = nullptr;
 }
 
-bool FontPlatformData::allowsLigatures() const
-{
-if (!m_font)
-return false;
-
-RetainPtr characterSet = adoptCF(CTFontCopyCharacterSet(ctFont()));
-return !(characterSet.get() && CFCharacterSetIsCharacterMember(characterSet.get(), 'a'));
-}
-
 inline int mapFontWidthVariantToCTFeatureSelector(FontWidthVariant variant)
 {
 switch(variant) {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193576] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193576] branches/safari-601-branch/Source/WebCore








Revision 193576
Author matthew_han...@apple.com
Date 2015-12-06 02:37:05 -0800 (Sun, 06 Dec 2015)


Log Message
Merge r190402. rdar://problem/23769741

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193575 => 193576)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:02 UTC (rev 193575)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:05 UTC (rev 193576)
@@ -1,3 +1,17 @@
+2015-12-06  Matthew Hanson  
+
+Merge r190402. rdar://problem/23769741
+
+2015-10-01  Csaba Osztrogonác  
+
+Fix the ARM build after r190192
+https://bugs.webkit.org/show_bug.cgi?id=149620
+
+Reviewed by Darin Adler.
+
+* platform/graphics/FontFeatureSettings.h:
+(WebCore::fontFeatureTag):
+
 2015-09-23  Myles C. Maxfield  
 
 [Cocoa] [Font Features] Implement font-variant-*


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h (193575 => 193576)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h	2015-12-06 10:37:02 UTC (rev 193575)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h	2015-12-06 10:37:05 UTC (rev 193576)
@@ -45,11 +45,13 @@
 static const bool safeToCompareToEmptyOrDeleted = true;
 };
 
+#define _0xFF static_cast(0xFF)
 struct FontFeatureTagHashTraits : WTF::GenericHashTraits {
 static const bool emptyValueIsZero = true;
-static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ -1, -1, -1, -1 }}); }
-static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ -1, -1, -1, -1 }}); }
+static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
+static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
 };
+#undef _0xFF
 
 class FontFeature {
 public:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193582] branches/safari-601-branch/Tools

[matthew_hanson]

Title: [193582] branches/safari-601-branch/Tools








Revision 193582
Author matthew_han...@apple.com
Date 2015-12-06 10:40:06 -0800 (Sun, 06 Dec 2015)


Log Message
Build fixes

Added Paths

branches/safari-601-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf
branches/safari-601-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.ttf
branches/safari-601-branch/Tools/WebKitTestRunner/FontWithFeatures.otf
branches/safari-601-branch/Tools/WebKitTestRunner/FontWithFeatures.ttf




Diff

Added: branches/safari-601-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf (0 => 193582)

--- branches/safari-601-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf	(rev 0)
+++ branches/safari-601-branch/Tools/DumpRenderTree/fonts/FontWithFeatures.otf	2015-12-06 18:40:06 UTC (rev 193582)
@@ -0,0 +1,25 @@
+OTTO
+\x80 CFF Vy\xD6\xEB\xAC"OGSUB仅."\xFC\xBAOS/2H\xE0Yb'\xB8dcmap\xD5\xAF(jheadeD\xF9(\x886hheag7(\xC0$hmtx\xD4\x86(\xE4\xD4maxpk)\xB8 name\xD9u/\xEA)\xD8|post8T 


FontWithFeaturesOTF

9
\x87
\x87\x85\xEE

FontWithFeaturesOTF
	
++ !"#$%&'()*+,-./012345
I\xA7
G
\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7	g
+
+\xA7G\xE7\x87+'+\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7 \x87\xFF\xFF\xFF\xFF\xC8\xFF\xC8\xFF\xFFX\xFFX\xFF\xFF\xFF\xFD\xA8\xFF\xFD\xA8\xFF\xFF\xFF\xFF\xFF\xC8\xFF
\xF4\xFF2\xFF2\xFF\xFA\xFF\xFF\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFE>\xFF\xFE>\xFF\xFE\xD4\xFF
,\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\x
 FF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xF
 F\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE
 \xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFEp\xFF\xFF\xCE\xFF2\xFF
\x90\xFF
\x90\xFF\xFEp\xFF
\x90\xFF2\xFF2\xFF
\x90\xFF\xFEp\xFF\xFF\xFF\xFF
\xF4\xFF&\xFF
\x90\xFF
\x90\xFF2\xFF\xFF\xCE\xFF\xFEp\xFF\xFEp\xFF
\x90\xFF\xFEp\xFF\xFF\xCE\xFF\xFF\xCE\xFF\xFEp
 

[webkit-changes] [193579] branches/safari-601-branch

[matthew_hanson]

Title: [193579] branches/safari-601-branch








Revision 193579
Author matthew_han...@apple.com
Date 2015-12-06 02:37:21 -0800 (Sun, 06 Dec 2015)


Log Message
Merge r190999. rdar://problem/23769821

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html
branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193578 => 193579)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,5 +1,21 @@
 2015-12-06  Matthew Hanson  
 
+Merge r190999. rdar://problem/23769821
+
+2015-10-13  Myles C. Maxfield  
+
+Unprefix font-kerning
+https://bugs.webkit.org/show_bug.cgi?id=150080
+
+Reviewed by Sam Weinig.
+
+This is the last property in CSS3 Fonts which is prefixed.
+
+* fast/text/font-kerning-expected.html:
+* fast/text/font-kerning.html:
+
+2015-12-06  Matthew Hanson  
+
 Merge r190848. rdar://problem/23769770
 
 2015-10-11  Myles C. Maxfield  


Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html (193578 => 193579)

--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html	2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning-expected.html	2015-12-06 10:37:21 UTC (rev 193579)
@@ -9,4 +9,12 @@
 AVAVAVAV
 AVAVAVAV
 AVAVAVAV
+
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+
 


Modified: branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html (193578 => 193579)

--- branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html	2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-kerning.html	2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,7 +1,10 @@
 
-.kerning-none { -webkit-font-kerning: none; }
-.kerning-auto { -webkit-font-kerning: auto; }
-.kerning-normal { -webkit-font-kerning: normal; }
+.kerning-none { font-kerning: none; }
+.kerning-auto { font-kerning: auto; }
+.kerning-normal { font-kerning: normal; }
+.webkit-kerning-none { -webkit-font-kerning: none; }
+.webkit-kerning-auto { -webkit-font-kerning: auto; }
+.webkit-kerning-normal { -webkit-font-kerning: normal; }
 
 
 
@@ -14,4 +17,16 @@
 AVAVAVAV
 AVAVAVAV
 
+
+
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+
+
+AVAVAVAV
+AVAVAVAV
+AVAVAVAV
+
+
 


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193578 => 193579)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:21 UTC (rev 193579)
@@ -1,5 +1,22 @@
 2015-12-06  Matthew Hanson  
 
+Merge r190999. rdar://problem/23769821
+
+2015-10-13  Myles C. Maxfield  
+
+Unprefix font-kerning
+https://bugs.webkit.org/show_bug.cgi?id=150080
+
+Reviewed by Sam Weinig.
+
+This is the last property in CSS3 Fonts which is prefixed.
+
+Test: fast/text/font-kerning.html
+
+* css/CSSPropertyNames.in:
+
+2015-12-06  Matthew Hanson  
+
 Merge r190402. rdar://problem/23769741
 
 2015-10-01  Csaba Osztrogonác  


Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193578 => 193579)

--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in	2015-12-06 10:37:16 UTC (rev 193578)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in	2015-12-06 10:37:21 UTC (rev 193579)
@@ -107,6 +107,7 @@
 text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
 font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
 -webkit-font-kerning [Inherited, FontProperty, NameForMethods=Kerning]
+font-kerning = -webkit-font-kerning
 -webkit-font-smoothing [Inherited, FontProperty]
 font-variant-ligatures [Inherited, FontProperty, NameForMethods=VariantLigatures, Custom=All]
 font-variant-position [Inherited, FontProperty, NameForMethods=VariantPosition]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [193580] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193580] branches/safari-601-branch/Source/WebCore








Revision 193580
Author matthew_han...@apple.com
Date 2015-12-06 02:37:24 -0800 (Sun, 06 Dec 2015)


Log Message
Merge r190895. rdar://problem/23769817

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193579 => 193580)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-06 10:37:24 UTC (rev 193580)
@@ -1,5 +1,25 @@
 2015-12-06  Matthew Hanson  
 
+Merge r190895. rdar://problem/23769817
+
+2015-10-12  Myles C. Maxfield  
+
+[Font Features] Tiny cleanup regarding FontCascade::typesettingFeatures()
+https://bugs.webkit.org/show_bug.cgi?id=150051
+
+Reviewed by Simon Fraser.
+
+There are no typesetting features which aren't kerning nor ligatures.
+
+No new tests because there is no behavior difference.
+
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::codePath):
+* platform/graphics/WidthIterator.h:
+(WebCore::WidthIterator::supportsTypesettingFeatures): Deleted.
+
+2015-12-06  Matthew Hanson  
+
 Merge r190999. rdar://problem/23769821
 
 2015-10-13  Myles C. Maxfield  


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193579 => 193580)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp	2015-12-06 10:37:24 UTC (rev 193580)
@@ -619,9 +619,11 @@
 // FIXME: This shouldn't be necessary because Font::applyTransforms() should perform all necessary shaping.
 if (m_fontDescription.featureSettings().size() > 0 || !m_fontDescription.variantSettings().isAllNormal())
 return Complex;
-
-if (run.length() > 1 && !WidthIterator::supportsTypesettingFeatures(*this))
+
+#if !PLATFORM(COCOA)
+if (run.length() > 1 && typesettingFeatures())
 return Complex;
+#endif
 
 if (!run.characterScanForCodePath())
 return Simple;


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h (193579 => 193580)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h	2015-12-06 10:37:21 UTC (rev 193579)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/WidthIterator.h	2015-12-06 10:37:24 UTC (rev 193580)
@@ -58,15 +58,6 @@
 Vector& arabicForms() { return m_arabicForms; }
 #endif
 
-static bool supportsTypesettingFeatures(const FontCascade& font)
-{
-#if PLATFORM(COCOA)
-return !(font.typesettingFeatures() & ~(Kerning | Ligatures));
-#else
-return !font.typesettingFeatures();
-#endif
-}
-
 const FontCascade* m_font;
 
 const TextRun& m_run;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193581] branches/safari-601-branch/Tools

[matthew_hanson]

Title: [193581] branches/safari-601-branch/Tools








Revision 193581
Author matthew_han...@apple.com
Date 2015-12-06 02:37:26 -0800 (Sun, 06 Dec 2015)


Log Message
Merge r191032. rdar://problem/23769770

Modified Paths

branches/safari-601-branch/Tools/ChangeLog
branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm




Diff

Modified: branches/safari-601-branch/Tools/ChangeLog (193580 => 193581)

--- branches/safari-601-branch/Tools/ChangeLog	2015-12-06 10:37:24 UTC (rev 193580)
+++ branches/safari-601-branch/Tools/ChangeLog	2015-12-06 10:37:26 UTC (rev 193581)
@@ -1,5 +1,21 @@
 2015-12-06  Matthew Hanson  
 
+Merge r191032. rdar://problem/23769770
+
+2015-10-13  Myles C. Maxfield  
+
+[iOS] Build fix
+
+Unreviewed.
+
+Mach-O section names are limited to 16 characters.
+
+* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+* DumpRenderTree/mac/DumpRenderTree.mm:
+(activateFontsIOS):
+
+2015-12-06  Matthew Hanson  
+
 Merge r190848. rdar://problem/23769770
 
 2015-10-11  Myles C. Maxfield  


Modified: branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193580 => 193581)

--- branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2015-12-06 10:37:24 UTC (rev 193580)
+++ branches/safari-601-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2015-12-06 10:37:26 UTC (rev 193581)
@@ -634,8 +634,8 @@
 fontData(WeightWatcher700);
 fontData(WeightWatcher800);
 fontData(WeightWatcher900);
-fontData(FontWithFeaturesTTF);
-fontData(FontWithFeaturesOTF);
+fontData(FWFTTF);
+fontData(FWFOTF);
 }
 #endif // !PLATFORM(IOS)
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193577] branches/safari-601-branch

[matthew_hanson]

Title: [193577] branches/safari-601-branch








Revision 193577
Author matthew_han...@apple.com
Date 2015-12-06 02:37:09 -0800 (Sun, 06 Dec 2015)


Log Message
Merge r190697. rdar://problem/23769789

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html
branches/safari-601-branch/Tools/ChangeLog
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures.xcodeproj/project.pbxproj


Added Paths

branches/safari-601-branch/LayoutTests/css3/resources/FontWithFeatures.ttf




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193576 => 193577)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 10:37:05 UTC (rev 193576)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 10:37:09 UTC (rev 193577)
@@ -1,3 +1,18 @@
+2015-12-06  Matthew Hanson  
+
+Merge r190697. rdar://problem/23769789
+
+2015-10-07  Myles C. Maxfield  
+
+Test font-variant-* and font-feature-settings with TrueType fonts
+https://bugs.webkit.org/show_bug.cgi?id=149776
+
+Reviewed by Simon Fraser.
+
+* css3/font-feature-settings-rendering-2-expected.html:
+* css3/font-feature-settings-rendering-2.html:
+* css3/resources/FontWithFeatures.ttf: Added.
+
 2015-09-23  Myles C. Maxfield  
 
 [Cocoa] [Font Features] Implement font-variant-*


Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html (193576 => 193577)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html	2015-12-06 10:37:05 UTC (rev 193576)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html	2015-12-06 10:37:09 UTC (rev 193577)
@@ -6,6 +6,10 @@
 font-family: "FontFeaturesTest";
 src: url("resources/FontWithFeatures.otf") format("opentype");
 }
+@font-face {
+font-family: "FontFeaturesTestTTF";
+src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
 
 
 
@@ -43,5 +47,39 @@
 BA
 BA
 
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+
 
 


Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html (193576 => 193577)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html	2015-12-06 10:37:05 UTC (rev 193576)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html	2015-12-06 10:37:09 UTC (rev 193577)
@@ -6,56 +6,97 @@
 font-family: "FontFeaturesTest";
 src: url("resources/FontWithFeatures.otf") format("opentype");
 }
+@font-face {
+font-family: "FontFeaturesTestTTF";
+src: url("resources/FontWithFeatures.ttf") format("truetype");
+}
 
 
 
 This tests that font features are able to be turned on and off as desired. It uses a special font
 designed specifically for this purpose. The test passes if you see a sequence of alternating check
 marks and X below.
-
+
+
 
-var insertionpoint = document.getElementById("insertionpoint");
-function addElement(feature, c) {
+var insertionPoint = document.getElementById("insertionPoint");
+var insertionPoint2 = document.getElementById("insertionPoint2");
+function addElement(placeToInsert, familyName, feature, c) {
 ["0", "1"].map(function(state) {
 var element = document.createElement("span");
 element.textContent = c;
-element.style.fontFamily = "FontFeaturesTest";
+element.style.fontFamily = familyName;
 element.style.fontFeatureSettings = '"' + feature + '" ' + state;
-insertionpoint.appendChild(element);
+placeToInsert.appendChild(element);
 });
-insertionpoint.appendChild(document.createTextNode(" "));
+placeToInsert.appendChild(document.createTextNode(" "));
 }
-addElement("liga", "C");
-addElement("clig", "D");
-addElement("dlig", "E");
-addElement("hlig", "F");
-addElement("calt", "G");
-addElement("subs", "H");
-addElement("sups", "I");
-addElement("smcp", "J");
-addElement("c2sc", "K");
-addElement("pcap", "L");
-addElement("c2pc", "M");
-addElement("unic", "N");
-addElement("titl", "O");
-addElement("lnum", "P");
-addElement("onum", "Q");
-addElement("pnum", 

[webkit-changes] [193570] branches/safari-601-branch

[matthew_hanson]

Title: [193570] branches/safari-601-branch








Revision 193570
Author matthew_han...@apple.com
Date 2015-12-05 23:27:50 -0800 (Sat, 05 Dec 2015)


Log Message
Roll out r193474. rdar://problem/23732400

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm


Removed Paths

branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt
branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193569 => 193570)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +1,9 @@
 2015-12-05  Matthew Hanson  
 
+Rollout r193474. rdar://problem/23732400
+
+2015-12-05  Matthew Hanson  
+
 Rollout r193478. rdar://problem/23732400
 
 2015-12-05  David Kilzer  


Deleted: branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt (193569 => 193570)

--- branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap-expected.txt	2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +0,0 @@
-
-Double tapping on the button should fire 2 click events.
-Click!
-Click!
-


Deleted: branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html (193569 => 193570)

--- branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/LayoutTests/fast/events/ios/unscalable-viewport-clicks-on-doubletap.html	2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,55 +0,0 @@
- 
-
-
-
-
-
-
-(function() {
-uiController.doubleTapAtPoint(50, 50, function() {});
-})();
-
-
-
-var clickCount = 0;
-if (window.testRunner) {
-testRunner.dumpAsText();
-testRunner.waitUntilDone();
-}
-
-function getUIScript() {
-return document.getElementById("ui-script").text;
-}
-
-function runTest() {
-if (testRunner.runUIScript) {
-testRunner.runUIScript(getUIScript(), function(result) {});
-}
-}
-function handleClicked() {
-clickCount++;
-document.body.appendChild(document.createTextNode("Click!"));
-document.body.appendChild(document.createElement("br"));
-if (clickCount == 2)
-testRunner.notifyDone();
-}
-
-
-
-body {
-margin: 0;
-}
-
-#target {
-width: 100px;
-height: 100px;
-}
-
-
-
-
-
-Double tapping on the button should fire 2 click events.
-
-
-


Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193569 => 193570)

--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:50 UTC (rev 193570)
@@ -1,5 +1,9 @@
 2015-12-05  Matthew Hanson  
 
+Rollout r193474. rdar://problem/23732400
+
+2015-12-05  Matthew Hanson  
+
 Rollout r193475. rdar://problem/23732400
 
 2015-12-05  Matthew Hanson  


Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193569 => 193570)

--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-12-06 07:27:50 UTC (rev 193570)
@@ -1005,8 +1005,6 @@
 }
 }
 
-[_contentView _setDoubleTapGesturesEnabled:[_scrollView isZoomEnabled] && [_scrollView minimumZoomScale] < [_scrollView maximumZoomScale]];
-
 [self _updateScrollViewBackground];
 
 if (_gestureController)


Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (193569 => 193570)

--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2015-12-06 07:27:45 UTC (rev 193569)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2015-12-06 07:27:50 UTC (rev 193570)
@@ -206,7 +206,6 @@
 - (void)_enableInspectorNodeSearch;
 - (void)_disableInspectorNodeSearch;
 - 

[webkit-changes] [193569] branches/safari-601-branch/Source/WebKit2

[matthew_hanson]

Title: [193569] branches/safari-601-branch/Source/WebKit2








Revision 193569
Author matthew_han...@apple.com
Date 2015-12-05 23:27:45 -0800 (Sat, 05 Dec 2015)


Log Message
Roll out r193475. rdar://problem/23732400

Modified Paths

branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
branches/safari-601-branch/Source/WebKit2/UIProcess/PageClient.h
branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-601-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/SmartMagnificationController.mm
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm
branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.cpp
branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h
branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm




Diff

Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193568 => 193569)

--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:37 UTC (rev 193568)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:45 UTC (rev 193569)
@@ -1,5 +1,9 @@
 2015-12-05  Matthew Hanson  
 
+Rollout r193475. rdar://problem/23732400
+
+2015-12-05  Matthew Hanson  
+
 Rollout r193476. rdar://problem/23732400
 
 2015-12-05  Matthew Hanson  


Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193568 => 193569)

--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-12-06 07:27:37 UTC (rev 193568)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-12-06 07:27:45 UTC (rev 193569)
@@ -1005,7 +1005,7 @@
 }
 }
 
-[_contentView _setDoubleTapGesturesEnabled:self._viewportIsUserScalable];
+[_contentView _setDoubleTapGesturesEnabled:[_scrollView isZoomEnabled] && [_scrollView minimumZoomScale] < [_scrollView maximumZoomScale]];
 
 [self _updateScrollViewBackground];
 
@@ -1392,13 +1392,12 @@
 force:YES];
 }
 
-- (CGFloat)_contentZoomScale
+- (BOOL)_zoomToRect:(WebCore::FloatRect)targetRect withOrigin:(WebCore::FloatPoint)origin fitEntireRect:(BOOL)fitEntireRect minimumScale:(double)minimumScale maximumScale:(double)maximumScale minimumScrollDistance:(float)minimumScrollDistance
 {
-return contentZoomScale(self);
-}
+const float maximumScaleFactorDeltaForPanScroll = 0.02;
 
-- (CGFloat)_targetContentZoomScaleForRect:(const WebCore::FloatRect&)targetRect currentScale:(double)currentScale fitEntireRect:(BOOL)fitEntireRect minimumScale:(double)minimumScale maximumScale:(double)maximumScale
-{
+double currentScale = contentZoomScale(self);
+
 WebCore::FloatSize unobscuredContentSize([self _contentRectForUserInteraction].size);
 double horizontalScale = unobscuredContentSize.width() * currentScale / targetRect.width();
 double verticalScale = unobscuredContentSize.height() * currentScale / targetRect.height();
@@ -1406,16 +1405,7 @@
 horizontalScale = std::min(std::max(horizontalScale, minimumScale), maximumScale);
 verticalScale = std::min(std::max(verticalScale, minimumScale), maximumScale);
 
-return fitEntireRect ? std::min(horizontalScale, verticalScale) : horizontalScale;
-}
-
-- (BOOL)_zoomToRect:(WebCore::FloatRect)targetRect withOrigin:(WebCore::FloatPoint)origin fitEntireRect:(BOOL)fitEntireRect minimumScale:(double)minimumScale maximumScale:(double)maximumScale minimumScrollDistance:(float)minimumScrollDistance
-{
-const float maximumScaleFactorDeltaForPanScroll = 0.02;
-
-double currentScale = contentZoomScale(self);
-double targetScale = [self _targetContentZoomScaleForRect:targetRect currentScale:currentScale fitEntireRect:fitEntireRect minimumScale:minimumScale maximumScale:maximumScale];
-
+double targetScale = fitEntireRect ? std::min(horizontalScale, verticalScale) : horizontalScale;
 if (fabs(targetScale - currentScale) < maximumScaleFactorDeltaForPanScroll) {
 if ([self _scrollToRect:targetRect origin:origin minimumScrollDistance:minimumScrollDistance])
 return true;
@@ -3064,11 +3054,6 @@
 return 

[webkit-changes] [193568] branches/safari-601-branch/Source/WebKit2

[matthew_hanson]

Title: [193568] branches/safari-601-branch/Source/WebKit2








Revision 193568
Author matthew_han...@apple.com
Date 2015-12-05 23:27:37 -0800 (Sat, 05 Dec 2015)


Log Message
Roll out r193476. rdar://problem/23732400

Modified Paths

branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (193567 => 193568)

--- branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog	2015-12-06 07:27:37 UTC (rev 193568)
@@ -1,5 +1,9 @@
 2015-12-05  Matthew Hanson  
 
+Rollout r193476. rdar://problem/23732400
+
+2015-12-05  Matthew Hanson  
+
 Rollout r193478. rdar://problem/23732400
 
 2015-12-04  Matthew Hanson  


Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (193567 => 193568)

--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h	2015-12-06 07:27:37 UTC (rev 193568)
@@ -161,7 +161,6 @@
 BOOL _usingGestureForSelection;
 BOOL _inspectorNodeSearchEnabled;
 BOOL _didAccessoryTabInitiateFocus;
-BOOL _isExpectingFastSingleTapCommit;
 }
 
 @end


Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (193567 => 193568)

--- branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-12-06 07:27:33 UTC (rev 193567)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2015-12-06 07:27:37 UTC (rev 193568)
@@ -359,7 +359,6 @@
 _actionSheetAssistant = adoptNS([[WKActionSheetAssistant alloc] initWithView:self]);
 [_actionSheetAssistant setDelegate:self];
 _smartMagnificationController = std::make_unique(self);
-_isExpectingFastSingleTapCommit = NO;
 }
 
 - (void)cleanupInteraction
@@ -369,7 +368,6 @@
 _actionSheetAssistant = nil;
 _smartMagnificationController = nil;
 _didAccessoryTabInitiateFocus = NO;
-_isExpectingFastSingleTapCommit = NO;
 [_formInputSession invalidate];
 _formInputSession = nil;
 [_highlightView removeFromSuperview];
@@ -759,11 +757,6 @@
 }
 
 [self _showTapHighlight];
-if (_isExpectingFastSingleTapCommit) {
-[self _finishInteraction];
-if (!_potentialTapInProgress)
-_isExpectingFastSingleTapCommit = NO;
-}
 }
 
 - (CGFloat)_fastClickZoomThreshold
@@ -1159,7 +1152,6 @@
 _page->potentialTapAtPosition(gestureRecognizer.location, ++_latestTapID);
 _potentialTapInProgress = YES;
 _isTapHighlightIDValid = YES;
-_isExpectingFastSingleTapCommit = !_doubleTapGestureRecognizer.get().enabled;
 }
 
 static void cancelPotentialTapIfNecessary(WKContentView* contentView)
@@ -1213,8 +1205,7 @@
 
 _page->commitPotentialTap();
 
-if (!_isExpectingFastSingleTapCommit)
-[self _finishInteraction];
+[self _finishInteraction];
 }
 
 - (void)_doubleTapRecognized:(UITapGestureRecognizer *)gestureRecognizer






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193567] branches/safari-601-branch

[matthew_hanson]

Title: [193567] branches/safari-601-branch








Revision 193567
Author matthew_han...@apple.com
Date 2015-12-05 23:27:33 -0800 (Sat, 05 Dec 2015)


Log Message
Roll out r193478. rdar://problem/23732400

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/TestExpectations
branches/safari-601-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h
branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in
branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in
branches/safari-601-branch/Source/WebCore/dom/Element.cpp
branches/safari-601-branch/Source/WebCore/dom/Element.h
branches/safari-601-branch/Source/WebCore/dom/Node.h
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h
branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
branches/safari-601-branch/Source/WebKit2/ChangeLog
branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm


Removed Paths

branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt
branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style.html
branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks-expected.txt
branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-manipulation-fast-clicks.html
branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing-expected.txt
branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-parsing.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193566 => 193567)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 07:27:33 UTC (rev 193567)
@@ -1,3 +1,7 @@
+2015-12-05  Matthew Hanson  
+
+Rollout r193478. rdar://problem/23732400
+
 2015-12-05  David Kilzer  
 
 Merge r191981. rdar://problem/23732379


Modified: branches/safari-601-branch/LayoutTests/TestExpectations (193566 => 193567)

--- branches/safari-601-branch/LayoutTests/TestExpectations	2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/TestExpectations	2015-12-06 07:27:33 UTC (rev 193567)
@@ -2,16 +2,6 @@
 #
 # See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
 
-#//
-# Platform-specific tests. Skipped here, then re-enabled on the appropriate platform.
-#//
-
-css3/touch-action [ Skip ]
-
-#//
-# End platform-specific tests.
-#//
-
 # pending functional patch and per-port verification
 webkit.org/b/109954 css3/line-break [ Skip ]
 


Deleted: branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt (193566 => 193567)

--- branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt	2015-12-06 07:18:59 UTC (rev 193566)
+++ branches/safari-601-branch/LayoutTests/css3/touch-action/touch-action-computed-style-expected.txt	2015-12-06 07:27:33 UTC (rev 193567)
@@ -1,22 +0,0 @@
-Testing touch-action: manipulation;
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing touch-action: auto;
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing a bogus value
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing all caps
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing weird casing
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing !important (auto)
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'auto'
-Testing !important (manipulation)
-PASS window.getComputedStyle(document.body).getPropertyValue('touch-action') is 'manipulation'
-Testing non-inheritance
-PASS window.getComputedStyle(document.getElementById('child')).getPropertyValue('touch-action') is 'auto'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing the computed style of 

[webkit-changes] [193519] branches/safari-601-branch/Tools

[matthew_hanson]

Title: [193519] branches/safari-601-branch/Tools








Revision 193519
Author matthew_han...@apple.com
Date 2015-12-05 10:30:17 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r189943. rdar://problem/23769735

Modified Paths

branches/safari-601-branch/Tools/ChangeLog
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp




Diff

Modified: branches/safari-601-branch/Tools/ChangeLog (193518 => 193519)

--- branches/safari-601-branch/Tools/ChangeLog	2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/ChangeLog	2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,5 +1,20 @@
 2015-12-05  Matthew Hanson  
 
+Merge r189943. rdar://problem/23769735
+
+2015-09-17  Myles C. Maxfield  
+
+Update licence in r189890
+https://bugs.webkit.org/show_bug.cgi?id=149306
+
+Reviewed by Dean Jackson.
+
+* FontWithFeatures/FontWithFeatures/FontCreator.cpp:
+* FontWithFeatures/FontWithFeatures/FontCreator.h:
+* FontWithFeatures/FontWithFeatures/main.cpp:
+
+2015-12-05  Matthew Hanson  
+
 Merge r189890. rdar://problem/23769735
 
 2015-09-16  Myles C. Maxfield  


Modified: branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp (193518 => 193519)

--- branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp	2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp	2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,10 +1,27 @@
-//
-//  FontCreator.cpp
-//  FontWithFeatures
-//
-//  Created by Litherum on 9/15/15.
-//  Copyright © 2015 Litherum. All rights reserved.
-//
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "FontCreator.h"
 


Modified: branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h (193518 => 193519)

--- branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h	2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h	2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,10 +1,27 @@
-//
-//  FontCreator.hpp
-//  FontWithFeatures
-//
-//  Created by Litherum on 9/15/15.
-//  Copyright © 2015 Litherum. All rights reserved.
-//
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 

[webkit-changes] [193518] branches/safari-601-branch

[matthew_hanson]

Title: [193518] branches/safari-601-branch








Revision 193518
Author matthew_han...@apple.com
Date 2015-12-05 10:30:14 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r189890. rdar://problem/23769735

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations
branches/safari-601-branch/LayoutTests/platform/win/TestExpectations
branches/safari-601-branch/Tools/ChangeLog


Added Paths

branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html
branches/safari-601-branch/LayoutTests/css3/resources/FontWithFeatures.otf
branches/safari-601-branch/Tools/FontWithFeatures/
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures.xcodeproj/
branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures.xcodeproj/project.pbxproj




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193517 => 193518)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:10 UTC (rev 193517)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:14 UTC (rev 193518)
@@ -1,5 +1,22 @@
 2015-12-05  Matthew Hanson  
 
+Merge r189890. rdar://problem/23769735
+
+2015-09-16  Myles C. Maxfield  
+
+Create a font which can be used for testing font features
+https://bugs.webkit.org/show_bug.cgi?id=149237
+
+Reviewed by Simon Fraser.
+
+* css3/font-feature-settings-rendering-2-expected.html: Added.
+* css3/font-feature-settings-rendering-2.html: Added.
+* css3/resources/FontWithFeatures.otf: Added.
+* platform/efl/TestExpectations:
+* platform/win/TestExpectations:
+
+2015-12-05  Matthew Hanson  
+
 Merge r188146. rdar://problem/23769732
 
 2015-08-07  Myles C. Maxfield  


Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html (0 => 193518)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html	2015-12-05 18:30:14 UTC (rev 193518)
@@ -0,0 +1,46 @@
+
+
+
+
+@font-face {
+font-family: "FontFeaturesTest";
+src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+
+
+
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+BA
+
+
+


Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html (0 => 193518)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html	2015-12-05 18:30:14 UTC (rev 193518)
@@ -0,0 +1,60 @@
+
+
+
+
+@font-face {
+font-family: "FontFeaturesTest";
+src: url("resources/FontWithFeatures.otf") format("opentype");
+}
+
+
+
+This tests that font features are able to be turned on and off as desired. It uses a special font
+designed specifically for this purpose. The test passes if you see a sequence of alternating check
+marks and X below.
+
+
+var insertionpoint = document.getElementById("insertionpoint");
+function addElement(feature, c) {
+["0", "1"].map(function(state) {
+var element = document.createElement("span");
+element.textContent = c;
+element.style.fontFamily = "FontFeaturesTest";
+element.style.webkitFontFeatureSettings = '"' + feature + '" ' + state;
+insertionpoint.appendChild(element);
+});
+insertionpoint.appendChild(document.createTextNode(" "));
+}
+addElement("liga", "C");
+addElement("clig", "D");
+addElement("dlig", "E");
+addElement("hlig", "F");
+addElement("calt", "G");
+addElement("subs", "H");
+addElement("sups", "I");
+addElement("smcp", "J");
+addElement("c2sc", "K");
+addElement("pcap", "L");
+addElement("c2pc", "M");
+addElement("unic", "N");
+addElement("titl", "O");
+addElement("onum", "P");
+addElement("pnum", "Q");
+addElement("tnum", "R");
+addElement("frac", "S");
+//addElement("afrc", "T");
+addElement("ordn", "U");
+addElement("zero", "V");
+addElement("hist", "W");
+addElement("jp78", "X");

[webkit-changes] [193521] branches/safari-601-branch

[matthew_hanson]

Title: [193521] branches/safari-601-branch








Revision 193521
Author matthew_han...@apple.com
Date 2015-12-05 10:30:26 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r190667. rdar://problem/23769584

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html
branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html
branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/rendering/RenderInline.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html
branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193520 => 193521)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:21 UTC (rev 193520)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:26 UTC (rev 193521)
@@ -1,5 +1,29 @@
 2015-12-05  Matthew Hanson  
 
+Merge r190667. rdar://problem/23769584
+
+2015-10-06  Simon Fraser  
+
+will-change should trigger stacking context based purely on properties
+https://bugs.webkit.org/show_bug.cgi?id=148068
+
+Reviewed by Zalan Bujtas.
+
+Previously, our will-change implementation didn't trigger stacking context
+on an inline if the will-change property didn't apply to inlines (like 'transform').
+However, this doesn't agree with the CSS-WG consensus (https://lists.w3.org/Archives/Public/www-style/2015Sep/0112.html).
+
+Change behavior to have stacking context creation behavior for will-change be
+identical for inlines and blocks.
+
+* platform/mac/TestExpectations: Fails on Mavericks because no backdrop-filter there.
+* fast/css/will-change/resources/will-change-stacking-helper.js:
+(makeStackingInline):
+* fast/css/will-change/will-change-creates-stacking-context-inline-expected.html: Added.
+* fast/css/will-change/will-change-creates-stacking-context-inline.html: Added.
+
+2015-12-05  Matthew Hanson  
+
 Merge r188604. rdar://problem/23769584
 
 2015-08-18  Simon Fraser  


Modified: branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (193520 => 193521)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	2015-12-05 18:30:21 UTC (rev 193520)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	2015-12-05 18:30:26 UTC (rev 193521)
@@ -27,7 +27,7 @@
 { 'property' : '-webkit-flow-from', 'stacking' : true },
 ];
 
-function makeStackingBlock(stackingProperty, value)
+function makeStackingElement(stackingProperty, value)
 {
 var container = document.createElement('div');
 container.className = 'container';
@@ -48,4 +48,3 @@
 
 document.body.appendChild(container);
 }
-


Modified: branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html (193520 => 193521)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html	2015-12-05 18:30:21 UTC (rev 193520)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html	2015-12-05 18:30:26 UTC (rev 193521)
@@ -45,7 +45,7 @@
 function doTest()
 {
 for (value of willChangeValues) {
-makeStackingBlock('z-index', value.stacking ? '0' : 'auto');
+makeStackingElement('z-index', value.stacking ? '0' : 'auto');
 }
 }
 


Copied: branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html (from rev 193520, branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html) (0 => 193521)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html	2015-12-05 18:30:26 

[webkit-changes] [193517] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193517] branches/safari-601-branch/Source/WebCore








Revision 193517
Author matthew_han...@apple.com
Date 2015-12-05 10:30:10 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r188168. rdar://problem/23769732

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193516 => 193517)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:06 UTC (rev 193516)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:10 UTC (rev 193517)
@@ -1,5 +1,34 @@
 2015-12-05  Matthew Hanson  
 
+Merge r188168. rdar://problem/23769732
+
+2015-08-07  Myles C. Maxfield  
+
+Post-review comments on r188146
+https://bugs.webkit.org/show_bug.cgi?id=147793
+
+Reviewed by Daniel Bates.
+
+No new tests because there is no behavior change.
+
+* platform/graphics/FontCache.h:
+* platform/graphics/cocoa/FontCacheCoreText.cpp:
+(WebCore::appendTrueTypeFeature):
+(WebCore::appendOpenTypeFeature):
+(WebCore::applyFontFeatureSettings):
+* platform/graphics/ios/FontCacheIOS.mm:
+(WebCore::FontCache::getSystemFontFallbackForCharacters):
+(WebCore::FontCache::createFontPlatformData):
+* platform/graphics/mac/FontCacheMac.mm:
+(WebCore::fontWithFamily):
+(WebCore::FontCache::systemFallbackForCharacters):
+* platform/graphics/mac/FontCustomPlatformData.cpp:
+(WebCore::FontCustomPlatformData::fontPlatformData):
+* rendering/RenderThemeIOS.mm:
+(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+
+2015-12-05  Matthew Hanson  
+
 Merge r188146. rdar://problem/23769732
 
 2015-08-07  Myles C. Maxfield  


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193516 => 193517)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h	2015-12-05 18:30:06 UTC (rev 193516)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h	2015-12-05 18:30:10 UTC (rev 193517)
@@ -182,7 +182,7 @@
 };
 
 #if PLATFORM(COCOA)
-RetainPtr applyFontFeatureSettings(CTFontRef, const FontFeatureSettings&);
+RetainPtr applyFontFeatureSettings(CTFontRef, const FontFeatureSettings*);
 #endif
 
 #if !PLATFORM(MAC)


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (193516 => 193517)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2015-12-05 18:30:06 UTC (rev 193516)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp	2015-12-05 18:30:10 UTC (rev 193517)
@@ -28,11 +28,9 @@
 
 namespace WebCore {
 
-static inline void appendTrueTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
+static inline void appendTrueTypeFeature(CFMutableArrayRef, const FontFeature&)
 {
-// FIXME: We should map OpenType feature strings to the TrueType feature type identifiers listed in 
-UNUSED_PARAM(features);
-UNUSED_PARAM(feature);
+// FIXME: We should map OpenType feature strings to the TrueType feature type identifiers listed in .
 }
 
 static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
@@ -41,9 +39,9 @@
 RetainPtr featureKey = feature.tag().string().createCFString();
 int rawFeatureValue = feature.value();
 RetainPtr featureValue = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, ));
-CFStringRef featureDictionaryKeys[] = {kCTFontOpenTypeFeatureTag, kCTFontOpenTypeFeatureValue};
-CFTypeRef featureDictionaryValues[] = {featureKey.get(), featureValue.get()};
-RetainPtr featureDictionary = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, (const void**)featureDictionaryKeys, featureDictionaryValues, 2, , ));
+CFStringRef featureDictionaryKeys[] = { kCTFontOpenTypeFeatureTag, kCTFontOpenTypeFeatureValue };
+CFTypeRef featureDictionaryValues[] = { featureKey.get(), featureValue.get() };
+RetainPtr featureDictionary = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, (const void**)featureDictionaryKeys, featureDictionaryValues, WTF_ARRAY_LENGTH(featureDictionaryValues), , ));
 CFArrayAppendValue(features, featureDictionary.get());
 

[webkit-changes] [193515] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193515] branches/safari-601-branch/Source/WebCore








Revision 193515
Author matthew_han...@apple.com
Date 2015-12-05 10:29:59 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r187982. rdar://problem/23769732

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601-branch/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
branches/safari-601-branch/Source/WebCore/platform/spi/mac/NSFontSPI.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193514 => 193515)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 17:08:20 UTC (rev 193514)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:29:59 UTC (rev 193515)
@@ -1,3 +1,36 @@
+2015-12-05  Matthew Hanson  
+
+Merge r187982. rdar://problem/23769732
+
+2015-08-05  Myles C. Maxfield  
+
+[OS X] Migrate to CTFontCreateForCharactersWithLanguage from [NSFont findFontLike:forString:withRange:inLanguage]
+https://bugs.webkit.org/show_bug.cgi?id=147483
+
+Reviewed by Dean Jackson.
+
+[NSFont findFontLike:forString:withRange:inLanguage] doesn't properly handle its last argument. In
+addition, we want to be moving away from NSFont in the first place and on to Core Text. This new
+CoreText function correctly handles its language argument, which is required for language-specific
+font fallback.
+
+This patch rolls r187707 back in which was rolled out in r187802 due to test flakiness. This patch
+fixes the flakiness.
+
+No new tests because there is no behavior change.
+
+* platform/graphics/FontCache.cpp:
+(WebCore::FontCache::purgeInactiveFontData):
+* platform/graphics/FontCache.h:
+(WebCore::FontCache::platformPurgeInactiveFontData):
+* platform/graphics/mac/FontCacheMac.mm:
+(WebCore::fallbackDedupSet):
+(WebCore::FontCache::platformPurgeInactiveFontData):
+(WebCore::lookupCTFont):
+(WebCore::FontCache::systemFallbackForCharacters):
+* platform/spi/cocoa/CoreTextSPI.h:
+* platform/spi/mac/NSFontSPI.h:
+
 2015-12-04  Matthew Hanson  
 
 Merge r191825. rdar://problem/23732363


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.cpp (193514 => 193515)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.cpp	2015-12-05 17:08:20 UTC (rev 193514)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.cpp	2015-12-05 18:29:59 UTC (rev 193515)
@@ -479,6 +479,8 @@
 fontVerticalDataCache.remove(key);
 }
 #endif
+
+platformPurgeInactiveFontData();
 }
 
 size_t FontCache::fontCount()


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193514 => 193515)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h	2015-12-05 17:08:20 UTC (rev 193514)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h	2015-12-05 18:29:59 UTC (rev 193515)
@@ -144,6 +144,7 @@
 WEBCORE_EXPORT size_t fontCount();
 WEBCORE_EXPORT size_t inactiveFontCount();
 WEBCORE_EXPORT void purgeInactiveFontData(unsigned count = UINT_MAX);
+void platformPurgeInactiveFontData();
 
 #if PLATFORM(WIN)
 RefPtr fontFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&, AtomicString& outFontFamilyName);
@@ -180,6 +181,12 @@
 friend class Font;
 };
 
+#if !PLATFORM(MAC)
+inline void FontCache::platformPurgeInactiveFontData()
+{
 }
+#endif
 
+}
+
 #endif


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193514 => 193515)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-05 17:08:20 UTC (rev 193514)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-05 18:29:59 UTC (rev 193515)
@@ -459,22 +459,59 @@
 return knownFamilies.get().add(family).isNewEntry;
 }
 
+typedef HashSet FallbackDedupSet;
+static FallbackDedupSet& fallbackDedupSet()
+{
+static NeverDestroyed dedupSet;
+return dedupSet.get();
+}
+
+void FontCache::platformPurgeInactiveFontData()
+{
+Vector toRemove;
+for (auto& font : fallbackDedupSet()) {
+if (CFGetRetainCount(font.get()) == 1)
+toRemove.append(font);
+}
+for (auto& font : toRemove)
+fallbackDedupSet().remove(font);
+}
+
+static inline RetainPtr lookupCTFont(CTFontRef font, float fontSize, const UChar* 

[webkit-changes] [193516] branches/safari-601-branch

[matthew_hanson]

Title: [193516] branches/safari-601-branch








Revision 193516
Author matthew_han...@apple.com
Date 2015-12-05 10:30:06 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r188146. rdar://problem/23769732

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h
branches/safari-601-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm


Added Paths

branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html
branches/safari-601-branch/LayoutTests/platform/mac-yosemite/css3/
branches/safari-601-branch/LayoutTests/platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt
branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193515 => 193516)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:29:59 UTC (rev 193515)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:06 UTC (rev 193516)
@@ -1,3 +1,19 @@
+2015-12-05  Matthew Hanson  
+
+Merge r188146. rdar://problem/23769732
+
+2015-08-07  Myles C. Maxfield  
+
+Implement font-feature-settings
+https://bugs.webkit.org/show_bug.cgi?id=147722
+
+Reviewed by Simon Fraser.
+
+Until I can make a custom font for reference tests, use a simple dump-render-tree test.
+
+* css3/font-feature-settings-preinstalled-fonts.html: Added.
+* platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt: Added.
+
 2015-12-04  Matthew Hanson  
 
 Merge r191128. rdar://problem/23732363


Added: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html (0 => 193516)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html	2015-12-05 18:30:06 UTC (rev 193516)
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+This test dumps render tree information for text styled with font-feature-settings.
+
+
+var fonts = ["Andale Mono", "Arial", "Didot", "Geneva", "Georgia", "Gill Sans", "Helvetica", "Helvetica Neue", "Hoefler Text", "Impact", "Lucida Grande", "Menlo", "Monaco", "Optima", "Tahoma", "Times", "Verdana", "Zapfino"];
+var features = ['"smcp" 1', '"c2sc" 1', '"zero" 1', '"nalt" 1', '"kern" 1', '"liga" 1', '"dlig" 1', '"hlig" 1', '"clig" 1', '"swsh" 1', '"calt" 1', '"hist" 1', '"salt" 1', '"ss01" 1', '"ss02" 1', '"ss03" 1', '"ss04" 1', '"ss05" 1', '"lnum" 1', '"onum" 1', '"pnum" 1', '"tnum" 1', '"frac" 1', '"afrc" 1'];
+fonts.map(function(font) {
+features.map(function(feature) {
+var element = document.createElement("div");
+element.textContent = "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in fjord.";
+element.style.fontFamily = font;
+element.style.webkitFontFeatureSettings = feature;
+document.body.appendChild(element);
+});
+});
+
+
+


Added: branches/safari-601-branch/LayoutTests/platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt (0 => 193516)

--- branches/safari-601-branch/LayoutTests/platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt	(rev 0)
+++ branches/safari-601-branch/LayoutTests/platform/mac-yosemite/css3/font-feature-settings-preinstalled-fonts-expected.txt	2015-12-05 18:30:06 UTC (rev 193516)
@@ -0,0 +1,1376 @@
+layer at (0,0) size 785x10402
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x10402
+  RenderBlock {HTML} at (0,0) size 785x10402
+RenderBody {BODY} at (8,16) size 769x10378
+  RenderBlock {P} at (0,0) size 769x18
+RenderText {#text} at (0,0) size 517x18
+  text run at (0,0) width 517: "This test dumps render tree information for text styled with font-feature-settings."
+  RenderBlock {DIV} at (0,34) size 769x36
+RenderText {#text} at (0,0) size 711x36
+  text run at (0,0) width 711: "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in"
+  text run at (0,18) width 58: "fjord."
+  RenderBlock {DIV} at (0,70) size 769x36
+RenderText {#text} at (0,0) size 711x36
+  text run at (0,0) width 711: "Lucky affluent actor asks to feast on giant 10.34\" cheese-filled quiche in"
+  text run at (0,18) width 58: 

[webkit-changes] [193524] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193524] branches/safari-601-branch/Source/WebCore








Revision 193524
Author matthew_han...@apple.com
Date 2015-12-05 10:30:37 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r188130. rdar://problem/23769732

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp
branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp
branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h
branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp
branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h
branches/safari-601-branch/Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h
branches/safari-601-branch/Source/WebCore/platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/freetype/FontPlatformData.h
branches/safari-601-branch/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h
branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp
branches/safari-601-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193523 => 193524)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:30 UTC (rev 193523)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:37 UTC (rev 193524)
@@ -1,5 +1,48 @@
 2015-12-05  Matthew Hanson  
 
+Merge r188130. rdar://problem/23769732
+
+2015-08-07  Myles C. Maxfield  
+
+Allow FontCustomPlatformData to consult with FontDescription
+https://bugs.webkit.org/show_bug.cgi?id=147775
+
+Reviewed by Zalan Bujtas.
+
+In order to implement font-feature-settings, web fonts need to be
+able to consult with the set of active font features. Rather than
+add yet another argument to all the functions in this flow, this
+patch passes around a reference to the FontDescription itself instead
+of copies of constituent members of it.
+
+No new tests because there is no behavior change.
+
+* css/CSSFontFaceSource.cpp:
+(WebCore::CSSFontFaceSource::font):
+* loader/cache/CachedFont.cpp:
+(WebCore::CachedFont::createFont):
+(WebCore::CachedFont::platformDataFromCustomData):
+* loader/cache/CachedFont.h:
+* loader/cache/CachedSVGFont.cpp:
+(WebCore::CachedSVGFont::platformDataFromCustomData):
+* loader/cache/CachedSVGFont.h:
+* platform/graphics/cairo/FontCustomPlatformData.h:
+* platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp:
+(WebCore::FontCustomPlatformData::fontPlatformData):
+* platform/graphics/freetype/FontPlatformData.h:
+* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+(WebCore::FontPlatformData::FontPlatformData):
+* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+(WebCore::Font::platformCreateScaledFont):
+* platform/graphics/mac/FontCustomPlatformData.cpp:
+(WebCore::FontCustomPlatformData::fontPlatformData):
+* platform/graphics/mac/FontCustomPlatformData.h:
+* platform/graphics/win/FontCustomPlatformData.cpp:
+(WebCore::FontCustomPlatformData::fontPlatformData):
+* platform/graphics/win/FontCustomPlatformData.h:
+
+2015-12-05  Matthew Hanson  
+
 Merge r187709. rdar://problem/23769732
 
 2015-07-31  Myles C. Maxfield  


Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp (193523 => 193524)

--- branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp	2015-12-05 18:30:30 UTC (rev 193523)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp	2015-12-05 18:30:37 UTC (rev 193524)
@@ -153,7 +153,7 @@
 auto customPlatformData = createFontCustomPlatformData(*m_generatedOTFBuffer);
 if (!customPlatformData)
 return nullptr;
-font = Font::create(customPlatformData->fontPlatformData(static_cast(fontDescription.computedPixelSize()), syntheticBold, syntheticItalic, fontDescription.orientation(), fontDescription.widthVariant(), fontDescription.renderingMode()), true, false);
+font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic), true, 

[webkit-changes] [193523] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193523] branches/safari-601-branch/Source/WebCore








Revision 193523
Author matthew_han...@apple.com
Date 2015-12-05 10:30:30 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r187709. rdar://problem/23769732

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193522 => 193523)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:28 UTC (rev 193522)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:30 UTC (rev 193523)
@@ -1,5 +1,18 @@
 2015-12-05  Matthew Hanson  
 
+Merge r187709. rdar://problem/23769732
+
+2015-07-31  Myles C. Maxfield  
+
+Fix the build
+
+Unreviewed.
+
+* platform/graphics/mac/FontCacheMac.mm:
+(WebCore::lookupCTFont):
+
+2015-12-05  Matthew Hanson  
+
 Merge r190667. rdar://problem/23769584
 
 2015-10-06  Simon Fraser  


Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193522 => 193523)

--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-05 18:30:28 UTC (rev 193522)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm	2015-12-05 18:30:30 UTC (rev 193523)
@@ -485,7 +485,9 @@
 
 static inline RetainPtr lookupCTFont(CTFontRef font, float fontSize, const UChar* characters, unsigned length)
 {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED != 1090
+UNUSED_PARAM(fontSize);
+#else
 if (!font) {
 font = reinterpret_cast([NSFont userFontOfSize:fontSize]);
 bool acceptable = true;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193522] branches/safari-601-branch/LayoutTests

[matthew_hanson]

Title: [193522] branches/safari-601-branch/LayoutTests








Revision 193522
Author matthew_han...@apple.com
Date 2015-12-05 10:30:28 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r190868. rdar://problem/23769584

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/platform/win/TestExpectations




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193521 => 193522)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:26 UTC (rev 193521)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:28 UTC (rev 193522)
@@ -1,5 +1,18 @@
 2015-12-05  Matthew Hanson  
 
+Merge r190868. rdar://problem/23769584
+
+2015-10-12  Brent Fulgham  
+
+[Win] Unreviewed test gardening after r190667.
+
+Mark fast/css/will-change/will-change-create-stacking-context-inline.html as failing, because
+Windows does not support backdrop-filter.
+
+* platform/win/TestExpectations:
+
+2015-12-05  Matthew Hanson  
+
 Merge r190667. rdar://problem/23769584
 
 2015-10-06  Simon Fraser  


Modified: branches/safari-601-branch/LayoutTests/platform/win/TestExpectations (193521 => 193522)

--- branches/safari-601-branch/LayoutTests/platform/win/TestExpectations	2015-12-05 18:30:26 UTC (rev 193521)
+++ branches/safari-601-branch/LayoutTests/platform/win/TestExpectations	2015-12-05 18:30:28 UTC (rev 193522)
@@ -538,6 +538,9 @@
 css3/blending/ [ Skip ]
 transitions/blendmode-transitions.html [ Skip ]
 
+# Backdrop Filters do not work on Windows
+fast/css/will-change/will-change-creates-stacking-context-inline.html [ ImageOnlyFailure ] 
+
 # TODO Not supported in CFNetwork yet. https://bugs.webkit.org/show_bug.cgi?id=100349
 webkit.org/b/100349 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-aborted.html [ Skip ]
 webkit.org/b/100349 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overridesexpires.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193520] branches/safari-601-branch

[matthew_hanson]

Title: [193520] branches/safari-601-branch








Revision 193520
Author matthew_han...@apple.com
Date 2015-12-05 10:30:21 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r188604. rdar://problem/23769584

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h
branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193519 => 193520)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:21 UTC (rev 193520)
@@ -1,5 +1,21 @@
 2015-12-05  Matthew Hanson  
 
+Merge r188604. rdar://problem/23769584
+
+2015-08-18  Simon Fraser  
+
+will-change: backface-visibility should not cause stacking context
+https://bugs.webkit.org/show_bug.cgi?id=148091
+
+Reviewed by Zalan Bujtas.
+
+Test that will-change: -webkit-backface-visibility does not create
+stacking context.
+
+* fast/css/will-change/resources/will-change-stacking-helper.js:
+
+2015-12-05  Matthew Hanson  
+
 Merge r189890. rdar://problem/23769735
 
 2015-09-16  Myles C. Maxfield  


Modified: branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (193519 => 193520)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	2015-12-05 18:30:21 UTC (rev 193520)
@@ -2,6 +2,7 @@
 { 'property' : 'auto', 'stacking' : false },
 { 'property' : 'background', 'stacking' : false },
 { 'property' : 'will-change', 'stacking' : false },
+{ 'property' : '-webkit-backface-visibility', 'stacking' : false },
 
 { 'property' : 'clip-path', 'stacking' : true },
 { 'property' : 'mask', 'stacking' : true },
@@ -16,7 +17,6 @@
 
 { 'property' : '-webkit-filter', 'stacking' : true },
 { 'property' : '-webkit-clip-path', 'stacking' : true },
-{ 'property' : '-webkit-backface-visibility', 'stacking' : true },
 { 'property' : '-webkit-box-reflect', 'stacking' : true },
 { 'property' : '-webkit-backdrop-filter', 'stacking' : true },
 { 'property' : '-webkit-mask', 'stacking' : true },


Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193519 => 193520)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 18:30:21 UTC (rev 193520)
@@ -1,5 +1,32 @@
 2015-12-05  Matthew Hanson  
 
+Merge r188604. rdar://problem/23769584
+
+2015-08-18  Simon Fraser  
+
+will-change: backface-visibility should not cause stacking context
+https://bugs.webkit.org/show_bug.cgi?id=148091
+
+Reviewed by Zalan Bujtas.
+
+Take CSSPropertyWebkitBackfaceVisibility out of the list of properties that causes
+will-change to create stacking context, since no value of the property creates
+stacking.
+
+Move willChangeCreatesStackingContext() and shouldWillChangeCreateStackingContext()
+into RenderInline since it's only called from there.
+
+* rendering/RenderElement.cpp:
+(WebCore::RenderElement::shouldWillChangeCreateStackingContext): Deleted.
+* rendering/RenderElement.h:
+(WebCore::RenderElement::willChangeCreatesStackingContext): Deleted.
+* rendering/RenderInline.h:
+(WebCore::RenderInline::willChangeCreatesStackingContext):
+* rendering/style/WillChangeData.cpp:
+(WebCore::propertyCreatesStackingContext): Deleted.
+
+2015-12-05  Matthew Hanson  
+
 Merge r188168. rdar://problem/23769732
 
 2015-08-07  Myles C. Maxfield  


Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp (193519 => 193520)

--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp	2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp	2015-12-05 18:30:21 UTC (rev 193520)
@@ -1446,16 +1446,6 @@
 return true;
 }
 
-bool RenderElement::shouldWillChangeCreateStackingContext() const
-{
-

[webkit-changes] [193528] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193528] branches/safari-601-branch/Source/WebCore








Revision 193528
Author matthew_han...@apple.com
Date 2015-12-05 11:54:34 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r191201. rdar://problem/23772907

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193527 => 193528)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 19:54:32 UTC (rev 193527)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 19:54:34 UTC (rev 193528)
@@ -1,5 +1,22 @@
 2015-12-05  Matthew Hanson  
 
+Merge r191201. rdar://problem/23772907
+
+2015-10-16  David Hyatt  
+
+ASSERT in imported/blink/fast/block/float/overhanging-float-crashes-when-sibling-becomes-formatting-context.html
+https://bugs.webkit.org/show_bug.cgi?id=150249
+
+Reviewed by Myles Maxfield.
+
+Covered by existing tests.
+
+* css/CSSValue.cpp:
+(WebCore::CSSValue::equals):
+Make sure the "unset" value has an equals implementation.
+
+2015-12-05  Matthew Hanson  
+
 Merge r191178. rdar://problem/23772788
 
 2015-10-16  David Hyatt  


Modified: branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp (193527 => 193528)

--- branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp	2015-12-05 19:54:32 UTC (rev 193527)
+++ branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp	2015-12-05 19:54:34 UTC (rev 193528)
@@ -201,6 +201,8 @@
 return compareCSSValues(*this, other);
 case InitialClass:
 return compareCSSValues(*this, other);
+case UnsetClass:
+return compareCSSValues(*this, other);
 #if ENABLE(CSS_GRID_LAYOUT)
 case GridLineNamesClass:
 return compareCSSValues(*this, other);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193527] branches/safari-601-branch

[matthew_hanson]

Title: [193527] branches/safari-601-branch








Revision 193527
Author matthew_han...@apple.com
Date 2015-12-05 11:54:32 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r191178. rdar://problem/23772788

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in
branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp
branches/safari-601-branch/Source/WebCore/css/makeprop.pl


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial-expected.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-initial.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset-expected.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-unset.html
branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-unset.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193526 => 193527)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 19:54:25 UTC (rev 193526)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 19:54:32 UTC (rev 193527)
@@ -1,5 +1,29 @@
 2015-12-05  Matthew Hanson  
 
+Merge r191178. rdar://problem/23772788
+
+2015-10-16  David Hyatt  
+
+Implement the "all" CSS property.
+https://bugs.webkit.org/show_bug.cgi?id=116966
+
+Reviewed by Zalan Bujtas.
+
+Added tests for the "all property, including a variables test!
+
+* fast/css/all-keyword-direction-expected.html: Added.
+* fast/css/all-keyword-direction.html: Added.
+* fast/css/all-keyword-inherit-expected.html: Added.
+* fast/css/all-keyword-inherit.html: Added.
+* fast/css/all-keyword-initial-expected.html: Added.
+* fast/css/all-keyword-initial.html: Added.
+* fast/css/all-keyword-unset-expected.html: Added.
+* fast/css/all-keyword-unset.html: Added.
+* fast/css/variables/all-keyword-unset-expected.html: Added.
+* fast/css/variables/all-keyword-unset.html: Added.
+
+2015-12-05  Matthew Hanson  
+
 Merge r191151. rdar://problem/23772904
 
 2015-10-15  David Hyatt  


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html (0 => 193527)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction-expected.html	2015-12-05 19:54:32 UTC (rev 193527)
@@ -0,0 +1,13 @@
+
+
+html {
+  font-size: small;
+  background-color: #F0F0F0;
+  color: blue;
+}
+
+span { direction:rtl; }
+
+
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus eget velit sagittis.
\ No newline at end of file


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html (0 => 193527)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-direction.html	2015-12-05 19:54:32 UTC (rev 193527)
@@ -0,0 +1,18 @@
+
+
+html {
+  font-size: small;
+  background-color: #F0F0F0;
+  color: blue;
+}
+
+blockquote {
+  background-color: skyblue;
+  color: red;
+  direction:rtl;
+  all: unset;
+}
+
+
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus eget velit sagittis.
\ No newline at end of file


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html (0 => 193527)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit-expected.html	2015-12-05 19:54:32 UTC (rev 193527)
@@ -0,0 +1,11 @@
+
+
+html {
+  font-size: small;
+  background-color: #F0F0F0;
+  color: blue;
+}
+
+
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus eget velit sagittis.
\ No newline at end of file


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html (0 => 193527)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-inherit.html	(rev 0)
+++ 

[webkit-changes] [193525] branches/safari-601-branch

[matthew_hanson]

Title: [193525] branches/safari-601-branch








Revision 193525
Author matthew_han...@apple.com
Date 2015-12-05 11:54:21 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r191151. rdar://problem/23772904

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/TestExpectations
branches/safari-601-branch/Source/WebCore/CMakeLists.txt
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/bindings/objc/DOMCSS.mm
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSToStyleMap.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValue.h
branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in
branches/safari-601-branch/Source/WebCore/css/CSSValuePool.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValuePool.h
branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/unset-keyword-expected.html
branches/safari-601-branch/LayoutTests/fast/css/unset-keyword.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/129-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/129.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/130-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/130.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/134-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/134.html
branches/safari-601-branch/Source/WebCore/css/CSSUnsetValue.cpp
branches/safari-601-branch/Source/WebCore/css/CSSUnsetValue.h


Removed Paths

branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/129-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/129.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/130-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/130.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/134-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/test-suite/failures/134.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193524 => 193525)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 18:30:37 UTC (rev 193524)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 19:54:21 UTC (rev 193525)
@@ -1,5 +1,37 @@
 2015-12-05  Matthew Hanson  
 
+Merge r191151. rdar://problem/23772904
+
+2015-10-15  David Hyatt  
+
+Add support for the CSS 'unset' keyword.
+https://bugs.webkit.org/show_bug.cgi?id=148614
+
+Reviewed by Dean Jackson.
+
+* TestExpectations:
+Remove the 3 failing variables tests that used the unset keyword now that they pass.
+
+* fast/css/unset-keyword-expected.html: Added.
+* fast/css/unset-keyword.html: Added.
+New test for both inherited and initial properties.
+
+* fast/css/variables/test-suite/129-expected.html: Added.
+* fast/css/variables/test-suite/129.html: Added.
+* fast/css/variables/test-suite/130-expected.html: Added.
+* fast/css/variables/test-suite/130.html: Added.
+* fast/css/variables/test-suite/134-expected.html: Added.
+* fast/css/variables/test-suite/134.html: Added.
+* fast/css/variables/test-suite/failures/129-expected.html: Removed.
+* fast/css/variables/test-suite/failures/129.html: Removed.
+* fast/css/variables/test-suite/failures/130-expected.html: Removed.
+* fast/css/variables/test-suite/failures/130.html: Removed.
+* fast/css/variables/test-suite/failures/134-expected.html: Removed.
+* fast/css/variables/test-suite/failures/134.html: Removed.
+Move these tests into the passing directory.
+
+2015-12-05  Matthew Hanson  
+
 Merge r190868. rdar://problem/23769584
 
 2015-10-12  Brent Fulgham  


Modified: branches/safari-601-branch/LayoutTests/TestExpectations (193524 => 193525)

--- branches/safari-601-branch/LayoutTests/TestExpectations	2015-12-05 18:30:37 UTC (rev 193524)
+++ branches/safari-601-branch/LayoutTests/TestExpectations	2015-12-05 19:54:21 UTC (rev 193525)
@@ -572,9 +572,6 @@
 webkit.org/b/150183 fast/css/variables/test-suite/failures/111.html [ ImageOnlyFailure ]
 webkit.org/b/150183 fast/css/variables/test-suite/failures/115.html [ ImageOnlyFailure ]
 webkit.org/b/150183 fast/css/variables/test-suite/failures/126.html [ ImageOnlyFailure ]

[webkit-changes] [193526] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193526] branches/safari-601-branch/Source/WebCore








Revision 193526
Author matthew_han...@apple.com
Date 2015-12-05 11:54:25 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r191155. rdar://problem/23772908

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193525 => 193526)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 19:54:21 UTC (rev 193525)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-05 19:54:25 UTC (rev 193526)
@@ -1,5 +1,21 @@
 2015-12-05  Matthew Hanson  
 
+Merge r191155. rdar://problem/23772908
+
+2015-10-15  David Hyatt  
+
+Patch parseKeywordValue to accept "unset" so that it goes down the faster parsing path.
+https://bugs.webkit.org/show_bug.cgi?id=150213
+
+Reviewed by Dean Jackson.
+
+No new tests as correctness doesn't change (just speed).
+
+* css/CSSParser.cpp:
+(WebCore::parseKeywordValue):
+
+2015-12-05  Matthew Hanson  
+
 Merge r191151. rdar://problem/23772904
 
 2015-10-15  David Hyatt  


Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193525 => 193526)

--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp	2015-12-05 19:54:21 UTC (rev 193525)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp	2015-12-05 19:54:25 UTC (rev 193526)
@@ -1191,10 +1191,10 @@
 if (!isKeywordPropertyID(propertyId)) {
 // All properties accept the values of "initial" and "inherit".
 String lowerCaseString = string.lower();
-if (lowerCaseString != "initial" && lowerCaseString != "inherit")
+if (lowerCaseString != "initial" && lowerCaseString != "inherit" && lowerCaseString != "unset")
 return CSSParser::ParseResult::Error;
 
-// Parse initial/inherit shorthands using the CSSParser.
+// Parse initial/inherit/unset shorthands using the CSSParser.
 if (shorthandForProperty(propertyId).length())
 return CSSParser::ParseResult::Error;
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [193529] branches/safari-601-branch

[matthew_hanson]

Title: [193529] branches/safari-601-branch








Revision 193529
Author matthew_han...@apple.com
Date 2015-12-05 11:54:45 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r191252. rdar://problem/23772905

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/CMakeLists.txt
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/bindings/objc/DOMCSS.mm
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValue.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValue.h
branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in
branches/safari-601-branch/Source/WebCore/css/CSSValuePool.cpp
branches/safari-601-branch/Source/WebCore/css/CSSValuePool.h
branches/safari-601-branch/Source/WebCore/css/FontLoader.cpp
branches/safari-601-branch/Source/WebCore/css/SelectorChecker.h
branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp
branches/safari-601-branch/Source/WebCore/css/StyleResolver.h


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert-expected.html
branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert.html
branches/safari-601-branch/LayoutTests/fast/css/revert-color-expected.html
branches/safari-601-branch/LayoutTests/fast/css/revert-color.html
branches/safari-601-branch/LayoutTests/fast/css/revert-margins-expected.html
branches/safari-601-branch/LayoutTests/fast/css/revert-margins.html
branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-revert-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/all-keyword-revert.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-inheritance-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-inheritance.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-no-inheritance-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-no-inheritance.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-variable-reference-expected.html
branches/safari-601-branch/LayoutTests/fast/css/variables/revert-variable-reference.html
branches/safari-601-branch/Source/WebCore/css/CSSRevertValue.cpp
branches/safari-601-branch/Source/WebCore/css/CSSRevertValue.h




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193528 => 193529)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 19:54:34 UTC (rev 193528)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 19:54:45 UTC (rev 193529)
@@ -1,5 +1,31 @@
 2015-12-05  Matthew Hanson  
 
+Merge r191252. rdar://problem/23772905
+
+2015-10-17  David Hyatt  
+
+Implement the CSS4 'revert' keyword.
+https://bugs.webkit.org/show_bug.cgi?id=149702
+
+Reviewed by Simon Fraser.
+
+* fast/css/all-keyword-revert-expected.html: Added.
+* fast/css/all-keyword-revert.html: Added.
+* fast/css/revert-color-expected.html: Added.
+* fast/css/revert-color.html: Added.
+* fast/css/revert-margins-expected.html: Added.
+* fast/css/revert-margins.html: Added.
+* fast/css/variables/all-keyword-revert-expected.html: Added.
+* fast/css/variables/all-keyword-revert.html: Added.
+* fast/css/variables/revert-inheritance-expected.html: Added.
+* fast/css/variables/revert-inheritance.html: Added.
+* fast/css/variables/revert-no-inheritance-expected.html: Added.
+* fast/css/variables/revert-no-inheritance.html: Added.
+* fast/css/variables/revert-variable-reference-expected.html: Added.
+* fast/css/variables/revert-variable-reference.html: Added.
+
+2015-12-05  Matthew Hanson  
+
 Merge r191178. rdar://problem/23772788
 
 2015-10-16  David Hyatt  


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert-expected.html (0 => 193529)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert-expected.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert-expected.html	2015-12-05 19:54:45 UTC (rev 193529)
@@ -0,0 +1,11 @@
+
+
+html {
+  font-size: small;
+  background-color: #F0F0F0;
+  color: blue;
+}
+
+
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus eget velit sagittis.
\ No newline at end of file


Added: branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert.html (0 => 193529)

--- branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/all-keyword-revert.html	2015-12-05 19:54:45 UTC (rev 193529)
@@ 

[webkit-changes] [193417] branches/safari-601-branch/Source/WebCore

[matthew_hanson]

Title: [193417] branches/safari-601-branch/Source/WebCore








Revision 193417
Author matthew_han...@apple.com
Date 2015-12-04 09:10:22 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r189427. rdar://problem/23732393

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193416 => 193417)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-04 17:10:19 UTC (rev 193416)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-04 17:10:22 UTC (rev 193417)
@@ -1,5 +1,90 @@
 2015-12-03  Matthew Hanson  
 
+Merge r189427. rdar://problem/23732393
+
+2015-09-04  Myles C. Maxfield  
+
+Rename members of CanvasRenderingContext2D::State
+https://bugs.webkit.org/show_bug.cgi?id=148889
+
+Reviewed by Tim Horton.
+
+CanvasRenderingContext2D::State is a struct, so its members should not start with m_.
+
+No new tests because there is no behavior change.
+
+* html/canvas/CanvasRenderingContext2D.cpp:
+(WebCore::CanvasRenderingContext2D::State::State):
+(WebCore::CanvasRenderingContext2D::State::operator=):
+(WebCore::CanvasRenderingContext2D::restore):
+(WebCore::CanvasRenderingContext2D::setStrokeStyle):
+(WebCore::CanvasRenderingContext2D::setFillStyle):
+(WebCore::CanvasRenderingContext2D::lineWidth):
+(WebCore::CanvasRenderingContext2D::setLineWidth):
+(WebCore::CanvasRenderingContext2D::lineCap):
+(WebCore::CanvasRenderingContext2D::setLineCap):
+(WebCore::CanvasRenderingContext2D::lineJoin):
+(WebCore::CanvasRenderingContext2D::setLineJoin):
+(WebCore::CanvasRenderingContext2D::miterLimit):
+(WebCore::CanvasRenderingContext2D::setMiterLimit):
+(WebCore::CanvasRenderingContext2D::shadowOffsetX):
+(WebCore::CanvasRenderingContext2D::setShadowOffsetX):
+(WebCore::CanvasRenderingContext2D::shadowOffsetY):
+(WebCore::CanvasRenderingContext2D::setShadowOffsetY):
+(WebCore::CanvasRenderingContext2D::shadowBlur):
+(WebCore::CanvasRenderingContext2D::setShadowBlur):
+(WebCore::CanvasRenderingContext2D::shadowColor):
+(WebCore::CanvasRenderingContext2D::setShadowColor):
+(WebCore::CanvasRenderingContext2D::getLineDash):
+(WebCore::CanvasRenderingContext2D::setLineDash):
+(WebCore::CanvasRenderingContext2D::setWebkitLineDash):
+(WebCore::CanvasRenderingContext2D::lineDashOffset):
+(WebCore::CanvasRenderingContext2D::setLineDashOffset):
+(WebCore::CanvasRenderingContext2D::applyLineDash):
+(WebCore::CanvasRenderingContext2D::globalAlpha):
+(WebCore::CanvasRenderingContext2D::setGlobalAlpha):
+(WebCore::CanvasRenderingContext2D::globalCompositeOperation):
+(WebCore::CanvasRenderingContext2D::setGlobalCompositeOperation):
+(WebCore::CanvasRenderingContext2D::scale):
+(WebCore::CanvasRenderingContext2D::rotate):
+(WebCore::CanvasRenderingContext2D::translate):
+(WebCore::CanvasRenderingContext2D::transform):
+(WebCore::CanvasRenderingContext2D::setTransform):
+(WebCore::CanvasRenderingContext2D::setStrokeColor):
+(WebCore::CanvasRenderingContext2D::setFillColor):
+(WebCore::CanvasRenderingContext2D::fillInternal):
+(WebCore::CanvasRenderingContext2D::strokeInternal):
+(WebCore::CanvasRenderingContext2D::clipInternal):
+(WebCore::CanvasRenderingContext2D::isPointInPathInternal):
+(WebCore::CanvasRenderingContext2D::isPointInStrokeInternal):
+(WebCore::CanvasRenderingContext2D::clearRect):
+(WebCore::CanvasRenderingContext2D::fillRect):
+(WebCore::CanvasRenderingContext2D::strokeRect):
+(WebCore::CanvasRenderingContext2D::setShadow):
+(WebCore::CanvasRenderingContext2D::applyShadow):
+(WebCore::CanvasRenderingContext2D::shouldDrawShadows):
+(WebCore::CanvasRenderingContext2D::drawImage):
+(WebCore::CanvasRenderingContext2D::transformAreaToDevice):
+(WebCore::CanvasRenderingContext2D::rectContainsCanvas):
+(WebCore::CanvasRenderingContext2D::compositeBuffer):
+(WebCore::CanvasRenderingContext2D::didDraw):
+(WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
+(WebCore::CanvasRenderingContext2D::font):
+(WebCore::CanvasRenderingContext2D::setFont):
+ 

[webkit-changes] [193420] branches/safari-601-branch

[matthew_hanson]

Title: [193420] branches/safari-601-branch








Revision 193420
Author matthew_han...@apple.com
Date 2015-12-04 09:10:40 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r188514. rdar://problem/23732374

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations
branches/safari-601-branch/LayoutTests/platform/mac-mavericks/TestExpectations
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/will-change/
branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/
branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html
branches/safari-601-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193419 => 193420)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:35 UTC (rev 193419)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:40 UTC (rev 193420)
@@ -1,5 +1,25 @@
 2015-12-03  Matthew Hanson  
 
+Merge r188514. rdar://problem/23732374
+
+2015-08-15  Simon Fraser  
+
+Have will-change create stacking context when necessary
+https://bugs.webkit.org/show_bug.cgi?id=148060
+
+Reviewed by Zalan Bujtas.
+
+Ref test for will-change creating stacking context.
+
+* fast/css/will-change/resources/will-change-stacking-helper.js: Added.
+(makeStackingBlock):
+* fast/css/will-change/will-change-creates-stacking-context-expected.html: Added.
+* fast/css/will-change/will-change-creates-stacking-context.html: Added.
+* platform/efl/TestExpectations: Mark image failure on EFL, since some CSS
+properties in the test are disabled there.
+
+2015-12-03  Matthew Hanson  
+
 Merge r188512. rdar://problem/23732374
 
 2015-08-14  Simon Fraser  


Added: branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (0 => 193420)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js	2015-12-04 17:10:40 UTC (rev 193420)
@@ -0,0 +1,51 @@
+var willChangeValues = [
+{ 'property' : 'auto', 'stacking' : false },
+{ 'property' : 'background', 'stacking' : false },
+{ 'property' : 'will-change', 'stacking' : false },
+
+{ 'property' : 'clip-path', 'stacking' : true },
+{ 'property' : 'mask', 'stacking' : true },
+{ 'property' : 'opacity', 'stacking' : true },
+{ 'property' : 'position', 'stacking' : true },
+{ 'property' : 'z-index', 'stacking' : true },
+{ 'property' : 'mix-blend-mode', 'stacking' : true },
+{ 'property' : 'isolation', 'stacking' : true },
+{ 'property' : 'perspective', 'stacking' : true },
+{ 'property' : 'transform', 'stacking' : true },
+{ 'property' : 'transform-style', 'stacking' : true },
+
+{ 'property' : '-webkit-filter', 'stacking' : true },
+{ 'property' : '-webkit-clip-path', 'stacking' : true },
+{ 'property' : '-webkit-backface-visibility', 'stacking' : true },
+{ 'property' : '-webkit-box-reflect', 'stacking' : true },
+{ 'property' : '-webkit-backdrop-filter', 'stacking' : true },
+{ 'property' : '-webkit-mask', 'stacking' : true },
+{ 'property' : '-webkit-mask-image', 'stacking' : true },
+{ 'property' : '-webkit-mask-box-image', 'stacking' : true },
+{ 'property' : '-webkit-transform', 'stacking' : true },
+{ 'property' : '-webkit-transform-style', 'stacking' : true },
+{ 'property' : '-webkit-flow-from', 'stacking' : true },
+];
+
+function makeStackingBlock(stackingProperty, value)
+{
+var container = document.createElement('div');
+container.className = 'container';
+
+var potentialStackingContext = document.createElement('div');
+potentialStackingContext.className = 'potential-stacking-context';
+potentialStackingContext.style[stackingProperty] = value;
+
+var child = document.createElement('div');
+child.className = 'child';
+potentialStackingContext.appendChild(child);
+
+container.appendChild(potentialStackingContext);
+
+var interposer = document.createElement('div');
+

[webkit-changes] [193421] branches/safari-601-branch

[matthew_hanson]

Title: [193421] branches/safari-601-branch








Revision 193421
Author matthew_han...@apple.com
Date 2015-12-04 09:10:48 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r188530. rdar://problem/23732374

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/_javascript_Core/ChangeLog
branches/safari-601-branch/Source/_javascript_Core/inspector/protocol/LayerTree.json
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h
branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h
branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.h
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h
branches/safari-601-branch/Source/WebInspectorUI/ChangeLog
branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js


Added Paths

branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt
branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html
branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation-expected.txt
branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193420 => 193421)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:48 UTC (rev 193421)
@@ -1,5 +1,21 @@
 2015-12-03  Matthew Hanson  
 
+Merge r188530. rdar://problem/23732374
+
+2015-08-17  Simon Fraser  
+
+will-change should sometimes trigger compositing
+https://bugs.webkit.org/show_bug.cgi?id=148072
+
+Reviewed by Tim Horton.
+
+* compositing/layer-creation/will-change-change-expected.txt: Added.
+* compositing/layer-creation/will-change-change.html: Added.
+* compositing/layer-creation/will-change-layer-creation-expected.txt: Added.
+* compositing/layer-creation/will-change-layer-creation.html: Added.
+
+2015-12-03  Matthew Hanson  
+
 Merge r188514. rdar://problem/23732374
 
 2015-08-15  Simon Fraser  


Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt (0 => 193421)

--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt	(rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt	2015-12-04 17:10:48 UTC (rev 193421)
@@ -0,0 +1,18 @@
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (children 1
+(GraphicsLayer
+  (bounds 800.00 600.00)
+  (contentsOpaque 1)
+  (children 1
+(GraphicsLayer
+  (position 28.00 20.00)
+  (bounds 100.00 100.00)
+  (contentsOpaque 1)
+)
+  )
+)
+  )
+)
+


Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html (0 => 193421)

--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html	2015-12-04 17:10:48 UTC (rev 193421)
@@ -0,0 +1,52 @@
+
+
+
+
+
+.box {
+width: 100px;
+height: 100px;
+margin: 20px;
+background-color: blue;
+position: relative;
+z-index: 0; /* Avoid changes in stacking triggering compositing */
+}
+
+.removal {
+will-change: transform;
+}
+
+body.changed .addition {
+will-change: transform;
+}
+
+body.changed .removal {
+will-change: auto;
+}
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+function doTest()
+{
+window.setTimeout(function() {
+document.body.classList.add('changed');
+if 

[webkit-changes] [193419] branches/safari-601-branch

[matthew_hanson]

Title: [193419] branches/safari-601-branch








Revision 193419
Author matthew_han...@apple.com
Date 2015-12-04 09:10:35 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r188512. rdar://problem/23732374

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/CMakeLists.txt
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
branches/safari-601-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.h
branches/safari-601-branch/Source/WebCore/css/CSSPrimitiveValue.h
branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in
branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in
branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h
branches/safari-601-branch/Source/WebCore/rendering/style/StyleAllInOne.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/StyleRareNonInheritedData.h


Added Paths

branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing-expected.txt
branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing.html
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp
branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193418 => 193419)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:26 UTC (rev 193418)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:35 UTC (rev 193419)
@@ -1,5 +1,21 @@
 2015-12-03  Matthew Hanson  
 
+Merge r188512. rdar://problem/23732374
+
+2015-08-14  Simon Fraser  
+
+Implement parsing for CSS will-change
+https://bugs.webkit.org/show_bug.cgi?id=148052
+
+Reviewed by Dean Jackson.
+
+will-change parsing test.
+
+* fast/css/will-change-parsing-expected.txt: Added.
+* fast/css/will-change-parsing.html: Added.
+
+2015-12-03  Matthew Hanson  
+
 Merge r190383. rdar://problem/23732393
 
 2015-09-30  Katlyn Graff  


Added: branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing-expected.txt (0 => 193419)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing-expected.txt	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing-expected.txt	2015-12-04 17:10:35 UTC (rev 193419)
@@ -0,0 +1,33 @@
+This tests checks that will-change parses correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyle("will-change:;") is "auto"
+PASS testComputedStyle("will-change: contents, all;") is "auto"
+PASS testComputedStyle("will-change: contents;") is "contents"
+PASS test("will-change: inherit;") is "inherit"
+PASS test("will-change: initial;") is "initial"
+PASS test("will-change: all;") is ""
+PASS test("will-change: none;") is ""
+PASS test("will-change: default;") is ""
+PASS test("will-change: will-change;") is ""
+PASS test("will-change: auto;") is "auto"
+PASS test("will-change: auto, contents;") is ""
+PASS test("will-change: scroll-position;") is "scroll-position"
+PASS test("will-change: contents;") is "contents"
+PASS test("will-change: scroll-position, scroll-position;") is "scroll-position, scroll-position"
+PASS test("will-change: contents, scroll-position, transform;") is "contents, scroll-position, transform"
+PASS test("will-change: contents, transform, scroll-position, transform;") is "contents, transform, scroll-position, transform"
+PASS test("will-change: , background;") is ""
+PASS test("will-change: background, transform;") is "background, transform"
+PASS test("will-change: background transform;") is ""
+PASS test("will-change: background, all;") is ""
+PASS test("will-change: background, will-change;") is ""
+PASS test("will-change: unknown-property;") is "unknown-property"
+PASS test("will-change: transform, initial;") is ""
+PASS test("will-change: default;") is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing.html (0 => 193419)

--- branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change-parsing.html	

[webkit-changes] [193416] branches/safari-601-branch

[matthew_hanson]

Title: [193416] branches/safari-601-branch








Revision 193416
Author matthew_han...@apple.com
Date 2015-12-04 09:10:19 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r188194. rdar://problem/23732393

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt
branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html
branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html
branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js
branches/safari-601-branch/LayoutTests/fast/canvas/script-tests/canvas-imageSmoothingEnabled.js
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193415 => 193416)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:19 UTC (rev 193416)
@@ -1,3 +1,26 @@
+2015-12-03  Matthew Hanson  
+
+Merge r188194. rdar://problem/23732393
+
+2015-08-08  Dean Jackson  
+
+Remove the webkit prefix from CanvasRenderingContext2D imageSmoothingEnabled
+https://bugs.webkit.org/show_bug.cgi?id=147803
+
+
+Reviewed by Sam Weinig.
+
+Use the standard version of imageSmoothingEnabled rather than
+the prefixed version.
+
+* fast/canvas/canvas-imageSmoothingEnabled-expected.txt:
+* fast/canvas/canvas-imageSmoothingEnabled-patterns.html:
+* fast/canvas/canvas-imageSmoothingEnabled-zero-size.html:
+* fast/canvas/script-tests/canvas-imageSmoothingEnabled-repaint.js:
+(draw):
+* fast/canvas/script-tests/canvas-imageSmoothingEnabled.js: Add some tests
+to make sure the prefixed version correctly maps to the standard version.
+
 2015-12-03  Timothy Hatcher  
 
 Skip Inspector tests because the new test harness does not work on the branch currently.


Modified: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt (193415 => 193416)

--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt	2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-expected.txt	2015-12-04 17:10:19 UTC (rev 193416)
@@ -4,11 +4,11 @@
 
 
 Test that the default value is true.
-PASS ctx.webkitImageSmoothingEnabled is true
+PASS ctx.imageSmoothingEnabled is true
 Test that false is returned after a the attribute is set to false.
-PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is false
 Test that restore works. We save a false state; create, then save a true state; and then finally restore.
-PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is false
 New canvas element created.
 Test that the image is smoothed by default. We check by making sure the pixel just to the left of the middle line is not completely black.
 PASS left_of_center_pixel.data[0] !== 0 is true
@@ -26,6 +26,15 @@
 PASS left_of_center_pixel.data[0] is 0
 PASS left_of_center_pixel.data[1] is 0
 PASS left_of_center_pixel.data[2] is 0
+Test that the prefixed attribute mirrors the unprefixed attribute.
+PASS ctx.imageSmoothingEnabled is false
+PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is true
+PASS ctx.webkitImageSmoothingEnabled is true
+PASS ctx.imageSmoothingEnabled is false
+PASS ctx.webkitImageSmoothingEnabled is false
+PASS ctx.imageSmoothingEnabled is true
+PASS ctx.webkitImageSmoothingEnabled is true
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html (193415 => 193416)

--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html	2015-12-04 13:16:05 UTC (rev 193415)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns.html	2015-12-04 17:10:19 UTC (rev 193416)
@@ -30,7 +30,7 @@
 var ctx = canvas.getContext('2d');
 var pattern = ctx.createPattern(image, "repeat");
 ctx.fillStyle = pattern;
-ctx.webkitImageSmoothingEnabled = smoothing;
+ctx.imageSmoothingEnabled = smoothing;
 ctx.scale(10, 10);
 ctx.fillRect(0, 0, canvas.width, canvas.height);
 }
@@ -39,7 +39,7 @@
 var ctx = canvas.getContext('2d');
 var pattern = 

[webkit-changes] [193418] branches/safari-601-branch

[matthew_hanson]

Title: [193418] branches/safari-601-branch








Revision 193418
Author matthew_han...@apple.com
Date 2015-12-04 09:10:26 -0800 (Fri, 04 Dec 2015)


Log Message
Merge r190383. rdar://problem/23732393

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.h
branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl


Added Paths

branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality-expected.txt
branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality.html




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193417 => 193418)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:22 UTC (rev 193417)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-04 17:10:26 UTC (rev 193418)
@@ -1,5 +1,22 @@
 2015-12-03  Matthew Hanson  
 
+Merge r190383. rdar://problem/23732393
+
+2015-09-30  Katlyn Graff  
+
+Tests support for imageSmoothingQuality attribute of Canvas element.
+https://bugs.webkit.org/show_bug.cgi?id=149541
+
+Reviewed by Ryosuke Niwa.
+
+Tests low, medium, high, and default values, value persistence when
+imageSmoothingEnabled is changed, and invalid input.
+
+* fast/canvas/canvas-imageSmoothingQuality-expected.txt: Added.
+* fast/canvas/canvas-imageSmoothingQuality.html: Added.
+
+2015-12-03  Matthew Hanson  
+
 Merge r188194. rdar://problem/23732393
 
 2015-08-08  Dean Jackson  


Added: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality-expected.txt (0 => 193418)

--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality-expected.txt	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality-expected.txt	2015-12-04 17:10:26 UTC (rev 193418)
@@ -0,0 +1,40 @@
+Tests for the imageSmoothingQuality attribute.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+PASS lowContext.imageSmoothingQuality is 'low'
+PASS mediumContext.imageSmoothingQuality is 'medium'
+PASS highContext.imageSmoothingQuality is 'high'
+
+PASS lowData is not mediumData
+PASS mediumData is not highData
+PASS lowData is not highData
+
+PASS sampleAlpha(lowData) is >= sampleAlpha(mediumData)
+PASS sampleAlpha(mediumData) is >= sampleAlpha(highData)
+
+PASS defaultContext.imageSmoothingQuality is 'low'
+
+PASS highContext.imageSmoothingEnabled = false; highContext.imageSmoothingQuality is 'high'
+PASS highContext.imageSmoothingQuality = 'medium'; highContext.imageSmoothingQuality is 'medium'
+
+highContext.imageSmoothingEnabled = true; highContext.imageSmoothingQuality = 'high';
+PASS scaleImageData(highCanvas, '3223') did not throw exception.
+PASS highContext.imageSmoothingQuality is 'high'
+PASS scaleImageData(highCanvas, 'bad_input') did not throw exception.
+PASS highContext.imageSmoothingQuality is 'high'
+PASS scaleImageData(highCanvas, 'LOW') did not throw exception.
+PASS highContext.imageSmoothingQuality is 'high'
+PASS scaleImageData(highCanvas, 'Medium') did not throw exception.
+PASS highContext.imageSmoothingQuality is 'high'
+
+highContext.save(); highContext.imageSmoothingQuality = 'medium';
+PASS highContext.restore(); highContext.imageSmoothingQuality is 'high'
+PASS scaleImageData(highCanvas, highCanvas.imageSmoothingQuality); is highData
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+ 


Added: branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality.html (0 => 193418)

--- branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality.html	(rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/canvas/canvas-imageSmoothingQuality.html	2015-12-04 17:10:26 UTC (rev 193418)
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+