[webkit-changes] [193615] trunk/Source/WebInspectorUI
Title: [193615] trunk/Source/WebInspectorUI
Revision 193615
Author commit-qu...@webkit.org
Date 2015-12-06 23:45:27 -0800 (Sun, 06 Dec 2015)
Log Message
Web Inspector: Regression (r192936) - changing selectors in the visual styles sidebar is broken
https://bugs.webkit.org/show_bug.cgi?id=151924
Patch by Devin Rousso on 2015-12-06
Reviewed by Brian Burg.
* UserInterface/Views/VisualStyleSelectorSection.js:
(WebInspector.VisualStyleSelectorSection):
(WebInspector.VisualStyleSelectorSection.prototype._selectorChanged):
Now uses an event listener instead of an "onselect" function.
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (193614 => 193615)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-07 06:27:48 UTC (rev 193614)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-07 07:45:27 UTC (rev 193615)
@@ -1,3 +1,15 @@
+2015-12-06 Devin Rousso
+
+Web Inspector: Regression (r192936) - changing selectors in the visual styles sidebar is broken
+https://bugs.webkit.org/show_bug.cgi?id=151924
+
+Reviewed by Brian Burg.
+
+* UserInterface/Views/VisualStyleSelectorSection.js:
+(WebInspector.VisualStyleSelectorSection):
+(WebInspector.VisualStyleSelectorSection.prototype._selectorChanged):
+Now uses an event listener instead of an "onselect" function.
+
2015-12-06 Matt Baker
Web Inspector: Comparisons in setters should use the massaged value (" = x || 0/false/null/etc")
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js (193614 => 193615)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-12-07 06:27:48 UTC (rev 193614)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-12-07 07:45:27 UTC (rev 193615)
@@ -55,7 +55,8 @@
selectorSection.element.appendChild(selectorListElement);
this._selectors = new WebInspector.TreeOutline(selectorListElement);
-this._selectors._onselect_ = this._selectorChanged.bind(this);
+this._selectors.addEventListener(WebInspector.TreeOutline.Event.SelectionDidChange, this._selectorChanged, this);
+
this._focusNextNewInspectorRule = false;
let addGlyphElement = useSVGSymbol("Images/Plus13.svg", "visual-style-selector-section-add-rule", WebInspector.UIString("Click to add a new rule."));
@@ -209,9 +210,9 @@
// Private
-_selectorChanged(selectedTreeElement)
+_selectorChanged(event)
{
-console.assert(selectedTreeElement);
+let selectedTreeElement = event.data.selectedElement;
if (!selectedTreeElement)
return;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193614] trunk/Source/WebCore
Title: [193614] trunk/Source/WebCore Revision 193614 Author simon.fra...@apple.com Date 2015-12-06 22:27:48 -0800 (Sun, 06 Dec 2015) Log Message Show more information about SVG renderers in showLayerTree() output https://bugs.webkit.org/show_bug.cgi?id=151930 Reviewed by Zalan Bujtas. In showLayerTree() output, for SVG renderers show: - visual and layout overflow, for boxes - frame rect, for boxes - layout state - class and id * rendering/RenderLayer.cpp: (WebCore::showLayerTree): * rendering/RenderTreeAsText.cpp: (WebCore::RenderTreeAsText::writeRenderObject): (WebCore::writeDebugInfo): New function to share dumping with svg output. (WebCore::write): * rendering/RenderTreeAsText.h: * rendering/svg/SVGRenderTreeAsText.cpp: (WebCore::writePositionAndStyle): Show the frameRect for boxes (e.g. RenderSVGRoot). Much more useful that showing the clippedOverflowRect. (WebCore::writeStandardPrefix): (WebCore::writeChildren): (WebCore::writeSVGResourceContainer): (WebCore::writeSVGContainer): (WebCore::write): (WebCore::writeSVGText): (WebCore::writeSVGInlineText): (WebCore::writeSVGImage): (WebCore::writeSVGGradientStop): (WebCore::writeResources): (WebCore::operator<<): Deleted. * rendering/svg/SVGRenderTreeAsText.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderLayer.cpp trunk/Source/WebCore/rendering/RenderTreeAsText.cpp trunk/Source/WebCore/rendering/RenderTreeAsText.h trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h Diff Modified: trunk/Source/WebCore/ChangeLog (193613 => 193614) --- trunk/Source/WebCore/ChangeLog 2015-12-07 06:27:08 UTC (rev 193613) +++ trunk/Source/WebCore/ChangeLog 2015-12-07 06:27:48 UTC (rev 193614) @@ -1,5 +1,41 @@ 2015-12-06 Simon Fraser +Show more information about SVG renderers in showLayerTree() output +https://bugs.webkit.org/show_bug.cgi?id=151930 + +Reviewed by Zalan Bujtas. + +In showLayerTree() output, for SVG renderers show: +- visual and layout overflow, for boxes +- frame rect, for boxes +- layout state +- class and id + +* rendering/RenderLayer.cpp: +(WebCore::showLayerTree): +* rendering/RenderTreeAsText.cpp: +(WebCore::RenderTreeAsText::writeRenderObject): +(WebCore::writeDebugInfo): New function to share dumping with svg output. +(WebCore::write): +* rendering/RenderTreeAsText.h: +* rendering/svg/SVGRenderTreeAsText.cpp: +(WebCore::writePositionAndStyle): Show the frameRect for boxes (e.g. RenderSVGRoot). +Much more useful that showing the clippedOverflowRect. +(WebCore::writeStandardPrefix): +(WebCore::writeChildren): +(WebCore::writeSVGResourceContainer): +(WebCore::writeSVGContainer): +(WebCore::write): +(WebCore::writeSVGText): +(WebCore::writeSVGInlineText): +(WebCore::writeSVGImage): +(WebCore::writeSVGGradientStop): +(WebCore::writeResources): +(WebCore::operator<<): Deleted. +* rendering/svg/SVGRenderTreeAsText.h: + +2015-12-06 Simon Fraser + Clipping along compositing borders in svg-edit https://bugs.webkit.org/show_bug.cgi?id=151791 Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (193613 => 193614) --- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-12-07 06:27:08 UTC (rev 193613) +++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-12-07 06:27:48 UTC (rev 193614) @@ -7073,7 +7073,7 @@ if (!layer) return; -WTF::String output = externalRepresentation(&layer->renderer().frame(), WebCore::RenderAsTextShowAllLayers | WebCore::RenderAsTextShowLayerNesting | WebCore::RenderAsTextShowCompositedLayers | WebCore::RenderAsTextShowAddresses | WebCore::RenderAsTextShowIDAndClass | WebCore::RenderAsTextDontUpdateLayout | WebCore::RenderAsTextShowLayoutState | WebCore::RenderAsTextShowOverflow); +WTF::String output = externalRepresentation(&layer->renderer().frame(), WebCore::RenderAsTextShowAllLayers | WebCore::RenderAsTextShowLayerNesting | WebCore::RenderAsTextShowCompositedLayers | WebCore::RenderAsTextShowAddresses | WebCore::RenderAsTextShowIDAndClass | WebCore::RenderAsTextDontUpdateLayout | WebCore::RenderAsTextShowLayoutState | WebCore::RenderAsTextShowOverflow | WebCore::RenderAsTextShowSVGGeometry); fprintf(stderr, "%s\n", output.utf8().data()); } Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (193613 => 193614) --- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2015-12-07 06:27:08 UTC (rev 193613) +++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2015-12-07 06:27:48 UTC (rev 193614) @@ -67,6 +67,7 @@ #include "ShadowRoot.h" #include "SimpleLineLayoutResolver.h" #include "StyleProperties.h" +#include "TextStream.h" #include #include #include @@ -393,8 +394,13 @@ } }
[webkit-changes] [193613] trunk
Title: [193613] trunk
Revision 193613
Author simon.fra...@apple.com
Date 2015-12-06 22:27:08 -0800 (Sun, 06 Dec 2015)
Log Message
Clipping along compositing borders in svg-edit
https://bugs.webkit.org/show_bug.cgi?id=151791
Reviewed by Zalan Bujtas.
Source/WebCore:
RenderSVGRoot::layout() failed to clear overflow before recomputing
visual overflow, which could cause it to get stuck with stale overflow.
This would cause underpainting if its size went from small to large.
Test: svg/overflow/visual-overflow-change.html
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::layout):
LayoutTests:
Ref test that triggers recomputation of overflow.
* svg/overflow/visual-overflow-change-expected.html: Added.
* svg/overflow/visual-overflow-change.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp
Added Paths
trunk/LayoutTests/svg/overflow/visual-overflow-change-expected.html
trunk/LayoutTests/svg/overflow/visual-overflow-change.html
Diff
Modified: trunk/LayoutTests/ChangeLog (193612 => 193613)
--- trunk/LayoutTests/ChangeLog 2015-12-07 06:15:28 UTC (rev 193612)
+++ trunk/LayoutTests/ChangeLog 2015-12-07 06:27:08 UTC (rev 193613)
@@ -1,3 +1,15 @@
+2015-12-06 Simon Fraser
+
+Clipping along compositing borders in svg-edit
+https://bugs.webkit.org/show_bug.cgi?id=151791
+
+Reviewed by Zalan Bujtas.
+
+Ref test that triggers recomputation of overflow.
+
+* svg/overflow/visual-overflow-change-expected.html: Added.
+* svg/overflow/visual-overflow-change.html: Added.
+
2015-12-06 Andy VanWagoner
[INTL] Implement String.prototype.toLocaleLowerCase in ECMA-402
Added: trunk/LayoutTests/svg/overflow/visual-overflow-change-expected.html (0 => 193613)
--- trunk/LayoutTests/svg/overflow/visual-overflow-change-expected.html (rev 0)
+++ trunk/LayoutTests/svg/overflow/visual-overflow-change-expected.html 2015-12-07 06:27:08 UTC (rev 193613)
@@ -0,0 +1,53 @@
+
+
+
+body {
+overflow: hidden;
+margin: 0;
+}
+
+.svgcanvas {
+position: relative;
+width: 3800px;
+height: 600px;
+display: inline-block;
+overflow: hidden;
+}
+
+.indicator {
+position: absolute;
+top: 0;
+left: 0;
+width: 3800px; /* Trigger composited tiling */
+height: 600px;
+display: inline-block;
+background-color: red;
+}
+
+.composited {
+-webkit-transform: translateZ(0);
+}
+
+#svgroot {
+position: absolute;
+top: 0;
+left: 0;
+background-color: gray;
+}
+
+svg {
+border: 4px solid black;
+box-sizing: border-box;
+}
+
+
+
+
+
+
+
+
+
+
+
+
Added: trunk/LayoutTests/svg/overflow/visual-overflow-change.html (0 => 193613)
--- trunk/LayoutTests/svg/overflow/visual-overflow-change.html (rev 0)
+++ trunk/LayoutTests/svg/overflow/visual-overflow-change.html 2015-12-07 06:27:08 UTC (rev 193613)
@@ -0,0 +1,75 @@
+
+
+
+body {
+overflow: hidden;
+margin: 0;
+}
+
+.svgcanvas {
+position: relative;
+width: 3800px;
+height: 600px;
+display: inline-block;
+overflow: hidden;
+}
+
+.indicator {
+position: absolute;
+top: 0;
+left: 0;
+width: 3800px; /* Trigger composited tiling */
+height: 600px;
+display: inline-block;
+background-color: red;
+}
+
+.composited {
+-webkit-transform: translateZ(0);
+}
+
+#svgroot {
+position: absolute;
+top: 0;
+left: 0;
+background-color: gray;
+}
+
+svg {
+border: 4px solid black;
+box-sizing: border-box;
+}
+
+
+if (window.testRunner)
+testRunner.waitUntilDone();
+
+function doTest()
+{
+window.setTimeout(function() {
+var svg = document.getElementById('svgroot');
+svg.setAttribute('x', 640);
+svg.setAttribute('y', 480);
+svg.setAttribute('width', 1920);
+svg.setAttribute('height', 1400);
+var background = ""
+background.setAttribute('x', 540);
+background.setAttribute('y', 480);
+
+if (window.testRunner)
+testRunner.notifyDone();
+}, 0);
+}
+
[webkit-changes] [193612] trunk/Source/WebInspectorUI
Title: [193612] trunk/Source/WebInspectorUI
Revision 193612
Author mattba...@apple.com
Date 2015-12-06 22:15:28 -0800 (Sun, 06 Dec 2015)
Log Message
Web Inspector: Comparisons in setters should use the massaged value (" = x || 0/false/null/etc")
https://bugs.webkit.org/show_bug.cgi?id=151910
Reviewed by Timothy Hatcher.
Updated setters that use default values to convert falsy inputs to the default value
before compariing against the current value.
* UserInterface/Models/TimelineMarker.js:
(WebInspector.TimelineMarker.prototype.set time):
Assert new value is a number.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGridNode.prototype.set hidden):
(WebInspector.DataGridNode.prototype.set data):
Assert new value is of type object. Use shallowEqual compare before setting value.
* UserInterface/Views/GeneralTreeElement.js:
(WebInspector.GeneralTreeElement.prototype.set classNames):
Use shallowEqual compare before setting value.
(WebInspector.GeneralTreeElement.prototype.set mainTitle):
(WebInspector.GeneralTreeElement.prototype.set subtitle):
(WebInspector.GeneralTreeElement.prototype.set status):
(WebInspector.GeneralTreeElement.prototype.set tooltipHandledSeparately):
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview.prototype.set startTime):
(WebInspector.TimelineOverview.prototype.set currentTime):
(WebInspector.TimelineOverview.prototype.set endTime):
(WebInspector.TimelineOverview.prototype.set scrollStartTime):
(WebInspector.TimelineOverview.prototype.set selectionStartTime):
Check current ruler selectionStartTime before setting value.
* UserInterface/Views/TimelineOverviewGraph.js:
(WebInspector.TimelineOverviewGraph.prototype.set zeroTime):
(WebInspector.TimelineOverviewGraph.prototype.set startTime):
(WebInspector.TimelineOverviewGraph.prototype.set endTime):
(WebInspector.TimelineOverviewGraph.prototype.set currentTime):
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler):
(WebInspector.TimelineRuler.prototype.set allowsClippedLabels):
(WebInspector.TimelineRuler.prototype.set formatLabelCallback):
(WebInspector.TimelineRuler.prototype.set allowsTimeRangeSelection):
(WebInspector.TimelineRuler.prototype.set zeroTime):
(WebInspector.TimelineRuler.prototype.set startTime):
(WebInspector.TimelineRuler.prototype.set endTime):
(WebInspector.TimelineRuler.prototype.set secondsPerPixel):
(WebInspector.TimelineRuler.prototype.set selectionStartTime):
(WebInspector.TimelineRuler.prototype.set selectionEndTime):
(WebInspector.TimelineRuler.prototype.set duration): Deleted.
The ruler duration and "pinned" state are controlled by setting an end
time. Removed since it wasn't being used, and there shouldn't be two
ways to the exact same thing.
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.set zeroTime):
(WebInspector.TimelineView.prototype.set startTime):
(WebInspector.TimelineView.prototype.set endTime):
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js
trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js
trunk/Source/WebInspectorUI/UserInterface/Views/GeneralTreeElement.js
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (193611 => 193612)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-12-07 06:13:26 UTC (rev 193611)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-12-07 06:15:28 UTC (rev 193612)
@@ -1,3 +1,65 @@
+2015-12-06 Matt Baker
+
+Web Inspector: Comparisons in setters should use the massaged value (" = x || 0/false/null/etc")
+https://bugs.webkit.org/show_bug.cgi?id=151910
+
+Reviewed by Timothy Hatcher.
+
+Updated setters that use default values to convert falsy inputs to the default value
+before compariing against the current value.
+
+* UserInterface/Models/TimelineMarker.js:
+(WebInspector.TimelineMarker.prototype.set time):
+Assert new value is a number.
+
+* UserInterface/Views/DataGrid.js:
+(WebInspector.DataGridNode.prototype.set hidden):
+(WebInspector.DataGridNode.prototype.set data):
+Assert new value is of type object. Use shallowEqual compare before setting value.
+
+* UserInterface/Views/GeneralTreeElement.js:
+(WebInspector.GeneralTreeElement.prototype.set classNames):
+Use shallowEqual compare before setting value.
+(WebInspector.GeneralTreeElement.prototype.set mainTitle):
+(WebInspector.GeneralTreeElement.prototype.set subtitle):
+(WebInspector.GeneralTreeElement.prototype.set status):
+(WebInspector.GeneralTreeElement.prototype.set tooltipHandledSeparately):
+
+* UserInterface/View
[webkit-changes] [193611] trunk
Title: [193611] trunk
Revision 193611
Author commit-qu...@webkit.org
Date 2015-12-06 22:13:26 -0800 (Sun, 06 Dec 2015)
Log Message
[INTL] Implement String.prototype.toLocaleLowerCase in ECMA-402
https://bugs.webkit.org/show_bug.cgi?id=147608
Patch by Andy VanWagoner on 2015-12-06
Reviewed by Benjamin Poulain.
Source/_javascript_Core:
Add toLocaleLowerCase using icu u_strToLower.
* runtime/IntlObject.cpp:
(JSC::defaultLocale): Expose.
(JSC::bestAvailableLocale): Expose.
(JSC::removeUnicodeLocaleExtension): Expose.
* runtime/IntlObject.h:
* runtime/StringPrototype.cpp:
(JSC::StringPrototype::finishCreation):
(JSC::stringProtoFuncToLocaleLowerCase): Add.
LayoutTests:
* js/script-tests/string-toLocaleLowerCase.js: Added.
* js/string-toLocaleLowerCase-expected.txt: Added.
* js/string-toLocaleLowerCase.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/IntlObject.cpp
trunk/Source/_javascript_Core/runtime/IntlObject.h
trunk/Source/_javascript_Core/runtime/StringPrototype.cpp
Added Paths
trunk/LayoutTests/js/script-tests/string-toLocaleLowerCase.js
trunk/LayoutTests/js/string-toLocaleLowerCase-expected.txt
trunk/LayoutTests/js/string-toLocaleLowerCase.html
Diff
Modified: trunk/LayoutTests/ChangeLog (193610 => 193611)
--- trunk/LayoutTests/ChangeLog 2015-12-07 05:14:30 UTC (rev 193610)
+++ trunk/LayoutTests/ChangeLog 2015-12-07 06:13:26 UTC (rev 193611)
@@ -1,3 +1,14 @@
+2015-12-06 Andy VanWagoner
+
+[INTL] Implement String.prototype.toLocaleLowerCase in ECMA-402
+https://bugs.webkit.org/show_bug.cgi?id=147608
+
+Reviewed by Benjamin Poulain.
+
+* js/script-tests/string-toLocaleLowerCase.js: Added.
+* js/string-toLocaleLowerCase-expected.txt: Added.
+* js/string-toLocaleLowerCase.html: Added.
+
2015-12-06 Simon Fraser
REGRESSION (r187121): Can't get to the main content of the page at https://theintercept.com/drone-papers/
Added: trunk/LayoutTests/js/script-tests/string-toLocaleLowerCase.js (0 => 193611)
--- trunk/LayoutTests/js/script-tests/string-toLocaleLowerCase.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/string-toLocaleLowerCase.js 2015-12-07 06:13:26 UTC (rev 193611)
@@ -0,0 +1,96 @@
+description("This test checks String.prototype.toLocaleLowerCase().");
+
+shouldBe("String.prototype.toLocaleLowerCase.length", "0");
+
+// Check empty string optimization.
+shouldBe("''.toLocaleLowerCase()", "''");
+
+// Generic
+shouldBe("String.prototype.toLocaleLowerCase.call({ toString() { return 'A' } })", "'a'");
+shouldThrow("String.prototype.toLocaleLowerCase.call({ toString() { throw Error('1') } })", "'Error: 1'");
+shouldThrow("String.prototype.toLocaleLowerCase.call(null)");
+shouldThrow("String.prototype.toLocaleLowerCase.call(undefined)");
+
+// Ignores non-object, non-string locale list.
+shouldBe("'A'.toLocaleLowerCase(9)", "'a'");
+// Handles array-like objects with holes.
+shouldBe("'\\u0130'.toLocaleLowerCase({ length: 4, 1: 'az', 3: 'en' })", "'i'");
+// Doesn't throw, but ignores private tags.
+shouldBe("'A'.toLocaleLowerCase('x-some-thing')", "'a'");
+// Throws on problems with length, get, or toString.
+shouldThrow("'A'.toLocaleLowerCase(Object.create(null, { length: { get() { throw Error('a') } } }))", "'Error: a'");
+shouldThrow("'A'.toLocaleLowerCase(Object.create(null, { length: { value: 1 }, 0: { get() { throw Error('b') } } }))", "'Error: b'");
+shouldThrow("'A'.toLocaleLowerCase([ { toString() { throw Error('c') } } ])", "'Error: c'");
+// Throws on bad tags.
+shouldThrow("'A'.toLocaleLowerCase([ 5 ])", "'TypeError: locale value must be a string or object'");
+shouldThrow("'A'.toLocaleLowerCase('')", "'RangeError: invalid language tag: '");
+shouldThrow("'A'.toLocaleLowerCase('a')", "'RangeError: invalid language tag: a'");
+shouldThrow("'A'.toLocaleLowerCase('abcdefghij')", "'RangeError: invalid language tag: abcdefghij'");
+shouldThrow("'A'.toLocaleLowerCase('#$')", "'RangeError: invalid language tag: #$'");
+shouldThrow("'A'.toLocaleLowerCase('en-@-abc')", "'RangeError: invalid language tag: en-@-abc'");
+shouldThrow("'A'.toLocaleLowerCase('en-u')", "'RangeError: invalid language tag: en-u'");
+shouldThrow("'A'.toLocaleLowerCase('en-u-kn-true-u-ko-true')", "'RangeError: invalid language tag: en-u-kn-true-u-ko-true'");
+shouldThrow("'A'.toLocaleLowerCase('en-x')", "'RangeError: invalid language tag: en-x'");
+shouldThrow("'A'.toLocaleLowerCase('en-*')", "'RangeError: invalid language tag: en-*'");
+shouldThrow("'A'.toLocaleLowerCase('en-')", "'RangeError: invalid language tag: en-'");
+shouldThrow("'A'.toLocaleLowerCase('en--US')", "'RangeError: invalid language tag: en--US'");
+
+// Check ascii and accents.
+shouldBe("'AbCdEfGhIjKlMnOpQRStuvWXyZ0123456789'.toLocaleLowerCase()", "'abcdefghijklmnopqrstuvwxyz0123456789'");
+shouldBe("'ÀÉÎÖŒØŪÑ'.toLocaleLowerCase()", "'àéîöœøūñ'");
+
+// Check n
[webkit-changes] [193610] trunk
Title: [193610] trunk
Revision 193610
Author simon.fra...@apple.com
Date 2015-12-06 21:14:30 -0800 (Sun, 06 Dec 2015)
Log Message
REGRESSION (r187121): Can't get to the main content of the page at https://theintercept.com/drone-papers/
https://bugs.webkit.org/show_bug.cgi?id=151849
rdar://problem/23132828
Reviewed by Zalan Bujtas.
Source/WebCore:
This page uses a fill-forwards animation where the last keyframe has height: auto.
After r187121, we tried to blend the height Length value from the last keyframe to the
first keyframe with progress=0 (which should pick up the 'auto' from the last keyframe).
However, Length::blend() just considered both 0 and 'auto' to be zero, and returned
the 0 length.
So fix Length::blend() to return the "from" length if progress is zero.
Test: animations/fill-forwards-auto-height.html
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc): Length::blend takes a double, so don't narrow to float.
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::fetchIntervalEndpointsForProperty): Declare two variables
at first use.
* platform/Length.h:
(WebCore::Length::blend):
LayoutTests:
New ref test.
The behavior of imported/blink/transitions/transition-not-interpolable.html changed
with this patch, but that test is trying to determine if transitions run to/from
'auto' values, and doing it wrong. The current patch doesn't change the user-visible
behavior of transitions with 'auto' endpoints (covered by http://webkit.org/b/38243).
* animations/fill-forwards-auto-height-expected.html: Added.
* animations/fill-forwards-auto-height.html: Added.
* imported/blink/transitions/transition-not-interpolable-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/imported/blink/transitions/transition-not-interpolable-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp
trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp
trunk/Source/WebCore/platform/Length.h
Added Paths
trunk/LayoutTests/animations/fill-forwards-auto-height-expected.html
trunk/LayoutTests/animations/fill-forwards-auto-height.html
Diff
Modified: trunk/LayoutTests/ChangeLog (193609 => 193610)
--- trunk/LayoutTests/ChangeLog 2015-12-07 04:55:15 UTC (rev 193609)
+++ trunk/LayoutTests/ChangeLog 2015-12-07 05:14:30 UTC (rev 193610)
@@ -1,3 +1,22 @@
+2015-12-06 Simon Fraser
+
+REGRESSION (r187121): Can't get to the main content of the page at https://theintercept.com/drone-papers/
+https://bugs.webkit.org/show_bug.cgi?id=151849
+rdar://problem/23132828
+
+Reviewed by Zalan Bujtas.
+
+New ref test.
+
+The behavior of imported/blink/transitions/transition-not-interpolable.html changed
+with this patch, but that test is trying to determine if transitions run to/from
+'auto' values, and doing it wrong. The current patch doesn't change the user-visible
+behavior of transitions with 'auto' endpoints (covered by http://webkit.org/b/38243).
+
+* animations/fill-forwards-auto-height-expected.html: Added.
+* animations/fill-forwards-auto-height.html: Added.
+* imported/blink/transitions/transition-not-interpolable-expected.txt:
+
2015-12-06 David Kilzer
REGRESSION(r193584): Causes heap use-after-free crashes in Web Inspector tests with AddressSanitizer (Requested by ddkilzer on #webkit).
Added: trunk/LayoutTests/animations/fill-forwards-auto-height-expected.html (0 => 193610)
--- trunk/LayoutTests/animations/fill-forwards-auto-height-expected.html (rev 0)
+++ trunk/LayoutTests/animations/fill-forwards-auto-height-expected.html 2015-12-07 05:14:30 UTC (rev 193610)
@@ -0,0 +1,26 @@
+
+
+
+
+
+.landing {
+width: 300px;
+overflow: hidden;
+border: 1px solid black;
+}
+
+.contents {
+height: 300px;
+background-color: gray;
+}
+
+
+
+
+
+
+
+
+
+
+
Added: trunk/LayoutTests/animations/fill-forwards-auto-height.html (0 => 193610)
--- trunk/LayoutTests/animations/fill-forwards-auto-height.html (rev 0)
+++ trunk/LayoutTests/animations/fill-forwards-auto-height.html 2015-12-07 05:14:30 UTC (rev 193610)
@@ -0,0 +1,43 @@
+
+
+
+
+
+@keyframes reveal {
+0%, 50% {
+height: 0;
+}
+
+100% {
+height: auto;
+}
+}
+
+.landing {
+width: 300px;
+overflow: hidden;
+border: 1px solid black;
+animation: reveal 0.01s forwards;
+}
+
+.contents {
+height: 300px;
+background-color: gray;
+}
+
+
+
+
+
+
+
+if (window.testRunner)
+testRunner.waitUntilDone();
+
+document.getElementById('animated').addEventListener('animationend', function() {
+if (window.testRunner)
+testRunner.notifyDone();
+})
+
+
+
Mo
[webkit-changes] [193609] trunk/Source/WebCore
Title: [193609] trunk/Source/WebCore
Revision 193609
Author simon.fra...@apple.com
Date 2015-12-06 20:55:15 -0800 (Sun, 06 Dec 2015)
Log Message
Give SVGTransformList some inline vector capacity
https://bugs.webkit.org/show_bug.cgi?id=151644
Reviewed by Andreas Kling.
Giving SVGTransformList inline capacity of one drops time under SVGTransformList::parse() by
about 1% on http://animateplus.com/demos/stress-test/
* svg/SVGTransformList.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/svg/SVGTransformList.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (193608 => 193609)
--- trunk/Source/WebCore/ChangeLog 2015-12-07 04:40:35 UTC (rev 193608)
+++ trunk/Source/WebCore/ChangeLog 2015-12-07 04:55:15 UTC (rev 193609)
@@ -1,3 +1,15 @@
+2015-12-06 Simon Fraser
+
+Give SVGTransformList some inline vector capacity
+https://bugs.webkit.org/show_bug.cgi?id=151644
+
+Reviewed by Andreas Kling.
+
+Giving SVGTransformList inline capacity of one drops time under SVGTransformList::parse() by
+about 1% on http://animateplus.com/demos/stress-test/
+
+* svg/SVGTransformList.h:
+
2015-12-06 Zalan Bujtas
Addressing post-review comments on r193374.
Modified: trunk/Source/WebCore/svg/SVGTransformList.h (193608 => 193609)
--- trunk/Source/WebCore/svg/SVGTransformList.h 2015-12-07 04:40:35 UTC (rev 193608)
+++ trunk/Source/WebCore/svg/SVGTransformList.h 2015-12-07 04:55:15 UTC (rev 193609)
@@ -27,7 +27,7 @@
namespace WebCore {
-class SVGTransformList : public Vector {
+class SVGTransformList : public Vector {
public:
SVGTransformList() { }
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193608] trunk/Source/WebCore
Title: [193608] trunk/Source/WebCore
Revision 193608
Author za...@apple.com
Date 2015-12-06 20:40:35 -0800 (Sun, 06 Dec 2015)
Log Message
Addressing post-review comments on r193374.
Reviewed by Antti Koivisto.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForText):
(WebCore::SimpleLineLayout::canUseForFontAndText):
(WebCore::SimpleLineLayout::canUseForStyle):
(WebCore::SimpleLineLayout::canUseForWithReason):
(WebCore::SimpleLineLayout::canUseFor):
(WebCore::SimpleLineLayout::printSimpleLineLayoutBlockList):
(WebCore::SimpleLineLayout::printSimpleLineLayoutCoverage):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/SimpleLineLayout.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (193607 => 193608)
--- trunk/Source/WebCore/ChangeLog 2015-12-07 03:27:30 UTC (rev 193607)
+++ trunk/Source/WebCore/ChangeLog 2015-12-07 04:40:35 UTC (rev 193608)
@@ -1,3 +1,18 @@
+2015-12-06 Zalan Bujtas
+
+Addressing post-review comments on r193374.
+
+Reviewed by Antti Koivisto.
+
+* rendering/SimpleLineLayout.cpp:
+(WebCore::SimpleLineLayout::canUseForText):
+(WebCore::SimpleLineLayout::canUseForFontAndText):
+(WebCore::SimpleLineLayout::canUseForStyle):
+(WebCore::SimpleLineLayout::canUseForWithReason):
+(WebCore::SimpleLineLayout::canUseFor):
+(WebCore::SimpleLineLayout::printSimpleLineLayoutBlockList):
+(WebCore::SimpleLineLayout::printSimpleLineLayoutCoverage):
+
2015-12-04 Myles C. Maxfield
Remove CORETEXT_WEB_FONTS
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (193607 => 193608)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-12-07 03:27:30 UTC (rev 193607)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-12-07 04:40:35 UTC (rev 193608)
@@ -61,84 +61,85 @@
#endif
enum AvoidanceReason_ : uint64_t {
-NoReason= 1LLU << 0,
-FlowIsInsideRegion = 1LLU << 1,
-FlowHasHorizonalWritingMode = 1LLU << 2,
-FlowHasOutline = 1LLU << 3,
-FlowIsRuby = 1LLU << 4,
-FlowIsPaginated = 1LLU << 5,
-FlowHasTextOverflow = 1LLU << 6,
-FlowIsDepricatedFlexBox = 1LLU << 7,
-FlowParentIsPlaceholderElement = 1LLU << 8,
-FlowParentIsTextAreaWithWrapping= 1LLU << 9,
-FlowHasNonSupportedChild= 1LLU << 10,
-FlowHasUnsupportedFloat = 1LLU << 11,
-FlowHasTextDecoration = 1LLU << 12,
-FlowIsJustifyAligned= 1LLU << 13,
-FlowHasOverflowVisible = 1LLU << 14,
-FlowIsNotLTR= 1LLU << 15,
-FlowHasLineBoxContainProperty = 1LLU << 16,
-FlowIsNotTopToBottom= 1LLU << 17,
-FlowHasLineBreak= 1LLU << 18,
-FlowHasWordBreak= 1LLU << 19,
-FlowHasNonNormalUnicodeBiDi = 1LLU << 20,
-FlowHasRTLOrdering = 1LLU << 21,
-FlowHasLineAlignEdges = 1LLU << 22,
-FlowHasLineSnap = 1LLU << 23,
-FlowHasHypensAuto = 1LLU << 24,
-FlowHasTextEmphasisFillOrMark = 1LLU << 25,
-FlowHasTextShadow = 1LLU << 26,
-FlowHasPseudoFirstLine = 1LLU << 27,
-FlowHasPseudoFirstLetter= 1LLU << 28,
-FlowHasTextCombine = 1LLU << 29,
-FlowHasTextFillBox = 1LLU << 30,
-FlowHasBorderFitLines = 1LLU << 31,
-FlowHasNonAutoLineBreak = 1LLU << 32,
-FlowHasNonAutoTrailingWord = 1LLU << 33,
-FlowHasSVGFont = 1LLU << 34,
-FlowTextIsEmpty = 1LLU << 35,
-FlowTextHasNoBreakSpace = 1LLU << 36,
-FlowTextHasSoftHyphen = 1LLU << 37,
-FlowTextHasDirectionCharacter = 1LLU << 38,
-FlowIsMissingPrimaryFont= 1LLU << 39,
-FlowFontIsMissingGlyph = 1LLU << 40,
-FlowTextIsCombineText = 1LLU << 41,
-FlowTextIsRenderCounter = 1LLU << 42,
-FlowTextIsRenderQuote = 1LLU << 43,
-FlowTextIsTextFragment = 1LLU << 44,
-FlowTextIsSVGInlineText = 1LLU << 45,
-FlowFontIsNotSimple = 1LLU << 46,
-FeatureIsDisabled = 1LLU << 47,
-FlowHasNoParent = 1LLU << 48,
-FlowHasNoChild = 1LLU << 49,
-EndOfReasons= 1LLU << 50
+FlowIsInsideRegion = 1LLU << 0,
+FlowHasHorizonalWritingMode = 1LLU << 1,
+FlowHasOutline = 1LLU << 2,
+FlowIsRuby = 1LLU << 3,
+F
[webkit-changes] [193607] trunk/Tools
Title: [193607] trunk/Tools
Revision 193607
Author ddkil...@apple.com
Date 2015-12-06 19:27:30 -0800 (Sun, 06 Dec 2015)
Log Message
TestNetscapePlugIn: Fix leaks found by static analyzer
Reviewed by Darin Adler.
Fixes the following leaks found by the static analyzer:
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'path'
return false;
^
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'target'
return false;
^
DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'url'
return false;
^
* DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
(toCString): Switch to returning std::unique_ptr. Add
early return if allocation fails.
(testPostURLFile): Switch to using std::unique_ptr.
Make sure to call fclose() on filehandle, even for an early
return.
(testSetStatus): Switch to using std::unique_ptr.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp
Diff
Modified: trunk/Tools/ChangeLog (193606 => 193607)
--- trunk/Tools/ChangeLog 2015-12-07 01:54:43 UTC (rev 193606)
+++ trunk/Tools/ChangeLog 2015-12-07 03:27:30 UTC (rev 193607)
@@ -1,3 +1,29 @@
+2015-12-06 David Kilzer
+
+TestNetscapePlugIn: Fix leaks found by static analyzer
+
+
+Reviewed by Darin Adler.
+
+Fixes the following leaks found by the static analyzer:
+DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'path'
+return false;
+ ^
+DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'target'
+return false;
+ ^
+DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:808:16: warning: Potential leak of memory pointed to by 'url'
+return false;
+ ^
+
+* DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp:
+(toCString): Switch to returning std::unique_ptr. Add
+early return if allocation fails.
+(testPostURLFile): Switch to using std::unique_ptr.
+Make sure to call fclose() on filehandle, even for an early
+return.
+(testSetStatus): Switch to using std::unique_ptr.
+
2015-12-05 David Kilzer
prepare-ChangeLog: Fix some warning messages when using svn
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp (193606 => 193607)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2015-12-07 01:54:43 UTC (rev 193606)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp 2015-12-07 03:27:30 UTC (rev 193607)
@@ -30,6 +30,7 @@
#include "PluginTest.h"
#include "TestObject.h"
#include
+#include
#include
#include
#include
@@ -775,12 +776,16 @@
return true;
}
-static char* toCString(const NPString& string)
+static std::unique_ptr toCString(const NPString& string)
{
-char* result = static_cast(malloc(string.UTF8Length + 1));
-memcpy(result, string.UTF8Characters, string.UTF8Length);
-result[string.UTF8Length] = '\0';
+size_t length = string.UTF8Length;
+std::unique_ptr result(new char[length + 1]);
+if (!result)
+return result;
+memcpy(result.get(), string.UTF8Characters, length);
+result[length] = '\0';
+
return result;
}
@@ -790,30 +795,27 @@
return false;
NPString urlString = NPVARIANT_TO_STRING(args[0]);
-char* url = ""
+auto url = ""
NPString targetString = NPVARIANT_TO_STRING(args[1]);
-char* target = toCString(targetString);
+auto target = toCString(targetString);
NPString pathString = NPVARIANT_TO_STRING(args[2]);
-char* path = toCString(pathString);
+auto path = toCString(pathString);
NPString contentsString = NPVARIANT_TO_STRING(args[3]);
-FILE* tempFile = fopen(path, "w");
+FILE* tempFile = fopen(path.get(), "w");
if (!tempFile)
return false;
-if (!fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile))
-return false;
-
+size_t count = fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile);
fclose(tempFile);
-NPError error = browser->posturl(obj->npp, url, target, pathString.UTF8Length, path, TRUE);
+if (!count)
+return false;
-free(path);
-free(target);
-free(url);
+NPError error = browser->posturl(obj->npp, url.get(), target.get(), pathString.UTF8Length, path.get(), TRUE);
BOOLEAN_TO_NPVARIANT(error == NPERR_NO_ERROR, *result);
return true;
@@ -972,15 +974,14 @@
static bool testSetStatus(PluginObject* ob
[webkit-changes] [193605] branches/safari-601-branch/Source
Title: [193605] branches/safari-601-branch/Source Revision 193605 Author bshaf...@apple.com Date 2015-12-06 17:16:22 -0800 (Sun, 06 Dec 2015) Log Message Versioning. Modified Paths branches/safari-601-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-601-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-601-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-601-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-601-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-601-branch/Source/_javascript_Core/Configurations/Version.xcconfig (193604 => 193605) --- branches/safari-601-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-07 01:14:51 UTC (rev 193604) +++ branches/safari-601-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-07 01:16:22 UTC (rev 193605) @@ -23,7 +23,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 5; -TINY_VERSION = 4; +TINY_VERSION = 5; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-601-branch/Source/WebCore/Configurations/Version.xcconfig (193604 => 193605) --- branches/safari-601-branch/Source/WebCore/Configurations/Version.xcconfig 2015-12-07 01:14:51 UTC (rev 193604) +++ branches/safari-601-branch/Source/WebCore/Configurations/Version.xcconfig 2015-12-07 01:16:22 UTC (rev 193605) @@ -23,7 +23,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 5; -TINY_VERSION = 4; +TINY_VERSION = 5; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-601-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (193604 => 193605) --- branches/safari-601-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-07 01:14:51 UTC (rev 193604) +++ branches/safari-601-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-07 01:16:22 UTC (rev 193605) @@ -1,6 +1,6 @@ MAJOR_VERSION = 601; MINOR_VERSION = 5; -TINY_VERSION = 4; +TINY_VERSION = 5; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-601-branch/Source/WebKit/mac/Configurations/Version.xcconfig (193604 => 193605) --- branches/safari-601-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-07 01:14:51 UTC (rev 193604) +++ branches/safari-601-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-07 01:16:22 UTC (rev 193605) @@ -23,7 +23,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 5; -TINY_VERSION = 4; +TINY_VERSION = 5; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); Modified: branches/safari-601-branch/Source/WebKit2/Configurations/Version.xcconfig (193604 => 193605) --- branches/safari-601-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-12-07 01:14:51 UTC (rev 193604) +++ branches/safari-601-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-12-07 01:16:22 UTC (rev 193605) @@ -23,7 +23,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 5; -TINY_VERSION = 4; +TINY_VERSION = 5; MICRO_VERSION = 0; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193604] tags/Safari-601.5.4/
Title: [193604] tags/Safari-601.5.4/ Revision 193604 Author bshaf...@apple.com Date 2015-12-06 17:14:51 -0800 (Sun, 06 Dec 2015) Log Message New tag. Added Paths tags/Safari-601.5.4/ Diff Property changes: tags/Safari-601.5.4 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193603] trunk/Source/JavaScriptCore
Title: [193603] trunk/Source/_javascript_Core Revision 193603 Author commit-qu...@webkit.org Date 2015-12-06 17:09:31 -0800 (Sun, 06 Dec 2015) Log Message [es6] Arrow function syntax. Fix tests after 149338 landing https://bugs.webkit.org/show_bug.cgi?id=151927 Patch by Skachkov Oleksandr on 2015-12-06 Reviewed by Saam Barati. After landing patch for 149338 errors appear in for ES6 Generator. Current fix is removed assert that was removed by patch with implemenation of ES6 Generator. * runtime/CommonSlowPaths.cpp: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/CommonSlowPaths.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (193602 => 193603) --- trunk/Source/_javascript_Core/ChangeLog 2015-12-07 00:41:47 UTC (rev 193602) +++ trunk/Source/_javascript_Core/ChangeLog 2015-12-07 01:09:31 UTC (rev 193603) @@ -1,3 +1,15 @@ +2015-12-06 Skachkov Oleksandr + +[es6] Arrow function syntax. Fix tests after 149338 landing +https://bugs.webkit.org/show_bug.cgi?id=151927 + +Reviewed by Saam Barati. + +After landing patch for 149338 errors appear in for ES6 Generator. Current fix is removed assert +that was removed by patch with implemenation of ES6 Generator. + +* runtime/CommonSlowPaths.cpp: + 2015-12-05 Aleksandr Skachkov [ES6] "super" and "this" should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment Modified: trunk/Source/_javascript_Core/runtime/CommonSlowPaths.cpp (193602 => 193603) --- trunk/Source/_javascript_Core/runtime/CommonSlowPaths.cpp 2015-12-07 00:41:47 UTC (rev 193602) +++ trunk/Source/_javascript_Core/runtime/CommonSlowPaths.cpp 2015-12-07 01:09:31 UTC (rev 193603) @@ -224,11 +224,6 @@ BEGIN(); JSFunction* constructor = jsCast(OP(2).jsValue().asCell()); -#if !ASSERT_DISABLED -ConstructData constructData; -ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS || constructor->jsExecutable()->isArrowFunction()); -#endif - auto& cacheWriteBarrier = pc[4].u.jsCell; if (!cacheWriteBarrier) cacheWriteBarrier.set(exec->vm(), exec->codeBlock(), constructor); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193602] branches/safari-601.1.46-branch/Source
Title: [193602] branches/safari-601.1.46-branch/Source Revision 193602 Author bshaf...@apple.com Date 2015-12-06 16:41:47 -0800 (Sun, 06 Dec 2015) Log Message Versioning. Modified Paths branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig (193601 => 193602) --- branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-07 00:40:35 UTC (rev 193601) +++ branches/safari-601.1.46-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-07 00:41:47 UTC (rev 193602) @@ -24,7 +24,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 1; TINY_VERSION = 46; -MICRO_VERSION = 84; +MICRO_VERSION = 85; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig (193601 => 193602) --- branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig 2015-12-07 00:40:35 UTC (rev 193601) +++ branches/safari-601.1.46-branch/Source/WebCore/Configurations/Version.xcconfig 2015-12-07 00:41:47 UTC (rev 193602) @@ -24,7 +24,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 1; TINY_VERSION = 46; -MICRO_VERSION = 84; +MICRO_VERSION = 85; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (193601 => 193602) --- branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-07 00:40:35 UTC (rev 193601) +++ branches/safari-601.1.46-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-07 00:41:47 UTC (rev 193602) @@ -1,7 +1,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 1; TINY_VERSION = 46; -MICRO_VERSION = 84; +MICRO_VERSION = 85; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig (193601 => 193602) --- branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-07 00:40:35 UTC (rev 193601) +++ branches/safari-601.1.46-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-07 00:41:47 UTC (rev 193602) @@ -24,7 +24,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 1; TINY_VERSION = 46; -MICRO_VERSION = 84; +MICRO_VERSION = 85; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); Modified: branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig (193601 => 193602) --- branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-12-07 00:40:35 UTC (rev 193601) +++ branches/safari-601.1.46-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-12-07 00:41:47 UTC (rev 193602) @@ -24,7 +24,7 @@ MAJOR_VERSION = 601; MINOR_VERSION = 1; TINY_VERSION = 46; -MICRO_VERSION = 84; +MICRO_VERSION = 85; NANO_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193601] tags/Safari-601.1.46.84/
Title: [193601] tags/Safari-601.1.46.84/ Revision 193601 Author bshaf...@apple.com Date 2015-12-06 16:40:35 -0800 (Sun, 06 Dec 2015) Log Message New tag. Added Paths tags/Safari-601.1.46.84/ Diff Property changes: tags/Safari-601.1.46.84 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193600] branches/safari-601.1.46-branch/Source/WebCore
Title: [193600] branches/safari-601.1.46-branch/Source/WebCore
Revision 193600
Author bshaf...@apple.com
Date 2015-12-06 15:07:58 -0800 (Sun, 06 Dec 2015)
Log Message
Merged r193599. rdar://problem/23769689
Modified Paths
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/Source/WebCore/ChangeLog (193599 => 193600)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 23:00:20 UTC (rev 193599)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 23:07:58 UTC (rev 193600)
@@ -1,5 +1,18 @@
2015-12-06 Babak Shafiei
+Merge r193599.
+
+2015-12-06 David Kilzer
+
+REGRESSION (r193575): variantSettings is unused when PLATFORM_FONT_LOOKUP is disabled
+
+
+* platform/graphics/mac/FontCacheMac.mm:
+(WebCore::fontWithFamily): Mark variantSettings as ununsed when
+PLATFORM_FONT_LOOKUP is disabled.
+
+2015-12-06 Babak Shafiei
+
Merge r188114. rdar://problem/23221171
2015-08-06 Myles C. Maxfield
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193599 => 193600)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 23:00:20 UTC (rev 193599)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 23:07:58 UTC (rev 193600)
@@ -297,6 +297,7 @@
#else
UNUSED_PARAM(featureSettings);
+UNUSED_PARAM(variantSettings);
NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (weight >= FontWeight600 ? NSBoldFontMask : 0);
if (hasDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily)) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193599] branches/safari-601-branch/Source/WebCore
Title: [193599] branches/safari-601-branch/Source/WebCore
Revision 193599
Author ddkil...@apple.com
Date 2015-12-06 15:00:20 -0800 (Sun, 06 Dec 2015)
Log Message
REGRESSION (r193575): variantSettings is unused when PLATFORM_FONT_LOOKUP is disabled
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::fontWithFamily): Mark variantSettings as ununsed when
PLATFORM_FONT_LOOKUP is disabled.
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 (193598 => 193599)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 22:43:01 UTC (rev 193598)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 23:00:20 UTC (rev 193599)
@@ -1,3 +1,12 @@
+2015-12-06 David Kilzer
+
+REGRESSION (r193575): variantSettings is unused when PLATFORM_FONT_LOOKUP is disabled
+
+
+* platform/graphics/mac/FontCacheMac.mm:
+(WebCore::fontWithFamily): Mark variantSettings as ununsed when
+PLATFORM_FONT_LOOKUP is disabled.
+
2015-12-06 Babak Shafiei
Merge r188114.
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193598 => 193599)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 22:43:01 UTC (rev 193598)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-06 23:00:20 UTC (rev 193599)
@@ -297,6 +297,7 @@
#else
UNUSED_PARAM(featureSettings);
+UNUSED_PARAM(variantSettings);
NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (weight >= FontWeight600 ? NSBoldFontMask : 0);
if (hasDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily)) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193598] branches/safari-601-branch/LayoutTests
Title: [193598] branches/safari-601-branch/LayoutTests Revision 193598 Author ddkil...@apple.com Date 2015-12-06 14:43:01 -0800 (Sun, 06 Dec 2015) Log Message REGRESSION (r193575): Conflict markers left in test files When trunk r190192 was merged to safari-601-branch, there were some conflict markers left in test files. This commit resolves those conflicts the same way I did when I merged r193575 to safari-601.1.46-branch. * fast/css/getComputedStyle/computed-style-expected.txt: * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: * svg/css/getComputedStyle-basic-expected.txt: - Resolve conflicts to take updated font properties, but to ignore -webkit-grid changes. * platform/mac/TestExpectations: Remove duplicate entries and take expectations for css3/font-* tests from trunk. Modified Paths branches/safari-601-branch/LayoutTests/ChangeLog branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations branches/safari-601-branch/LayoutTests/svg/css/getComputedStyle-basic-expected.txt Diff Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193597 => 193598) --- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 22:25:08 UTC (rev 193597) +++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-06 22:43:01 UTC (rev 193598) @@ -1,3 +1,22 @@ +2015-12-06 David Kilzer + +REGRESSION (r193575): Conflict markers left in test files + + +When trunk r190192 was merged to safari-601-branch, there were +some conflict markers left in test files. This commit resolves +those conflicts the same way I did when I merged r193575 to +safari-601.1.46-branch. + +* fast/css/getComputedStyle/computed-style-expected.txt: +* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: +* svg/css/getComputedStyle-basic-expected.txt: +- Resolve conflicts to take updated font properties, but to + ignore -webkit-grid changes. + +* platform/mac/TestExpectations: Remove duplicate entries and +take expectations for css3/font-* tests from trunk. + 2015-12-06 Matthew Hanson Merge r190999. rdar://problem/23769821 Modified: branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (193597 => 193598) --- branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-12-06 22:25:08 UTC (rev 193597) +++ branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-12-06 22:43:01 UTC (rev 193598) @@ -159,25 +159,12 @@ justify-items: start; -webkit-font-kerning: auto; -webkit-font-smoothing: auto; -<<< HEAD --webkit-font-variant-ligatures: normal; -=== font-variant-ligatures: normal; font-variant-position: normal; font-variant-caps: normal; font-variant-numeric: normal; font-variant-alternates: normal; font-variant-east-asian: normal; --webkit-grid-auto-columns: auto; --webkit-grid-auto-flow: row; --webkit-grid-auto-rows: auto; --webkit-grid-column-end: auto; --webkit-grid-column-start: auto; --webkit-grid-template-columns: none; --webkit-grid-template-rows: none; --webkit-grid-row-end: auto; --webkit-grid-row-start: auto; ->>> 105717c... [Cocoa] [Font Features] Implement font-variant-* -webkit-hyphenate-character: auto; -webkit-hyphenate-limit-after: auto; -webkit-hyphenate-limit-before: auto; Modified: branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (193597 => 193598) --- branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-12-06 22:25:08 UTC (rev 193597) +++ branches/safari-601-branch/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-12-06 22:43:01 UTC (rev 193598) @@ -158,25 +158,12 @@ justify-items: auto -webkit-font-kerning: auto -webkit-font-smoothing: auto -<<< HEAD --webkit-font-variant-ligatures: normal -=== font-variant-ligatures: normal font-variant-position: normal font-variant-caps: normal font-variant-numeric: normal font-variant-alternates: normal font-variant-east-asian: normal --webkit-grid-auto-columns: auto --webkit-grid-auto-flow: row --webkit-grid-auto-rows: auto --webkit-grid-column-end: auto --webkit-grid-column-start: auto --webkit-grid-template-columns: none --webkit-grid-template-rows: none --webkit-grid-row-end: auto --webkit-grid-row-start: auto ->>> 105717c... [Cocoa] [Font Features] Implement font-variant-* -webkit-hyphenate-character: auto -webkit-hyphenate-limit-after: auto -webkit-hyphenate-limit-before: auto Modified: branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations (193597 =>
[webkit-changes] [193597] tags/Safari-602.1.13.1
Title: [193597] tags/Safari-602.1.13.1
Revision 193597
Author bshaf...@apple.com
Date 2015-12-06 14:25:08 -0800 (Sun, 06 Dec 2015)
Log Message
Roll out r192796. rdar://problem/23763584
Modified Paths
tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog
tags/Safari-602.1.13.1/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm
tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp
tags/Safari-602.1.13.1/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
tags/Safari-602.1.13.1/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
tags/Safari-602.1.13.1/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
tags/Safari-602.1.13.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
tags/Safari-602.1.13.1/Source/WebKit2/Shared/WebProcessCreationParameters.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessProxy.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/WebProcess.cpp
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/WebProcess.h
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/WebProcess.messages.in
tags/Safari-602.1.13.1/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
tags/Safari-602.1.13.1/Tools/ChangeLog
tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp
tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp
tags/Safari-602.1.13.1/Tools/WebKitTestRunner/TestController.cpp
Diff
Modified: tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog (193596 => 193597)
--- tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:23:40 UTC (rev 193596)
+++ tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:25:08 UTC (rev 193597)
@@ -1,5 +1,9 @@
2015-12-06 Babak Shafiei
+Roll out r192796.
+
+2015-12-06 Babak Shafiei
+
Roll out r192808.
2015-12-01 Commit Queue
Modified: tags/Safari-602.1.13.1/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm (193596 => 193597)
--- tags/Safari-602.1.13.1/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2015-12-06 22:23:40 UTC (rev 193596)
+++ tags/Safari-602.1.13.1/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm 2015-12-06 22:25:08 UTC (rev 193597)
@@ -93,13 +93,8 @@
if (SessionTracker::storageSession(sessionID))
return;
-String base;
-if (SessionTracker::getIdentifierBase().isNull())
-base = [[NSBundle mainBundle] bundleIdentifier];
-else
-base = SessionTracker::getIdentifierBase();
-
-SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(base + '.' + String::number(sessionID.sessionID()))
+ASSERT(!SessionTracker::getIdentifierBase().isNull());
+SessionTracker::setSession(sessionID, NetworkStorageSession::createPrivateBrowsingSession(SessionTracker::getIdentifierBase() + '.' + String::number(sessionID.sessionID()))
#if USE(NETWORK_SESSION)
, std::make_unique(NetworkSession::Type::Ephemeral, sessionID)
#endif
Modified: tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (193596 => 193597)
--- tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:23:40 UTC (rev 193596)
+++ tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:25:08 UTC (rev 193597)
@@ -27,7 +27,6 @@
#include "APIDictionary.h"
#include "WKArray.h"
-#include "WKContextPrivate.h"
#include "WKMutableDictionary.h"
#include "WKPreferencesRefPrivate.h"
#include "WKSharedAPICast.h"
@@ -135,10 +134,6 @@
{
}
-void WKContextSetUsesNetworkProcess(WKContextRef, bool)
-{
-}
-
#if PLATFORM(MAC)
CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
[webkit-changes] [193596] tags/Safari-602.1.13.1
Title: [193596] tags/Safari-602.1.13.1
Revision 193596
Author bshaf...@apple.com
Date 2015-12-06 14:23:40 -0800 (Sun, 06 Dec 2015)
Log Message
Roll out r192808. rdar://problem/23763584
Modified Paths
tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog
tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKAPICast.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/C/WKContext.h
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebPageProxy.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.cpp
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/WebProcessPool.h
tags/Safari-602.1.13.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
tags/Safari-602.1.13.1/Tools/ChangeLog
tags/Safari-602.1.13.1/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp
tags/Safari-602.1.13.1/Tools/WebKitTestRunner/TestController.cpp
Added Paths
tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/ProcessModel.h
Diff
Modified: tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/ChangeLog 2015-12-06 22:23:40 UTC (rev 193596)
@@ -1,3 +1,7 @@
+2015-12-06 Babak Shafiei
+
+Roll out r192808.
+
2015-12-01 Commit Queue
Unreviewed, rolling out r192914.
Modified: tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -139,15 +139,6 @@
{
}
-void WKContextSetProcessModel(WKContextRef, WKProcessModel)
-{
-}
-
-WKProcessModel WKContextGetProcessModel(WKContextRef)
-{
-return kWKProcessModelMultipleSecondaryProcesses;
-}
-
#if PLATFORM(MAC)
CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
{
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-12-06 22:23:40 UTC (rev 193596)
@@ -41,7 +41,14 @@
auto configuration = ProcessPoolConfiguration::create();
configuration->m_shouldHaveLegacyDataStore = true;
+#if PLATFORM(GTK)
+// FIXME: Remove this ifdef once all ports have switched to use always NetworkProcess.
+// See https://bugs.webkit.org/show_bug.cgi?id=151418.
+configuration->m_processModel = WebKit::ProcessModelMultipleSecondaryProcesses;
configuration->m_maximumProcessCount = 1;
+#else
+configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
+#endif
configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
@@ -73,6 +80,7 @@
auto copy = this->create();
copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
+copy->m_processModel = this->m_processModel;
copy->m_maximumProcessCount = this->m_maximumProcessCount;
copy->m_cacheModel = this->m_cacheModel;
copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
Modified: tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (193595 => 193596)
--- tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-12-06 22:20:25 UTC (rev 193595)
+++ tags/Safari-602.1.13.1/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-12-06 22:23:40 UTC (rev 193596)
@@ -28,6 +28,7 @@
#include "APIObject.h"
#include "CacheModel.h"
+#include "ProcessModel.h"
#include
#include
#include
@@ -47,6 +48,9 @@
bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
+WebKit::ProcessModel processModel() const { return m_processModel; }
+void setProcessModel(WebKit::ProcessModel processModel) { m_proce
[webkit-changes] [193595] branches/safari-601.1.46-branch/Source/WebCore
Title: [193595] branches/safari-601.1.46-branch/Source/WebCore
Revision 193595
Author ddkil...@apple.com
Date 2015-12-06 14:20:25 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r188114. rdar://problem/23221171
Modified Paths
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp
branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.h
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCache.h
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193594 => 193595)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:10:46 UTC (rev 193594)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:20:25 UTC (rev 193595)
@@ -1,3 +1,35 @@
+2015-12-06 Babak Shafiei
+
+Merge r188114. rdar://problem/23221171
+
+2015-08-06 Myles C. Maxfield
+
+CSSSegmentedFontFace::fontRanges() does not handle duplicate fonts correctly
+https://bugs.webkit.org/show_bug.cgi?id=147765
+
+Reviewed by Filip Pizlo.
+
+CSSSegmentedFontFace::fontRanges() was trying to hash on FontDescriptors by
+picking a few specific pieces of data out of the FontDescriptor, computing
+a hash on it, and using that unsigned as a key in a HashMap. This has two
+problems: it doesn't handle equality correctly, as hash collisions cannot
+depend on an equality operator to dedup, and it doesn't hash on all the
+members of a FontDescription.
+
+Instead, this HashMap should use FontDescriptionKey, which represents a
+FontDescription, and is designed exactly for the purpose of being used as a
+key in a HashMap.
+
+No new tests because there is no behavior change (because a problem occurs
+when two different FontDescriptions hash to the same value, which is rare).
+
+* css/CSSSegmentedFontFace.cpp:
+(WebCore::CSSSegmentedFontFace::fontRanges):
+* css/CSSSegmentedFontFace.h:
+* platform/graphics/FontCache.h:
+(WebCore::FontDescriptionKeyHash::hash):
+(WebCore::FontDescriptionKeyHash::equal):
+
2015-12-06 Matthew Hanson
Merge r190895. rdar://problem/23769765
Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp (193594 => 193595)
--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2015-12-06 22:10:46 UTC (rev 193594)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2015-12-06 22:20:25 UTC (rev 193595)
@@ -31,6 +31,7 @@
#include "CSSFontSelector.h"
#include "Document.h"
#include "Font.h"
+#include "FontCache.h"
#include "FontDescription.h"
#include "RuntimeEnabledFeatures.h"
@@ -113,17 +114,11 @@
return FontRanges();
FontTraitsMask desiredTraitsMask = fontDescription.traitsMask();
-// FIXME: Unify this function with FontDescriptionFontDataCacheKey in FontCache.h (Or just use the regular FontCache instead of this)
-unsigned hashKey = ((fontDescription.computedPixelSize() + 1) << (FontTraitsMaskWidth + FontWidthVariantWidth + FontSynthesisWidth + 1))
-| (fontDescription.fontSynthesis() << (FontTraitsMaskWidth + FontWidthVariantWidth + 1))
-| ((fontDescription.orientation() == Vertical ? 1 : 0) << (FontTraitsMaskWidth + FontWidthVariantWidth))
-| fontDescription.widthVariant() << FontTraitsMaskWidth
-| desiredTraitsMask;
-auto addResult = m_descriptionToRangesMap.add(hashKey, FontRanges());
+auto addResult = m_descriptionToRangesMap.add(FontDescriptionFontDataCacheKey(fontDescription), FontRanges());
auto& fontRanges = addResult.iterator->value;
-if (addResult.isNewEntry) {
+if (true /*addResult.isNewEntry*/) {
for (auto& face : m_fontFaces) {
if (!face->isValid())
continue;
Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.h (193594 => 193595)
--- branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.h 2015-12-06 22:10:46 UTC (rev 193594)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSSegmentedFontFace.h 2015-12-06 22:20:25 UTC (rev 193595)
@@ -26,6 +26,7 @@
#ifndef CSSSegmentedFontFace_h
#define CSSSegmentedFontFace_h
+#include "FontCache.h"
#include "FontRanges.h"
#include
#include
@@ -73,7 +74,7 @@
#endif
CSSFontSelector* m_fontSelector;
-HashMap m_descriptionToRangesMap;
+HashMap> m_descriptionToRangesMap;
Vector, 1> m_fontFaces;
#if ENABLE(FONT_LOAD_EVENTS)
Vector> m_callbacks;
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCache.h (193594 => 193595)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-06 22:10:46 UTC (rev 19359
[webkit-changes] [193594] branches/safari-601.1.46-branch/Source/WebCore
Title: [193594] branches/safari-601.1.46-branch/Source/WebCore
Revision 193594
Author ddkil...@apple.com
Date 2015-12-06 14:10:46 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r190895. rdar://problem/23769765
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/WidthIterator.h
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193593 => 193594)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:03:37 UTC (rev 193593)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:10:46 UTC (rev 193594)
@@ -1,5 +1,25 @@
2015-12-06 Matthew Hanson
+Merge r190895. rdar://problem/23769765
+
+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/23770070
2015-10-13 Myles C. Maxfield
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193593 => 193594)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-06 22:03:37 UTC (rev 193593)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-06 22:10:46 UTC (rev 193594)
@@ -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.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h (193593 => 193594)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-06 22:03:37 UTC (rev 193593)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/WidthIterator.h 2015-12-06 22:10:46 UTC (rev 193594)
@@ -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] [193593] branches/safari-601.1.46-branch
Title: [193593] branches/safari-601.1.46-branch Revision 193593 Author ddkil...@apple.com Date 2015-12-06 14:03:37 -0800 (Sun, 06 Dec 2015) Log Message Merge r190999. rdar://problem/23770070 Modified Paths branches/safari-601.1.46-branch/LayoutTests/ChangeLog branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning-expected.html branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning.html branches/safari-601.1.46-branch/Source/WebCore/ChangeLog branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in Diff Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193592 => 193593) --- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 22:03:21 UTC (rev 193592) +++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 22:03:37 UTC (rev 193593) @@ -1,5 +1,21 @@ 2015-12-06 Matthew Hanson +Merge r190999. rdar://problem/23770070 + +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/23769702 2015-10-11 Myles C. Maxfield Modified: branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning-expected.html (193592 => 193593) --- branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 22:03:21 UTC (rev 193592) +++ branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning-expected.html 2015-12-06 22:03:37 UTC (rev 193593) @@ -9,4 +9,12 @@ AVAVAVAV AVAVAVAV AVAVAVAV + +AVAVAVAV +AVAVAVAV +AVAVAVAV +AVAVAVAV +AVAVAVAV +AVAVAVAV + Modified: branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning.html (193592 => 193593) --- branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 22:03:21 UTC (rev 193592) +++ branches/safari-601.1.46-branch/LayoutTests/fast/text/font-kerning.html 2015-12-06 22:03:37 UTC (rev 193593) @@ -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.1.46-branch/Source/WebCore/ChangeLog (193592 => 193593) --- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:03:21 UTC (rev 193592) +++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 22:03:37 UTC (rev 193593) @@ -1,5 +1,22 @@ 2015-12-06 Matthew Hanson +Merge r190999. rdar://problem/23770070 + +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/23769689 2015-10-01 Csaba Osztrogonác Modified: branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in (193592 => 193593) --- branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 22:03:21 UTC (rev 193592) +++ branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-06 22:03:37 UTC (rev 193593) @@ -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 https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193592] branches/safari-601-branch/Source/WebCore
Title: [193592] branches/safari-601-branch/Source/WebCore
Revision 193592
Author bshaf...@apple.com
Date 2015-12-06 14:03:21 -0800 (Sun, 06 Dec 2015)
Log Message
Merged r188114. rdar://problem/23769852
Modified Paths
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp
branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h
branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193591 => 193592)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-06 22:03:21 UTC (rev 193592)
@@ -1,3 +1,35 @@
+2015-12-06 Babak Shafiei
+
+Merge r188114.
+
+2015-08-06 Myles C. Maxfield
+
+CSSSegmentedFontFace::fontRanges() does not handle duplicate fonts correctly
+https://bugs.webkit.org/show_bug.cgi?id=147765
+
+Reviewed by Filip Pizlo.
+
+CSSSegmentedFontFace::fontRanges() was trying to hash on FontDescriptors by
+picking a few specific pieces of data out of the FontDescriptor, computing
+a hash on it, and using that unsigned as a key in a HashMap. This has two
+problems: it doesn't handle equality correctly, as hash collisions cannot
+depend on an equality operator to dedup, and it doesn't hash on all the
+members of a FontDescription.
+
+Instead, this HashMap should use FontDescriptionKey, which represents a
+FontDescription, and is designed exactly for the purpose of being used as a
+key in a HashMap.
+
+No new tests because there is no behavior change (because a problem occurs
+when two different FontDescriptions hash to the same value, which is rare).
+
+* css/CSSSegmentedFontFace.cpp:
+(WebCore::CSSSegmentedFontFace::fontRanges):
+* css/CSSSegmentedFontFace.h:
+* platform/graphics/FontCache.h:
+(WebCore::FontDescriptionKeyHash::hash):
+(WebCore::FontDescriptionKeyHash::equal):
+
2015-12-06 Matthew Hanson
Merge r190895. rdar://problem/23769817
Modified: branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp (193591 => 193592)
--- branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2015-12-06 22:03:21 UTC (rev 193592)
@@ -31,6 +31,7 @@
#include "CSSFontSelector.h"
#include "Document.h"
#include "Font.h"
+#include "FontCache.h"
#include "FontDescription.h"
#include "RuntimeEnabledFeatures.h"
@@ -113,17 +114,11 @@
return FontRanges();
FontTraitsMask desiredTraitsMask = fontDescription.traitsMask();
-// FIXME: Unify this function with FontDescriptionFontDataCacheKey in FontCache.h (Or just use the regular FontCache instead of this)
-unsigned hashKey = ((fontDescription.computedPixelSize() + 1) << (FontTraitsMaskWidth + FontWidthVariantWidth + FontSynthesisWidth + 1))
-| (fontDescription.fontSynthesis() << (FontTraitsMaskWidth + FontWidthVariantWidth + 1))
-| ((fontDescription.orientation() == Vertical ? 1 : 0) << (FontTraitsMaskWidth + FontWidthVariantWidth))
-| fontDescription.widthVariant() << FontTraitsMaskWidth
-| desiredTraitsMask;
-auto addResult = m_descriptionToRangesMap.add(hashKey, FontRanges());
+auto addResult = m_descriptionToRangesMap.add(FontDescriptionFontDataCacheKey(fontDescription), FontRanges());
auto& fontRanges = addResult.iterator->value;
-if (addResult.isNewEntry) {
+if (true /*addResult.isNewEntry*/) {
for (auto& face : m_fontFaces) {
if (!face->isValid())
continue;
Modified: branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h (193591 => 193592)
--- branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h 2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h 2015-12-06 22:03:21 UTC (rev 193592)
@@ -26,6 +26,7 @@
#ifndef CSSSegmentedFontFace_h
#define CSSSegmentedFontFace_h
+#include "FontCache.h"
#include "FontRanges.h"
#include
#include
@@ -73,7 +74,7 @@
#endif
CSSFontSelector* m_fontSelector;
-HashMap m_descriptionToRangesMap;
+HashMap> m_descriptionToRangesMap;
Vector, 1> m_fontFaces;
#if ENABLE(FONT_LOAD_EVENTS)
Vector> m_callbacks;
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193591 => 193592)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-06 22:03:21 UTC (
[webkit-changes] [193591] tags/Safari-602.1.13.1/Source
Title: [193591] tags/Safari-602.1.13.1/Source Revision 193591 Author bshaf...@apple.com Date 2015-12-06 13:59:06 -0800 (Sun, 06 Dec 2015) Log Message Versioning. Modified Paths tags/Safari-602.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig tags/Safari-602.1.13.1/Source/WebCore/Configurations/Version.xcconfig tags/Safari-602.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig tags/Safari-602.1.13.1/Source/WebKit/mac/Configurations/Version.xcconfig tags/Safari-602.1.13.1/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: tags/Safari-602.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig (193590 => 193591) --- tags/Safari-602.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-06 21:53:55 UTC (rev 193590) +++ tags/Safari-602.1.13.1/Source/_javascript_Core/Configurations/Version.xcconfig 2015-12-06 21:59:06 UTC (rev 193591) @@ -24,9 +24,9 @@ MAJOR_VERSION = 602; MINOR_VERSION = 1; TINY_VERSION = 13; -MICRO_VERSION = 0; +MICRO_VERSION = 1; NANO_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-602.1.13.1/Source/WebCore/Configurations/Version.xcconfig (193590 => 193591) --- tags/Safari-602.1.13.1/Source/WebCore/Configurations/Version.xcconfig 2015-12-06 21:53:55 UTC (rev 193590) +++ tags/Safari-602.1.13.1/Source/WebCore/Configurations/Version.xcconfig 2015-12-06 21:59:06 UTC (rev 193591) @@ -24,9 +24,9 @@ MAJOR_VERSION = 602; MINOR_VERSION = 1; TINY_VERSION = 13; -MICRO_VERSION = 0; +MICRO_VERSION = 1; NANO_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-602.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig (193590 => 193591) --- tags/Safari-602.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-06 21:53:55 UTC (rev 193590) +++ tags/Safari-602.1.13.1/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-12-06 21:59:06 UTC (rev 193591) @@ -1,9 +1,9 @@ MAJOR_VERSION = 602; MINOR_VERSION = 1; TINY_VERSION = 13; -MICRO_VERSION = 0; +MICRO_VERSION = 1; NANO_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); // The system version prefix is based on the current system version. SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; Modified: tags/Safari-602.1.13.1/Source/WebKit/mac/Configurations/Version.xcconfig (193590 => 193591) --- tags/Safari-602.1.13.1/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-06 21:53:55 UTC (rev 193590) +++ tags/Safari-602.1.13.1/Source/WebKit/mac/Configurations/Version.xcconfig 2015-12-06 21:59:06 UTC (rev 193591) @@ -24,9 +24,9 @@ MAJOR_VERSION = 602; MINOR_VERSION = 1; TINY_VERSION = 13; -MICRO_VERSION = 0; +MICRO_VERSION = 1; NANO_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-602.1.13.1/Source/WebKit2/Configurations/Version.xcconfig (193590 => 193591) --- tags/Safari-602.1.13.1/Source/WebKit2/Configurations/Version.xcconfig 2015-12-06 21:53:55 UTC (rev 193590) +++ tags/Safari-602.1.13.1/Source/WebKit2/Configurations/Version.xcconfig 2015-12-06 21:59:06 UTC (rev 193591) @@ -24,9 +24,9 @@ MAJOR_VERSION = 602; MINOR_VERSION = 1; TINY_VERSION = 13; -MICRO_VERSION = 0; +MICRO_VERSION = 1; NANO_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193590] branches/safari-601.1.46-branch/Tools
Title: [193590] branches/safari-601.1.46-branch/Tools Revision 193590 Author ddkil...@apple.com Date 2015-12-06 13:53:55 -0800 (Sun, 06 Dec 2015) Log Message Merge r191032. rdar://problem/23769702 Modified Paths branches/safari-601.1.46-branch/Tools/ChangeLog branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm Diff Modified: branches/safari-601.1.46-branch/Tools/ChangeLog (193589 => 193590) --- branches/safari-601.1.46-branch/Tools/ChangeLog 2015-12-06 21:53:53 UTC (rev 193589) +++ branches/safari-601.1.46-branch/Tools/ChangeLog 2015-12-06 21:53:55 UTC (rev 193590) @@ -1,5 +1,21 @@ 2015-12-06 Matthew Hanson +Merge r191032. rdar://problem/23769702 + +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/23769702 "Build fix" (r193582) from Expo branch squash-merged here: Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193589 => 193590) --- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 21:53:53 UTC (rev 193589) +++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-06 21:53:55 UTC (rev 193590) @@ -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] [193588] tags/Safari-602.1.13.1/
Title: [193588] tags/Safari-602.1.13.1/ Revision 193588 Author bshaf...@apple.com Date 2015-12-06 13:48:19 -0800 (Sun, 06 Dec 2015) Log Message New tag. Added Paths tags/Safari-602.1.13.1/ Diff Property changes: tags/Safari-602.1.13.1 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193587] branches/safari-601.1.46-branch
Title: [193587] branches/safari-601.1.46-branch Revision 193587 Author ddkil...@apple.com Date 2015-12-06 13:32:41 -0800 (Sun, 06 Dec 2015) Log Message Merge r190697. rdar://problem/23769727 Modified Paths branches/safari-601.1.46-branch/LayoutTests/ChangeLog branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html branches/safari-601.1.46-branch/Tools/ChangeLog branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp branches/safari-601.1.46-branch/Tools/FontWithFeatures/FontWithFeatures.xcodeproj/project.pbxproj Added Paths branches/safari-601.1.46-branch/LayoutTests/css3/resources/FontWithFeatures.ttf Diff Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193586 => 193587) --- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 21:21:01 UTC (rev 193586) +++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 21:32:41 UTC (rev 193587) @@ -1,5 +1,20 @@ 2015-12-06 Matthew Hanson +Merge r190697. rdar://problem/23769727 + +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-12-06 Matthew Hanson + Merge r193575. rdar://problem/23769689 2015-09-23 Myles C. Maxfield Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html (193586 => 193587) --- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html 2015-12-06 21:21:01 UTC (rev 193586) +++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2-expected.html 2015-12-06 21:32:41 UTC (rev 193587) @@ -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.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html (193586 => 193587) --- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-12-06 21:21:01 UTC (rev 193586) +++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html 2015-12-06 21:32:41 UTC (rev 193587) @@ -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"); -ad
[webkit-changes] [193586] branches/safari-601.1.46-branch/Source/WebCore
Title: [193586] branches/safari-601.1.46-branch/Source/WebCore
Revision 193586
Author ddkil...@apple.com
Date 2015-12-06 13:21:01 -0800 (Sun, 06 Dec 2015)
Log Message
Merge r190402. rdar://problem/23769689
Modified Paths
branches/safari-601.1.46-branch/Source/WebCore/ChangeLog
branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193585 => 193586)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 21:20:58 UTC (rev 193585)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 21:21:01 UTC (rev 193586)
@@ -1,5 +1,19 @@
2015-12-06 Matthew Hanson
+Merge r190402. rdar://problem/23769689
+
+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-12-06 Matthew Hanson
+
Merge r193575. rdar://problem/23769689
2015-09-23 Myles C. Maxfield
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h (193585 => 193586)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-12-06 21:20:58 UTC (rev 193585)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-12-06 21:21:01 UTC (rev 193586)
@@ -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] [193583] branches/safari-601.1.46-branch
Title: [193583] branches/safari-601.1.46-branch Revision 193583 Author ddkil...@apple.com Date 2015-12-06 12:40:47 -0800 (Sun, 06 Dec 2015) Log Message Merge r190564. rdar://problem/23769693 Modified Paths branches/safari-601.1.46-branch/LayoutTests/ChangeLog branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-parsing.html branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering-2.html branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-rendering.html branches/safari-601.1.46-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt branches/safari-601.1.46-branch/LayoutTests/fast/css/inherited-properties-rare-text.html branches/safari-601.1.46-branch/LayoutTests/fast/text/shaping/shaping-script-order.html branches/safari-601.1.46-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html branches/safari-601.1.46-branch/LayoutTests/fonts/unicode-character-font-crash.html branches/safari-601.1.46-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html branches/safari-601.1.46-branch/Source/WebCore/ChangeLog branches/safari-601.1.46-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp branches/safari-601.1.46-branch/Source/WebCore/css/CSSParser.cpp branches/safari-601.1.46-branch/Source/WebCore/css/CSSPropertyNames.in branches/safari-601.1.46-branch/Source/WebCore/css/CSSValueKeywords.in branches/safari-601.1.46-branch/Source/WebCore/css/StyleBuilderCustom.h branches/safari-601.1.46-branch/Source/WebInspectorUI/ChangeLog branches/safari-601.1.46-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js Diff Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193582 => 193583) --- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 18:40:06 UTC (rev 193582) +++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 20:40:47 UTC (rev 193583) @@ -1,3 +1,25 @@ +2015-12-05 Dana Burkart + +Merge r190564. rdar://problem/23769693 + +2015-10-05 Myles C. Maxfield + +Unprefix -webkit-font-feature-settings +https://bugs.webkit.org/show_bug.cgi?id=149722 + +Reviewed by Sam Weinig. + +* css3/font-feature-settings-parsing.html: +* css3/font-feature-settings-preinstalled-fonts.html: +* css3/font-feature-settings-rendering-2.html: +* css3/font-feature-settings-rendering.html: +* fast/css/inherited-properties-rare-text-expected.txt: +* fast/css/inherited-properties-rare-text.html: +* fast/text/shaping/shaping-script-order.html: +* fast/text/shaping/shaping-selection-rect.html: +* fonts/unicode-character-font-crash.html: +* scrollbars/scrollbar-scrollbarparts-repaint-crash.html: + 2015-12-06 Babak Shafiei Merge r191646. Modified: branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-parsing.html (193582 => 193583) --- branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-parsing.html 2015-12-06 18:40:06 UTC (rev 193582) +++ branches/safari-601.1.46-branch/LayoutTests/css3/font-feature-settings-parsing.html 2015-12-06 20:40:47 UTC (rev 193583) @@ -2,128 +2,128 @@#valid_normal {--webkit-font-feature-settings: normal;+font-feature-settings: normal; } #valid_value_1 {--webkit-font-feature-settings: "dlig" 1;+font-feature-settings: "dlig" 1; } #valid_value_2 {--webkit-font-feature-settings: "swsh" 2;+font-feature-settings: "swsh" 2; } #valid_value_on {--webkit-font-feature-settings: "smcp" on;+font-feature-settings: "smcp" on; } #valid_value_off {--webkit-font-feature-settings: "liga" off;+font-feature-settings: "liga" off; } #valid_value_omit {--webkit-font-feature-settings: "c2sc";+font-feature-settings: "c2sc"; } #valid_valuelist {--webkit-font-feature-settings: "tnum", 'hist';+font-feature-settings: "tnum", 'hist'; } #valid_singlequote {--webkit-font-feature-settings: 'PKRN';+font-feature-settings: 'PKRN'; }
[webkit-changes] [193582] branches/safari-601-branch/Tools
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 FontWithFeaturesOTF9 \x87 \x87 \x85 \xEE FontWithFeaturesOTF + + !"#$%&'()*+,-./012345I\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7 g + +\xA7 G \xE7 \x87+'+\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87'\xC7g\xA7G\xE7\x87 ' \xC7 g \xA7 G \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 \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
[webkit-changes] [193581] branches/safari-601-branch/Tools
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
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", "R"); -addElement("tnum", "S"); -addElement("frac", "T"); -//addElement(
[webkit-changes] [193580] branches/safari-601-branch/Source/WebCore
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] [193579] branches/safari-601-branch
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 https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193576] branches/safari-601-branch/Source/WebCore
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] [193574] branches/safari-601.1.46-branch/LayoutTests
Title: [193574] branches/safari-601.1.46-branch/LayoutTests Revision 193574 Author bshaf...@apple.com Date 2015-12-06 00:10:15 -0800 (Sun, 06 Dec 2015) Log Message Merged r191646. rdar://problem/23766315 Modified Paths branches/safari-601.1.46-branch/LayoutTests/ChangeLog branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt Diff Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193573 => 193574) --- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 08:09:14 UTC (rev 193573) +++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 08:10:15 UTC (rev 193574) @@ -1,5 +1,15 @@ 2015-12-06 Babak Shafiei +Merge r191646. + +2015-10-27 Wenson Hsieh + +Unreviewed, fix a failing iOS WK2 test. + +* fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt: + +2015-12-06 Babak Shafiei + Merge r191644. 2015-10-27 Wenson Hsieh Modified: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt (193573 => 193574) --- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt 2015-12-06 08:09:14 UTC (rev 193573) +++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt 2015-12-06 08:10:15 UTC (rev 193574) @@ -1,2 +1 @@ The viewport zoomed to scale: 1.6 - ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [193573] branches/safari-601.1.46-branch
Title: [193573] branches/safari-601.1.46-branch Revision 193573 Author bshaf...@apple.com Date 2015-12-06 00:09:14 -0800 (Sun, 06 Dec 2015) Log Message Merged r191644. rdar://problem/23766315 Modified Paths branches/safari-601.1.46-branch/LayoutTests/ChangeLog branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/PageClient.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/WebPageProxy.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/SmartMagnificationController.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/SmartMagnificationController.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentView.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ViewGestureGeometryCollector.h branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp branches/safari-601.1.46-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm Added Paths branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out.html branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-at-initial-scale-fast-clicks-expected.txt branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-at-initial-scale-fast-clicks.html branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-zooms-from-element-to-initial-scale-expected.txt branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-zooms-from-element-to-initial-scale.html Diff Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193572 => 193573) --- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 07:58:39 UTC (rev 193572) +++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 08:09:14 UTC (rev 193573) @@ -1,3 +1,30 @@ +2015-12-06 Babak Shafiei + +Merge r191644. + +2015-10-27 Wenson Hsieh + +Implement viewport-width-based fast-click heuristic +https://bugs.webkit.org/show_bug.cgi?id=150604 + + +Reviewed by Simon Fraser. + +Implement a new fast-click heuristic that applies to viewports with width = device-width. Adds +new tests to check various fast-clicking behaviors. These three tests check (for pages with width= +device-width) that: + +- Double-tapping to zoom still works when the scale is not the initial scale. +- If the page is at initial scale, we fire fast-clicks instead of zooming. +- When zooming out from element scale, we end up at initial scale instead of minimum scale. + +* fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt: Added. +* fast/events/ios/viewport-device-width-allows-double-tap-zoom-out.html: Added. +* fast/events/ios/viewport-device-width-at-initial-scale-fast-clicks-expected.txt: Added. +* fast/events/ios/viewport-device-width-at-initial-scale-fast-clicks.html: Added. +* fast/events/ios/viewport-zooms-from-element-to-initial-scale-expected.txt: Added. +* fast/events/ios/viewport-zooms-from-element-to-initial-scale.html: Added. + 2015-12-05 Babak Shafiei Merge r192953. Copied: branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt (from rev 191644, trunk/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt) (0 => 193573) --- branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom-out-expected.txt (rev 0) +++ branches/safari-601.1.46-branch/LayoutTests/fast/events/ios/viewport-device-width-allows-double-tap-zoom
