[webkit-changes] [199674] trunk/Tools

[dburkart]

Title: [199674] trunk/Tools








Revision 199674
Author dburk...@apple.com
Date 2016-04-18 10:13:04 -0700 (Mon, 18 Apr 2016)


Log Message
svn-apply: add option for ignoring changes to ChangeLog files
https://bugs.webkit.org/show_bug.cgi?id=156618

Reviewed by Darin Adler.

This change adds a new option to svn-apply, --skip-changelogs, which short-circuits out of
patch() if the file in question is a ChangeLog.

* Scripts/svn-apply:
(patch):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/svn-apply




Diff

Modified: trunk/Tools/ChangeLog (199673 => 199674)

--- trunk/Tools/ChangeLog	2016-04-18 16:45:35 UTC (rev 199673)
+++ trunk/Tools/ChangeLog	2016-04-18 17:13:04 UTC (rev 199674)
@@ -1,3 +1,16 @@
+2016-04-18  Dana Burkart  
+
+svn-apply: add option for ignoring changes to ChangeLog files
+https://bugs.webkit.org/show_bug.cgi?id=156618
+
+Reviewed by Darin Adler.
+
+This change adds a new option to svn-apply, --skip-changelogs, which short-circuits out of
+patch() if the file in question is a ChangeLog.
+
+* Scripts/svn-apply:
+(patch):
+
 2016-04-18  Carlos Garcia Campos  
 
 Pending API Request URL is wrong after reloading


Modified: trunk/Tools/Scripts/svn-apply (199673 => 199674)

--- trunk/Tools/Scripts/svn-apply	2016-04-18 16:45:35 UTC (rev 199673)
+++ trunk/Tools/Scripts/svn-apply	2016-04-18 17:13:04 UTC (rev 199674)
@@ -90,16 +90,18 @@
 my $showHelp = 0;
 my $reviewer;
 my $force = 0;
+my $skipChangeLogs = 0;
 
 my $optionParseSuccess = GetOptions(
 "merge!" => \$merge,
 "help!" => \$showHelp,
 "reviewer=s" => \$reviewer,
-"force!" => \$force
+"force!" => \$force,
+"skip-changelogs" => \$skipChangeLogs
 );
 
 if (!$optionParseSuccess || $showHelp) {
-print STDERR basename($0) . " [-h|--help] [--force] [-m|--merge] [-r|--reviewer name] patch1 [patch2 ...]\n";
+print STDERR basename($0) . " [-h|--help] [--force] [-m|--merge] [-r|--reviewer name] [--skip-changelogs] patch1 [patch2 ...]\n";
 exit 1;
 }
 
@@ -332,6 +334,11 @@
 $addition = 1 if ($diffHashRef->{isNew} || $patch =~ /\n@@ -0,0 .* @@/);
 $deletion = 1 if ($diffHashRef->{isDeletion} || $patch =~ /\n@@ .* \+0,0 @@/);
 
+if (basename($fullPath) eq "ChangeLog" && $skipChangeLogs) {
+print "Skipping '$fullPath' since --skip-changelogs was passed on the command line.";
+return;
+}
+
 if (!$addition && !$deletion && !$isBinary && $hasTextChunks) {
 # Standard patch, patch tool can handle this.
 if (basename($fullPath) eq "ChangeLog") {






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

[webkit-changes] [198815] trunk

[dburkart]

Title: [198815] trunk








Revision 198815
Author dburk...@apple.com
Date 2016-03-29 17:31:01 -0700 (Tue, 29 Mar 2016)


Log Message
Web Inspector: JS PrettyPrinting in do/while loops, "while" should be on the same line as "}" if there was a closing brace
https://bugs.webkit.org/show_bug.cgi?id=117616


Reviewed by Joseph Pecoraro.

Source/WebInspectorUI:

This patch fixes the formatting of do / while loops in the WebInspector CodeFormatter.

Before:
do {
  "x"
}
while (0);

After:
do {
  "x"
} while (0);

* UserInterface/Views/CodeMirrorFormatters.js:
(shouldHaveSpaceBeforeToken):
If we encounter a while token and the last token was a closing brace, we *should* add a space if that closing
brace was closing a do block.

(removeLastNewline):
If we encounter a while token and the last token was a closing brace, we *should not* add a newline if that closing
brace closes a do block.

(modifyStateForTokenPre):
We should keep track of the last token that we encountered before entering into a block. We do this by setting
a lastContentBeforeBlock property on openBraceStartMarker / state objects.

In addition, this fixes a bug where we do not pop a state object off of openBraceStartMarkers if our indentCount
is 0. Without doing this, we cannot reliably determine whether or not our while token needs to be inline or not.

LayoutTests:

* inspector/codemirror/prettyprinting-_javascript_-expected.txt:
* inspector/codemirror/prettyprinting-_javascript_.html:
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop-expected.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-within-if-expected.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-within-if.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-followed-by-while-expected.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-followed-by-while.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-while-within-do-while-expected.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-while-within-do-while.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/while-within-do-while-expected.js: Added.
* inspector/codemirror/resources/prettyprinting/_javascript_-tests/while-within-do-while.js: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/inspector/codemirror/prettyprinting-_javascript_-expected.txt
trunk/LayoutTests/inspector/codemirror/prettyprinting-_javascript_.html
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorFormatters.js


Added Paths

trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop-expected.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-within-if-expected.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-within-if.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-followed-by-while-expected.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-followed-by-while.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-while-within-do-while-expected.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/if-while-within-do-while.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/while-within-do-while-expected.js
trunk/LayoutTests/inspector/codemirror/resources/prettyprinting/_javascript_-tests/while-within-do-while.js




Diff

Modified: trunk/LayoutTests/ChangeLog (198814 => 198815)

--- trunk/LayoutTests/ChangeLog	2016-03-30 00:26:00 UTC (rev 198814)
+++ trunk/LayoutTests/ChangeLog	2016-03-30 00:31:01 UTC (rev 198815)
@@ -1,3 +1,24 @@
+2016-03-29  Dana Burkart and Matthew Hanson  
+
+Web Inspector: JS PrettyPrinting in do/while loops, "while" should be on the same line as "}" if there was a closing brace
+https://bugs.webkit.org/show_bug.cgi?id=117616
+
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/codemirror/prettyprinting-_javascript_-expected.txt:
+* inspector/codemirror/prettyprinting-_javascript_.html:
+* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop-expected.js: Added.
+* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-loop.js: Added.
+* inspector/codemirror/resources/prettyprinting/_javascript_-tests/do-while-within-if-expected.js: Added.
+* 

[webkit-changes] [196436] trunk/Tools

[dburkart]

Title: [196436] trunk/Tools








Revision 196436
Author dburk...@apple.com
Date 2016-02-11 13:45:36 -0800 (Thu, 11 Feb 2016)


Log Message
Large logs can bring down the webkit master
https://bugs.webkit.org/show_bug.cgi?id=122112

Reviewed by Lucas Forschler.

Implement the suggested fix of throwing away stdout / stderr.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKit1LeakTests):

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (196435 => 196436)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2016-02-11 21:43:48 UTC (rev 196435)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2016-02-11 21:45:36 UTC (rev 196436)
@@ -652,6 +652,8 @@
 return RunWebKitTests.start(self)
 
 class RunWebKit1LeakTests(RunWebKit1Tests):
+want_stdout = False
+want_stderr = False
 warnOnWarnings = True
 def start(self):
 self.setCommand(self.command + ["--leaks"])


Modified: trunk/Tools/ChangeLog (196435 => 196436)

--- trunk/Tools/ChangeLog	2016-02-11 21:43:48 UTC (rev 196435)
+++ trunk/Tools/ChangeLog	2016-02-11 21:45:36 UTC (rev 196436)
@@ -1,3 +1,15 @@
+2016-02-11  Dana Burkart  
+
+Large logs can bring down the webkit master
+https://bugs.webkit.org/show_bug.cgi?id=122112
+
+Reviewed by Lucas Forschler.
+
+Implement the suggested fix of throwing away stdout / stderr.
+
+* BuildSlaveSupport/build.webkit.org-config/master.cfg:
+(RunWebKit1LeakTests):
+
 2016-02-10  Jason Marcell  
 
 Remove calls to parseInt in order to work with non-integer revisions






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

[webkit-changes] [195359] trunk/Tools

[dburkart]

Title: [195359] trunk/Tools








Revision 195359
Author dburk...@apple.com
Date 2016-01-20 11:30:42 -0800 (Wed, 20 Jan 2016)


Log Message
Botwatcher's dashboard should show an 'X' when the build is broken
https://bugs.webkit.org/show_bug.cgi?id=152507

Reviewed by David Kilzer.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
(BuildbotStaticAnalyzerQueueView.prototype.appendStaticAnalyzerQueueStatus):
(BuildbotStaticAnalyzerQueueView.prototype.update):

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js (195358 => 195359)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2016-01-20 19:27:46 UTC (rev 195358)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2016-01-20 19:30:42 UTC (rev 195359)
@@ -61,6 +61,7 @@
 var text;
 
 var failedStep = new BuildbotTestResults(iteration._firstFailedStep);
+var issueCount = failedStep.issueCount;
 
 if (iteration.successful) {
 statusLineViewColor = StatusLineView.Status.Good;
@@ -73,9 +74,10 @@
 url = ""
 statusLineViewColor = StatusLineView.Status.Bad;
 text = "build failed";
+issueCount = null;
 }
 
-var status = new StatusLineView(messageElement, statusLineViewColor, (text) ? text : "found " + failedStep.issueCount + " issues", failedStep.issueCount, url);
+var status = new StatusLineView(messageElement, statusLineViewColor, (text) ? text : "found " + failedStep.issueCount + " issues", issueCount, url);
 
 this.element.appendChild(status.element);
 appendedStatus = true;


Modified: trunk/Tools/ChangeLog (195358 => 195359)

--- trunk/Tools/ChangeLog	2016-01-20 19:27:46 UTC (rev 195358)
+++ trunk/Tools/ChangeLog	2016-01-20 19:30:42 UTC (rev 195359)
@@ -1,3 +1,14 @@
+2016-01-20  Dana Burkart  
+
+Botwatcher's dashboard should show an 'X' when the build is broken
+https://bugs.webkit.org/show_bug.cgi?id=152507
+
+Reviewed by David Kilzer.
+
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
+(BuildbotStaticAnalyzerQueueView.prototype.appendStaticAnalyzerQueueStatus):
+(BuildbotStaticAnalyzerQueueView.prototype.update):
+
 2016-01-19  Jason Marcell  
 
 Remove assertion from revisionContentForIteration that is causing errors on the dashboard.






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

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

[dburkart]

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








Revision 193537
Author dburk...@apple.com
Date 2015-12-05 16:46:54 -0800 (Sat, 05 Dec 2015)


Log Message
Merge r190564. rdar://problem/23769747

Modified Paths

branches/safari-601-branch/LayoutTests/ChangeLog
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-preinstalled-fonts.html
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering-2.html
branches/safari-601-branch/LayoutTests/css3/font-feature-settings-rendering.html
branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt
branches/safari-601-branch/LayoutTests/fast/css/inherited-properties-rare-text.html
branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-script-order.html
branches/safari-601-branch/LayoutTests/fast/text/shaping/shaping-selection-rect.html
branches/safari-601-branch/LayoutTests/fonts/unicode-character-font-crash.html
branches/safari-601-branch/LayoutTests/scrollbars/scrollbar-scrollbarparts-repaint-crash.html
branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in
branches/safari-601-branch/Source/WebCore/css/CSSValueKeywords.in
branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h
branches/safari-601-branch/Source/WebInspectorUI/ChangeLog
branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js




Diff

Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193536 => 193537)

--- branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/ChangeLog	2015-12-06 00:46:54 UTC (rev 193537)
@@ -1,3 +1,25 @@
+2015-12-05  Dana Burkart  
+
+Merge r190564. rdar://problem/23769747
+
+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-05  Matthew Hanson  
 
 Merge r192953. rdar://problem/23581540


Modified: branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html (193536 => 193537)

--- branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html	2015-12-05 22:02:53 UTC (rev 193536)
+++ branches/safari-601-branch/LayoutTests/css3/font-feature-settings-parsing.html	2015-12-06 00:46:54 UTC (rev 193537)
@@ -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] [192923] branches/safari-601-branch/Source/WebCore

[dburkart]

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








Revision 192923
Author dburk...@apple.com
Date 2015-12-01 16:13:02 -0800 (Tue, 01 Dec 2015)


Log Message
Merge r192758. rdar://problem/23581476

Modified Paths

branches/safari-601-branch/Source/WebCore/ChangeLog
branches/safari-601-branch/Source/WebCore/css/CSSSelector.cpp
branches/safari-601-branch/Source/WebCore/css/CSSSelector.h
branches/safari-601-branch/Source/WebCore/css/CSSSelectorList.cpp




Diff

Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (192922 => 192923)

--- branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-01 23:53:03 UTC (rev 192922)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog	2015-12-02 00:13:02 UTC (rev 192923)
@@ -1,3 +1,43 @@
+2015-12-01  Dana Burkart  
+
+Merge r192758. rdar://problem/23581476
+
+2015-11-23  David Kilzer  
+
+Hardening against CSSSelector double frees
+
+
+
+Reviewed by Antti Koivisto.
+
+Add some security assertions to catch this issue if it ever
+happens in Debug builds, and make changes in
+CSSSelector::~CSSSelector() and
+CSSSelectorList::deleteSelectors() to prevent obvious issues if
+they're ever called twice in Release builds.
+
+No new tests because we don't know how to reproduce this.
+
+* css/CSSSelector.cpp:
+(WebCore::CSSSelector::CSSSelector): Initialize
+m_destructorHasBeenCalled.
+* css/CSSSelector.h:
+(WebCore::CSSSelector::m_destructorHasBeenCalled): Add bitfield.
+(WebCore::CSSSelector::CSSSelector): Initialize
+m_destructorHasBeenCalled.
+(WebCore::CSSSelector::~CSSSelector): Add security assertion
+that this is never called twice.  Clear out any fields that
+would have caused us to dereference an object twice.
+
+* css/CSSSelectorList.cpp:
+(WebCore::CSSSelectorList::deleteSelectors): Clear
+m_selectorArray when freeing the memory to which it was
+pointing.  This prevents re-entrancy issues or calling this
+method twice on the same thread.  Also restructure the for()
+loop to prevent calling CSSSelector::isLastInSelectorList()
+after CSSSelector::~CSSSelector() has been called (via CRBug
+241892).
+
 2015-10-29  Babak Shafiei  
 
 Merge r191756.


Modified: branches/safari-601-branch/Source/WebCore/css/CSSSelector.cpp (192922 => 192923)

--- branches/safari-601-branch/Source/WebCore/css/CSSSelector.cpp	2015-12-01 23:53:03 UTC (rev 192922)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSelector.cpp	2015-12-02 00:13:02 UTC (rev 192923)
@@ -64,6 +64,9 @@
 , m_descendantDoubleChildSyntax(false)
 #endif
 , m_caseInsensitiveAttributeValueMatching(false)
+#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
+, m_destructorHasBeenCalled(false)
+#endif
 {
 const AtomicString& tagLocalName = tagQName.localName();
 const AtomicString tagLocalNameASCIILowercase = tagLocalName.convertToASCIILowercase();


Modified: branches/safari-601-branch/Source/WebCore/css/CSSSelector.h (192922 => 192923)

--- branches/safari-601-branch/Source/WebCore/css/CSSSelector.h	2015-12-01 23:53:03 UTC (rev 192922)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSelector.h	2015-12-02 00:13:02 UTC (rev 192923)
@@ -321,6 +321,9 @@
 unsigned m_descendantDoubleChildSyntax : 1;
 #endif
 unsigned m_caseInsensitiveAttributeValueMatching : 1;
+#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
+unsigned m_destructorHasBeenCalled : 1;
+#endif
 
 unsigned simpleSelectorSpecificityForPage() const;
 
@@ -463,6 +466,9 @@
 , m_descendantDoubleChildSyntax(false)
 #endif
 , m_caseInsensitiveAttributeValueMatching(false)
+#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
+, m_destructorHasBeenCalled(false)
+#endif
 {
 }
 
@@ -481,6 +487,9 @@
 , m_descendantDoubleChildSyntax(o.m_descendantDoubleChildSyntax)
 #endif
 , m_caseInsensitiveAttributeValueMatching(o.m_caseInsensitiveAttributeValueMatching)
+#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
+, m_destructorHasBeenCalled(false)
+#endif
 {
 if (o.m_hasRareData) {
 m_data.m_rareData = o.m_data.m_rareData;
@@ -499,14 +508,26 @@
 
 inline CSSSelector::~CSSSelector()
 {
-if (m_hasRareData)
+ASSERT_WITH_SECURITY_IMPLICATION(!m_destructorHasBeenCalled);
+#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
+m_destructorHasBeenCalled = true;
+#endif
+if (m_hasRareData) {
 m_data.m_rareData->deref();
-else if (m_hasNameWithCase)
+m_data.m_rareData = nullptr;
+m_hasRareData = false;
+} else if (m_hasNameWithCase) {
 m_data.m_nameWithCase->deref();
-else if (match() == Tag)
+m_data.m_nameWithCase = 

[webkit-changes] [192889] trunk/Source/ThirdParty

[dburkart]

Title: [192889] trunk/Source/ThirdParty








Revision 192889
Author dburk...@apple.com
Date 2015-12-01 10:26:18 -0800 (Tue, 01 Dec 2015)


Log Message
Remove Mountain Lion support from gtest
https://bugs.webkit.org/show_bug.cgi?id=151705

Reviewed by Darin Adler.

* gtest/xcode/Config/General.xcconfig:

Modified Paths

trunk/Source/ThirdParty/ChangeLog
trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig




Diff

Modified: trunk/Source/ThirdParty/ChangeLog (192888 => 192889)

--- trunk/Source/ThirdParty/ChangeLog	2015-12-01 17:40:31 UTC (rev 192888)
+++ trunk/Source/ThirdParty/ChangeLog	2015-12-01 18:26:18 UTC (rev 192889)
@@ -1,3 +1,12 @@
+2015-12-01  Dana Burkart  
+
+Remove Mountain Lion support from gtest
+https://bugs.webkit.org/show_bug.cgi?id=151705
+
+Reviewed by Darin Adler.
+
+* gtest/xcode/Config/General.xcconfig:
+
 2015-11-02  Andy Estes  
 
 [Cocoa] Add tvOS and watchOS to SUPPORTED_PLATFORMS


Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (192888 => 192889)

--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2015-12-01 17:40:31 UTC (rev 192888)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig	2015-12-01 18:26:18 UTC (rev 192889)
@@ -65,14 +65,6 @@
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_101000);
-TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_101100);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;






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

[webkit-changes] [192840] trunk/Source/ThirdParty/ANGLE

[dburkart]

Title: [192840] trunk/Source/ThirdParty/ANGLE








Revision 192840
Author dburk...@apple.com
Date 2015-11-30 16:03:51 -0800 (Mon, 30 Nov 2015)


Log Message
Remove Mountain Lion support from ANGLE
https://bugs.webkit.org/show_bug.cgi?id=151679

Reviewed by Darin Adler.

* Configurations/Base.xcconfig:

Modified Paths

trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig




Diff

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (192839 => 192840)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2015-11-30 23:57:31 UTC (rev 192839)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2015-12-01 00:03:51 UTC (rev 192840)
@@ -1,3 +1,12 @@
+2015-11-30  Dana Burkart  
+
+Remove Mountain Lion support from ANGLE
+https://bugs.webkit.org/show_bug.cgi?id=151679
+
+Reviewed by Darin Adler.
+
+* Configurations/Base.xcconfig:
+
 2015-11-02  Andy Estes  
 
 [Cocoa] Add tvOS and watchOS to SUPPORTED_PLATFORMS


Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (192839 => 192840)

--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2015-11-30 23:57:31 UTC (rev 192839)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2015-12-01 00:03:51 UTC (rev 192840)
@@ -53,14 +53,6 @@
 
 SDKROOT = macosx.internal;
 
-TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
-TOOLCHAINS_macosx_1080 = default;
-TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
-TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
-TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
-TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_macosx_101100);
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);






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

[webkit-changes] [191900] trunk/Tools

[dburkart]

Title: [191900] trunk/Tools








Revision 191900
Author dburk...@apple.com
Date 2015-11-02 10:46:58 -0800 (Mon, 02 Nov 2015)


Log Message
svn-apply should handle unified diffs
https://bugs.webkit.org/show_bug.cgi?id=150650

Reviewed by Darin Adler.

* Scripts/VCSUtils.pm:
(parseUnifiedDiffHeader):
This method parses a unified diff header, and returns a information in the
style of parseGitDiffHeader and parseSvnDiffHeader.

(parseDiffHeader):
Teach parseDiffHeader to recognize unified diff headers.

(parseDiff):
Teach parseDiff to recognize unified diffs.

* Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl:
* Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/VCSUtils.pm
trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl


Added Paths

trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl




Diff

Modified: trunk/Tools/ChangeLog (191899 => 191900)

--- trunk/Tools/ChangeLog	2015-11-02 18:42:37 UTC (rev 191899)
+++ trunk/Tools/ChangeLog	2015-11-02 18:46:58 UTC (rev 191900)
@@ -1,3 +1,24 @@
+2015-10-30  Dana Burkart  
+
+svn-apply should handle unified diffs
+https://bugs.webkit.org/show_bug.cgi?id=150650
+
+Reviewed by Darin Adler.
+
+* Scripts/VCSUtils.pm:
+(parseUnifiedDiffHeader):
+This method parses a unified diff header, and returns a information in the
+style of parseGitDiffHeader and parseSvnDiffHeader.
+
+(parseDiffHeader):
+Teach parseDiffHeader to recognize unified diff headers.
+
+(parseDiff):
+Teach parseDiff to recognize unified diffs.
+
+* Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl:
+* Scripts/webkitperl/VCSUtils_unittest/parseUnifiedDiffHeader.pl: Added.
+
 2015-11-02  Csaba Osztrogonác  
 
 Fix the FTL JIT build with system LLVM on Linux


Modified: trunk/Tools/Scripts/VCSUtils.pm (191899 => 191900)

--- trunk/Tools/Scripts/VCSUtils.pm	2015-11-02 18:42:37 UTC (rev 191899)
+++ trunk/Tools/Scripts/VCSUtils.pm	2015-11-02 18:46:58 UTC (rev 191900)
@@ -109,6 +109,7 @@
 # Project time zone for Cupertino, CA, US
 my $changeLogTimeZone = "PST8PDT";
 
+my $unifiedDiffStartRegEx = qr#^--- ([abc]\/)?([^\r\n]+)#;
 my $gitDiffStartRegEx = qr#^diff --git [^\r\n]+#;
 my $gitDiffStartWithPrefixRegEx = qr#^diff --git \w/(.+) \w/([^\r\n]+)#; # We suppose that --src-prefix and --dst-prefix don't contain a non-word character (\W) and end with '/'.
 my $gitDiffStartWithoutPrefixNoSpaceRegEx = qr#^diff --git (\S+) (\S+)$#;
@@ -941,6 +942,103 @@
 return (\%header, $_);
 }
 
+# Parse the next Unified diff header from the given file handle, and advance
+# the handle so the last line read is the first line after the header.
+#
+# This subroutine dies if given leading junk.
+#
+# Args:
+#   $fileHandle: advanced so the last line read from the handle is the first
+#line of the header to parse.  This should be a line
+#beginning with "Index:".
+#   $line: the line last read from $fileHandle
+#
+# Returns ($headerHashRef, $lastReadLine):
+#   $headerHashRef: a hash reference representing a diff header, as follows--
+# indexPath: the path of the target file, which is the path found in
+#the "Index:" line.
+# isNew: the value 1 if the diff is for a new file.
+# isDeletion: the value 1 if the diff is a file deletion.
+# svnConvertedText: the header text converted to a header with the paths
+#   in some lines corrected.
+#   $lastReadLine: the line last read from $fileHandle.
+sub parseUnifiedDiffHeader($$)
+{
+my ($fileHandle, $line) = @_;
+
+$_ = $line;
+
+my $currentPosition = tell($fileHandle);
+my $indexLine;
+my $indexPath;
+if (/$unifiedDiffStartRegEx/) {
+# Use $POSTMATCH to preserve the end-of-line character.
+my $eol = $POSTMATCH;
+
+$indexPath = $2;
+
+# In the case of an addition, we look at the next line for the index path
+if ($indexPath eq "/dev/null") {
+$_ = <$fileHandle>;
+if (/^\+\+\+ ([abc]\/)?([^\t\n\r]+)/) {
+$indexPath = $2;
+} else {
+die "Unrecognized unified diff format.";
+}
+$_ = $line;
+}
+
+$indexLine = "Index: $indexPath$eol"; # Convert to SVN format.
+} else {
+die("Could not parse leading \"---\" line: \"$line\".");
+}
+
+seek($fileHandle, $currentPosition, 0);
+
+my $isDeletion;
+my $isHeaderEnding;
+my $isNew;
+my $svnConvertedText = $indexLine;
+while (1) {
+# Temporarily strip off any end-of-line characters to simplify
+# regex matching below.
+s/([\n\r]+)$//;
+my $eol = $1;
+
+if (/^--- \/dev\/null/) {
+$isNew = 1;
+} elsif (/^\+\+\+ 

[webkit-changes] [191601] trunk

[dburkart]

Title: [191601] trunk








Revision 191601
Author dburk...@apple.com
Date 2015-10-26 14:45:23 -0700 (Mon, 26 Oct 2015)


Log Message
`make analyze` should build using the debug configuration
https://bugs.webkit.org/show_bug.cgi?id=150571

Reviewed by Lucas Forschler.

.:

* Makefile.shared:

WebKitLibraries:

* Makefile:

Modified Paths

trunk/ChangeLog
trunk/Makefile.shared
trunk/WebKitLibraries/ChangeLog
trunk/WebKitLibraries/Makefile




Diff

Modified: trunk/ChangeLog (191600 => 191601)

--- trunk/ChangeLog	2015-10-26 21:41:36 UTC (rev 191600)
+++ trunk/ChangeLog	2015-10-26 21:45:23 UTC (rev 191601)
@@ -1,3 +1,12 @@
+2015-10-26  Dana Burkart  
+
+`make analyze` should build using the debug configuration
+https://bugs.webkit.org/show_bug.cgi?id=150571
+
+Reviewed by Lucas Forschler.
+
+* Makefile.shared:
+
 2015-10-26  Philippe Normand  
 
 Unreviewed, rolling out r191576.


Modified: trunk/Makefile.shared (191600 => 191601)

--- trunk/Makefile.shared	2015-10-26 21:41:36 UTC (rev 191600)
+++ trunk/Makefile.shared	2015-10-26 21:45:23 UTC (rev 191601)
@@ -51,7 +51,7 @@
 	( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 
 analyze:
-	$(SCRIPTS_PATH)/set-webkit-configuration --release $(ASAN_OPTION)
+	$(SCRIPTS_PATH)/set-webkit-configuration --debug $(ASAN_OPTION)
 ifndef PATH_TO_SCAN_BUILD
 	( $(SET_COLOR_DIAGNOSTICS_ARG); xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) RUN_CLANG_STATIC_ANALYZER=YES | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} )
 else


Modified: trunk/WebKitLibraries/ChangeLog (191600 => 191601)

--- trunk/WebKitLibraries/ChangeLog	2015-10-26 21:41:36 UTC (rev 191600)
+++ trunk/WebKitLibraries/ChangeLog	2015-10-26 21:45:23 UTC (rev 191601)
@@ -1,3 +1,12 @@
+2015-10-26  Dana Burkart  
+
+`make analyze` should build using the debug configuration
+https://bugs.webkit.org/show_bug.cgi?id=150571
+
+Reviewed by Lucas Forschler.
+
+* Makefile:
+
 2015-10-20  Yoav Weiss  
 
 Rename the PICTURE_SIZES flag to CURRENTSRC


Modified: trunk/WebKitLibraries/Makefile (191600 => 191601)

--- trunk/WebKitLibraries/Makefile	2015-10-26 21:41:36 UTC (rev 191600)
+++ trunk/WebKitLibraries/Makefile	2015-10-26 21:45:23 UTC (rev 191601)
@@ -23,7 +23,7 @@
 	@$(MAKE) libs
 
 analyze:
-	$(SCRIPTS_PATH)/set-webkit-configuration --release
+	$(SCRIPTS_PATH)/set-webkit-configuration --debug
 	@$(MAKE) libs
 
 clean:






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

[webkit-changes] [191367] trunk/Tools

[dburkart]

Title: [191367] trunk/Tools








Revision 191367
Author dburk...@apple.com
Date 2015-10-20 18:41:52 -0700 (Tue, 20 Oct 2015)


Log Message
svn-apply fails to apply binary diffs in some cases
https://bugs.webkit.org/show_bug.cgi?id=64647

Reviewed by Daniel Bates.

* Scripts/VCSUtils.pm:
(decodeGitBinaryPatchDeltaSize): Modified.
We need to handle the case where the binary diff is the last in the patch; so we match on "-- \n" or "\Z".
* Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/VCSUtils.pm
trunk/Tools/Scripts/svn-apply


Added Paths

trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl




Diff

Modified: trunk/Tools/ChangeLog (191366 => 191367)

--- trunk/Tools/ChangeLog	2015-10-21 01:10:32 UTC (rev 191366)
+++ trunk/Tools/ChangeLog	2015-10-21 01:41:52 UTC (rev 191367)
@@ -1,3 +1,15 @@
+2015-10-20  Dana Burkart  
+
+svn-apply fails to apply binary diffs in some cases
+https://bugs.webkit.org/show_bug.cgi?id=64647
+
+Reviewed by Daniel Bates.
+
+* Scripts/VCSUtils.pm:
+(decodeGitBinaryPatchDeltaSize): Modified.
+We need to handle the case where the binary diff is the last in the patch; so we match on "-- \n" or "\Z".
+* Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl: Added.
+
 2015-10-20  Alexey Proskuryakov  
 
 Mac Debug EWS never finishes when there are failures


Modified: trunk/Tools/Scripts/VCSUtils.pm (191366 => 191367)

--- trunk/Tools/Scripts/VCSUtils.pm	2015-10-21 01:10:32 UTC (rev 191366)
+++ trunk/Tools/Scripts/VCSUtils.pm	2015-10-21 01:41:52 UTC (rev 191367)
@@ -2039,8 +2039,8 @@
 # Then, content of the chunk comes. To decode the content, we
 # need decode it with base85 first, and then zlib.
 my $gitPatchRegExp = '(literal|delta) ([0-9]+)\n([A-Za-z0-9!#$%&()*+-;<=>?@^_`{|}~\\n]*?)\n\n';
-if ($contents !~ m"\nGIT binary patch\n$gitPatchRegExp$gitPatchRegExp\Z") {
-die "$fullPath: unknown git binary patch format"
+if ($contents !~ m"\nGIT binary patch\n$gitPatchRegExp$gitPatchRegExp(\Z|-- \n)") {
+return ();
 }
 
 my $binaryChunkType = $1;


Modified: trunk/Tools/Scripts/svn-apply (191366 => 191367)

--- trunk/Tools/Scripts/svn-apply	2015-10-21 01:10:32 UTC (rev 191366)
+++ trunk/Tools/Scripts/svn-apply	2015-10-21 01:41:52 UTC (rev 191367)
@@ -250,6 +250,9 @@
 my $contents = $diffHashRef->{svnConvertedText};
 
 my ($binaryChunkType, $binaryChunk, $reverseBinaryChunkType, $reverseBinaryChunk) = decodeGitBinaryPatch($contents, $fullPath);
+if (!$binaryChunkType) {
+die "$fullPath: unknown git binary patch format";
+}
 
 my $isFileAddition = $diffHashRef->{isNew};
 my $isFileDeletion = $diffHashRef->{isDeletion};


Added: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl (0 => 191367)

--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl	(rev 0)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl	2015-10-21 01:41:52 UTC (rev 191367)
@@ -0,0 +1,126 @@
+#!/usr/bin/perl -w
+#
+# Copyright (C) 2015 Apple Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Unit tests for decodeGitBinaryPatch()
+
+use strict;
+use warnings;
+
+use Test::More;
+use VCSUtils;
+
+my @testCaseHashRefs = (
+{
+diffName => "Single line chunks",
+inputText => <<'END',
+index 490e319f550754ff97dbc4d5a69ad7dbc69c85da..7764e296b482c0ff2c9e4f04114cee9fa1f7544f 100644
+GIT binary patch
+delta 12
+Tcmdnzb;WhVcGk^`9I~ "foo/bar",
+expectedReturn => [
+'delta',
+

[webkit-changes] [191372] trunk/Tools

[dburkart]

Title: [191372] trunk/Tools








Revision 191372
Author dburk...@apple.com
Date 2015-10-20 21:51:27 -0700 (Tue, 20 Oct 2015)


Log Message
Fix the build

Unreviewed.

My previous patch was missing a necessary space character.

* Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl




Diff

Modified: trunk/Tools/ChangeLog (191371 => 191372)

--- trunk/Tools/ChangeLog	2015-10-21 04:25:02 UTC (rev 191371)
+++ trunk/Tools/ChangeLog	2015-10-21 04:51:27 UTC (rev 191372)
@@ -1,5 +1,15 @@
 2015-10-20  Dana Burkart  
 
+Fix the build
+
+Unreviewed.
+
+My previous patch was missing a necessary space character.
+
+* Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl:
+
+2015-10-20  Dana Burkart  
+
 svn-apply fails to apply binary diffs in some cases
 https://bugs.webkit.org/show_bug.cgi?id=64647
 


Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl (191371 => 191372)

--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl	2015-10-21 04:25:02 UTC (rev 191371)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/decodeGitBinaryPatch.pl	2015-10-21 04:51:27 UTC (rev 191372)
@@ -94,7 +94,7 @@
 z%E0#7lQ5vNzoxn>y*jsW?-djFDBQQ*K3#hs+NZMgm!)^#@~ZxQ`d0Mso6dZV^n)D=
 zZz*ZUS2-6H?wvlpqOj}k?}x6)d~fuM+baq`D*FGwuWD4AqtpM|m2=PUW{)i7Uwi%)
 
---
+-- 
 1.7.4.4
 END
 fullPath => "foo/bar",






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

[webkit-changes] [190366] trunk/Tools

[dburkart]

Title: [190366] trunk/Tools








Revision 190366
Author dburk...@apple.com
Date 2015-09-30 13:05:17 -0700 (Wed, 30 Sep 2015)


Log Message
git-add-reviewer should trim trailing spaces/newlines
https://bugs.webkit.org/show_bug.cgi?id=149513

Reviewed by Darin Adler.

* Scripts/git-add-reviewer:
(nonInteractive):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/git-add-reviewer




Diff

Modified: trunk/Tools/ChangeLog (190365 => 190366)

--- trunk/Tools/ChangeLog	2015-09-30 20:00:53 UTC (rev 190365)
+++ trunk/Tools/ChangeLog	2015-09-30 20:05:17 UTC (rev 190366)
@@ -1,3 +1,13 @@
+2015-09-30  Dana Burkart  
+
+git-add-reviewer should trim trailing spaces/newlines
+https://bugs.webkit.org/show_bug.cgi?id=149513
+
+Reviewed by Darin Adler.
+
+* Scripts/git-add-reviewer:
+(nonInteractive):
+
 2015-09-30  Eric Carlson  
 
 REGRESSION(r190262): User media unit test failures after r190262


Modified: trunk/Tools/Scripts/git-add-reviewer (190365 => 190366)

--- trunk/Tools/Scripts/git-add-reviewer	2015-09-30 20:00:53 UTC (rev 190365)
+++ trunk/Tools/Scripts/git-add-reviewer	2015-09-30 20:05:17 UTC (rev 190366)
@@ -170,6 +170,7 @@
 my $headCommit = toCommit($head);
 
 isAncestor($commit, $head) or die "$ARGV[0] is not an ancestor of HEAD.";
+chomp($reviewer);
 
 my %item = (
 reviewer => $reviewer,






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

[webkit-changes] [188220] branches/safari-601.1-branch

[dburkart]

Title: [188220] branches/safari-601.1-branch








Revision 188220
Author dburk...@apple.com
Date 2015-08-10 13:32:06 -0700 (Mon, 10 Aug 2015)


Log Message
Merge r188190. rdar://problem/22191482

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp
branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp


Removed Paths

branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html
branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188219 => 188220)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-10 20:32:06 UTC (rev 188220)
@@ -1,3 +1,21 @@
+2015-08-10  Dana Burkart  dburk...@apple.com
+
+Merge r188190. rdar://problem/22191482
+
+2015-08-08  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r179871.
+https://bugs.webkit.org/show_bug.cgi?id=147810
+
+Breaks product images on http://www.apple.com/shop/buy-
+mac/macbook (Requested by smfr on #webkit).
+
+Reverted changeset:
+
+Render: properly update body's background image
+https://bugs.webkit.org/show_bug.cgi?id=140183
+http://trac.webkit.org/changeset/179871
+
 2015-08-07  Alexey Proskuryakov  a...@apple.com
 
 Correct expectations for platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html.


Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html (188219 => 188220)

--- branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html	2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html	2015-08-10 20:32:06 UTC (rev 188220)
@@ -1,24 +0,0 @@
-!doctype html
-html
-head
-
-style
-body {
-width: 1024px;
-height: 720px;
-left: 0px;
-top: 0px;
-margin: 0px;
-position: absolute;
-background-image: url(../resources/apple.jpg);
-}
-/style
-
-/head
-body
-div style=background-color: red; position: relative; top: 32px; left: 32px; width: 200px; height: 200px;
-div style=background-color: blue; position: absolute; top: 100px; left: 100px; width: 360px; height: 150px;/div
-/div
-/body
-/html
-


Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html (188219 => 188220)

--- branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html	2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html	2015-08-10 20:32:06 UTC (rev 188220)
@@ -1,49 +0,0 @@
-!doctype html
-html
-head
-script language=_javascript_
-
-function onLoad() {
-document.body.style.background = ""
-
-var div = document.getElementById(div);
-div.style.zIndex = -1;
-
-var trans = document.createElement(div);
-trans.style.backgroundColor = blue;
-trans.style.width = 360px;
-trans.style.height = 150px;
-trans.style.position = absolute;
-trans.style.top = 100px;
-trans.style.left = 100px;
-trans.style.webkitTransform = translateZ(0);
-
-div.appendChild(trans);
-
-if (window.testRunner)
-testRunner.notifyDone();
-}
-
-if (window.testRunner)
-testRunner.waitUntilDone();
-
-/script
-
-style
-body {
-width: 1024px;
-height: 720px;
-left: 0px;
-top: 0px;
-margin: 0px;
-position: absolute;
-z-index: -1;
-}
-/style
-
-/head
-body _onload_=onLoad()
-div id=div style=background-color: red; position: relative; top: 32px; left: 32px; width: 200px; height: 200px;/div
-/body
-/html
-


Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188219 => 188220)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-10 20:32:06 UTC (rev 188220)
@@ -1,3 +1,21 @@
+2015-08-10  Dana Burkart  dburk...@apple.com
+
+Merge r188190. rdar://problem/22191482
+
+2015-08-08  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r179871.
+https://bugs.webkit.org/show_bug.cgi?id=147810
+
+Breaks product images on http://www.apple.com/shop/buy-
+mac/macbook (Requested by smfr on #webkit).
+
+Reverted changeset:
+
+Render: properly update body's background image
+

[webkit-changes] [188225] branches/safari-601.1-branch

[dburkart]

Title: [188225] branches/safari-601.1-branch








Revision 188225
Author dburk...@apple.com
Date 2015-08-10 13:38:50 -0700 (Mon, 10 Aug 2015)


Log Message
Merge r188182. rdar://problem/21254835

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt
branches/safari-601.1-branch/LayoutTests/platform/mac/media/track/track-cue-rendering-horizontal-expected.txt
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css


Added Paths

branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt
branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188224 => 188225)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-10 20:38:50 UTC (rev 188225)
@@ -1,5 +1,21 @@
 2015-08-10  Dana Burkart  dburk...@apple.com
 
+Merge r188182. rdar://problem/21254835
+
+2015-08-07  James Craig  jcr...@apple.com
+
+REGRESSION(r184722) AX: WebKit video playback toolbar removed from DOM; no longer accessible to VoiceOver
+https://bugs.webkit.org/show_bug.cgi?id=145684
+
+Reviewed by Dean Jackson.
+
+* http/tests/contentextensions/text-track-blocked-expected.txt: Minor update to test case expectation.
+* media/video-controls-show-on-kb-or-ax-event-expected.txt: Added.
+* media/video-controls-show-on-kb-or-ax-event.html: New test validates video controls can be displayed without the need for a mouse.
+* platform/mac/media/track/track-cue-rendering-horizontal-expected.txt: Minor update to test case expectation.
+
+2015-08-10  Dana Burkart  dburk...@apple.com
+
 Merge r188190. rdar://problem/22191482
 
 2015-08-08  Commit Queue  commit-qu...@webkit.org


Modified: branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt (188224 => 188225)

--- branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt	2015-08-10 20:36:48 UTC (rev 188224)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/text-track-blocked-expected.txt	2015-08-10 20:38:50 UTC (rev 188225)
@@ -14,3 +14,5 @@
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
   RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,256) size 320x10
+  RenderButton {BUTTON} at (0,230) size 320x10 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]


Added: branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt (0 => 188225)

--- branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event-expected.txt	2015-08-10 20:38:50 UTC (rev 188225)
@@ -0,0 +1,6 @@
+This tests that, after the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the hidden Show Controls button.
+
+PASS
+
+
+


Added: branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html (0 => 188225)

--- branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/media/video-controls-show-on-kb-or-ax-event.html	2015-08-10 20:38:50 UTC (rev 188225)
@@ -0,0 +1,42 @@
+body
+p
+This tests that, after the video controls fade out, they can be shown when VoiceOver or a keyboard user clicks the hidden Show Controls button.
+/p
+p id=result
+FAIL: Test did not run.br
+/p
+video id=video controls autoplay _onplaying_=playing() src=""
+script
+if (window.testRunner) {
+testRunner.waitUntilDone();
+testRunner.dumpAsText();
+}
+
+function playing() {
+
+// Mouse over the video then mouse out to hide controls more quickly.
+eventSender.mouseMoveTo(100,100);
+eventSender.mouseMoveTo(1,1);
+
+setTimeout(function() {
+var result = document.getElementById(result);
+result.innerHTML = ;
+var root = internals.shadowRoot(document.getElementById(video))
+
+var button = root.firstChild.querySelector('button');
+if (button) {
+button.focus();
+eventSender.keyDown(' '); // Use 

[webkit-changes] [188224] branches/safari-601.1-branch/Source/WebCore

[dburkart]

Title: [188224] branches/safari-601.1-branch/Source/WebCore








Revision 188224
Author dburk...@apple.com
Date 2015-08-10 13:36:48 -0700 (Mon, 10 Aug 2015)


Log Message
Merge r188196. rdar://problem/22192773

Modified Paths

branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp




Diff

Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188223 => 188224)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-10 20:36:10 UTC (rev 188223)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-10 20:36:48 UTC (rev 188224)
@@ -1,5 +1,23 @@
 2015-08-10  Dana Burkart  dburk...@apple.com
 
+Merge r188196. rdar://problem/22192773
+
+2015-08-09  Eric Carlson  eric.carl...@apple.com
+
+[Mac] Always require ExternalDeviceAutoPlayCandidate flag to AirPlay automatically
+https://bugs.webkit.org/show_bug.cgi?id=147801
+
+Reviewed by Dean Jackson.
+
+Test: http/tests/media/video-media-document-disposition-download.html
+
+* Modules/mediasession/WebMediaSessionManager.cpp:
+(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't tell the last element
+  to begin playing to the target unless the ExternalDeviceAutoPlayCandidate flag is set and
+  it is not currently playing.
+
+2015-08-10  Dana Burkart  dburk...@apple.com
+
 Merge r188190. rdar://problem/22191482
 
 2015-08-08  Commit Queue  commit-qu...@webkit.org


Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (188223 => 188224)

--- branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp	2015-08-10 20:36:10 UTC (rev 188223)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp	2015-08-10 20:36:48 UTC (rev 188224)
@@ -272,7 +272,7 @@
 indexOfClientWillPlayToTarget = indexOfClientThatRequestedPicker;
 if (indexOfClientWillPlayToTarget == notFound  indexOfLastClientToRequestPicker != notFound)
 indexOfClientWillPlayToTarget = indexOfLastClientToRequestPicker;
-if (indexOfClientWillPlayToTarget == notFound  haveActiveRoute)
+if (indexOfClientWillPlayToTarget == notFound  haveActiveRoute  flagsAreSet(m_clientState[0]-flags, MediaProducer::ExternalDeviceAutoPlayCandidate)  !flagsAreSet(m_clientState[0]-flags, MediaProducer::IsPlayingVideo))
 indexOfClientWillPlayToTarget = 0;
 
 LOG(Media, WebMediaSessionManager::configurePlaybackTargetClients - indexOfClientWillPlayToTarget = %zu, indexOfClientWillPlayToTarget);






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

[webkit-changes] [188230] trunk/Websites/test-results

[dburkart]

Title: [188230] trunk/Websites/test-results








Revision 188230
Author dburk...@apple.com
Date 2015-08-10 14:35:54 -0700 (Mon, 10 Aug 2015)


Log Message
Fix flakiness dashboard stability and performance issues.
https://bugs.webkit.org/show_bug.cgi?id=147835

Reviewed by Ryosuke Niwa.

* init-database.sql:
* public/.htaccess:
* public/include/json-shared.php:
* public/include/test-results.php:

Modified Paths

trunk/Websites/test-results/ChangeLog
trunk/Websites/test-results/init-database.sql
trunk/Websites/test-results/public/.htaccess
trunk/Websites/test-results/public/include/json-shared.php
trunk/Websites/test-results/public/include/test-results.php




Diff

Modified: trunk/Websites/test-results/ChangeLog (188229 => 188230)

--- trunk/Websites/test-results/ChangeLog	2015-08-10 20:56:18 UTC (rev 188229)
+++ trunk/Websites/test-results/ChangeLog	2015-08-10 21:35:54 UTC (rev 188230)
@@ -1,3 +1,15 @@
+2015-08-10  Dana Burkart  dburk...@apple.com
+
+Fix flakiness dashboard stability and performance issues.
+https://bugs.webkit.org/show_bug.cgi?id=147835
+
+Reviewed by Ryosuke Niwa.
+
+* init-database.sql:
+* public/.htaccess:
+* public/include/json-shared.php:
+* public/include/test-results.php:
+
 2014-01-23  Ryosuke Niwa  rn...@webkit.org
 
 Upstream changes to json-shared.php from the perf dashboard
@@ -535,7 +547,7 @@
 (TestResultsView._createResultCell): Show the test time and the expected result.
 (TestResultsView._createTestResultRow): Compute the slowest run and also round time to tenth of second for time
 less than 10s or second if it's more than 10s so that the test time will always be shown in two digits.
-Also show the bug number and the latest expected result on the left columns after linkifying the bug numbers. 
+Also show the bug number and the latest expected result on the left columns after linkifying the bug numbers.
 (TestResultsView._matchesFailureType): Added. Determines whether results is of a particular failure type.
 (TestResultsView._populateBuilderPane):
 (TestResultsView.fetchFailingTestsForBuilder): Store the failure type such as flaky, wrongtestexpectations.
@@ -576,4 +588,3 @@
 loadTestsFromLocationHash.
 (TestResultsView.loadTestsFromLocationHash): Take care of both 'tests' and 'builder' components.
 (fetchManifest): Setup the UI to select a builder.
-


Modified: trunk/Websites/test-results/init-database.sql (188229 => 188230)

--- trunk/Websites/test-results/init-database.sql	2015-08-10 20:56:18 UTC (rev 188229)
+++ trunk/Websites/test-results/init-database.sql	2015-08-10 21:35:54 UTC (rev 188230)
@@ -51,7 +51,7 @@
 reftest_type varchar(64));
 
 CREATE TABLE results (
-id serial PRIMARY KEY,
+id bigserial PRIMARY KEY,
 test integer REFERENCES tests ON DELETE CASCADE,
 build integer REFERENCES builds ON DELETE CASCADE,
 expected varchar(64) NOT NULL,
@@ -64,4 +64,4 @@
 CREATE INDEX results_build ON results(build);
 CREATE INDEX results_is_flaky ON results(is_flaky);
 
-SET work_mem='50MB';
+SET work_mem='1024MB';


Modified: trunk/Websites/test-results/public/.htaccess (188229 => 188230)

--- trunk/Websites/test-results/public/.htaccess	2015-08-10 20:56:18 UTC (rev 188229)
+++ trunk/Websites/test-results/public/.htaccess	2015-08-10 21:35:54 UTC (rev 188230)
@@ -5,4 +5,5 @@
 php_value post_max_size 11000
 php_value memory_limit 12000
 php_value max_input_time 60
+php_value max_execution_time 240
 /IfModule


Modified: trunk/Websites/test-results/public/include/json-shared.php (188229 => 188230)

--- trunk/Websites/test-results/public/include/json-shared.php	2015-08-10 20:56:18 UTC (rev 188229)
+++ trunk/Websites/test-results/public/include/json-shared.php	2015-08-10 21:35:54 UTC (rev 188230)
@@ -1,4 +1,5 @@
 ?php
+ini_set('memory_limit','1024M');
 
 require_once('db.php');
 


Modified: trunk/Websites/test-results/public/include/test-results.php (188229 => 188230)

--- trunk/Websites/test-results/public/include/test-results.php	2015-08-10 20:56:18 UTC (rev 188229)
+++ trunk/Websites/test-results/public/include/test-results.php	2015-08-10 21:35:54 UTC (rev 188230)
@@ -1,4 +1,5 @@
 ?php
+ini_set('memory_limit', '1024M');
 
 require_once('db.php');
 
@@ -67,7 +68,7 @@
 require_format('test_time', $tests['time'], '/^\d*$/');
 $modifiers = array_get($tests, 'modifiers');
 if ($modifiers)
-require_format('test_modifiers', $modifiers, '/^[A-Za-z0-9 \.\/]+$/');
+require_format('test_modifiers', $modifiers, '/^[A-Za-z0-9 \.\/\+]+$/');
 else
 $modifiers = NULL;
 $category = 'LayoutTest'; // FIXME: Support other test categories.






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

[webkit-changes] [188078] branches/safari-601.1-branch/Source/WebKit/win

[dburkart]

Title: [188078] branches/safari-601.1-branch/Source/WebKit/win








Revision 188078
Author dburk...@apple.com
Date 2015-08-06 16:09:43 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187894. rdar://problem/15779101

Modified Paths

branches/safari-601.1-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h




Diff

Modified: branches/safari-601.1-branch/Source/WebKit/win/ChangeLog (188077 => 188078)

--- branches/safari-601.1-branch/Source/WebKit/win/ChangeLog	2015-08-06 23:09:42 UTC (rev 188077)
+++ branches/safari-601.1-branch/Source/WebKit/win/ChangeLog	2015-08-06 23:09:43 UTC (rev 188078)
@@ -1,5 +1,16 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187894. rdar://problem/15779101
+
+2015-08-04  Alex Christensen  achristen...@webkit.org
+
+Fix Windows build after r187886.
+
+* Plugins/PluginStream.h:
+Befriend PluginView.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187886. rdar://problem/15779101
 
 2015-08-04  Alexey Proskuryakov  a...@apple.com


Modified: branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h (188077 => 188078)

--- branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h	2015-08-06 23:09:42 UTC (rev 188077)
+++ branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h	2015-08-06 23:09:43 UTC (rev 188078)
@@ -116,6 +116,8 @@
 NPReason m_reason;
 NPStream m_stream;
 PluginQuirkSet m_quirks;
+
+friend class PluginView;
 };
 
 } // namespace WebCore






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

[webkit-changes] [188076] branches/safari-601.1-branch

[dburkart]

Title: [188076] branches/safari-601.1-branch








Revision 188076
Author dburk...@apple.com
Date 2015-08-06 16:09:38 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187886. rdar://problem/15779101

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/NetscapePlugInStreamLoader.h
branches/safari-601.1-branch/Source/WebCore/loader/ResourceLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/ResourceLoader.h
branches/safari-601.1-branch/Source/WebCore/loader/SubresourceLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/SubresourceLoader.h
branches/safari-601.1-branch/Source/WebCore/plugins/npapi.h
branches/safari-601.1-branch/Source/WebCore/plugins/npfunctions.h
branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1-branch/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h
branches/safari-601.1-branch/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.mm
branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h
branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm
branches/safari-601.1-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.cpp
branches/safari-601.1-branch/Source/WebKit/win/Plugins/PluginStream.h
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
branches/safari-601.1-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h
branches/safari-601.1-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginController.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h
branches/safari-601.1-branch/Tools/ChangeLog
branches/safari-601.1-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj
branches/safari-601.1-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj.filters
branches/safari-601.1-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
branches/safari-601.1-branch/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
branches/safari-601.1-branch/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
branches/safari-601.1-branch/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h
branches/safari-601.1-branch/Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp


Added Paths

branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-notify-expected.txt
branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-notify.html
branches/safari-601.1-branch/LayoutTests/platform/wk2/http/tests/plugins/
branches/safari-601.1-branch/LayoutTests/platform/wk2/http/tests/plugins/get-url-redirect-notify-expected.txt
branches/safari-601.1-branch/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/URLRedirect.cpp




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188075 => 188076)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:08:48 UTC (rev 188075)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:09:38 UTC (rev 188076)
@@ -1,5 +1,24 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187886. rdar://problem/15779101
+
+2015-08-04  Alexey Proskuryakov  a...@apple.com
+
+Implement NPAPI redirect handling
+https://bugs.webkit.org/show_bug.cgi?id=138675
+rdar://problem/15779101
+
+Patch by Jeffrey Pfau, updated and tweaked by me.
+
+Reviewed by Anders Carlsson.
+
+* http/tests/plugins/get-url-redirect-notify-expected.txt: Added.
+* 

[webkit-changes] [188079] branches/safari-601.1-branch/Source/WebKit/mac

[dburkart]

Title: [188079] branches/safari-601.1-branch/Source/WebKit/mac








Revision 188079
Author dburk...@apple.com
Date 2015-08-06 16:09:45 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187910. rdar://problem/15779101

Modified Paths

branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h




Diff

Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (188078 => 188079)

--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog	2015-08-06 23:09:43 UTC (rev 188078)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog	2015-08-06 23:09:45 UTC (rev 188079)
@@ -1,5 +1,15 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187910. rdar://problem/15779101
+
+2015-08-04  Simon Fraser  simon.fra...@apple.com
+
+Fix the build.
+
+* Plugins/WebNetscapePluginStream.h:
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187886. rdar://problem/15779101
 
 2015-08-04  Alexey Proskuryakov  a...@apple.com


Modified: branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (188078 => 188079)

--- branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h	2015-08-06 23:09:43 UTC (rev 188078)
+++ branches/safari-601.1-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h	2015-08-06 23:09:45 UTC (rev 188079)
@@ -98,9 +98,9 @@
 
 // NetscapePlugInStreamLoaderClient methods.
 void willSendRequest(WebCore::NetscapePlugInStreamLoader*, WebCore::ResourceRequest, const WebCore::ResourceResponse redirectResponse, std::functionvoid (WebCore::ResourceRequest)) override;
-void didReceiveResponse(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceResponse);
-void didFail(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceError);
-bool wantsAllStreams() const;
+void didReceiveResponse(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceResponse) override;
+void didFail(WebCore::NetscapePlugInStreamLoader*, const WebCore::ResourceError) override;
+bool wantsAllStreams() const override;
 
 RetainPtrNSMutableData m_deliveryData;
 WebCore::URL m_requestURL;






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

[webkit-changes] [188082] branches/safari-601.1-branch

[dburkart]

Title: [188082] branches/safari-601.1-branch








Revision 188082
Author dburk...@apple.com
Date 2015-08-06 16:22:38 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187930. rdar://problem/21870332

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/page/mac/EventHandlerMac.mm


Added Paths

branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/resources/background.html
branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe-expected.txt
branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188081 => 188082)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:21:04 UTC (rev 188081)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:22:38 UTC (rev 188082)
@@ -1,5 +1,21 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187930. rdar://problem/21870332
+
+2015-08-04  Brent Fulgham  bfulg...@apple.com
+
+REGRESSION (r173784): [Mac] Correct latching error for non-scrollable iframe nested inside scrollable div.
+https://bugs.webkit.org/show_bug.cgi?id=147668
+rdar://problem/21870332
+
+Reviewed by Simon Fraser.
+
+* platform/mac/fast/scrolling/resources/background.html: Added.
+* platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe-expected.txt: Added.
+* platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html: Added.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187886. rdar://problem/15779101
 
 2015-08-04  Alexey Proskuryakov  a...@apple.com


Added: branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/resources/background.html (0 => 188082)

--- branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/resources/background.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/resources/background.html	2015-08-06 23:22:38 UTC (rev 188082)
@@ -0,0 +1,18 @@
+!DOCTYPE html
+
+html
+head
+style
+div {
+position: relative;
+width: 400px;
+height: 2000px;
+padding: 0;
+background-image: repeating-linear-gradient(to bottom, white, silver 200px);
+}
+/style
+/head
+body
+divThis content is displayed in an iframe. The iframe should be sized such that it does not need to scroll./div
+/body
+/html


Added: branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe-expected.txt (0 => 188082)

--- branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe-expected.txt	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe-expected.txt	2015-08-06 23:22:38 UTC (rev 188082)
@@ -0,0 +1,16 @@
+Put mouse inside the iframe (below) and flick downwards
+
+Tests that iframe does scroll when inner iframe is NOT scrollable.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS div did scroll.
+PASS Page did NOT scroll.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html (0 => 188082)

--- branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html	2015-08-06 23:22:38 UTC (rev 188082)
@@ -0,0 +1,118 @@
+!DOCTYPE html
+html
+head
+link rel=help href=""
+script src=""
+/head
+body
+script
+
+var divTarget;
+var pageScrollPositionBefore;
+var divScrollPositionBefore;
+
+var continueCount = 5;
+
+function locationInWindowCoordinates(element)
+{
+var position = {};
+position.x = element.offsetLeft;
+position.y = element.offsetTop;
+
+while (element.offsetParent) {
+position.x = position.x + element.offsetParent.offsetLeft;
+position.y = position.y + element.offsetParent.offsetTop;
+if (element == document.getElementsByTagName(body)[0])
+break;
+
+element = element.offsetParent;
+}
+
+return position;
+}
+
+function finishTest()
+{
+finishJSTest();
+testRunner.notifyDone();
+}
+
+function checkForScroll() {
+var pageScrollPositionAfter = document.body.scrollTop;
+var divScrollPositionAfter = divTarget.scrollTop;
+
+if (divScrollPositionBefore != divScrollPositionAfter)

[webkit-changes] [188083] branches/safari-601.1-branch

[dburkart]

Title: [188083] branches/safari-601.1-branch








Revision 188083
Author dburk...@apple.com
Date 2015-08-06 16:22:41 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187935. rdar://problem/22097682

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm


Added Paths

branches/safari-601.1-branch/LayoutTests/accessibility/mac/
branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt
branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children.html




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188082 => 188083)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:22:38 UTC (rev 188082)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:22:41 UTC (rev 188083)
@@ -1,5 +1,24 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187935. rdar://problem/22097682
+
+2015-08-04  Doug Russell  d_russ...@apple.com
+
+AX: tree item children returned from ranged getter are different from full array of children
+https://bugs.webkit.org/show_bug.cgi?id=147660
+
+Add an isTreeItem() check in ranged element getter so that it matches the logic in
+the getter for the full children array. This prevents returning a row as a child
+when only the rows contents should be returned. This prevents navigation issues on
+websites without aria outlines.
+
+Reviewed by Chris Fleizach.
+
+* accessibility/mac/aria-tree-item-children-expected.txt: Added.
+* accessibility/mac/aria-tree-item-children.html: Added.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187930. rdar://problem/21870332
 
 2015-08-04  Brent Fulgham  bfulg...@apple.com


Added: branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt (0 => 188083)

--- branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children-expected.txt	2015-08-06 23:22:41 UTC (rev 188083)
@@ -0,0 +1,13 @@
+Animals
+Birds
+This tests that aria tree items can be fetched as either a full list of children or via range getter to ensure the range getter isn't returning a row as it's first child.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS tree.role is 'AXRole: AXOutline'
+PASS child1 == child2 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children.html (0 => 188083)

--- branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/accessibility/mac/aria-tree-item-children.html	2015-08-06 23:22:41 UTC (rev 188083)
@@ -0,0 +1,47 @@
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+script src=""
+script
+if (window.testRunner)
+   testRunner.dumpAsText();
+/script
+/head
+body id=body
+
+ul id=tree role=tree aria-labelledby=treelabel aria-activedescendant=tree0_item0_2_0_1 tabindex=0
+li id=treeitem1 role=treeitem aria-level=1 aria-expanded=true
+span
+span class=expander/span
+Animals
+/span
+ul role=group
+div id=treeitem2 role=treeitem aria-level=2spanBirds/span/div
+/ul
+/span
+/li
+/ul
+
+p id=description/p
+div id=console/div
+
+script
+
+description(This tests that aria tree items can be fetched as either a full list of children or via range getter to ensure the range getter isn't returning a row as it's first child.);
+
+if (window.accessibilityController) {
+
+  var tree = accessibilityController.accessibleElementById(tree)
+  shouldBe(tree.role, 'AXRole: AXOutline');
+
+  var treeitem = tree.childAtIndex(0);
+  var child1 = treeitem.childAtIndex(0);
+  var child2 = treeitem.uiElementArrayAttributeValue(AXChildren)[0];
+  shouldBe(child1 == child2, true);
+}
+
+/script
+
+script src=""
+/body
+/html


Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188082 => 188083)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:22:38 UTC (rev 188082)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:22:41 UTC (rev 188083)
@@ -1,5 +1,26 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187935. rdar://problem/22097682
+
+2015-08-04  Doug Russell  d_russ...@apple.com
+
+AX: tree item children returned from ranged getter are different from full array of children
+

[webkit-changes] [188091] branches/safari-601.1-branch

[dburkart]

Title: [188091] branches/safari-601.1-branch








Revision 188091
Author dburk...@apple.com
Date 2015-08-06 16:35:32 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187962. rdar://problem/21827815

Modified Paths

branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.cpp
branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.h
branches/safari-601.1-branch/Source/WebCore/loader/FrameLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/Shared/SessionState.cpp
branches/safari-601.1-branch/Source/WebKit2/Shared/SessionState.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp
branches/safari-601.1-branch/Tools/ChangeLog
branches/safari-601.1-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
branches/safari-601.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ShouldOpenExternalURLsInNewWindowActions.mm


Added Paths

branches/safari-601.1-branch/Tools/TestWebKitAPI/Tests/WebKit2/should-open-external-schemes.html




Diff

Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188090 => 188091)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:35:28 UTC (rev 188090)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:35:32 UTC (rev 188091)
@@ -1,5 +1,39 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187962. rdar://problem/21827815
+
+2015-08-05  Daniel Bates  daba...@apple.com
+
+REGRESSION (r185111): Clicking phone numbers doesn't prompt to call sometimes
+https://bugs.webkit.org/show_bug.cgi?id=147678
+rdar://problem/21827815
+
+Reviewed by Brady Eidson.
+
+Fixes an issue where a non-user-initiated navigation of the main frame to a phone link (tel URL)
+may be ignored. The navigation is ignored if the page was reloaded as a result of a web content
+process crash, its lifetime exceeded the back-forward cache expiration interval, or a person
+quits and opens Safari again, among other scenarios.
+
+* history/HistoryItem.cpp:
+(WebCore::HistoryItem::setShouldOpenExternalURLsPolicy): Added.
+(WebCore::HistoryItem::shouldOpenExternalURLsPolicy): Added.
+* history/HistoryItem.h:
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::loadDifferentDocumentItem): Apply the should open external URLs policy
+from the history item, if applicable. Also, be more explicit when instantiating a NavigationAction
+so as to help make it straightforward to reduce the number of NavigationAction constructors we have
+in the future.
+* loader/HistoryController.cpp:
+(WebCore::HistoryController::saveDocumentState): Save the should open external URLs policy to
+the history item.
+(WebCore::HistoryController::restoreDocumentState): Apply the should open external URLs policy
+from the history item to the document loader.
+(WebCore::HistoryController::initializeItem): Update the should open external URLs policy of
+the history item to reflect the policy of the document loader associated with the current frame.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187935. rdar://problem/22097682
 
 2015-08-04  Doug Russell  d_russ...@apple.com


Modified: branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.cpp (188090 => 188091)

--- branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.cpp	2015-08-06 23:35:28 UTC (rev 188090)
+++ branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.cpp	2015-08-06 23:35:32 UTC (rev 188091)
@@ -351,6 +351,16 @@
 m_documentState.clear();
 }
 
+void HistoryItem::setShouldOpenExternalURLsPolicy(ShouldOpenExternalURLsPolicy policy)
+{
+m_shouldOpenExternalURLsPolicy = policy;
+}
+
+ShouldOpenExternalURLsPolicy HistoryItem::shouldOpenExternalURLsPolicy() const
+{
+return m_shouldOpenExternalURLsPolicy;
+}
+
 bool HistoryItem::isTargetItem() const
 {
 return m_isTargetItem;


Modified: branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.h (188090 => 188091)

--- branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.h	2015-08-06 23:35:28 UTC (rev 188090)
+++ branches/safari-601.1-branch/Source/WebCore/history/HistoryItem.h	2015-08-06 23:35:32 UTC (rev 188091)
@@ -28,6 +28,7 @@
 #define HistoryItem_h
 
 #include FloatRect.h
+#include FrameLoaderTypes.h
 #include IntPoint.h
 

[webkit-changes] [188090] branches/safari-601.1-branch/Source/WebKit2

[dburkart]

Title: [188090] branches/safari-601.1-branch/Source/WebKit2








Revision 188090
Author dburk...@apple.com
Date 2015-08-06 16:35:28 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187764. rdar://problem/22077836

Modified Paths

branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm
branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (188089 => 188090)

--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-08-06 23:35:12 UTC (rev 188089)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-08-06 23:35:28 UTC (rev 188090)
@@ -1,5 +1,43 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187764. rdar://problem/22077836
+
+2015-08-03  Beth Dakin  bda...@apple.com
+
+Need WKWebView API to enable/disable link preview
+https://bugs.webkit.org/show_bug.cgi?id=147573
+-and corresponding-
+rdar://problem/22077836
+
+Reviewed by Dan Bernstein.
+
+WKView implementation.
+* UIProcess/API/Cocoa/WKViewPrivate.h:
+
+New API. Call into WKView to handle Mac.
+* UIProcess/API/Cocoa/WKWebView.h:
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView initWithFrame:configuration:]):
+(-[WKWebView allowsLinkPreview]):
+(-[WKWebView setAllowsLinkPreview:]):
+
+Remove the SPI declaration from WKWebViewPrivate in order to make this API.
+* UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
+Handle the Mac side.
+* UIProcess/API/mac/WKView.mm:
+(-[WKView viewDidMoveToWindow]):
+(-[WKView initWithFrame:processPool:configuration:webView:]):
+(-[WKView allowsBackForwardNavigationGestures]):
+(-[WKView allowsLinkPreview]):
+(-[WKView setAllowsLinkPreview:]):
+
+Don’t register previews when link preview is prevented.
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView _registerPreview]):
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187886. rdar://problem/15779101
 
 2015-08-04  Alexey Proskuryakov  a...@apple.com


Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h (188089 => 188090)

--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h	2015-08-06 23:35:12 UTC (rev 188089)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h	2015-08-06 23:35:28 UTC (rev 188090)
@@ -129,6 +129,9 @@
 
 - (void)setMagnification:(double)magnification centeredAtPoint:(NSPoint)point;
 
+- (void)setAllowsLinkPreview:(BOOL)allowsLinkPreview;
+- (BOOL)allowsLinkPreview;
+
 - (void)saveBackForwardSnapshotForCurrentItem;
 - (void)saveBackForwardSnapshotForItem:(WKBackForwardListItemRef)item;
 


Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (188089 => 188090)

--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h	2015-08-06 23:35:12 UTC (rev 188089)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h	2015-08-06 23:35:28 UTC (rev 188090)
@@ -231,6 +231,12 @@
 */
 @property (WK_NULLABLE_PROPERTY nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
+/*! @abstract A Boolean value indicating whether link preview is allowed for any
+ links inside this WKWebView.
+ @discussion The default value is NO on iOS and YES on Mac.
+ */
+@property (nonatomic) BOOL allowsLinkPreview WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
 #if TARGET_OS_IPHONE
 /*! @abstract The scroll view associated with the web view.
  */


Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (188089 => 188090)

--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-08-06 23:35:12 UTC (rev 188089)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-08-06 23:35:28 UTC (rev 188090)
@@ -351,7 +351,6 @@
 [self _updateScrollViewBackground];
 
 _viewportMetaTagWidth = -1;
-_allowsLinkPreview = YES;
 
 [self _frameOrBoundsChanged];
 
@@ -659,6 +658,35 @@
 return toAPI(_page.get());
 }
 
+- (BOOL)allowsLinkPreview
+{
+#if PLATFORM(MAC)
+return [_wkView allowsLinkPreview];
+#elif PLATFORM(IOS)
+return _allowsLinkPreview;
+#endif
+}
+
+- (void)setAllowsLinkPreview:(BOOL)allowsLinkPreview
+{
+#if PLATFORM(MAC)
+[_wkView 

[webkit-changes] [188095] branches/safari-601.1-branch/Source/WebKit2

[dburkart]

Title: [188095] branches/safari-601.1-branch/Source/WebKit2








Revision 188095
Author dburk...@apple.com
Date 2015-08-06 16:48:19 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r188011. rdar://problem/22055130

Modified Paths

branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm
branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebFrameProxy.cpp
branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebFrameProxy.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (188094 => 188095)

--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-08-06 23:48:16 UTC (rev 188094)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-08-06 23:48:19 UTC (rev 188095)
@@ -1,5 +1,54 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r188011. rdar://problem/22055130
+
+2015-08-05  Tim Horton  timothy_hor...@apple.com
+
+PDFPlugins are clipped in link previews (and remain so when opened)
+https://bugs.webkit.org/show_bug.cgi?id=147708
+rdar://problem/22055130
+
+Reviewed by Simon Fraser.
+
+* UIProcess/API/mac/WKView.mm:
+(-[WKView initWithFrame:processPool:configuration:webView:]):
+(-[WKView _supportsArbitraryLayoutModes]):
+(-[WKView _didCommitLoadForMainFrame]):
+(-[WKView _setLayoutMode:]):
+(-[WKView _setViewScale:]):
+Avoid using any layout mode other than ViewSize for main frame PluginDocuments,
+because they will often end up behaving incorrectly (especially with PDFPlugin,
+which is even more special in that it takes over application of page scale).
+
+Save any incoming changes to the viewScale and layoutMode, and re-apply
+them once we load something in the main frame that is *not* a PluginDocument.
+
+* UIProcess/API/mac/WKViewInternal.h:
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::scalePage):
+Make sure to reset WebCore's page scale if the main frame contains a
+PluginDocument that takes care of page scale itself.
+
+(WebKit::WebPage::didCommitLoad):
+Do the same thing as what we do in WKView _didCommitLoadForMainFrame,
+but without the UI process round-trip, to avoid an ugly flash.
+
+* UIProcess/WebFrameProxy.cpp:
+(WebKit::WebFrameProxy::didCommitLoad):
+* UIProcess/WebFrameProxy.h:
+(WebKit::WebFrameProxy::containsPluginDocument):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::didCommitLoadForFrame):
+* UIProcess/WebPageProxy.h:
+* UIProcess/WebPageProxy.messages.in:
+* UIProcess/mac/PageClientImpl.mm:
+(WebKit::PageClientImpl::didCommitLoadForMainFrame):
+* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+(WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
+Plumb and keep track of whether the main frame contains a PluginDocument or not.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187962. rdar://problem/21827815
 
 2015-08-05  Daniel Bates  daba...@apple.com


Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (188094 => 188095)

--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-08-06 23:48:16 UTC (rev 188094)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-08-06 23:48:19 UTC (rev 188095)
@@ -264,6 +264,8 @@
 BOOL _allowsLinkPreview;
 
 RetainPtrWKViewLayoutStrategy _layoutStrategy;
+WKLayoutMode _lastRequestedLayoutMode;
+float _lastRequestedViewScale;
 CGSize _minimumViewSize;
 
 RetainPtrCALayer _rootLayer;
@@ -3776,6 +3778,8 @@
 _data-_clipsToVisibleRect = NO;
 _data-_useContentPreparationRectForVisibleRect = NO;
 _data-_windowOcclusionDetectionEnabled = YES;
+_data-_lastRequestedLayoutMode = kWKLayoutModeViewSize;
+_data-_lastRequestedViewScale = 1;
 
 _data-_windowVisibilityObserver = adoptNS([[WKWindowVisibilityObserver alloc] initWithView:self]);
 
@@ -3894,6 +3898,41 @@
 _data-_gestureController-didFirstVisuallyNonEmptyLayoutForMainFrame();
 }
 
+- (BOOL)_supportsArbitraryLayoutModes
+{
+WebPageProxy* 

[webkit-changes] [188094] branches/safari-601.1-branch/Source/WebKit/win

[dburkart]

Title: [188094] branches/safari-601.1-branch/Source/WebKit/win








Revision 188094
Author dburk...@apple.com
Date 2015-08-06 16:48:16 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r188005. rdar://problem/22059707

Modified Paths

branches/safari-601.1-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h
branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp
branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h
branches/safari-601.1-branch/Source/WebKit/win/WebView.cpp




Diff

Modified: branches/safari-601.1-branch/Source/WebKit/win/ChangeLog (188093 => 188094)

--- branches/safari-601.1-branch/Source/WebKit/win/ChangeLog	2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/ChangeLog	2015-08-06 23:48:16 UTC (rev 188094)
@@ -1,5 +1,25 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r188005. rdar://problem/22059707
+
+2015-08-05  Brent Fulgham  bfulg...@apple.com
+
+[Win] Allow display of mixed content on Windows by default
+https://bugs.webkit.org/show_bug.cgi?id=147693
+rdar://problem/22059707
+
+Reviewed by Alex Christensen.
+
+* Interfaces/IWebPreferencesPrivate.idl: Add preference accessor
+to allow getting/setting use of insecure content.
+* WebPreferenceKeysPrivate.h: Add new key for preference.
+* WebPreferences.cpp: Implement preference accessor.
+* WebPreferences.h:
+* WebView.cpp: Set WebCore settings to match prefernces for
+loading mixed content.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187894. rdar://problem/15779101
 
 2015-08-04  Alex Christensen  achristen...@webkit.org


Modified: branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (188093 => 188094)

--- branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl	2015-08-06 23:48:16 UTC (rev 188094)
@@ -168,4 +168,6 @@
 {
 HRESULT _javascript_RuntimeFlags([out, retval] unsigned* flags);
 HRESULT setJavaScriptRuntimeFlags([in] unsigned flags);
+HRESULT allowDisplayAndRunningOfInsecureContent([out, retval] BOOL* enabled);
+HRESULT setAllowDisplayAndRunningOfInsecureContent([in] BOOL enabled);
 }
\ No newline at end of file


Modified: branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (188093 => 188094)

--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h	2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h	2015-08-06 23:48:16 UTC (rev 188094)
@@ -163,3 +163,5 @@
 #define WebKitMockScrollbarsEnabledPreferenceKey WebKitMockScrollbarsEnabled
 
 #define WebKitEnableInheritURIQueryComponentPreferenceKey WebKitEnableInheritURIQueryComponent
+
+#define WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey WebKitAllowDisplayAndRunningOfInsecureContent


Modified: branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp (188093 => 188094)

--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp	2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp	2015-08-06 23:48:16 UTC (rev 188094)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006-2011, 2014-2015 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -293,6 +293,8 @@
 
 CFDictionaryAddValue(defaults, CFSTR(WebKitRequestAnimationFrameEnabledPreferenceKey), kCFBooleanFalse);
 
+CFDictionaryAddValue(defaults, CFSTR(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey), kCFBooleanTrue);
+
 defaultSettings = defaults;
 }
 
@@ -1842,3 +1844,15 @@
 setBoolValue(WebKitEnableInheritURIQueryComponentPreferenceKey, enabled);
 return S_OK;
 }
+
+HRESULT WebPreferences::allowDisplayAndRunningOfInsecureContent(BOOL* enabled)
+{
+*enabled = boolValueForKey(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey);
+return S_OK;
+}
+
+HRESULT WebPreferences::setAllowDisplayAndRunningOfInsecureContent(BOOL enabled)
+{
+setBoolValue(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey, enabled);
+return S_OK;
+}


Modified: branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h (188093 => 188094)

--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h	2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h	2015-08-06 23:48:16 

[webkit-changes] [188073] branches/safari-601.1-branch

[dburkart]

Title: [188073] branches/safari-601.1-branch








Revision 188073
Author dburk...@apple.com
Date 2015-08-06 16:08:03 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187620. rdar://problem/15779101

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/DocumentLoader.h
branches/safari-601.1-branch/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/NetscapePlugInStreamLoader.h
branches/safari-601.1-branch/Source/WebCore/loader/ResourceLoader.cpp
branches/safari-601.1-branch/Source/WebCore/loader/ResourceLoader.h
branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp


Added Paths

branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-expected.txt
branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect.html
branches/safari-601.1-branch/LayoutTests/http/tests/plugins/resources/redirection-response.php




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188072 => 188073)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 22:45:20 UTC (rev 188072)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:08:03 UTC (rev 188073)
@@ -1,3 +1,20 @@
+2015-08-06  Dana Burkart  dburk...@apple.com
+
+Merge r187620. rdar://problem/15779101
+
+2015-07-30  Anders Carlsson  ander...@apple.com
+
+Assertion failure when a plug-in loads a resource that redirects somewhere
+https://bugs.webkit.org/show_bug.cgi?id=147469
+
+Reviewed by Alexey Proskuryakov.
+
+Add a test.
+
+* http/tests/plugins/get-url-redirect-expected.txt: Added.
+* http/tests/plugins/get-url-redirect.html: Added.
+* http/tests/plugins/resources/redirection-response.php: Added.
+
 2015-08-04  Alexey Proskuryakov  a...@apple.com
 
 Merge r187933.


Added: branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-expected.txt (0 => 188073)

--- branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-expected.txt	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect-expected.txt	2015-08-06 23:08:03 UTC (rev 188073)
@@ -0,0 +1 @@
+This tests that NPN_GetURLNotify does not ASSERT in debug builds. 


Added: branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect.html (0 => 188073)

--- branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect.html	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/plugins/get-url-redirect.html	2015-08-06 23:08:03 UTC (rev 188073)
@@ -0,0 +1,19 @@
+html
+body
+This tests that NPN_GetURLNotify does not ASSERT in debug builds.
+embed name=plg type=application/x-webkit-test-netscape/embed
+script
+function notify()
+{
+if (window.testRunner)
+testRunner.notifyDone();
+}
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+plg.getURLNotify(resources/redirection-response.php?status=301target=load-me-1.txt, null, notify);
+/script
+/body
+/html


Added: branches/safari-601.1-branch/LayoutTests/http/tests/plugins/resources/redirection-response.php (0 => 188073)

--- branches/safari-601.1-branch/LayoutTests/http/tests/plugins/resources/redirection-response.php	(rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/plugins/resources/redirection-response.php	2015-08-06 23:08:03 UTC (rev 188073)
@@ -0,0 +1,31 @@
+?php
+$status_code = $_GET['status'];
+
+$uri = rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . / . $_GET['target'];
+
+$host = $_SERVER['HTTP_HOST'];
+if (isset($_GET['host']))
+$host = $_GET['host'];
+
+switch ($status_code) {
+case 301:
+header(HTTP/1.1 301 Moved Permanently);
+header(Location: http:// . $host . $uri);
+break;
+case 302:
+header(HTTP/1.1 302 Found);
+header(Location: http:// . $host . $uri);
+break;
+case 303:
+header(HTTP/1.1 303 See Other);
+header(Location: http:// . $host . $uri);
+break;
+case 307:
+header(HTTP/1.1 307 Temporary Redirect);
+header(Location: http:// . $host . $uri);
+break;
+default:
+header(HTTP/1.1 500 Internal Server Error);
+echo Unexpected status code ($status_code) received.;
+}
+?


Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188072 => 188073)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 22:45:20 UTC (rev 188072)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:08:03 UTC (rev 188073)
@@ -1,3 +1,44 @@
+2015-08-06  Dana Burkart  dburk...@apple.com
+
+ 

[webkit-changes] [188075] branches/safari-601.1-branch/Source/WebCore

[dburkart]

Title: [188075] branches/safari-601.1-branch/Source/WebCore








Revision 188075
Author dburk...@apple.com
Date 2015-08-06 16:08:48 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187693. rdar://problem/22047626

Modified Paths

branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp




Diff

Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188074 => 188075)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:08:46 UTC (rev 188074)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:08:48 UTC (rev 188075)
@@ -1,5 +1,24 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187693. rdar://problem/22047626
+
+2015-07-31  Myles C. Maxfield  mmaxfi...@apple.com
+
+[Cocoa] Latin quotes are used with the system font on Chinese devices
+https://bugs.webkit.org/show_bug.cgi?id=147504
+
+Reviewed by Dean Jackson.
+
+The system font has some fancy logic regarding character selection which requires
+using Core Text for glyph selection.
+
+No new tests because tests can't change the system language of the device.
+
+* platform/graphics/mac/GlyphPageMac.cpp:
+(WebCore::shouldUseCoreText):
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187622. rdar://problem/15779101
 
 2015-07-30  Anders Carlsson  ander...@apple.com


Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (188074 => 188075)

--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp	2015-08-06 23:08:46 UTC (rev 188074)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp	2015-08-06 23:08:48 UTC (rev 188075)
@@ -42,7 +42,7 @@
 
 static bool shouldUseCoreText(const UChar* buffer, unsigned bufferLength, const Font* fontData)
 {
-if (fontData-platformData().isCompositeFontReference())
+if (fontData-platformData().isCompositeFontReference() || fontData-isSystemFont())
 return true;
 if (fontData-platformData().widthVariant() != RegularWidth || fontData-hasVerticalGlyphs()) {
 // Ideographs don't have a vertical variant or width variants.






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

[webkit-changes] [188074] branches/safari-601.1-branch

[dburkart]

Title: [188074] branches/safari-601.1-branch








Revision 188074
Author dburk...@apple.com
Date 2015-08-06 16:08:46 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187622. rdar://problem/15779101

Modified Paths

branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp
branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m




Diff

Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188073 => 188074)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:08:46 UTC (rev 188074)
@@ -1,5 +1,16 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187622. rdar://problem/15779101
+
+2015-07-30  Anders Carlsson  ander...@apple.com
+
+Remove stray printf.
+
+* loader/SubframeLoader.cpp:
+(WebCore::SubframeLoader::requestObject):
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187620. rdar://problem/15779101
 
 2015-07-30  Anders Carlsson  ander...@apple.com


Modified: branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp (188073 => 188074)

--- branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp	2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Source/WebCore/loader/SubframeLoader.cpp	2015-08-06 23:08:46 UTC (rev 188074)
@@ -212,7 +212,6 @@
 
 bool SubframeLoader::requestObject(HTMLPlugInImageElement ownerElement, const String url, const AtomicString frameName, const String mimeType, const VectorString paramNames, const VectorString paramValues)
 {
-printf(request oject url %s mime type %s\n, url.ascii().data(), mimeType.ascii().data());
 if (url.isEmpty()  mimeType.isEmpty())
 return false;
 


Modified: branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (188073 => 188074)

--- branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m	2015-08-06 23:08:03 UTC (rev 188073)
+++ branches/safari-601.1-branch/Tools/MiniBrowser/mac/WK1BrowserWindowController.m	2015-08-06 23:08:46 UTC (rev 188074)
@@ -52,6 +52,7 @@
 [[WebPreferences standardPreferences] setDeveloperExtrasEnabled:YES];
 [[WebPreferences standardPreferences] setImageControlsEnabled:YES];
 [[WebPreferences standardPreferences] setServiceControlsEnabled:YES];
+[[WebPreferences standardPreferences] setJavaScriptCanOpenWindowsAutomatically:YES];
 
 [_webView _listenForLayoutMilestones:WebDidFirstLayout | WebDidFirstVisuallyNonEmptyLayout | WebDidHitRelevantRepaintedObjectsAreaThreshold];
 
@@ -87,7 +88,7 @@
 - (IBAction)showHideWebView:(id)sender
 {
 BOOL hidden = ![_webView isHidden];
-
+
 [_webView setHidden:hidden];
 }
 
@@ -95,7 +96,7 @@
 {
 if ([_webView window]) {
 [_webView retain];
-[_webView removeFromSuperview]; 
+[_webView removeFromSuperview];
 } else {
 [containerView addSubview:_webView];
 [_webView release];
@@ -104,7 +105,7 @@
 
 - (IBAction)setScale:(id)sender
 {
-
+
 }
 
 - (IBAction)reload:(id)sender
@@ -154,10 +155,10 @@
 
 if (action == @selector(goBack:))
 return [_webView canGoBack];
-
+
 if (action == @selector(goForward:))
 return [_webView canGoForward];
-
+
 return YES;
 }
 
@@ -302,6 +303,14 @@
 {
 }
 
+- (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request
+{
+WK1BrowserWindowController *newBrowserWindowController = [[WK1BrowserWindowController alloc] initWithWindowNibName:@BrowserWindow];
+[newBrowserWindowController.window makeKeyAndOrderFront:self];
+
+return newBrowserWindowController-_webView;
+}
+
 - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
 {
 if (frame != [sender mainFrame])






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

[webkit-changes] [188077] branches/safari-601.1-branch/Source/WebCore

[dburkart]

Title: [188077] branches/safari-601.1-branch/Source/WebCore








Revision 188077
Author dburk...@apple.com
Date 2015-08-06 16:09:42 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187892. rdar://problem/21932187

Modified Paths

branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp
branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp




Diff

Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188076 => 188077)

--- branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:09:38 UTC (rev 188076)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog	2015-08-06 23:09:42 UTC (rev 188077)
@@ -1,5 +1,28 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187892. rdar://problem/21932187
+
+2015-08-04  Eric Carlson  eric.carl...@apple.com
+
+[Mac] Do not require a video track for AirPlay
+https://bugs.webkit.org/show_bug.cgi?id=147647
+
+Reviewed by Jer Noble.
+
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.handleReadyStateChange): Call updateWirelessTargetAvailable().
+(Controller.prototype.updateHasVideo): Don't call updateWirelessTargetAvailable().
+(Controller.prototype.updateWirelessTargetAvailable): Don't require video.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::setReadyState): Call updateMediaState when we reach HAVE_METADATA.
+(WebCore::HTMLMediaElement::mediaState): Don't require video, only that the file can play.
+
+* html/MediaElementSession.cpp:
+(WebCore::MediaElementSession::showPlaybackTargetPicker): Check readyState instead of hasVideo.
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187886. rdar://problem/15779101
 
 2015-08-04  Alexey Proskuryakov  a...@apple.com


Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (188076 => 188077)

--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-08-06 23:09:38 UTC (rev 188076)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-08-06 23:09:42 UTC (rev 188077)
@@ -688,6 +688,7 @@
 this.updateCaptionButton();
 this.updateCaptionContainer();
 this.updateFullscreenButtons();
+this.updateWirelessTargetAvailable();
 this.updateWirelessTargetPickerButton();
 this.updateProgress();
 this.updateControls();
@@ -1866,9 +1867,6 @@
 this.controls.panel.classList.remove(this.ClassNames.noVideo);
 else
 this.controls.panel.classList.add(this.ClassNames.noVideo);
-
-// The wireless target picker is only visible for files with video, force an update.
-this.updateWirelessTargetAvailable();
 },
 
 updateVolume: function()
@@ -1982,7 +1980,7 @@
 if (this.wirelessPlaybackDisabled)
 wirelessPlaybackTargetsAvailable = false;
 
-if (wirelessPlaybackTargetsAvailable  this.isPlayable()  this.hasVideo())
+if (wirelessPlaybackTargetsAvailable  this.isPlayable())
 this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.hidden);
 else
 this.controls.wirelessTargetPicker.classList.add(this.ClassNames.hidden);


Modified: branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp (188076 => 188077)

--- branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-08-06 23:09:38 UTC (rev 188076)
+++ branches/safari-601.1-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-08-06 23:09:42 UTC (rev 188077)
@@ -2119,6 +2119,10 @@
 downcastMediaDocument(document()).mediaElementNaturalSizeChanged(expandedIntSize(m_player-naturalSize()));
 
 logMediaLoadRequest(document().page(), m_player-engineDescription(), String(), true);
+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+updateMediaState(UpdateMediaState::Asynchronously);
+#endif
 }
 
 bool shouldUpdateDisplayState = false;
@@ -6422,7 +6426,7 @@
 state |= RequiresPlaybackTargetMonitoring;
 
 bool requireUserGesture = m_mediaSession-hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
-if (hasActiveVideo  !requireUserGesture  !m_failedToPlayToWirelessTarget)
+if (m_readyState = HAVE_METADATA  !requireUserGesture  !m_failedToPlayToWirelessTarget)
 state |= ExternalDeviceAutoPlayCandidate;
 
 if (hasActiveVideo  endedPlayback())


Modified: branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp (188076 => 188077)

--- branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp	2015-08-06 23:09:38 UTC (rev 188076)
+++ 

[webkit-changes] [188084] branches/safari-601.1-branch/LayoutTests

[dburkart]

Title: [188084] branches/safari-601.1-branch/LayoutTests








Revision 188084
Author dburk...@apple.com
Date 2015-08-06 16:22:43 -0700 (Thu, 06 Aug 2015)


Log Message
Merge r187964. rdar://problem/21870332

Modified Paths

branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html




Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188083 => 188084)

--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-08-06 23:22:43 UTC (rev 188084)
@@ -1,5 +1,19 @@
 2015-08-06  Dana Burkart  dburk...@apple.com
 
+Merge r187964. rdar://problem/21870332
+
+2015-08-05  Brent Fulgham  bfulg...@apple.com
+
+Unreviewed test gardening.
+
+Skip new latched scrolling test on WK1 due to timeout. Check in some minor clean-ups in
+the test based on feedback from Antti and others:
+
+* platform/mac/TestExpectations:
+* platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html:
+
+2015-08-06  Dana Burkart  dburk...@apple.com
+
 Merge r187935. rdar://problem/22097682
 
 2015-08-04  Doug Russell  d_russ...@apple.com


Modified: branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations (188083 => 188084)

--- branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations	2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations	2015-08-06 23:22:43 UTC (rev 188084)
@@ -1360,3 +1360,6 @@
 [ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.pattern.source-in.html [ Pass Failure ]
 [ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.fill.source-out.html [ Pass Failure ]
 [ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.fill.source-in.html [ Pass Failure ]
+
+# WK1-only timeout.
+fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html [ Skip ]


Modified: branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html (188083 => 188084)

--- branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html	2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html	2015-08-06 23:22:43 UTC (rev 188084)
@@ -11,8 +11,6 @@
 var pageScrollPositionBefore;
 var divScrollPositionBefore;
 
-var continueCount = 5;
-
 function locationInWindowCoordinates(element)
 {
 var position = {};
@@ -37,7 +35,8 @@
 testRunner.notifyDone();
 }
 
-function checkForScroll() {
+function checkForScroll()
+{
 var pageScrollPositionAfter = document.body.scrollTop;
 var divScrollPositionAfter = divTarget.scrollTop;
 
@@ -54,7 +53,8 @@
 finishTest();
 }
 
-function scrollTest() {
+function scrollTest()
+{
 pageScrollPositionBefore = document.body.scrollTop;
 
 divTarget = document.getElementById('scrollable_div');
@@ -66,8 +66,7 @@
 
 divScrollPositionBefore = divTarget.scrollTop;
 
-// Scroll the #source until we reach the #target.
-eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+eventSender.mouseMoveTo(startPosX, startPosY);
 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
@@ -81,9 +80,10 @@
 eventSender.callAfterScrollingCompletes(checkForScroll);
 }
 
-function setupTopLevel() {
-
+function setupTopLevel()
+{
 if (window.eventSender) {
+jsTestIsAsync = true;
 testRunner.waitUntilDone();
 
 eventSender.monitorWheelEvents();






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

[webkit-changes] [186548] tags/Safari-600.8.1/

[dburkart]

Title: [186548] tags/Safari-600.8.1/








Revision 186548
Author dburk...@apple.com
Date 2015-07-08 17:41:30 -0700 (Wed, 08 Jul 2015)


Log Message
Removing erroneous tag so we can re-tag.

Removed Paths

tags/Safari-600.8.1/




Diff




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

[webkit-changes] [186549] tags/Safari-600.8.1/

[dburkart]

Title: [186549] tags/Safari-600.8.1/








Revision 186549
Author dburk...@apple.com
Date 2015-07-08 17:41:49 -0700 (Wed, 08 Jul 2015)


Log Message
Tag for submission.

Added Paths

tags/Safari-600.8.1/




Diff

Property changes: tags/Safari-600.8.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] [186529] tags/Safari-600.8.1/

[dburkart]

Title: [186529] tags/Safari-600.8.1/








Revision 186529
Author dburk...@apple.com
Date 2015-07-08 15:49:57 -0700 (Wed, 08 Jul 2015)


Log Message
Tagging for submission.

Added Paths

tags/Safari-600.8.1/




Diff

Property changes: tags/Safari-600.8.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] [184882] trunk/Tools

[dburkart]

Title: [184882] trunk/Tools








Revision 184882
Author dburk...@apple.com
Date 2015-05-26 15:31:04 -0700 (Tue, 26 May 2015)


Log Message
Fixes compatibility issues with recent dashboard cleanup.
https://bugs.webkit.org/show_bug.cgi?id=144814

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
(BuildbotStaticAnalyzerQueueView):
(BuildbotStaticAnalyzerQueueView.prototype.update):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady):

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js (184881 => 184882)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2015-05-26 22:15:34 UTC (rev 184881)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2015-05-26 22:31:04 UTC (rev 184882)
@@ -87,6 +87,6 @@
 }
 }
 
-this.appendBuildStyle.call(this, this.queues, 'Release', appendStaticAnalyzerQueueStatus);
+this.appendBuildStyle.call(this, this.queues, 'Static Analyzer', appendStaticAnalyzerQueueStatus);
 }
 };


Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js (184881 => 184882)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js	2015-05-26 22:15:34 UTC (rev 184881)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js	2015-05-26 22:31:04 UTC (rev 184882)
@@ -225,7 +225,7 @@
 }
 
 if (platformQueues.staticAnalyzer) {
-var view = new BuildbotStaticAnalyzerQueueView(platformQueues.staticAnalyzer.release);
+var view = new BuildbotStaticAnalyzerQueueView(platformQueues.staticAnalyzer);
 cell.appendChild(view.element);
 }
 


Modified: trunk/Tools/ChangeLog (184881 => 184882)

--- trunk/Tools/ChangeLog	2015-05-26 22:15:34 UTC (rev 184881)
+++ trunk/Tools/ChangeLog	2015-05-26 22:31:04 UTC (rev 184882)
@@ -1,3 +1,16 @@
+2015-05-26  Dana Burkart  dburk...@apple.com
+
+Fixes compatibility issues with recent dashboard cleanup.
+https://bugs.webkit.org/show_bug.cgi?id=144814
+
+Reviewed by Alexey Proskuryakov.
+
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
+(BuildbotStaticAnalyzerQueueView):
+(BuildbotStaticAnalyzerQueueView.prototype.update):
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
+(documentReady):
+
 2015-05-26  Alexey Proskuryakov  a...@apple.com
 
 Botwatcher's dashboard doesn't show JSC test regressions on Apple bots






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

[webkit-changes] [184804] trunk/Tools

[dburkart]

Title: [184804] trunk/Tools








Revision 184804
Author dburk...@apple.com
Date 2015-05-22 17:11:30 -0700 (Fri, 22 May 2015)


Log Message
Add support to the botwatchers dashboard for a static analyzer bot.
https://bugs.webkit.org/show_bug.cgi?id=144814

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
scan-build should be considered a productive step.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js:
(BuildbotQueue):
Adds support for the staticAnalyzer property

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js:
(BuildbotTestResults.prototype._parseResults):
Get bug count from the scan-build step output

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js:
(documentReady):
Rename the performance column 'Other', and merge the current 'Other' column with it.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot):
Now that performance bots are part of the 'Other' column, give them better headings.

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Main.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (184803 => 184804)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js	2015-05-22 23:57:59 UTC (rev 184803)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js	2015-05-23 00:11:30 UTC (rev 184804)
@@ -75,7 +75,8 @@
 webkitpy-test: 1,
 webkitperl-test: 1,
 bindings-generation-tests: 1,
-perf-test: 1
+perf-test: 1,
+scan build: 1,
 };
 
 BuildbotIteration.TestSteps = {


Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js (184803 => 184804)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js	2015-05-22 23:57:59 UTC (rev 184803)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js	2015-05-23 00:11:30 UTC (rev 184804)
@@ -39,6 +39,7 @@
 this.builder = info.builder || false;
 this.tester = info.tester || false;
 this.performance = info.performance || false;
+this.staticAnalyzer = info.staticAnalyzer || false;
 this.leaks = info.leaks || false;
 this.architecture = info.architecture || null;
 this.testCategory = info.testCategory || null;


Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js (184803 => 184804)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js	2015-05-22 23:57:59 UTC (rev 184803)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js	2015-05-23 00:11:30 UTC (rev 184804)
@@ -93,6 +93,7 @@
 this.newPassesCount = testStep.results[1].reduce(resultSummarizer.bind(null, new pass), undefined);
 this.missingCount = testStep.results[1].reduce(resultSummarizer.bind(null, missing), undefined);
 this.crashCount = testStep.results[1].reduce(resultSummarizer.bind(null, crash), undefined);
+this.issueCount = testStep.results[1].reduce(resultSummarizer.bind(null, issue), undefined);
 
 if (!this.failureCount  !this.flakyCount  !this.totalLeakCount  !this.uniqueLeakCount  !this.newPassesCount  !this.missingCount) {
 // This step exited with a non-zero exit status, but we didn't find any output about the number of failed tests.
@@ -146,7 +147,7 @@
 
 // FIXME (bug 127186): It is particularly unfortunate for image diffs, because we currently only check image results
 // on retry (except for reftests), so many times, you will see images on buildbot page, but not on the dashboard.
-// FIXME: Find a way to display expected mismatch reftest failures. 
+// FIXME: Find a way to display expected mismatch reftest failures.
 if (value.actual.split( )[0].contains(IMAGE)  value.reftest_type != !=)
 item.has_image_diff = true;
 


Modified: 

[webkit-changes] [184805] trunk/Tools

[dburkart]

Title: [184805] trunk/Tools








Revision 184805
Author dburk...@apple.com
Date 2015-05-22 17:19:03 -0700 (Fri, 22 May 2015)


Log Message
Add missing file from r184804 (mis-applied diff).
https://bugs.webkit.org/show_bug.cgi?id=144814

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js: Added.
(BuildbotStaticAnalyzerQueueView):
(BuildbotStaticAnalyzerQueueView.prototype.update.appendStaticAnalyzerQueueStatus):
(BuildbotStaticAnalyzerQueueView.prototype.update):

Modified Paths

trunk/Tools/ChangeLog


Added Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js




Diff

Added: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js (0 => 184805)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	(rev 0)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2015-05-23 00:19:03 UTC (rev 184805)
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+BuildbotStaticAnalyzerQueueView = function(queues)
+{
+BuildbotQueueView.call(this, [], queues);
+this.update();
+};
+
+BaseObject.addConstructorFunctions(BuildbotStaticAnalyzerQueueView);
+
+BuildbotStaticAnalyzerQueueView.prototype = {
+constructor: BuildbotStaticAnalyzerQueueView,
+__proto__: BuildbotQueueView.prototype,
+
+update: function()
+{
+QueueView.prototype.update.call(this);
+
+this.element.removeChildren();
+
+function appendStaticAnalyzerQueueStatus(queue)
+{
+var appendedStatus = false;
+
+var limit = 2;
+for (var i = 0; i  queue.iterations.length  limit  0; ++i) {
+var iteration = queue.iterations[i];
+if (!iteration.loaded || !iteration.finished)
+continue;
+
+--limit;
+
+var willHaveAnotherStatusLine = i + 1  queue.iterations.length  limit  0  !iteration.successful; // This is not 100% correct, as the remaining iterations may not be finished or loaded yet, but close enough.
+var messageElement = this.revisionContentForIteration(iteration, (iteration.productive  willHaveAnotherStatusLine) ? iteration.previousProductiveIteration : null);
+
+var url = ""
+var statusLineViewColor = StatusLineView.Status.Neutral;
+var text;
+
+var failedStep = new BuildbotTestResults(iteration._firstFailedStep);
+
+if (iteration.successful) {
+statusLineViewColor = StatusLineView.Status.Good;
+limit = 0;
+text = no issues found;
+} else if (!iteration.productive) {
+statusLineViewColor = StatusLineView.Status.Danger;
+text = iteration._firstFailedStep.name +  failed;
+} else if (iteration.failed  /failed to build/.test(iteration.text)) {
+url = ""
+statusLineViewColor = StatusLineView.Status.Bad;
+text = build failed;
+}
+
+var status = new StatusLineView(messageElement, statusLineViewColor, (text) ? text : found  + failedStep.issueCount +  issues, failedStep.issueCount, url);
+
+this.element.appendChild(status.element);
+appendedStatus = 

[webkit-changes] [184809] trunk/Tools

[dburkart]

Title: [184809] trunk/Tools








Revision 184809
Author dburk...@apple.com
Date 2015-05-22 17:54:59 -0700 (Fri, 22 May 2015)


Log Message
Fix internal dashboard breakage from recent commit.
https://bugs.webkit.org/show_bug.cgi?id=144814

Unreviewed build fix.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
(BuildbotStaticAnalyzerQueueView.prototype.update.appendStaticAnalyzerQueueStatus):
(BuildbotStaticAnalyzerQueueView.prototype.update):

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js (184808 => 184809)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2015-05-23 00:38:56 UTC (rev 184808)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js	2015-05-23 00:54:59 UTC (rev 184809)
@@ -87,6 +87,6 @@
 }
 }
 
-this.appendBuildStyle.call(this, this.releaseQueues, 'Release', appendStaticAnalyzerQueueStatus);
+this.appendBuildStyle.call(this, this.queues, 'Release', appendStaticAnalyzerQueueStatus);
 }
 };


Modified: trunk/Tools/ChangeLog (184808 => 184809)

--- trunk/Tools/ChangeLog	2015-05-23 00:38:56 UTC (rev 184808)
+++ trunk/Tools/ChangeLog	2015-05-23 00:54:59 UTC (rev 184809)
@@ -1,3 +1,14 @@
+2015-05-22  Dana Burkart  dburk...@apple.com
+
+Fix internal dashboard breakage from recent commit.
+https://bugs.webkit.org/show_bug.cgi?id=144814
+
+Unreviewed build fix.
+
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotStaticAnalyzerQueueView.js:
+(BuildbotStaticAnalyzerQueueView.prototype.update.appendStaticAnalyzerQueueStatus):
+(BuildbotStaticAnalyzerQueueView.prototype.update):
+
 2015-05-22  Alexey Proskuryakov  a...@apple.com
 
 REGRESSION (OS X 10.9.2): PageVisibilityStateWithWindowChanges.WebKit2 API test fails






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

[webkit-changes] [184233] branches/safari-601.1.32-branch

[dburkart]

Title: [184233] branches/safari-601.1.32-branch








Revision 184233
Author dburk...@apple.com
Date 2015-05-12 20:02:40 -0700 (Tue, 12 May 2015)


Log Message
Merge r183942. rdar://problem/20049088

Modified Paths

branches/safari-601.1.32-branch/LayoutTests/ChangeLog
branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations
branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog




Diff

Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184232 => 184233)

--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 03:02:40 UTC (rev 184233)
@@ -1,7 +1,7 @@
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 
-Merge r183894. rdar://problem/20049088
+Merge r183942. rdar://problem/20049088
 
 2015-05-06  Dean Jackson  d...@apple.com
 
@@ -11,13 +11,36 @@
 
 Reviewed by Simon Fraser.
 
+Take 2 - this was rolled out because Mavericks was crashing.
+
 A test that creates some backdrop views, then makes them
 big enough that it would trigger tiling (which we don't want
 to happen).
 
 * compositing/media-controls-bar-appearance-big-expected.txt: Added.
 * compositing/media-controls-bar-appearance-big.html: Added.
+* platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
 
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+
+Merge r183894. rdar://problem/20049088
+
+2015-05-06  Dean Jackson  d...@apple.com
+
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
+
+Reviewed by Simon Fraser.
+
+A test that creates some backdrop views, then makes them
+big enough that it would trigger tiling (which we don't want
+to happen).
+
+* compositing/media-controls-bar-appearance-big-expected.txt: Added.
+* compositing/media-controls-bar-appearance-big.html: Added.
+
 2015-05-06  Brent Fulgham  bfulg...@apple.com
 
 Scroll-snap points do not handle margins and padding propertly


Modified: branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations (184232 => 184233)

--- branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations	2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations	2015-05-13 03:02:40 UTC (rev 184233)
@@ -5,3 +5,7 @@
 fast/events/mouse-force-changed.html [ Skip ]
 fast/events/mouse-force-down.html [ Skip ]
 fast/events/mouse-force-up.html [ Skip ]
+
+# No support for Filters Level 2
+compositing/media-controls-bar-appearance.html [ Skip ]
+compositing/media-controls-bar-appearance-big.html [ Skip ]


Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184232 => 184233)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:02:40 UTC (rev 184233)
@@ -1,7 +1,7 @@
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 
-Merge r183894. rdar://problem/20049088
+Merge r183942. rdar://problem/20049088
 
 2015-05-06  Dean Jackson  d...@apple.com
 
@@ -11,6 +11,8 @@
 
 Reviewed by Simon Fraser.
 
+Take 2 - this was rolled out because Mavericks was crashing.
+
 Make sure backdrop layers don't tile. If they are big
 enough, we'll leave it to the platform compositor to handle.
 
@@ -24,6 +26,32 @@
 (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
 a layer needs a backdrop before checking if it needs to tile.
 
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+
+Merge r183894. rdar://problem/20049088
+
+2015-05-06  Dean Jackson  d...@apple.com
+
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
+
+Reviewed by Simon Fraser.
+
+Make sure backdrop layers don't tile. If they are big
+enough, we'll leave it to the platform compositor to handle.
+
+This also fixes a bug where if a layer changed from a backdrop
+type to a tiled type, it would still retain its custom appearance
+and we'd try to add children to the wrong layer.
+
+Test: compositing/media-controls-bar-appearance-big.html
+
+* platform/graphics/ca/GraphicsLayerCA.cpp:
+

[webkit-changes] [184232] branches/safari-601.1.32-branch

[dburkart]

Title: [184232] branches/safari-601.1.32-branch








Revision 184232
Author dburk...@apple.com
Date 2015-05-12 20:02:36 -0700 (Tue, 12 May 2015)


Log Message
Merge r183894. rdar://problem/20049088

Modified Paths

branches/safari-601.1.32-branch/LayoutTests/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm


Added Paths

branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt
branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big.html




Diff

Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184231 => 184232)

--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 02:01:22 UTC (rev 184231)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 03:02:36 UTC (rev 184232)
@@ -1,3 +1,23 @@
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+
+Merge r183894. rdar://problem/20049088
+
+2015-05-06  Dean Jackson  d...@apple.com
+
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
+
+Reviewed by Simon Fraser.
+
+A test that creates some backdrop views, then makes them
+big enough that it would trigger tiling (which we don't want
+to happen).
+
+* compositing/media-controls-bar-appearance-big-expected.txt: Added.
+* compositing/media-controls-bar-appearance-big.html: Added.
+
 2015-05-06  Brent Fulgham  bfulg...@apple.com
 
 Scroll-snap points do not handle margins and padding propertly
@@ -47,21 +67,26 @@
 * platform/mac/fast/text/systemFont.html: Update test to include font weights for -apple-system.
 * platform/mac/fast/text/systemFont-expected.txt: Update expectations.
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+Merge r183894. rdar://problem/20049088
 
-Reviewed by Simon Fraser.
+2015-05-06  Dean Jackson  d...@apple.com
 
-A test that creates some backdrop views, then makes them
-big enough that it would trigger tiling (which we don't want
-to happen).
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
 
-* compositing/media-controls-bar-appearance-big-expected.txt: Added.
-* compositing/media-controls-bar-appearance-big.html: Added.
+Reviewed by Simon Fraser.
 
+A test that creates some backdrop views, then makes them
+big enough that it would trigger tiling (which we don't want
+to happen).
+
+* compositing/media-controls-bar-appearance-big-expected.txt: Added.
+* compositing/media-controls-bar-appearance-big.html: Added.
+
 2015-05-06  Martin Robinson  mrobin...@igalia.com
 
 [FreeType] Vertical CJK glyphs should not be rendered with synthetic oblique


Added: branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt (0 => 184232)

--- branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt	(rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt	2015-05-13 03:02:36 UTC (rev 184232)
@@ -0,0 +1,23 @@
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 2056.00 4117.00)
+  (children 1
+(GraphicsLayer
+  (bounds 2056.00 4117.00)
+  (contentsOpaque 1)
+  (children 2
+(GraphicsLayer
+  (position 8.00 8.00)
+  (bounds 2048.00 2048.00)
+  (drawsContent 1)
+)
+(GraphicsLayer
+  (position 8.00 2056.00)
+  (bounds 2048.00 2048.00)
+  (drawsContent 1)
+)
+  )
+)
+  )
+)
+


Added: branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big.html (0 => 184232)

--- branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big.html	(rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/compositing/media-controls-bar-appearance-big.html	2015-05-13 03:02:36 UTC (rev 184232)
@@ -0,0 +1,56 @@
+!DOCTYPE html
+html
+head
+style
+div {
+position: relative;
+height: 100px;
+width: 100px;
+}
+.big {
+width: 2048px;
+height: 2048px;
+}
+.media-controls {
+

[webkit-changes] [184236] branches/safari-601.1.32-branch/Source/WebKit2

[dburkart]

Title: [184236] branches/safari-601.1.32-branch/Source/WebKit2








Revision 184236
Author dburk...@apple.com
Date 2015-05-12 20:15:51 -0700 (Tue, 12 May 2015)


Log Message
Merge r183911. rdar://problem/20702435

Modified Paths

branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184235 => 184236)

--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 03:15:49 UTC (rev 184235)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 03:15:51 UTC (rev 184236)
@@ -2,65 +2,69 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183909. rdar://problem/18894598
+Merge r183911. rdar://problem/20702435
 
-2015-05-06  Daniel Bates  daba...@apple.com
+2015-05-06  Jer Noble  jer.no...@apple.com
 
-[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
-https://bugs.webkit.org/show_bug.cgi?id=144657
-rdar://problem/18894598
+[WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
+https://bugs.webkit.org/show_bug.cgi?id=144716
 
-Reviewed by Andy Estes.
+Reviewed by Darin Adler.
 
-Pause and resume the database thread when the UIProcess enters and leaves the background,
-respectively, so that we avoid WebProcess termination due to holding a locked SQLite
-database file when the WebProcess is suspended. This behavior matches the analagous
-behavior in Legacy WebKit.
+We create a mask animation for the transition between windowed and fullscreen modes, on the
+assumption that the element being taken into fullscreen mode does not have visible children
+who extend beyond that elements bounds. This assumption breaks down in the case where div
+with absolutely positioned children is taken fullscreen. While we can't necessarily make the
+transition look correct in this case, we can remove the mask after the transition completes.
 
-* UIProcess/WebPageProxy.h:
-* UIProcess/ios/WKContentView.mm:
-(-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
-when the UIProcess enters the background.
-* UIProcess/ios/WebPageProxyIOS.mm:
-(WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
-We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
-WebProcess is running to receive it. We'll release this assertion when the WebProcess replies that it received the
-notification.
-* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
-(WebKit::WebDatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseManager::setPauseAllDatabases().
-* WebProcess/WebCoreSupport/WebDatabaseManager.h:
-* WebProcess/WebPage/WebPage.h:
-* WebProcess/WebPage/WebPage.messages.in: Add message ApplicationDidEnterBackground(). Also,
-add empty lines to help demarcate this message and the other UIKit application lifecycle-related
-messages from the rest of the list of messages.
-* WebProcess/WebPage/ios/WebPageIOS.mm:
-(WebKit::WebPage::applicationWillEnterForeground): Resume the database thread.
-(WebKit::WebPage::applicationDidEnterBackground): Pause the database thread.
+* UIProcess/mac/WKFullScreenWindowController.mm:
+(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
+(WebKit::removeAllMediaKeyStorageForOriginPath):
 
 2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-Merge r183942. rdar://problem/20049088
+Merge r183909. rdar://problem/18894598
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-06  Daniel Bates  daba...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+https://bugs.webkit.org/show_bug.cgi?id=144657
+rdar://problem/18894598
 
-Reviewed by Simon Fraser.
+Reviewed by Andy Estes.
 
-Take 2 - this was rolled out because Mavericks was crashing.
+Pause and resume the database 

[webkit-changes] [184244] branches/safari-601.1.32-branch

[dburkart]

Title: [184244] branches/safari-601.1.32-branch








Revision 184244
Author dburk...@apple.com
Date 2015-05-12 20:58:20 -0700 (Tue, 12 May 2015)


Log Message
Merge r183954. rdar://problem/20281886

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/page/EventHandler.h
branches/safari-601.1.32-branch/Source/WebCore/page/mac/EventHandlerMac.mm
branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.h
branches/safari-601.1.32-branch/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
branches/safari-601.1.32-branch/Source/WebKit/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebViewData.h
branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebViewInternal.h
branches/safari-601.1.32-branch/Tools/ChangeLog
branches/safari-601.1.32-branch/Tools/TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184243 => 184244)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:58:15 UTC (rev 184243)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:58:20 UTC (rev 184244)
@@ -2,177 +2,203 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183953. rdar://problem/19997548
+Merge r183954. rdar://problem/20281886
 
-2015-05-06  Roger Fong  roger_f...@apple.com
+2015-05-07  Beth Dakin  bda...@apple.com
 
-Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
-https://bugs.webkit.org/show_bug.cgi?id=144700.
-rdar://problem/19997548
+New force-related DOM events should fire in WK1 views
+https://bugs.webkit.org/show_bug.cgi?id=144663
+-and corresponding-
+rdar://problem/20281886
 
-Reviewed by Jer Noble.
+Reviewed by Sam Weinig.
 
-Update time and timeline during the timeline input event instead of the wrapper's mousemove.
-(Controller.prototype.handleWrapperMouseMove):
-(Controller.prototype.handleTimelineMouseMove):
-(Controller.prototype.drawTimelineBackground):
+All of the WK1 mouse events need to take the correspondingPressureEvent.
+* page/EventHandler.h:
 
-(Controller.prototype.updateControlsWhileScrubbing):
-Updates time and scrubber to reflect timeline user input.
+Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
+have accurate pressure information for all of the mouse events in subframes.
+* page/mac/EventHandlerMac.mm:
+(WebCore::correspondingPressureEventSlot):
+(WebCore::EventHandler::correspondingPressureEvent):
+(WebCore::CurrentEventScope::CurrentEventScope):
+(WebCore::CurrentEventScope::~CurrentEventScope):
 
+These events don’t have an associated pressure, so send nil for the
+correspondingPressureEvent.
+(WebCore::EventHandler::wheelEvent):
+(WebCore::EventHandler::keyEvent):
+
+Pipe through correspondingPressureEvent.
+(WebCore::EventHandler::mouseDown):
+(WebCore::EventHandler::mouseDragged):
+(WebCore::EventHandler::mouseUp):
+(WebCore::EventHandler::mouseMoved):
+
+New function to handle pressure change events.
+(WebCore::EventHandler::pressureChange):
+
+Pipe through correspondingPressureEvent.
+(WebCore::EventHandler::passMouseMovedEventToScrollbars):
+(WebCore::EventHandler::currentPlatformMouseEvent):
+
+Take the correspondingPressureEvent in order to build a PlatformMouseEvent with
+the correct pressure information.
+* platform/mac/PlatformEventFactoryMac.h:
+* platform/mac/PlatformEventFactoryMac.mm:
+(WebCore::globalPointForEvent):
+(WebCore::pointForEvent):
+(WebCore::mouseButtonForEvent):
+(WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
+(WebCore::PlatformEventFactory::createPlatformMouseEvent):
+
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183943. rdar://problem/19913748
+Merge r183953. rdar://problem/19997548
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-06  Roger Fong  

[webkit-changes] [184252] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184252] branches/safari-601.1.32-branch/Source/WebCore








Revision 184252
Author dburk...@apple.com
Date 2015-05-12 21:17:17 -0700 (Tue, 12 May 2015)


Log Message
Merge r184005. rdar://problem/20486538

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
branches/safari-601.1.32-branch/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184251 => 184252)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:14 UTC (rev 184251)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:17 UTC (rev 184252)
@@ -2,344 +2,341 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184001. rdar://problem/20862460
+Merge r184005. rdar://problem/20486538
 
-2015-05-08  Eric Carlson  eric.carl...@apple.com
+2015-05-08  Alexey Proskuryakov  a...@apple.com
 
-[Mac] Playback target clients do not unregister on page reload
-https://bugs.webkit.org/show_bug.cgi?id=144761
+Crashes in SocketStreamHandleBase::close
+https://bugs.webkit.org/show_bug.cgi?id=144767
+rdar://problem/20486538
 
 Reviewed by Brady Eidson.
 
-* dom/Document.cpp:
-(WebCore::Document::prepareForDestruction): Unregister all target picker clients.
+This is a speculative fix, I could not reproduce the crash.
 
-* html/HTMLMediaElement.cpp:
-(WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
-(WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
-(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
-(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
+* Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
+Normally, processOutgoingFrameQueue() closes the handle in the end when called in
+OutgoingFrameQueueClosing state. But there is no definitive protection against
+processing two CLOSE frames, in which case we'd try to close the handle twice.
 
+* platform/network/cf/SocketStreamHandleCFNet.cpp:
+(WebCore::SocketStreamHandle::readStreamCallback): Passing empty data to the client
+results in the socket being closed, which makes no sense here.
+
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183971. rdar://problem/20065572
+Merge r184001. rdar://problem/20862460
 
-2015-05-07  Dean Jackson  d...@apple.com
+2015-05-08  Eric Carlson  eric.carl...@apple.com
 
-[iOS] MediaControls: disappear while scrubbing
-https://bugs.webkit.org/show_bug.cgi?id=144777
-rdar://problem/20065572
+[Mac] Playback target clients do not unregister on page reload
+https://bugs.webkit.org/show_bug.cgi?id=144761
 
-Reviewed by Eric Carlson.
+Reviewed by Brady Eidson.
 
-If we are scrubbing we shouldn't hide the controls.
+* dom/Document.cpp:
+(WebCore::Document::prepareForDestruction): Unregister all target picker clients.
 
-* Modules/mediacontrols/mediaControlsApple.js:
-(Controller.prototype.hideControls): Return early if we are scrubbing.
-* Modules/mediacontrols/mediaControlsiOS.js:
-(ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
-rename from non-underscored value throughout the file.
-(ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
-the timer to hide the controls.
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
+(WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
+(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
+(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
 
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183970. rdar://problem/20769741
+Merge r183971. rdar://problem/20065572
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-07  Dean Jackson  d...@apple.com
 
-REGRESSION (r183300): Fixed elements flash when scrolling
-https://bugs.webkit.org/show_bug.cgi?id=144778
-

[webkit-changes] [184253] branches/safari-601.1.32-branch/Source/WebKit2

[dburkart]

Title: [184253] branches/safari-601.1.32-branch/Source/WebKit2








Revision 184253
Author dburk...@apple.com
Date 2015-05-12 21:17:20 -0700 (Tue, 12 May 2015)


Log Message
Merge r184026. rdar://problem/20757196

Modified Paths

branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184252 => 184253)

--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 04:17:17 UTC (rev 184252)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 04:17:20 UTC (rev 184253)
@@ -2,113 +2,117 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183937. rdar://problem/20458697
+Merge r184026. rdar://problem/20757196
 
-2015-05-07  Jer Noble  jer.no...@apple.com
+2015-05-08  Dan Bernstein  m...@apple.com
 
-[WK2][Fullscreen] Fullscreen video does not enter low-power mode.
-https://bugs.webkit.org/show_bug.cgi?id=144744
+rdar://problem/20757196 NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
+https://bugs.webkit.org/show_bug.cgi?id=144818
 
-Reviewed by Darin Adler.
+Reviewed by Anders Carlsson.
 
-One of the requirements of entering low-power compositing mode is that no masking layers
-are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
-transition animation completes, remove the mask layer entirely from our clipping layer.
-This means it needs to be re-created and added when entering fullscreen, rather than just
-at initialization time.
+Allow NSString instances that contain unpaired surrogates to be encoded by
+WKRemoteObjectCoder by encoding them directly rather than using
+-[NSString encodeWithCoder:].
 
-* UIProcess/mac/WKFullScreenWindowController.mm:
-(-[WKFullScreenWindowController initWithWindow:webView:]):
-(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
-(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
+* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+(encodeString): Added. Sets an API::String as the object to encode.
+(encodeObject): Changed to use encodeString for NSString instances.
+(decodeString): Added. Gets an API::String from the dictionary and returns it as an
+NSString.
+(decodeObject): Changed to use decodeString for NSString instances.
 
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183911. rdar://problem/20702435
+Merge r183937. rdar://problem/20458697
 
-2015-05-06  Jer Noble  jer.no...@apple.com
+2015-05-07  Jer Noble  jer.no...@apple.com
 
-[WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
-https://bugs.webkit.org/show_bug.cgi?id=144716
+[WK2][Fullscreen] Fullscreen video does not enter low-power mode.
+https://bugs.webkit.org/show_bug.cgi?id=144744
 
 Reviewed by Darin Adler.
 
-We create a mask animation for the transition between windowed and fullscreen modes, on the
-assumption that the element being taken into fullscreen mode does not have visible children
-who extend beyond that elements bounds. This assumption breaks down in the case where div
-with absolutely positioned children is taken fullscreen. While we can't necessarily make the
-transition look correct in this case, we can remove the mask after the transition completes.
+One of the requirements of entering low-power compositing mode is that no masking layers
+are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
+transition animation completes, remove the mask layer entirely from our clipping layer.
+This means it needs to be re-created and added when entering fullscreen, rather than just
+at initialization time.
 
 * UIProcess/mac/WKFullScreenWindowController.mm:
+(-[WKFullScreenWindowController initWithWindow:webView:]):
 (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
-* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
-(WebKit::removeAllMediaKeyStorageForOriginPath):
+(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
 
 2015-05-12  Dana Burkart

[webkit-changes] [184251] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184251] branches/safari-601.1.32-branch/Source/WebCore








Revision 184251
Author dburk...@apple.com
Date 2015-05-12 21:17:14 -0700 (Tue, 12 May 2015)


Log Message
Merge r184001. rdar://problem/20862460

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/dom/Document.cpp
branches/safari-601.1.32-branch/Source/WebCore/html/HTMLMediaElement.cpp
branches/safari-601.1.32-branch/Source/WebCore/html/HTMLMediaElement.h




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184250 => 184251)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:10 UTC (rev 184250)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:14 UTC (rev 184251)
@@ -2,322 +2,316 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183971. rdar://problem/20065572
+Merge r184001. rdar://problem/20862460
 
-2015-05-07  Dean Jackson  d...@apple.com
+2015-05-08  Eric Carlson  eric.carl...@apple.com
 
-[iOS] MediaControls: disappear while scrubbing
-https://bugs.webkit.org/show_bug.cgi?id=144777
-rdar://problem/20065572
+[Mac] Playback target clients do not unregister on page reload
+https://bugs.webkit.org/show_bug.cgi?id=144761
 
-Reviewed by Eric Carlson.
+Reviewed by Brady Eidson.
 
-If we are scrubbing we shouldn't hide the controls.
+* dom/Document.cpp:
+(WebCore::Document::prepareForDestruction): Unregister all target picker clients.
 
-* Modules/mediacontrols/mediaControlsApple.js:
-(Controller.prototype.hideControls): Return early if we are scrubbing.
-* Modules/mediacontrols/mediaControlsiOS.js:
-(ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
-rename from non-underscored value throughout the file.
-(ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
-the timer to hide the controls.
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
+(WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
+(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
+(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
 
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183970. rdar://problem/20769741
+Merge r183971. rdar://problem/20065572
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-07  Dean Jackson  d...@apple.com
 
-REGRESSION (r183300): Fixed elements flash when scrolling
-https://bugs.webkit.org/show_bug.cgi?id=144778
-rdar://problem/20769741
+[iOS] MediaControls: disappear while scrubbing
+https://bugs.webkit.org/show_bug.cgi?id=144777
+rdar://problem/20065572
 
-Reviewed by Dean Jackson.
+Reviewed by Eric Carlson.
 
-After r183300 we can detached layer backing store when outside the coverage region.
-However, position:fixed layers are moved around by the ScrollingCoordinator behind
-GraphicsLayer's back, so we can do layer flushes with stale information about layer
-geometry.
+If we are scrubbing we shouldn't hide the controls.
 
-To avoid dropping backing store for layers in this situation, prevent backing
-store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
-layers. Preventing detachment on a layer also prevents detachment on all descendant
-layers.
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.hideControls): Return early if we are scrubbing.
+* Modules/mediacontrols/mediaControlsiOS.js:
+(ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
+rename from non-underscored value throughout the file.
+(ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
+the timer to hide the controls.
 
-* platform/graphics/GraphicsLayer.h:
-(WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
-(WebCore::GraphicsLayer::allowsBackingStoreDetachment):
-* platform/graphics/ca/GraphicsLayerCA.cpp:
-(WebCore::GraphicsLayerCA::GraphicsLayerCA):
-(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
-

[webkit-changes] [184250] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184250] branches/safari-601.1.32-branch/Source/WebCore








Revision 184250
Author dburk...@apple.com
Date 2015-05-12 21:17:10 -0700 (Tue, 12 May 2015)


Log Message
Merge r183971. rdar://problem/20065572

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
branches/safari-601.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184249 => 184250)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:10:54 UTC (rev 184249)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:10 UTC (rev 184250)
@@ -2,298 +2,294 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183970. rdar://problem/20769741
+Merge r183971. rdar://problem/20065572
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-07  Dean Jackson  d...@apple.com
 
-REGRESSION (r183300): Fixed elements flash when scrolling
-https://bugs.webkit.org/show_bug.cgi?id=144778
-rdar://problem/20769741
+[iOS] MediaControls: disappear while scrubbing
+https://bugs.webkit.org/show_bug.cgi?id=144777
+rdar://problem/20065572
 
-Reviewed by Dean Jackson.
+Reviewed by Eric Carlson.
 
-After r183300 we can detached layer backing store when outside the coverage region.
-However, position:fixed layers are moved around by the ScrollingCoordinator behind
-GraphicsLayer's back, so we can do layer flushes with stale information about layer
-geometry.
+If we are scrubbing we shouldn't hide the controls.
 
-To avoid dropping backing store for layers in this situation, prevent backing
-store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
-layers. Preventing detachment on a layer also prevents detachment on all descendant
-layers.
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.hideControls): Return early if we are scrubbing.
+* Modules/mediacontrols/mediaControlsiOS.js:
+(ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
+rename from non-underscored value throughout the file.
+(ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
+the timer to hide the controls.
 
-* platform/graphics/GraphicsLayer.h:
-(WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
-(WebCore::GraphicsLayer::allowsBackingStoreDetachment):
-* platform/graphics/ca/GraphicsLayerCA.cpp:
-(WebCore::GraphicsLayerCA::GraphicsLayerCA):
-(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
-if backing store detachment is prevented.
-(WebCore::GraphicsLayerCA::recursiveCommitChanges): Set a bit in the CommitState to
-communicate to descendants that detachment is prevented.
-* platform/graphics/ca/GraphicsLayerCA.h:
-(WebCore::GraphicsLayerCA::CommitState::CommitState): Deleted.
-* rendering/RenderLayerBacking.cpp:
-(WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
-* rendering/RenderLayerBacking.h:
-(WebCore::RenderLayerBacking::setScrollingNodeIDForRole): If registering with a non-zero
-nodeID for the ViewportConstrained role, turn off backing store detachment.
-
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183965. rdar://problem/20866590
+Merge r183970. rdar://problem/20769741
 
-2015-05-07  Dean Jackson  d...@apple.com
+2015-05-07  Simon Fraser  simon.fra...@apple.com
 
-[iOS] While scrubbing and holding down, video continues to play
-https://bugs.webkit.org/show_bug.cgi?id=144776
-rdar://problem/20863757
+REGRESSION (r183300): Fixed elements flash when scrolling
+https://bugs.webkit.org/show_bug.cgi?id=144778
+rdar://problem/20769741
 
-Reviewed by Simon Fraser.
+Reviewed by Dean Jackson.
 
-When we are scrubbing a video, we should pause playback. As we
-let go of the scrubber playback can resume (but only if it was
-playing originally).
+After r183300 we can detached layer backing store when outside the coverage region.
+However, position:fixed layers are moved around by the ScrollingCoordinator behind
+GraphicsLayer's back, so we 

[webkit-changes] [184255] branches/safari-601.1.32-branch/Source/WebInspectorUI

[dburkart]

Title: [184255] branches/safari-601.1.32-branch/Source/WebInspectorUI








Revision 184255
Author dburk...@apple.com
Date 2015-05-12 21:25:36 -0700 (Tue, 12 May 2015)


Log Message
Merge r184108. rdar://problem/20903134

Modified Paths

branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineSidebarPanel.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog (184254 => 184255)

--- branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog	2015-05-13 04:25:32 UTC (rev 184254)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog	2015-05-13 04:25:36 UTC (rev 184255)
@@ -1,3 +1,28 @@
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
+
+Merge r184108. rdar://problem/20903134
+
+2015-05-11  Timothy Hatcher  timo...@apple.com
+
+Web Inspector: NavigationSidebarPanel leaks some event listeners
+https://bugs.webkit.org/show_bug.cgi?id=144523
+
+Reviewed by Joseph Pecoraro.
+
+* UserInterface/Views/NavigationSidebarPanel.js:
+(WebInspector.NavigationSidebarPanel):
+(WebInspector.NavigationSidebarPanel.prototype.closed):
+* UserInterface/Views/ResourceSidebarPanel.js:
+(WebInspector.ResourceSidebarPanel.prototype.closed):
+* UserInterface/Views/SearchSidebarPanel.js:
+(WebInspector.SearchSidebarPanel.prototype.closed):
+* UserInterface/Views/StorageSidebarPanel.js:
+(WebInspector.StorageSidebarPanel.prototype.closed):
+* UserInterface/Views/TimelineSidebarPanel.js:
+(WebInspector.TimelineSidebarPanel.prototype.closed):
+
 2015-05-06  Matt Baker  mattba...@apple.com
 
 Web Inspector: The text in the left pane overlaps the Filter Time Events field in the Timeline after the Web Inspector is resized


Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (184254 => 184255)

--- branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2015-05-13 04:25:32 UTC (rev 184254)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js	2015-05-13 04:25:36 UTC (rev 184255)
@@ -52,7 +52,8 @@
 this.element.appendChild(this._topOverflowShadowElement);
 }
 
-window.addEventListener(resize, this._updateContentOverflowShadowVisibility.bind(this));
+this._boundUpdateContentOverflowShadowVisibility = this._updateContentOverflowShadowVisibility.bind(this);
+window.addEventListener(resize, this._boundUpdateContentOverflowShadowVisibility);
 
 this._filtersSetting = new WebInspector.Setting(identifier + -navigation-sidebar-filters, {});
 this._filterBar.filters = this._filtersSetting.value;
@@ -76,6 +77,12 @@
 
 // Public
 
+closed()
+{
+window.removeEventListener(resize, this._boundUpdateContentOverflowShadowVisibility);
+WebInspector.Frame.removeEventListener(null, null, this);
+}
+
 get contentBrowser()
 {
 return this._contentBrowser;


Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (184254 => 184255)

--- branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js	2015-05-13 04:25:32 UTC (rev 184254)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js	2015-05-13 04:25:36 UTC (rev 184255)
@@ -56,6 +56,8 @@
 
 closed()
 {
+super.closed();
+
 WebInspector.Frame.removeEventListener(null, null, this);
 WebInspector.frameResourceManager.removeEventListener(null, null, this);
 WebInspector.debuggerManager.removeEventListener(null, null, this);


Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js (184254 => 184255)

--- branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js	2015-05-13 04:25:32 UTC (rev 184254)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js	2015-05-13 04:25:36 UTC (rev 184255)
@@ -64,6 +64,8 @@
 
 closed()
 {
+super.closed();
+
 WebInspector.Frame.removeEventListener(null, null, this);
 }
 


Modified: 

[webkit-changes] [184267] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184267] branches/safari-601.1.32-branch/Source/WebCore








Revision 184267
Author dburk...@apple.com
Date 2015-05-12 22:33:29 -0700 (Tue, 12 May 2015)


Log Message
Merge r184207. rdar://problem/20707307

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184266 => 184267)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:26 UTC (rev 184266)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:29 UTC (rev 184267)
@@ -2,624 +2,609 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184140. rdar://problem/20907253
+Merge r184207. rdar://problem/20707307
 
-2015-05-11  Eric Carlson  eric.carl...@apple.com
+2015-05-12  Brent Fulgham  bfulg...@apple.com
 
-[Mac] Update device picker icon when video tracks change
-https://bugs.webkit.org/show_bug.cgi?id=144889
-rdar://problem/20907253
+[Win] Unreviewed build fix for older DirectX build environments.
 
-Reviewed by Brent Fulgham.
+* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Switch back to our
+d3d stub header to avoid build failures on July 2004 DXSDK build environments.
 
-* Modules/mediacontrols/mediaControlsApple.js:
-(Controller.prototype.updateHasVideo):
-
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184139. rdar://problem/20125088
+Merge r184140. rdar://problem/20907253
 
-2015-05-11  Brent Fulgham  bfulg...@apple.com
+2015-05-11  Eric Carlson  eric.carl...@apple.com
 
-Scroll snap logic should be triggered when resizing the WebView
-https://bugs.webkit.org/show_bug.cgi?id=142590
-rdar://problem/20125088
+[Mac] Update device picker icon when video tracks change
+https://bugs.webkit.org/show_bug.cgi?id=144889
+rdar://problem/20907253
 
-Reviewed by Simon Fraser.
+Reviewed by Brent Fulgham.
 
-Tests coming in a second patch.
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.updateHasVideo):
 
-Resizing of the main frame or overflow regions was properly recalculating the scroll snap points,
-but there was no code to honor these values when window resizing was occurring. The correction was
-handled in two ways:
-1. Scrolling thread operations that moved to new snap points needed to notify the main thread that
-   it had shifted to a new snap point, so that the resize code (which happens on the main thread)
-   could ensure that we stayed clamped to the correct 'tile' in the snap region.
-2. Main thread (overflow) resizes were likewise missing code to honor the current snap position
-   after resizing calculations were complete.
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-This change also required the addition of two indices to the scrollable area to track which scroll
-snap point was currently being used. We don't bother with a 'none' case because you cannot have a
-'none' state when you have an active set of scroll snap points, and we do not execute this code
-if the scroll snap points are null.
+Merge r184139. rdar://problem/20125088
 
-The FrameView code was computing updated snap offsets after it had dispatched frame view layout
-information to the scrolling thread, which was wrong. This was also corrected.
+2015-05-11  Brent Fulgham  bfulg...@apple.com
 
-I think it might be possible to track all of this state inside the ScrollController, but the current
-scroll snap architecture destroys and recreates the state each time a new set of interactions starts.
-This should be fixed in the future, which would allow us to remove some of this local state.
+Scroll snap logic should be triggered when resizing the WebView
+https://bugs.webkit.org/show_bug.cgi?id=142590
+rdar://problem/20125088
 
-* page/FrameView.cpp:
-(WebCore::FrameView::performPostLayoutTasks): Make sure 'updateSnapOffsets' is called prior to
-calling 'frameViewLayoutUpdated' so the scrolling thread gets correct updated points. Add a new
-call to 

[webkit-changes] [184266] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184266] branches/safari-601.1.32-branch/Source/WebCore








Revision 184266
Author dburk...@apple.com
Date 2015-05-12 22:33:26 -0700 (Tue, 12 May 2015)


Log Message
Merge r184140. rdar://problem/20907253

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184265 => 184266)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:23 UTC (rev 184265)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:26 UTC (rev 184266)
@@ -2,607 +2,596 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184139. rdar://problem/20125088
+Merge r184140. rdar://problem/20907253
 
-2015-05-11  Brent Fulgham  bfulg...@apple.com
+2015-05-11  Eric Carlson  eric.carl...@apple.com
 
-Scroll snap logic should be triggered when resizing the WebView
-https://bugs.webkit.org/show_bug.cgi?id=142590
-rdar://problem/20125088
+[Mac] Update device picker icon when video tracks change
+https://bugs.webkit.org/show_bug.cgi?id=144889
+rdar://problem/20907253
 
-Reviewed by Simon Fraser.
+Reviewed by Brent Fulgham.
 
-Tests coming in a second patch.
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.updateHasVideo):
 
-Resizing of the main frame or overflow regions was properly recalculating the scroll snap points,
-but there was no code to honor these values when window resizing was occurring. The correction was
-handled in two ways:
-1. Scrolling thread operations that moved to new snap points needed to notify the main thread that
-   it had shifted to a new snap point, so that the resize code (which happens on the main thread)
-   could ensure that we stayed clamped to the correct 'tile' in the snap region.
-2. Main thread (overflow) resizes were likewise missing code to honor the current snap position
-   after resizing calculations were complete.
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-This change also required the addition of two indices to the scrollable area to track which scroll
-snap point was currently being used. We don't bother with a 'none' case because you cannot have a
-'none' state when you have an active set of scroll snap points, and we do not execute this code
-if the scroll snap points are null.
+Merge r184139. rdar://problem/20125088
 
-The FrameView code was computing updated snap offsets after it had dispatched frame view layout
-information to the scrolling thread, which was wrong. This was also corrected.
+2015-05-11  Brent Fulgham  bfulg...@apple.com
 
-I think it might be possible to track all of this state inside the ScrollController, but the current
-scroll snap architecture destroys and recreates the state each time a new set of interactions starts.
-This should be fixed in the future, which would allow us to remove some of this local state.
+Scroll snap logic should be triggered when resizing the WebView
+https://bugs.webkit.org/show_bug.cgi?id=142590
+rdar://problem/20125088
 
-* page/FrameView.cpp:
-(WebCore::FrameView::performPostLayoutTasks): Make sure 'updateSnapOffsets' is called prior to
-calling 'frameViewLayoutUpdated' so the scrolling thread gets correct updated points. Add a new
-call to 'scrollToNearestActiveSnapPoint', which will keep us on our current snap point during
-resize (if appropriate).
-* page/scrolling/AsyncScrollingCoordinator.cpp:
-(WebCore::AsyncScrollingCoordinator::updateScrollSnapOffsetIndices): Added. This finds and notifies
-the correct scroll region when a new snap position (index) has been selected by user interaction on
-the scrolling thread.
-(WebCore::AsyncScrollingCoordinator::deferTestsForReason): Added an assertion for 'isMainThread'.
-(WebCore::AsyncScrollingCoordinator::removeTestDeferralForReason): Ditto.
-* page/scrolling/AsyncScrollingCoordinator.h:
-* page/scrolling/AxisScrollSnapOffsets.h:
-(WebCore::closestSnapOffset): Modified to also return the selected snap point index so we can track
-it to handle resize operations.
-* page/scrolling/ScrollingTree.h:
-(WebCore::ScrollingTree::updateScrollSnapOffsetIndices):
-* page/scrolling/ThreadedScrollingTree.cpp:
-

[webkit-changes] [184268] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184268] branches/safari-601.1.32-branch/Source/WebCore








Revision 184268
Author dburk...@apple.com
Date 2015-05-12 22:33:32 -0700 (Tue, 12 May 2015)


Log Message
Merge r184226. rdar://problem/20707307

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCore.proj




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184267 => 184268)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:29 UTC (rev 184267)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 05:33:32 UTC (rev 184268)
@@ -2,637 +2,623 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184207. rdar://problem/20707307
+Merge r184226. rdar://problem/20707307
 
 2015-05-12  Brent Fulgham  bfulg...@apple.com
 
-[Win] Unreviewed build fix for older DirectX build environments.
+[Win] Update DXSDK_DIR settings for build system.
 
-* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Switch back to our
-d3d stub header to avoid build failures on July 2004 DXSDK build environments.
+Unreviewed build fix.
 
+* WebCore.vcxproj/WebCore.proj: Add DXSDK_DIR definition for builder.
+
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184140. rdar://problem/20907253
+Merge r184207. rdar://problem/20707307
 
-2015-05-11  Eric Carlson  eric.carl...@apple.com
+2015-05-12  Brent Fulgham  bfulg...@apple.com
 
-[Mac] Update device picker icon when video tracks change
-https://bugs.webkit.org/show_bug.cgi?id=144889
-rdar://problem/20907253
+[Win] Unreviewed build fix for older DirectX build environments.
 
-Reviewed by Brent Fulgham.
+* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Switch back to our
+d3d stub header to avoid build failures on July 2004 DXSDK build environments.
 
-* Modules/mediacontrols/mediaControlsApple.js:
-(Controller.prototype.updateHasVideo):
-
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184139. rdar://problem/20125088
+Merge r184140. rdar://problem/20907253
 
-2015-05-11  Brent Fulgham  bfulg...@apple.com
+2015-05-11  Eric Carlson  eric.carl...@apple.com
 
-Scroll snap logic should be triggered when resizing the WebView
-https://bugs.webkit.org/show_bug.cgi?id=142590
-rdar://problem/20125088
+[Mac] Update device picker icon when video tracks change
+https://bugs.webkit.org/show_bug.cgi?id=144889
+rdar://problem/20907253
 
-Reviewed by Simon Fraser.
+Reviewed by Brent Fulgham.
 
-Tests coming in a second patch.
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.updateHasVideo):
 
-Resizing of the main frame or overflow regions was properly recalculating the scroll snap points,
-but there was no code to honor these values when window resizing was occurring. The correction was
-handled in two ways:
-1. Scrolling thread operations that moved to new snap points needed to notify the main thread that
-   it had shifted to a new snap point, so that the resize code (which happens on the main thread)
-   could ensure that we stayed clamped to the correct 'tile' in the snap region.
-2. Main thread (overflow) resizes were likewise missing code to honor the current snap position
-   after resizing calculations were complete.
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-This change also required the addition of two indices to the scrollable area to track which scroll
-snap point was currently being used. We don't bother with a 'none' case because you cannot have a
-'none' state when you have an active set of scroll snap points, and we do not execute this code
-if the scroll snap points are null.
+Merge r184139. rdar://problem/20125088
 
-The FrameView code was computing updated snap offsets after it had dispatched frame view layout
-information to the scrolling thread, which was wrong. This was also corrected.
+2015-05-11  Brent Fulgham  bfulg...@apple.com
 
-  

[webkit-changes] [184263] branches/safari-601.1.32-branch/Source/WebInspectorUI

[dburkart]

Title: [184263] branches/safari-601.1.32-branch/Source/WebInspectorUI








Revision 184263
Author dburk...@apple.com
Date 2015-05-12 22:33:03 -0700 (Tue, 12 May 2015)


Log Message
Merge r184130. rdar://problem/20829494

Modified Paths

branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Base/Main.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ContentView.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js
branches/safari-601.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TabContentView.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog (184262 => 184263)

--- branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog	2015-05-13 05:31:25 UTC (rev 184262)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog	2015-05-13 05:33:03 UTC (rev 184263)
@@ -2,27 +2,89 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184108. rdar://problem/20903134
+Merge r184130. rdar://problem/20829494
 
 2015-05-11  Timothy Hatcher  timo...@apple.com
 
-Web Inspector: NavigationSidebarPanel leaks some event listeners
-https://bugs.webkit.org/show_bug.cgi?id=144523
+Web Inspector: REGRESSION (Tabs): Issues reloading a resource with breakpoints
+https://bugs.webkit.org/show_bug.cgi?id=144650
 
-Reviewed by Joseph Pecoraro.
+Fix a number of issues with Debugger tab and navigation/reloading:
+- Close old content views in the Debugger tab when main frame navigates.
+- Prune old resource tree elements before attempting to restore a cookie that might match an old resource.
+- Allow breakpoint selections to be restored from a saved cookie.
+- Fix an assert when closing a content view that isn't the current index, but is the current view.
+- Avoid calling closed() multiple times when a ContentView is in the back/forward list more than once.
+- Make restoreStateFromCookie properly set and use the causedByNavigation argument for a longer restore delay.
+- Create a new cookie object per tab instead of it being cumulative from the previous cookie.
 
+Reviewed by Brian Burg.
+
+* UserInterface/Base/Main.js:
+(WebInspector._mainResourceDidChange): Delay calling _restoreCookieForOpenTabs to give time for sidebars
+and tabs to respond to the main resource change.
+(WebInspector._restoreCookieForOpenTabs): Rename causedByReload to causedByNavigation. Nothing special about
+reload since we restore on all navigation.
+
+* UserInterface/Views/ContentView.js:
+(WebInspector.ContentView): Support Breakpoint as a represented object, which happens during a cookie restore.
+(WebInspector.ContentView.isViewable): Ditto.
+
+* UserInterface/Views/ContentViewContainer.js:
+(WebInspector.ContentViewContainer.prototype.closeAllContentViews): Disassociate if the view is current and not just
+the current entry index. This matches other close functions. This fixes an assert in _disassociateFromContentView.
+(WebInspector.ContentViewContainer.prototype._disassociateFromContentView): Don't disassociate multiple times. This
+avoids calling the closed() function on a view more than once.
+
+* UserInterface/Views/DebuggerSidebarPanel.js:
+(WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
+(WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange): Renamed from _mainResourceChanged.
+Close all content views if this is the main frame. Also prune all old resources. Doing this now avoids a flash
+of having old and new resources in the tree caused by the default delay in NavigationSidebarPanel's _checkForOldResources.
+
 * UserInterface/Views/NavigationSidebarPanel.js:
-(WebInspector.NavigationSidebarPanel):
-(WebInspector.NavigationSidebarPanel.prototype.closed):
-* UserInterface/Views/ResourceSidebarPanel.js:
-(WebInspector.ResourceSidebarPanel.prototype.closed):
-* UserInterface/Views/SearchSidebarPanel.js:
-(WebInspector.SearchSidebarPanel.prototype.closed):
-* UserInterface/Views/StorageSidebarPanel.js:
-(WebInspector.StorageSidebarPanel.prototype.closed):
-* UserInterface/Views/TimelineSidebarPanel.js:
-(WebInspector.TimelineSidebarPanel.prototype.closed):
+

[webkit-changes] [184269] branches/safari-601.1.32-branch

[dburkart]

Title: [184269] branches/safari-601.1.32-branch








Revision 184269
Author dburk...@apple.com
Date 2015-05-12 22:34:21 -0700 (Tue, 12 May 2015)


Log Message
Fix horked ChangeLogs

Modified Paths

branches/safari-601.1.32-branch/LayoutTests/ChangeLog
branches/safari-601.1.32-branch/Source/_javascript_Core/ChangeLog
branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog
branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog
branches/safari-601.1.32-branch/Source/WTF/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Tools/ChangeLog




Diff

Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184268 => 184269)

--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 05:33:32 UTC (rev 184268)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 05:34:21 UTC (rev 184269)
@@ -1,6 +1,4 @@
-2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
-dburk...@apple.com
+2015-05-12  Dana Burkart dburk...@apple.com
 
 Merge r184116. rdar://problem/20774613
 
@@ -15,65 +13,61 @@
 * http/tests/contentextensions/domain-rules.html: Added.
 * http/tests/contentextensions/domain-rules.html.json: Added.
 
-2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
-dburk...@apple.com
+2015-05-12  Dana Burkart dburk...@apple.com
 
-Merge r183943. rdar://problem/19913748
+Merge r183943. rdar://problem/19913748
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-07  Simon Fraser  simon.fra...@apple.com
 
-Remove the WK1-only code path for independently composited iframes
-https://bugs.webkit.org/show_bug.cgi?id=144722
+Remove the WK1-only code path for independently composited iframes
+https://bugs.webkit.org/show_bug.cgi?id=144722
 
-Reviewed by Dean Jackson.
+Reviewed by Dean Jackson.
 
-Results different from WK2, because WK1 does not make layers for scrollbars.
+Results different from WK2, because WK1 does not make layers for scrollbars.
 
-* platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt: Added.
+* platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt: Added.
 
-2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+2015-05-12  Dana Burkart dburk...@apple.com
 
-Merge r183942. rdar://problem/20049088
+Merge r183942. rdar://problem/20049088
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-06  Dean Jackson  d...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
 
-Reviewed by Simon Fraser.
+Reviewed by Simon Fraser.
 
-Take 2 - this was rolled out because Mavericks was crashing.
+Take 2 - this was rolled out because Mavericks was crashing.
 
-A test that creates some backdrop views, then makes them
-big enough that it would trigger tiling (which we don't want
-to happen).
+A test that creates some backdrop views, then makes them
+big enough that it would trigger tiling (which we don't want
+to happen).
 
-* compositing/media-controls-bar-appearance-big-expected.txt: Added.
-* compositing/media-controls-bar-appearance-big.html: Added.
-* platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
+* compositing/media-controls-bar-appearance-big-expected.txt: Added.
+* compositing/media-controls-bar-appearance-big.html: Added.
+* platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
 
-2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+2015-05-12  Dana Burkart dburk...@apple.com
 
-Merge r183894. rdar://problem/20049088
+Merge r183894. rdar://problem/20049088
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-06  Dean Jackson  d...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+Handle backdrop views that 

[webkit-changes] [184238] branches/safari-601.1.32-branch/Source/WebKit2

[dburkart]

Title: [184238] branches/safari-601.1.32-branch/Source/WebKit2








Revision 184238
Author dburk...@apple.com
Date 2015-05-12 20:22:10 -0700 (Tue, 12 May 2015)


Log Message
Merge r183937. rdar://problem/20458697

Modified Paths

branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184237 => 184238)

--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 03:22:07 UTC (rev 184237)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 03:22:10 UTC (rev 184238)
@@ -2,89 +2,93 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183911. rdar://problem/20702435
+Merge r183937. rdar://problem/20458697
 
-2015-05-06  Jer Noble  jer.no...@apple.com
+2015-05-07  Jer Noble  jer.no...@apple.com
 
-[WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
-https://bugs.webkit.org/show_bug.cgi?id=144716
+[WK2][Fullscreen] Fullscreen video does not enter low-power mode.
+https://bugs.webkit.org/show_bug.cgi?id=144744
 
 Reviewed by Darin Adler.
 
-We create a mask animation for the transition between windowed and fullscreen modes, on the
-assumption that the element being taken into fullscreen mode does not have visible children
-who extend beyond that elements bounds. This assumption breaks down in the case where div
-with absolutely positioned children is taken fullscreen. While we can't necessarily make the
-transition look correct in this case, we can remove the mask after the transition completes.
+One of the requirements of entering low-power compositing mode is that no masking layers
+are present in any of the ancestors of the fullscreen video layer. So once our fullscreen
+transition animation completes, remove the mask layer entirely from our clipping layer.
+This means it needs to be re-created and added when entering fullscreen, rather than just
+at initialization time.
 
 * UIProcess/mac/WKFullScreenWindowController.mm:
+(-[WKFullScreenWindowController initWithWindow:webView:]):
 (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
-* WebProcess/MediaCache/WebMediaKeyStorageManager.cpp:
-(WebKit::removeAllMediaKeyStorageForOriginPath):
+(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
 
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183909. rdar://problem/18894598
+Merge r183911. rdar://problem/20702435
 
-2015-05-06  Daniel Bates  daba...@apple.com
+2015-05-06  Jer Noble  jer.no...@apple.com
 
-[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
-https://bugs.webkit.org/show_bug.cgi?id=144657
-rdar://problem/18894598
+[WK2][Fullscreen] Elements whose children extend beyond their bounds are clipped in fullscreen mode.
+https://bugs.webkit.org/show_bug.cgi?id=144716
 
-Reviewed by Andy Estes.
+Reviewed by Darin Adler.
 
-Pause and resume the database thread when the UIProcess enters and leaves the background,
-respectively, so that we avoid WebProcess termination due to holding a locked SQLite
-database file when the WebProcess is suspended. This behavior matches the analagous
-behavior in Legacy WebKit.
+We create a mask animation for the transition between windowed and fullscreen modes, on the
+assumption that the element being taken into fullscreen mode does not have visible children
+who extend beyond that elements bounds. This assumption breaks down in the case where div
+with absolutely positioned children is taken fullscreen. While we can't necessarily make the
+transition look correct in this case, we can remove the mask after the transition completes.
 
-* UIProcess/WebPageProxy.h:
-* UIProcess/ios/WKContentView.mm:
-(-[WKContentView _applicationDidEnterBackground:]): Call WebPageProxy::applicationDidEnterBackground()
-when the UIProcess enters the background.
-* UIProcess/ios/WebPageProxyIOS.mm:
-(WebKit::WebPageProxy::applicationDidEnterBackground): Added; notify the WebProcess to pause the database thread.
-We temporarily take out background assertion on the WebProcess before sending this notification to ensure that the
-  

[webkit-changes] [184237] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184237] branches/safari-601.1.32-branch/Source/WebCore








Revision 184237
Author dburk...@apple.com
Date 2015-05-12 20:22:07 -0700 (Tue, 12 May 2015)


Log Message
Merge r183927. rdar://problem/20854785

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184236 => 184237)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:15:51 UTC (rev 184236)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:22:07 UTC (rev 184237)
@@ -2,62 +2,54 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183909. rdar://problem/18894598
+Merge r183927. rdar://problem/20854785
 
-2015-05-06  Daniel Bates  daba...@apple.com
+2015-05-07  Eric Carlson  eric.carl...@apple.com
 
-[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
-https://bugs.webkit.org/show_bug.cgi?id=144657
-rdar://problem/18894598
+[Mac] Playback target isn't set on new element
+https://bugs.webkit.org/show_bug.cgi?id=144724
 
-Reviewed by Andy Estes.
+Reviewed by Jer Noble.
 
-Export WebCore functionality to pause and resume the database thread so that we can
-make use of this functionality from WebKit2.
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setShouldPlayToPlaybackTarget
+if necessary.
+(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Remember
+the setting in case we don't have an AVPlayer yet.
 
-* Modules/webdatabase/AbstractDatabaseServer.h:
-* Modules/webdatabase/DatabaseManager.cpp:
-(WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
-* Modules/webdatabase/DatabaseManager.h:
-* Modules/webdatabase/DatabaseServer.cpp:
-(WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
-DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
-For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
-we fix https://bugs.webkit.org/show_bug.cgi?id=144660.
-* Modules/webdatabase/DatabaseServer.h:
-
 2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-Merge r183942. rdar://problem/20049088
+Merge r183909. rdar://problem/18894598
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-06  Daniel Bates  daba...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+https://bugs.webkit.org/show_bug.cgi?id=144657
+rdar://problem/18894598
 
-Reviewed by Simon Fraser.
+Reviewed by Andy Estes.
 
-Take 2 - this was rolled out because Mavericks was crashing.
+Export WebCore functionality to pause and resume the database thread so that we can
+make use of this functionality from WebKit2.
 
-Make sure backdrop layers don't tile. If they are big
-enough, we'll leave it to the platform compositor to handle.
+* Modules/webdatabase/AbstractDatabaseServer.h:
+* Modules/webdatabase/DatabaseManager.cpp:
+(WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
+* Modules/webdatabase/DatabaseManager.h:
+* Modules/webdatabase/DatabaseServer.cpp:
+(WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
+DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
+For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
+we fix https://bugs.webkit.org/show_bug.cgi?id=144660.
+* Modules/webdatabase/DatabaseServer.h:
 
-This also fixes a bug where if a layer changed from a backdrop
-   

[webkit-changes] [184246] branches/safari-601.1.32-branch/Source/WebKit/mac

[dburkart]

Title: [184246] branches/safari-601.1.32-branch/Source/WebKit/mac








Revision 184246
Author dburk...@apple.com
Date 2015-05-12 21:08:45 -0700 (Tue, 12 May 2015)


Log Message
Merge r183957. rdar://problem/20811128

Modified Paths

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




Diff

Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184245 => 184246)

--- branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog	2015-05-13 04:02:09 UTC (rev 184245)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog	2015-05-13 04:08:45 UTC (rev 184246)
@@ -2,65 +2,85 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183954. rdar://problem/20281886
+Merge r183957. rdar://problem/20811128
 
-2015-05-07  Beth Dakin  bda...@apple.com
+2015-05-07  Timothy Horton  timothy_hor...@apple.com
 
-New force-related DOM events should fire in WK1 views
-https://bugs.webkit.org/show_bug.cgi?id=144663
--and corresponding-
-rdar://problem/20281886
+Occasional null deref in WebImmediateActionController
+https://bugs.webkit.org/show_bug.cgi?id=144772
+rdar://problem/20811128
 
-Reviewed by Sam Weinig.
+Reviewed by Beth Dakin.
 
-Pass the lastPressureEvent to WebCore.
-* WebView/WebHTMLView.mm:
-(-[WebHTMLView _updateMouseoverWithEvent:]):
-(-[WebHTMLView rightMouseUp:]):
-(-[WebHTMLView menuForEvent:]):
-(-[WebHTMLView acceptsFirstMouse:]):
-(-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
-(-[WebHTMLView mouseDown:mouseDown:]):
-(-[WebHTMLView mouseDragged:]):
-(-[WebHTMLView mouseUp:mouseUp:]):
+* WebView/WebImmediateActionController.mm:
+(-[WebImmediateActionController _defaultAnimationController]):
+(-[WebImmediateActionController _animationControllerForDataDetectedText]):
+(-[WebImmediateActionController _animationControllerForDataDetectedLink]):
+Null-check TextIndicators before dereferencing.
 
-New NSRespnder method for pressure changes.
-(-[WebHTMLView pressureChangeWithEvent:]):
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
-default action. Get rid of willHandleMouseDown; now that the gesture recognizer
-sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
-* WebView/WebImmediateActionController.h:
-* WebView/WebImmediateActionController.mm:
-(-[WebImmediateActionController _clearImmediateActionState]):
+Merge r183954. rdar://problem/20281886
 
-Set all of the immediateActionStages on EventHandler. This is critical to keep
-link navigation happening at the right time now that
-delaysPrimaryMouseButtonEvents is set to NO.
-(-[WebImmediateActionController performHitTestAtPoint:]):
-(-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
-(-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
-(-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
+2015-05-07  Beth Dakin  bda...@apple.com
 
-Use a dummy animation controller if the content prevents default.
-(-[WebImmediateActionController _defaultAnimationController]):
-(-[WebImmediateActionController _updateImmediateActionItem]):
-(-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
+New force-related DOM events should fire in WK1 views
+https://bugs.webkit.org/show_bug.cgi?id=144663
+-and corresponding-
+rdar://problem/20281886
 
-Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
-we expect to.
-* WebView/WebView.mm:
-(-[WebView _commonInitializationWithFrameName:groupName:]):
+Reviewed by Sam Weinig.
 
-Cache the most recent pressure event so that we can send it to WebCore for all of
-the mouse events.
-(-[WebView _pressureEvent]):
-(-[WebView _setPressureEvent:]):
-* WebView/WebViewData.h:
-* WebView/WebViewData.mm:
-(-[WebViewPrivate dealloc]):
-* WebView/WebViewInternal.h:
+Pass the lastPressureEvent to WebCore.
+* WebView/WebHTMLView.mm:
+(-[WebHTMLView _updateMouseoverWithEvent:]):
+(-[WebHTMLView rightMouseUp:]):
+   

[webkit-changes] [184248] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184248] branches/safari-601.1.32-branch/Source/WebCore








Revision 184248
Author dburk...@apple.com
Date 2015-05-12 21:08:53 -0700 (Tue, 12 May 2015)


Log Message
Merge r183970. rdar://problem/20769741

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/GraphicsLayer.h
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderLayerBacking.cpp
branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderLayerBacking.h




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184247 => 184248)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:08:49 UTC (rev 184247)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:08:53 UTC (rev 184248)
@@ -2,257 +2,270 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183965. rdar://problem/20866590
+Merge r183970. rdar://problem/20769741
 
-2015-05-07  Dean Jackson  d...@apple.com
+2015-05-07  Simon Fraser  simon.fra...@apple.com
 
-[iOS] While scrubbing and holding down, video continues to play
-https://bugs.webkit.org/show_bug.cgi?id=144776
-rdar://problem/20863757
+REGRESSION (r183300): Fixed elements flash when scrolling
+https://bugs.webkit.org/show_bug.cgi?id=144778
+rdar://problem/20769741
 
-Reviewed by Simon Fraser.
+Reviewed by Dean Jackson.
 
-When we are scrubbing a video, we should pause playback. As we
-let go of the scrubber playback can resume (but only if it was
-playing originally).
+After r183300 we can detached layer backing store when outside the coverage region.
+However, position:fixed layers are moved around by the ScrollingCoordinator behind
+GraphicsLayer's back, so we can do layer flushes with stale information about layer
+geometry.
 
-* Modules/mediacontrols/mediaControlsiOS.js:
-(ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
-(ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
-(ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
-(ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
-potentially about to scrub.
-(ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
+To avoid dropping backing store for layers in this situation, prevent backing
+store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
+layers. Preventing detachment on a layer also prevents detachment on all descendant
+layers.
 
+* platform/graphics/GraphicsLayer.h:
+(WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
+(WebCore::GraphicsLayer::allowsBackingStoreDetachment):
+* platform/graphics/ca/GraphicsLayerCA.cpp:
+(WebCore::GraphicsLayerCA::GraphicsLayerCA):
+(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
+if backing store detachment is prevented.
+(WebCore::GraphicsLayerCA::recursiveCommitChanges): Set a bit in the CommitState to
+communicate to descendants that detachment is prevented.
+* platform/graphics/ca/GraphicsLayerCA.h:
+(WebCore::GraphicsLayerCA::CommitState::CommitState): Deleted.
+* rendering/RenderLayerBacking.cpp:
+(WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
+* rendering/RenderLayerBacking.h:
+(WebCore::RenderLayerBacking::setScrollingNodeIDForRole): If registering with a non-zero
+nodeID for the ViewportConstrained role, turn off backing store detachment.
+
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183954. rdar://problem/20281886
+Merge r183965. rdar://problem/20866590
 
-2015-05-07  Beth Dakin  bda...@apple.com
+2015-05-07  Dean Jackson  d...@apple.com
 
-New force-related DOM events should fire in WK1 views
-https://bugs.webkit.org/show_bug.cgi?id=144663
--and corresponding-
-rdar://problem/20281886
+[iOS] While scrubbing and holding down, video continues to play
+https://bugs.webkit.org/show_bug.cgi?id=144776
+rdar://problem/20863757
 
- 

[webkit-changes] [184247] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184247] branches/safari-601.1.32-branch/Source/WebCore








Revision 184247
Author dburk...@apple.com
Date 2015-05-12 21:08:49 -0700 (Tue, 12 May 2015)


Log Message
Merge r183965. rdar://problem/20866590

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184246 => 184247)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:08:45 UTC (rev 184246)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:08:49 UTC (rev 184247)
@@ -2,231 +2,229 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183954. rdar://problem/20281886
+Merge r183965. rdar://problem/20866590
 
-2015-05-07  Beth Dakin  bda...@apple.com
+2015-05-07  Dean Jackson  d...@apple.com
 
-New force-related DOM events should fire in WK1 views
-https://bugs.webkit.org/show_bug.cgi?id=144663
--and corresponding-
-rdar://problem/20281886
+[iOS] While scrubbing and holding down, video continues to play
+https://bugs.webkit.org/show_bug.cgi?id=144776
+rdar://problem/20863757
 
-Reviewed by Sam Weinig.
+Reviewed by Simon Fraser.
 
-All of the WK1 mouse events need to take the correspondingPressureEvent.
-* page/EventHandler.h:
+When we are scrubbing a video, we should pause playback. As we
+let go of the scrubber playback can resume (but only if it was
+playing originally).
 
-Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
-have accurate pressure information for all of the mouse events in subframes.
-* page/mac/EventHandlerMac.mm:
-(WebCore::correspondingPressureEventSlot):
-(WebCore::EventHandler::correspondingPressureEvent):
-(WebCore::CurrentEventScope::CurrentEventScope):
-(WebCore::CurrentEventScope::~CurrentEventScope):
+* Modules/mediacontrols/mediaControlsiOS.js:
+(ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
+(ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
+(ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
+(ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
+potentially about to scrub.
+(ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
 
-These events don’t have an associated pressure, so send nil for the
-correspondingPressureEvent.
-(WebCore::EventHandler::wheelEvent):
-(WebCore::EventHandler::keyEvent):
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-Pipe through correspondingPressureEvent.
-(WebCore::EventHandler::mouseDown):
-(WebCore::EventHandler::mouseDragged):
-(WebCore::EventHandler::mouseUp):
-(WebCore::EventHandler::mouseMoved):
+Merge r183954. rdar://problem/20281886
 
-New function to handle pressure change events.
-(WebCore::EventHandler::pressureChange):
+2015-05-07  Beth Dakin  bda...@apple.com
 
-Pipe through correspondingPressureEvent.
-(WebCore::EventHandler::passMouseMovedEventToScrollbars):
-(WebCore::EventHandler::currentPlatformMouseEvent):
+New force-related DOM events should fire in WK1 views
+https://bugs.webkit.org/show_bug.cgi?id=144663
+-and corresponding-
+rdar://problem/20281886
 
-Take the correspondingPressureEvent in order to build a PlatformMouseEvent with
-the correct pressure information.
-* platform/mac/PlatformEventFactoryMac.h:
-* platform/mac/PlatformEventFactoryMac.mm:
-(WebCore::globalPointForEvent):
-(WebCore::pointForEvent):
-(WebCore::mouseButtonForEvent):
-(WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
-(WebCore::PlatformEventFactory::createPlatformMouseEvent):
+Reviewed by Sam Weinig.
 
-2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
-dburk...@apple.com
+All of the WK1 mouse events need to take the correspondingPressureEvent.
+* page/EventHandler.h:
 
-Merge r183953. rdar://problem/19997548
+Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
+have accurate pressure information for all of 

[webkit-changes] [184254] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184254] branches/safari-601.1.32-branch/Source/WebCore








Revision 184254
Author dburk...@apple.com
Date 2015-05-12 21:25:32 -0700 (Tue, 12 May 2015)


Log Message
Merge r184104. rdar://problem/20727702

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/platform/graphics/MaskImageOperation.cpp




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184253 => 184254)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:17:20 UTC (rev 184253)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 04:25:32 UTC (rev 184254)
@@ -2,369 +2,374 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184005. rdar://problem/20486538
+Merge r184104. rdar://problem/20727702
 
-2015-05-08  Alexey Proskuryakov  a...@apple.com
+2015-05-11  Antti Koivisto  an...@apple.com
 
-Crashes in SocketStreamHandleBase::close
-https://bugs.webkit.org/show_bug.cgi?id=144767
-rdar://problem/20486538
+WebContent crash under com.apple.WebCore: WebCore::WebKitCSSResourceValue::isCSSValueNone const + 6
+https://bugs.webkit.org/show_bug.cgi?id=144870
+rdar://problem/20727702
 
-Reviewed by Brady Eidson.
+Reviewed by Simon Fraser.
 
-This is a speculative fix, I could not reproduce the crash.
+No repro but we are seeing null pointer crashes like this:
 
-* Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
-Normally, processOutgoingFrameQueue() closes the handle in the end when called in
-OutgoingFrameQueueClosing state. But there is no definitive protection against
-processing two CLOSE frames, in which case we'd try to close the handle twice.
+Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
+0   com.apple.WebCore   0x7fff92da5706 WebCore::WebKitCSSResourceValue::isCSSValueNone() const + 6
+1   com.apple.WebCore   0x7fff93382b48 WebCore::MaskImageOperation::isCSSValueNone() const + 24
+2   com.apple.WebCore   0x7fff92e0475e WebCore::FillLayer::hasNonEmptyMaskImage() const + 30
 
-* platform/network/cf/SocketStreamHandleCFNet.cpp:
-(WebCore::SocketStreamHandle::readStreamCallback): Passing empty data to the client
-results in the socket being closed, which makes no sense here.
+* platform/graphics/MaskImageOperation.cpp:
+(WebCore::MaskImageOperation::MaskImageOperation):
+(WebCore::MaskImageOperation::isCSSValueNone):
 
+This would crash like this if both m_styleImage and m_cssMaskImageValue are null.
+There are no obvious guarantees that this doesn't happen. Two of the constructor variants allow it
+and there is setImage which may turn m_styleImage null later too.
+
+Fix by making null m_cssMaskImageValue always signify CSSValueNone.
+
+(WebCore::MaskImageOperation::cssValue):
+
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184001. rdar://problem/20862460
+Merge r184005. rdar://problem/20486538
 
-2015-05-08  Eric Carlson  eric.carl...@apple.com
+2015-05-08  Alexey Proskuryakov  a...@apple.com
 
-[Mac] Playback target clients do not unregister on page reload
-https://bugs.webkit.org/show_bug.cgi?id=144761
+Crashes in SocketStreamHandleBase::close
+https://bugs.webkit.org/show_bug.cgi?id=144767
+rdar://problem/20486538
 
 Reviewed by Brady Eidson.
 
-* dom/Document.cpp:
-(WebCore::Document::prepareForDestruction): Unregister all target picker clients.
+This is a speculative fix, I could not reproduce the crash.
 
-* html/HTMLMediaElement.cpp:
-(WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
-(WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
-(WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
-(WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
+* Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
+Normally, processOutgoingFrameQueue() closes the handle in the end when called in
+OutgoingFrameQueueClosing state. But there is no definitive protection against
+processing two CLOSE frames, in which case we'd try to close the handle twice.
 
+* platform/network/cf/SocketStreamHandleCFNet.cpp:
+

[webkit-changes] [184257] branches/safari-601.1.32-branch/Source/WebKit2

[dburkart]

Title: [184257] branches/safari-601.1.32-branch/Source/WebKit2








Revision 184257
Author dburk...@apple.com
Date 2015-05-12 21:25:46 -0700 (Tue, 12 May 2015)


Log Message
Merge r184121. rdar://problem/20774613

Modified Paths

branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp




Diff

Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184256 => 184257)

--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 04:25:44 UTC (rev 184256)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog	2015-05-13 04:25:46 UTC (rev 184257)
@@ -2,173 +2,168 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184116. rdar://problem/20774613
+Merge r184121. rdar://problem/20774613
 
-2015-05-11  Alex Christensen  achristen...@webkit.org
+2015-05-11  Myles C. Maxfield  mmaxfi...@apple.com
 
-[Content Extensions] Support domain-specific rules and exceptions.
-https://bugs.webkit.org/show_bug.cgi?id=144833
+Unreviewed build fix
 
-Reviewed by Darin Adler.
+Unreviewed.
 
-* Shared/WebCompiledContentExtension.cpp:
-(WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
-(WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
-(WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
-(WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
-(WebKit::WebCompiledContentExtension::domainFiltersBytecode):
-(WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
-(WebKit::WebCompiledContentExtension::bytecode): Deleted.
-(WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
-* Shared/WebCompiledContentExtension.h:
-* Shared/WebCompiledContentExtensionData.cpp:
-(WebKit::WebCompiledContentExtensionData::encode):
-(WebKit::WebCompiledContentExtensionData::decode):
-* Shared/WebCompiledContentExtensionData.h:
-(WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
 * UIProcess/API/APIUserContentExtensionStore.cpp:
-(API::ContentExtensionMetaData::fileSize):
-(API::encodeContentExtensionMetaData):
-(API::decodeContentExtensionMetaData):
 (API::compiledToFile):
-(API::createExtension):
-Keep track of 3 different types of bytecode to be able to handle domain-specific rules.
 
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r184026. rdar://problem/20757196
+Merge r184116. rdar://problem/20774613
 
-2015-05-08  Dan Bernstein  m...@apple.com
+2015-05-11  Alex Christensen  achristen...@webkit.org
 
-rdar://problem/20757196 NSInternalInconsistencyException raised in -[NSString encodeWithCoder:] beneath createEncodedObject when using WKRemoteObjectEncoder for Safari AutoFill
-https://bugs.webkit.org/show_bug.cgi?id=144818
+[Content Extensions] Support domain-specific rules and exceptions.
+https://bugs.webkit.org/show_bug.cgi?id=144833
 
-Reviewed by Anders Carlsson.
+Reviewed by Darin Adler.
 
-Allow NSString instances that contain unpaired surrogates to be encoded by
-WKRemoteObjectCoder by encoding them directly rather than using
--[NSString encodeWithCoder:].
+* Shared/WebCompiledContentExtension.cpp:
+(WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecode):
+(WebKit::WebCompiledContentExtension::filtersWithoutDomainsBytecodeLength):
+(WebKit::WebCompiledContentExtension::filtersWithDomainsBytecode):
+(WebKit::WebCompiledContentExtension::filtersWithDomainsBytecodeLength):
+(WebKit::WebCompiledContentExtension::domainFiltersBytecode):
+(WebKit::WebCompiledContentExtension::domainFiltersBytecodeLength):
+(WebKit::WebCompiledContentExtension::bytecode): Deleted.
+(WebKit::WebCompiledContentExtension::bytecodeLength): Deleted.
+* Shared/WebCompiledContentExtension.h:
+* Shared/WebCompiledContentExtensionData.cpp:
+(WebKit::WebCompiledContentExtensionData::encode):
+(WebKit::WebCompiledContentExtensionData::decode):
+* Shared/WebCompiledContentExtensionData.h:
+(WebKit::WebCompiledContentExtensionData::WebCompiledContentExtensionData):
+* UIProcess/API/APIUserContentExtensionStore.cpp:
+(API::ContentExtensionMetaData::fileSize):
+   

[webkit-changes] [184235] branches/safari-601.1.32-branch/Source

[dburkart]

Title: [184235] branches/safari-601.1.32-branch/Source








Revision 184235
Author dburk...@apple.com
Date 2015-05-12 20:15:49 -0700 (Tue, 12 May 2015)


Log Message
Merge r183909. rdar://problem/18894598

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h
branches/safari-601.1.32-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
branches/safari-601.1.32-branch/Source/WebCore/Modules/webdatabase/DatabaseManager.h
branches/safari-601.1.32-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.cpp
branches/safari-601.1.32-branch/Source/WebCore/Modules/webdatabase/DatabaseServer.h
branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm
branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm
branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp
branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.h
branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h
branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184234 => 184235)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:08:50 UTC (rev 184234)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:15:49 UTC (rev 184235)
@@ -1,35 +1,35 @@
 2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-Merge r183942. rdar://problem/20049088
+Merge r183909. rdar://problem/18894598
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-06  Daniel Bates  daba...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+[iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+https://bugs.webkit.org/show_bug.cgi?id=144657
+rdar://problem/18894598
 
-Reviewed by Simon Fraser.
+Reviewed by Andy Estes.
 
-Take 2 - this was rolled out because Mavericks was crashing.
+Export WebCore functionality to pause and resume the database thread so that we can
+make use of this functionality from WebKit2.
 
-Make sure backdrop layers don't tile. If they are big
-enough, we'll leave it to the platform compositor to handle.
+* Modules/webdatabase/AbstractDatabaseServer.h:
+* Modules/webdatabase/DatabaseManager.cpp:
+(WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
+* Modules/webdatabase/DatabaseManager.h:
+* Modules/webdatabase/DatabaseServer.cpp:
+(WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
+DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
+For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
+we fix https://bugs.webkit.org/show_bug.cgi?id=144660.
+* Modules/webdatabase/DatabaseServer.h:
 
-This also fixes a bug where if a layer changed from a backdrop
-type to a tiled type, it would still retain its custom appearance
-and we'd try to add children to the wrong layer.
-
-Test: compositing/media-controls-bar-appearance-big.html
-
-* platform/graphics/ca/GraphicsLayerCA.cpp:
-(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
-a layer needs a backdrop before checking if it needs to tile.
-
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 
-Merge r183894. rdar://problem/20049088
+Merge r183942. rdar://problem/20049088
 
 2015-05-06  Dean Jackson  d...@apple.com
 
@@ -39,6 +39,8 @@
 
 Reviewed by Simon Fraser.
 
+Take 2 - this was rolled out because Mavericks was crashing.
+
 Make sure backdrop layers don't tile. If they are big
 enough, we'll leave it to the platform compositor to handle.
 
@@ -52,6 +54,32 @@
 (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
 a layer needs a backdrop before checking if it needs to tile.
 
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+
+Merge r183894. rdar://problem/20049088
+
+ 

[webkit-changes] [184243] branches/safari-601.1.32-branch/Source/WebCore

[dburkart]

Title: [184243] branches/safari-601.1.32-branch/Source/WebCore








Revision 184243
Author dburk...@apple.com
Date 2015-05-12 20:58:15 -0700 (Tue, 12 May 2015)


Log Message
Merge r183953. rdar://problem/19997548

Modified Paths

branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js




Diff

Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184242 => 184243)

--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:58:11 UTC (rev 184242)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog	2015-05-13 03:58:15 UTC (rev 184243)
@@ -2,155 +2,149 @@
 Dana Burkart  dburk...@apple.com
 dburk...@apple.com
 
-Merge r183943. rdar://problem/19913748
+Merge r183953. rdar://problem/19997548
 
-2015-05-07  Simon Fraser  simon.fra...@apple.com
+2015-05-06  Roger Fong  roger_f...@apple.com
 
-Remove the WK1-only code path for independently composited iframes
-https://bugs.webkit.org/show_bug.cgi?id=144722
+Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
+https://bugs.webkit.org/show_bug.cgi?id=144700.
+rdar://problem/19997548
 
-Reviewed by Dean Jackson.
+Reviewed by Jer Noble.
 
-In WebKit1 on Mac, we allowed iframes to be composited independently of their
-parent document, relying on the fact that the frame's platform view can host
-a layer-backed view. However, this ran into bugs (rdar://problem/18862298),
-and triggers the assertion at the end of FrameView::updateLayoutAndStyleIfNeededRecursive(),
-because the compositing update after a layout can dirty style in notifyIFramesOfCompositingChange().
+Update time and timeline during the timeline input event instead of the wrapper's mousemove.
+(Controller.prototype.handleWrapperMouseMove):
+(Controller.prototype.handleTimelineMouseMove):
+(Controller.prototype.drawTimelineBackground):
 
-Removing the WK1-only code path solves these problems. It also eliminates the need
-to do compositing-specific frame overlap testing.
+(Controller.prototype.updateControlsWhileScrubbing):
+Updates time and scrubber to reflect timeline user input.
 
-* page/FrameView.cpp:
-(WebCore::FrameView::setIsOverlapped): No need to do compositing-related things here.
-Any iframe that gets composited will participate in the normal compositing overlap
-testing in its parent frame.
-(WebCore::FrameView::hasCompositedContentIncludingDescendants): Deleted.
-(WebCore::FrameView::hasCompositingAncestor): Deleted.
-* page/FrameView.h:
-* rendering/RenderLayerCompositor.cpp: Replace ownerElement() checks in this file
-with an isMainFrameCompositor() for readability. Some 0-nullptr.
-(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
-(WebCore::RenderLayerCompositor::chromeClient):
-(WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
-(WebCore::RenderLayerCompositor::updateCompositingLayers):
-(WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
-(WebCore::RenderLayerCompositor::updateBacking):
-(WebCore::RenderLayerCompositor::layerTreeAsText):
-(WebCore::RenderLayerCompositor::frameContentsCompositor):
-(WebCore::RenderLayerCompositor::setIsInWindow):
-(WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame):
-(WebCore::RenderLayerCompositor::requiresCompositingForFrame): frameRenderer.requiresAcceleratedCompositing()
-already bails on no content RenderView, so the shouldPropagateCompositingToEnclosingFrame() check does
-nothing and is removed.
-(WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer):
-(WebCore::RenderLayerCompositor::requiresScrollLayer):
-(WebCore::RenderLayerCompositor::documentUsesTiledBacking):
-(WebCore::RenderLayerCompositor::isMainFrameCompositor):
-(WebCore::RenderLayerCompositor::shouldCompositeOverflowControls):
-(WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):
-(WebCore::RenderLayerCompositor::requiresContentShadowLayer):
-(WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
-(WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
-(WebCore::RenderLayerCompositor::updateLayerForHeader):
-(WebCore::RenderLayerCompositor::updateLayerForFooter):
-(WebCore::RenderLayerCompositor::ensureRootLayer): Main frame attaches via 

[webkit-changes] [184242] branches/safari-601.1.32-branch

[dburkart]

Title: [184242] branches/safari-601.1.32-branch








Revision 184242
Author dburk...@apple.com
Date 2015-05-12 20:58:11 -0700 (Tue, 12 May 2015)


Log Message
Merge r183943. rdar://problem/19913748

Modified Paths

branches/safari-601.1.32-branch/LayoutTests/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/ChangeLog
branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.cpp
branches/safari-601.1.32-branch/Source/WebCore/page/FrameView.h
branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderLayerCompositor.h
branches/safari-601.1.32-branch/Source/WebCore/rendering/RenderWidget.cpp


Added Paths

branches/safari-601.1.32-branch/LayoutTests/platform/mac-wk1/compositing/visible-rect/
branches/safari-601.1.32-branch/LayoutTests/platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt




Diff

Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184241 => 184242)

--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 03:51:19 UTC (rev 184241)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog	2015-05-13 03:58:11 UTC (rev 184242)
@@ -1,30 +1,24 @@
 2015-05-12  Dana Burkart
-Dana Burkart  dburk...@apple.com
+Dana Burkart  dburk...@apple.com
+dburk...@apple.com
 
-Merge r183942. rdar://problem/20049088
+Merge r183943. rdar://problem/19913748
 
-2015-05-06  Dean Jackson  d...@apple.com
+2015-05-07  Simon Fraser  simon.fra...@apple.com
 
-Handle backdrop views that have to tile
-https://bugs.webkit.org/show_bug.cgi?id=142317
-rdar://problem/20049088
+Remove the WK1-only code path for independently composited iframes
+https://bugs.webkit.org/show_bug.cgi?id=144722
 
-Reviewed by Simon Fraser.
+Reviewed by Dean Jackson.
 
-Take 2 - this was rolled out because Mavericks was crashing.
+Results different from WK2, because WK1 does not make layers for scrollbars.
 
-A test that creates some backdrop views, then makes them
-big enough that it would trigger tiling (which we don't want
-to happen).
+* platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt: Added.
 
-* compositing/media-controls-bar-appearance-big-expected.txt: Added.
-* compositing/media-controls-bar-appearance-big.html: Added.
-* platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
-
 2015-05-12  Dana Burkart
 Dana Burkart  dburk...@apple.com
 
-Merge r183894. rdar://problem/20049088
+Merge r183942. rdar://problem/20049088
 
 2015-05-06  Dean Jackson  d...@apple.com
 
@@ -34,13 +28,36 @@
 
 Reviewed by Simon Fraser.
 
+Take 2 - this was rolled out because Mavericks was crashing.
+
 A test that creates some backdrop views, then makes them
 big enough that it would trigger tiling (which we don't want
 to happen).
 
 * compositing/media-controls-bar-appearance-big-expected.txt: Added.
 * compositing/media-controls-bar-appearance-big.html: Added.
+* platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
 
+2015-05-12  Dana Burkart
+Dana Burkart  dburk...@apple.com
+
+Merge r183894. rdar://problem/20049088
+
+2015-05-06  Dean Jackson  d...@apple.com
+
+Handle backdrop views that have to tile
+https://bugs.webkit.org/show_bug.cgi?id=142317
+rdar://problem/20049088
+
+Reviewed by Simon Fraser.
+
+A test that creates some backdrop views, then makes them
+big enough that it would trigger tiling (which we don't want
+to happen).
+
+* compositing/media-controls-bar-appearance-big-expected.txt: Added.
+* compositing/media-controls-bar-appearance-big.html: Added.
+
 2015-05-06  Brent Fulgham  bfulg...@apple.com
 
 Scroll-snap points do not handle margins and padding propertly


Added: branches/safari-601.1.32-branch/LayoutTests/platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt (0 => 184242)

--- branches/safari-601.1.32-branch/LayoutTests/platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt	(rev 0)
+++ branches/safari-601.1.32-branch/LayoutTests/platform/mac-wk1/compositing/visible-rect/iframe-no-layers-expected.txt	2015-05-13 03:58:11 UTC (rev 184242)
@@ -0,0 +1,33 @@
+
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 1508.00 1516.00)
+  (visible rect 10.00, 100.00 285.00 x 135.00)
+  (coverage rect 10.00, 100.00 285.00 x 135.00)
+  (intersects coverage rect 1)
+  (contentsScale 1.00)
+  (children 1
+

[webkit-changes] [183146] branches/safari-600.7-branch/Source/WebKit2

[dburkart]

Title: [183146] branches/safari-600.7-branch/Source/WebKit2








Revision 183146
Author dburk...@apple.com
Date 2015-04-22 15:43:32 -0700 (Wed, 22 Apr 2015)


Log Message
Merge r181580 for rdar://problem/20545393.

Modified Paths

branches/safari-600.7-branch/Source/WebKit2/ChangeLog
branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm




Diff

Modified: branches/safari-600.7-branch/Source/WebKit2/ChangeLog (183145 => 183146)

--- branches/safari-600.7-branch/Source/WebKit2/ChangeLog	2015-04-22 22:41:28 UTC (rev 183145)
+++ branches/safari-600.7-branch/Source/WebKit2/ChangeLog	2015-04-22 22:43:32 UTC (rev 183146)
@@ -1,3 +1,19 @@
+2015-04-22  Dana Burkart  matthew_han...@apple.com
+
+Merge r181580 for rdar://problem/20545393.
+
+2015-03-13  Enrica Casucci  enr...@apple.com
+
+Webkit crash in WebKit::nextFocusableElement() when typing TAB on external keyboard
+rdar://problem/20155503
+
+Reviewed by David Kilzer.
+
+Adding null check!
+
+* WebProcess/WebPage/ios/WebPageIOS.mm:
+(WebKit::nextFocusableElement):
+
 2015-04-22  Matthew Hanson  matthew_han...@apple.com
 
 Merge r182746. rdar://problem/20645260


Modified: branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (183145 => 183146)

--- branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-04-22 22:41:28 UTC (rev 183145)
+++ branches/safari-600.7-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-04-22 22:43:32 UTC (rev 183146)
@@ -1993,7 +1993,7 @@
 
 static inline Element* nextFocusableElement(Node* startNode, Page* page, bool isForward)
 {
-if (!startNode-isElementNode())
+if (!startNode || !startNode-isElementNode())
 return nullptr;
 
 RefPtrKeyboardEvent key = KeyboardEvent::create();






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

[webkit-changes] [183051] branches/safari-600.7-branch/

[dburkart]

Title: [183051] branches/safari-600.7-branch/








Revision 183051
Author dburk...@apple.com
Date 2015-04-20 22:52:58 -0700 (Mon, 20 Apr 2015)


Log Message
Branched from safari-600.6-branch

Added Paths

branches/safari-600.7-branch/




Diff

Property changes: branches/safari-600.7-branch



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] [181714] trunk/Tools

[dburkart]

Title: [181714] trunk/Tools








Revision 181714
Author dburk...@apple.com
Date 2015-03-18 17:01:42 -0700 (Wed, 18 Mar 2015)


Log Message
ASAN_OPTIONS=allocator_may_return_null=1 needs to be set 
https://bugs.webkit.org/show_bug.cgi?id=142547

Reviewed by Alexey Proskuryakov.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/driver.py




Diff

Modified: trunk/Tools/ChangeLog (181713 => 181714)

--- trunk/Tools/ChangeLog	2015-03-18 23:35:06 UTC (rev 181713)
+++ trunk/Tools/ChangeLog	2015-03-19 00:01:42 UTC (rev 181714)
@@ -1,3 +1,13 @@
+2015-03-18  Dana Burkart  dburk...@apple.com
+
+ASAN_OPTIONS=allocator_may_return_null=1 needs to be set 
+https://bugs.webkit.org/show_bug.cgi?id=142547
+
+Reviewed by Alexey Proskuryakov.
+
+* Scripts/webkitpy/port/driver.py:
+(Driver._setup_environ_for_driver):
+
 2015-03-18  Alexey Proskuryakov  a...@apple.com
 
 Tweak how AppleSystemFontOSSubversion default is added


Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (181713 => 181714)

--- trunk/Tools/Scripts/webkitpy/port/driver.py	2015-03-18 23:35:06 UTC (rev 181713)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py	2015-03-19 00:01:42 UTC (rev 181714)
@@ -38,6 +38,7 @@
 from webkitpy.common.system import path
 from webkitpy.common.system.profiler import ProfilerFactory
 from webkitpy.layout_tests.servers.web_platform_test_server import WebPlatformTestServer
+from webkitpy.common.asan.utils import ASanUtility
 
 
 _log = logging.getLogger(__name__)
@@ -316,6 +317,7 @@
 #environment['DUMPRENDERTREE_TEMP'] = str(self._port._driver_tempdir_for_environment())
 environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
 environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
+environment['ASAN_OPTIONS'] = allocator_may_return_null=1
 if 'WEBKIT_OUTPUTDIR' in os.environ:
 environment['WEBKIT_OUTPUTDIR'] = os.environ['WEBKIT_OUTPUTDIR']
 if self._profiler:






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

[webkit-changes] [181715] trunk/Tools

[dburkart]

Title: [181715] trunk/Tools








Revision 181715
Author dburk...@apple.com
Date 2015-03-18 17:14:08 -0700 (Wed, 18 Mar 2015)


Log Message
Remove extraneous import to fix the build.

Unreviewed.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/driver.py




Diff

Modified: trunk/Tools/ChangeLog (181714 => 181715)

--- trunk/Tools/ChangeLog	2015-03-19 00:01:42 UTC (rev 181714)
+++ trunk/Tools/ChangeLog	2015-03-19 00:14:08 UTC (rev 181715)
@@ -1,5 +1,13 @@
 2015-03-18  Dana Burkart  dburk...@apple.com
 
+Remove extraneous import to fix the build.
+
+Unreviewed.
+
+* Scripts/webkitpy/port/driver.py:
+
+2015-03-18  Dana Burkart  dburk...@apple.com
+
 ASAN_OPTIONS=allocator_may_return_null=1 needs to be set 
 https://bugs.webkit.org/show_bug.cgi?id=142547
 


Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (181714 => 181715)

--- trunk/Tools/Scripts/webkitpy/port/driver.py	2015-03-19 00:01:42 UTC (rev 181714)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py	2015-03-19 00:14:08 UTC (rev 181715)
@@ -38,7 +38,6 @@
 from webkitpy.common.system import path
 from webkitpy.common.system.profiler import ProfilerFactory
 from webkitpy.layout_tests.servers.web_platform_test_server import WebPlatformTestServer
-from webkitpy.common.asan.utils import ASanUtility
 
 
 _log = logging.getLogger(__name__)






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

[webkit-changes] [180657] branches/safari-600.5-branch

[dburkart]

Title: [180657] branches/safari-600.5-branch








Revision 180657
Author dburk...@apple.com
Date 2015-02-25 21:05:32 -0800 (Wed, 25 Feb 2015)


Log Message
Merged r180174. rdar://19947808

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableCell.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableCell.h


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180656 => 180657)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-26 04:29:26 UTC (rev 180656)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-26 05:05:32 UTC (rev 180657)
@@ -1,3 +1,21 @@
+2015-02-25  Dana Burkart  dburk...@apple.com
+
+Merged r180174. rdar://problem/19947808
+
+2015-02-16  Zalan Bujtas  za...@apple.com
+
+RenderTableCell can't access its parent while in detached state.
+https://bugs.webkit.org/show_bug.cgi?id=141639
+rdar://problem/19850760
+
+Reviewed by Simon Fraser.
+
+Null check against ancestor chain so that certain methods in RenderTableCell can
+be called even if the renderer is not yet attached.
+
+* fast/table/table-cell-crash-when-detached-state-expected.txt: Added.
+* fast/table/table-cell-crash-when-detached-state.html: Added.
+
 2015-02-20  Dana Burkart  dburk...@apple.com
 
 Merged r180087. rdar://problem/19850762


Copied: branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt (from rev 180174, trunk/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt) (0 => 180657)

--- branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt	2015-02-26 05:05:32 UTC (rev 180657)
@@ -0,0 +1 @@
+Pass if no crash or assert in debug.


Copied: branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html (from rev 180174, trunk/LayoutTests/fast/table/table-cell-crash-when-detached-state.html) (0 => 180657)

--- branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html	2015-02-26 05:05:32 UTC (rev 180657)
@@ -0,0 +1,21 @@
+!DOCTYPE html
+html
+head
+titleThis tests table cell can survive width/height related calls while it is in detached state./title
+style
+	h1 {
+	display: table-cell !important;
+	background-clip: padding-box;
+	-webkit-transform: rotateX(0deg);
+	}
+/style
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+Pass if no crash or assert in debug.
+h1/h1
+/body
+/html


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180656 => 180657)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-26 04:29:26 UTC (rev 180656)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-26 05:05:32 UTC (rev 180657)
@@ -1,3 +1,31 @@
+2015-02-25  Dana Burkart  dburk...@apple.com
+
+Merged r180174. rdar://problem/19947808
+
+2015-02-16  Zalan Bujtas  za...@apple.com
+
+RenderTableCell can't access its parent while in detached state.
+https://bugs.webkit.org/show_bug.cgi?id=141639
+rdar://problem/19850760
+
+Reviewed by Simon Fraser.
+
+Null check against ancestor chain so that certain methods in RenderTableCell can
+be called even if the renderer is not yet attached.
+
+Test: fast/table/table-cell-crash-when-detached-state.html
+
+* rendering/RenderTableCell.cpp:
+(WebCore::RenderTableCell::borderLeft):
+(WebCore::RenderTableCell::borderRight):
+(WebCore::RenderTableCell::borderTop):
+(WebCore::RenderTableCell::borderBottom):
+(WebCore::RenderTableCell::borderStart):
+(WebCore::RenderTableCell::borderEnd):
+(WebCore::RenderTableCell::borderBefore):
+(WebCore::RenderTableCell::borderAfter):
+* rendering/RenderTableCell.h:
+
 2015-02-23  Babak Shafiei  bshaf...@apple.com
 
 Follow-up merge for r179877.


Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableCell.cpp (180656 => 180657)

--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableCell.cpp	2015-02-26 04:29:26 UTC (rev 180656)
+++ 

[webkit-changes] [180658] branches/safari-600.5-branch

[dburkart]

Title: [180658] branches/safari-600.5-branch








Revision 180658
Author dburk...@apple.com
Date 2015-02-25 21:12:10 -0800 (Wed, 25 Feb 2015)


Log Message
Merged r180364. rdar://19720096

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png
branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderMultiColumnSet.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderMultiColumnSet.h


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html
branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180657 => 180658)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-26 05:05:32 UTC (rev 180657)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-26 05:12:10 UTC (rev 180658)
@@ -1,5 +1,22 @@
 2015-02-25  Dana Burkart  dburk...@apple.com
 
+Merged r180364. rdar://problem/19720096
+
+2015-02-19  David Hyatt  hy...@apple.com
+
+Columns are splitting unsplittable content.
+https://bugs.webkit.org/show_bug.cgi?id=141807
+rdar://problem/18387659
+
+Reviewed by Dean Jackson.
+
+* fast/multicol/inline-table-dynamic-movement-expected.html: Added.
+* fast/multicol/inline-table-dynamic-movement.html: Added.
+* platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png:
+* platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
+
+2015-02-25  Dana Burkart  dburk...@apple.com
+
 Merged r180174. rdar://problem/19947808
 
 2015-02-16  Zalan Bujtas  za...@apple.com


Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html (from rev 180364, trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html) (0 => 180658)

--- branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html	2015-02-26 05:12:10 UTC (rev 180658)
@@ -0,0 +1,9 @@
+
+
+div id='test' style=-webkit-columns:2; height:500px; border:3px solid black; -webkit-column-fill: autodiv style=height:150px; background-color:lime/div
+
+table style=display:inline-table; height:300pxtrtd style=vertical-align:middle; height:100%Hello worldbrimg style=height:250px;width:175px; background-color:purple
+td style=vertical-align:middle; height:100%Also worldbr
+img style=height:250px;width:175px; background-color:purple
+/table
+


Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement.html (from rev 180364, trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement.html) (0 => 180658)

--- branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/inline-table-dynamic-movement.html	2015-02-26 05:12:10 UTC (rev 180658)
@@ -0,0 +1,21 @@
+
+script
+function doIt()
+{
+document.getElementById('test').offsetHeight
+document.getElementById('test').style.height = '500px';
+}
+/script
+
+div id='test' style=-webkit-columns:2; height:400px; border:3px solid black; -webkit-column-fill: autodiv style=height:150px; background-color:lime/div
+
+table style=display:inline-table; height:300pxtrtd style=vertical-align:middle; height:100%Hello worldbrimg style=height:250px;width:175px; background-color:purple
+td style=vertical-align:middle; height:100%Also worldbr
+img style=height:250px;width:175px; background-color:purple
+/table
+
+/div
+
+script
+doIt()
+/script


Modified: branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png

(Binary files differ)


Modified: branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt (180657 => 180658)

--- branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt	2015-02-26 05:05:32 UTC (rev 180657)
+++ branches/safari-600.5-branch/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt	2015-02-26 05:12:10 UTC (rev 180658)
@@ -1,10 +1,10 @@
-layer at (0,0) size 785x3403
+layer at (0,0) size 785x3430
   RenderView at (0,0) size 785x600
-layer 

[webkit-changes] [180458] branches/safari-600.5-branch

[dburkart]

Title: [180458] branches/safari-600.5-branch








Revision 180458
Author dburk...@apple.com
Date 2015-02-20 14:40:21 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r179567. rdar://problem/19850762

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180457 => 180458)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 22:40:21 UTC (rev 180458)
@@ -1,5 +1,20 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merge r179567.
+
+2015-02-02  Enrica Casucci  enr...@apple.com
+
+Additional emoji support.
+https://bugs.webkit.org/show_bug.cgi?id=141047
+rdar://problem/19045135
+
+Reviewed by Darin Adler.
+
+* editing/deleting/delete-emoji.html: Added.
+* editing/deleting/delete-emoji-expected.txt: Added.
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merge r176473.
 
 2014-11-21  Glenn Adams  gl...@skynav.com and Myles C. Maxfield  mmaxfi...@apple.com


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180457 => 180458)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 22:40:21 UTC (rev 180458)
@@ -1,5 +1,30 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merge r179567.
+
+2015-02-02  Enrica Casucci  enr...@apple.com
+
+Additional emoji support.
+https://bugs.webkit.org/show_bug.cgi?id=141047
+rdar://problem/19045135
+
+Reviewed by Darin Adler.
+
+Adds support for emoji modifiers and group emoji.
+
+Test: editing/deleting/delete-emoji.html
+
+* platform/graphics/FontCascade.cpp:
+(WebCore::FontCascade::characterRangeCodePath):
+* platform/text/TextBreakIterator.cpp:
+(WebCore::cursorMovementIterator):
+* rendering/RenderText.cpp:
+(WebCore::isEmojiGroupCandidate):
+(WebCore::isEmojiModifier):
+(WebCore::RenderText::previousOffsetForBackwardDeletion):
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merge r176473.
 
 * rendering/SimpleLineLayout.cpp:


Modified: branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp (180457 => 180458)

--- branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-02-20 22:28:23 UTC (rev 180457)
+++ branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp	2015-02-20 22:40:21 UTC (rev 180458)
@@ -405,6 +405,10 @@
 $WJ = [:LineBreak = Word_Joiner:];
 $XX = [:LineBreak = Unknown:];
 $ZW = [:LineBreak = ZWSpace:];
+$ZWJ = \\u200D;
+$EmojiForModsAndSeqs = [\\U0001F466-\\U0001F469];
+$EmojiForModsOnly = [\\u261D \\u270A-\\u270C \\U0001F385 \\U0001F3C3-\\U0001F3C4 \\U0001F3C7 \\U0001F3CA \\U0001F442-\\U0001F443 \\U0001F446-\\U0001F450 \\U0001F46E-\\U0001F478 \\U0001F47C \\U0001F481-\\U0001F483 \\U0001F485-\\U0001F487 \\U0001F4AA \\U0001F645-\\U0001F647 \\U0001F64B-\\U0001F64F \\U0001F6B4-\\U0001F6B6 \\U0001F6C0];
+$EmojiMods = [\\U0001F3FB-\\U0001F3FF];
 $dictionary = [:LineBreak = Complex_Context:];
 $ALPlus = [$AL $AI $SA $SG $XX];
 $ALcm = $ALPlus $CM*;
@@ -481,6 +485,7 @@
 $LB4NonBreaks [$SP $ZW];
 $CAN_CM $CM* [$SP $ZW];
 $CM+ [$SP $ZW];
+[$EmojiForModsAndSeqs $EmojiMods] $ZWJ $EmojiForModsAndSeqs;
 $CAN_CM $CM+;
 $CM+;
 $CAN_CM $CM* $WJcm;
@@ -547,7 +552,8 @@
 $IScm ($ALcm | $HLcm);
 ($ALcm | $HLcm | $NUcm) $OPcm;
 $CM+ $OPcm;
-$CPcm ($ALcm | $HLcm | $NUcm);;
+$CPcm ($ALcm | $HLcm | $NUcm);
+[$EmojiForModsAndSeqs $EmojiForModsOnly] $EmojiMods;;
 
 static const char* uax14Reverse =
 !!reverse;
@@ -585,6 +591,7 @@
 $LF $CR;
 [$SP $ZW] [$LB4NonBreaks-$CM];
 [$SP $ZW] $CM+ $CAN_CM;
+$EmojiForModsAndSeqs $ZWJ [$EmojiForModsAndSeqs $EmojiMods];
 $CM+ $CAN_CM;
 $CM* $WJ $CM* $CAN_CM;
 $CM* $WJ [$LB8NonBreaks-$CM];
@@ -641,7 +648,8 @@
 $CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
 $CM* ($ALPlus | $HL) $CM* $IS;
 $CM* $OP $CM* ($ALPlus | $HL | $NU);
-$CM* ($ALPlus | $HL | $NU) $CM* $CP;;
+$CM* ($ALPlus | $HL | $NU) $CM* $CP;
+$EmojiMods [$EmojiForModsAndSeqs $EmojiForModsOnly];;
 
 static const char* uax14SafeForward =
 !!safe_forward;






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

[webkit-changes] [180459] branches/safari-600.5-branch

[dburkart]

Title: [180459] branches/safari-600.5-branch








Revision 180459
Author dburk...@apple.com
Date 2015-02-20 14:46:07 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180087. rdar://19850762

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt
branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji.html
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180458 => 180459)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 22:40:21 UTC (rev 180458)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 22:46:07 UTC (rev 180459)
@@ -1,5 +1,22 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180087. rdar://problem/19850762
+
+2015-02-12  Enrica Casucci  enr...@apple.com
+
+Additional emoji group support.
+https://bugs.webkit.org/show_bug.cgi?id=141539
+rdar://problem/19727527
+
+Reviewed by Sam Weinig.
+
+Updating test to reflect the new emoji ligatures supported.
+
+* editing/deleting/delete-emoji-expected.txt:
+* editing/deleting/delete-emoji.html:
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merge r179567.
 
 2015-02-02  Enrica Casucci  enr...@apple.com


Modified: branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt (180458 => 180459)

--- branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-02-20 22:40:21 UTC (rev 180458)
+++ branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji-expected.txt	2015-02-20 22:46:07 UTC (rev 180459)
@@ -1,17 +1,29 @@
 This test verifies that emoji groups and emoji with variations are deleted correctly
 
 Dump of markup 1:
-| ‍‍#selection-caret
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍‍❤️‍‍#selection-caret
 
 
 Dump of markup 2:
+| ‍‍‍❤️‍‍❤️‍‍❤️‍‍#selection-caret
+
+Dump of markup 3:
+| ‍‍‍❤️‍‍❤️‍#selection-caret
+
+Dump of markup 4:
+| ‍‍‍❤️‍#selection-caret
+
+Dump of markup 5:
+| ‍‍#selection-caret
+
+Dump of markup 6:
 | #selection-caret
 
-Dump of markup 3:
+Dump of markup 7:
 | #selection-caret
 
-Dump of markup 4:
+Dump of markup 8:
 | #selection-caret
 
-Dump of markup 5:
+Dump of markup 9:
 | #selection-caret


Modified: branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji.html (180458 => 180459)

--- branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji.html	2015-02-20 22:40:21 UTC (rev 180458)
+++ branches/safari-600.5-branch/LayoutTests/editing/deleting/delete-emoji.html	2015-02-20 22:46:07 UTC (rev 180459)
@@ -1,7 +1,7 @@
 !DOCTYPE html
 html
 body
-div id=test contenteditable=true#x1F466;#x1F3FB;#x1F466;#x1F3FE;#x1F3FB;#x1F466;#x1F3FE;#x1F466;#x1F469;#x200D;#x1F469;#x200D;#x1F466;
+div id=test contenteditable=true#x1F466;#x1F3FB;#x1F466;#x1F3FE;#x1F3FB;#x1F466;#x1F3FE;#x1F466;#x1F469;#x200D;#x1F469;#x200D;#x1F466;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F468;#x1F469;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F469;#x1F468;#x200D;#x2764;#xFE0F;#x200D;#x1F48B;#x200D;#x1F468;
 /div
 script src=""
 script
@@ -9,7 +9,7 @@
 
 var selection = window.getSelection();
 var testElement = document.getElementById('test');
-selection.setBaseAndExtent(testElement.firstChild, 20, testElement.firstChild, 20);
+selection.setBaseAndExtent(testElement.firstChild, 56, testElement.firstChild, 56);
 Markup.dump(test);
 document.execCommand(Delete);
 Markup.dump(test);
@@ -19,6 +19,14 @@
 Markup.dump(test);
 document.execCommand(Delete);
 Markup.dump(test);
+document.execCommand(Delete);
+Markup.dump(test);
+document.execCommand(Delete);
+Markup.dump(test);
+document.execCommand(Delete);
+Markup.dump(test);
+document.execCommand(Delete);
+Markup.dump(test);
 /script
 /body
 /html


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180458 => 180459)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 22:40:21 UTC (rev 180458)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 22:46:07 UTC (rev 180459)
@@ -1,5 +1,25 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180087. rdar://problem/19850762
+
+2015-02-12  Enrica Casucci  enr...@apple.com
+
+Additional emoji group support.
+https://bugs.webkit.org/show_bug.cgi?id=141539
+rdar://problem/19727527
+
+Reviewed by Sam Weinig.
+
+Adding some new emoji ligatures.
+Updated existing test to include the new sequences.
+
+* platform/text/TextBreakIterator.cpp:
+(WebCore::cursorMovementIterator):
+* 

[webkit-changes] [180463] branches/safari-600.5-branch/Source/JavaScriptCore

[dburkart]

Title: [180463] branches/safari-600.5-branch/Source/_javascript_Core








Revision 180463
Author dburk...@apple.com
Date 2015-02-20 15:13:08 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180325. rdar://problem/19828591

Modified Paths

branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog
branches/safari-600.5-branch/Source/_javascript_Core/interpreter/Interpreter.cpp
branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.cpp
branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.h




Diff

Modified: branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog (180462 => 180463)

--- branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 23:09:34 UTC (rev 180462)
+++ branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 23:13:08 UTC (rev 180463)
@@ -1,5 +1,23 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180325. rdar://problem/19828591
+
+2015-02-18  Filip Pizlo  fpi...@apple.com
+
+Effectful calls to length should only happen once on the varargs path.
+rdar://problem/19828518
+
+Reviewed by Michael Saboff.
+
+* interpreter/Interpreter.cpp:
+(JSC::sizeFrameForVarargs):
+(JSC::loadVarargs):
+* runtime/VM.cpp:
+(JSC::VM::VM):
+* runtime/VM.h:
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merged r180237. rdar://problem/19870991
 
 2015-02-17  Filip Pizlo  fpi...@apple.com


Modified: branches/safari-600.5-branch/Source/_javascript_Core/interpreter/Interpreter.cpp (180462 => 180463)

--- branches/safari-600.5-branch/Source/_javascript_Core/interpreter/Interpreter.cpp	2015-02-20 23:09:34 UTC (rev 180462)
+++ branches/safari-600.5-branch/Source/_javascript_Core/interpreter/Interpreter.cpp	2015-02-20 23:13:08 UTC (rev 180463)
@@ -173,6 +173,7 @@
 if (asObject(arguments)-classInfo() == Arguments::info()) {
 Arguments* argsObject = asArguments(arguments);
 unsigned argCount = argsObject-length(callFrame);
+callFrame-vm().varargsLength = argCount;
 if (argCount = firstVarArgOffset)
 argCount -= firstVarArgOffset;
 else
@@ -204,6 +205,7 @@
 
 JSObject* argObject = asObject(arguments);
 unsigned argCount = argObject-get(callFrame, callFrame-propertyNames().length).toUInt32(callFrame);
+callFrame-vm().varargsLength = argCount;
 if (argCount = firstVarArgOffset)
 argCount -= firstVarArgOffset;
 else
@@ -240,7 +242,8 @@
 
 if (asObject(arguments)-classInfo() == Arguments::info()) {
 Arguments* argsObject = asArguments(arguments);
-unsigned argCount = argsObject-length(callFrame);
+unsigned argCount = callFrame-vm().varargsLength;
+callFrame-vm().varargsLength = 0;
 if (argCount = firstVarArgOffset) {
 argCount -= firstVarArgOffset;
 newCallFrame-setArgumentCountIncludingThis(argCount + 1);
@@ -264,8 +267,7 @@
 return;
 }
 
-JSObject* argObject = asObject(arguments);
-unsigned argCount = argObject-get(callFrame, callFrame-propertyNames().length).toUInt32(callFrame);
+unsigned argCount = callFrame-vm().varargsLength;
 if (argCount = firstVarArgOffset) {
 argCount -= firstVarArgOffset;
 newCallFrame-setArgumentCountIncludingThis(argCount + 1);


Modified: branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.cpp (180462 => 180463)

--- branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.cpp	2015-02-20 23:09:34 UTC (rev 180462)
+++ branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.cpp	2015-02-20 23:13:08 UTC (rev 180463)
@@ -198,6 +198,7 @@
 , interpreter(0)
 , jsArrayClassInfo(JSArray::info())
 , jsFinalObjectClassInfo(JSFinalObject::info())
+, varargsLength(0)
 , sizeOfLastScratchBuffer(0)
 , entryScope(0)
 , m_regExpCache(new RegExpCache(this))


Modified: branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.h (180462 => 180463)

--- branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.h	2015-02-20 23:09:34 UTC (rev 180462)
+++ branches/safari-600.5-branch/Source/_javascript_Core/runtime/VM.h	2015-02-20 23:13:08 UTC (rev 180463)
@@ -414,6 +414,7 @@
 
 JSValue hostCallReturnValue;
 ExecState* newCallFrameReturnValue;
+unsigned varargsLength;
 ExecState* callFrameForThrow;
 void* targetMachinePCForThrow;
 Instruction* targetInterpreterPCForThrow;






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

[webkit-changes] [180418] branches/safari-600.5-branch/Source/WebCore

[dburkart]

Title: [180418] branches/safari-600.5-branch/Source/WebCore








Revision 180418
Author dburk...@apple.com
Date 2015-02-20 09:38:22 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180147. rdar://19850657

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180417 => 180418)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 17:15:00 UTC (rev 180417)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 17:38:22 UTC (rev 180418)
@@ -1,3 +1,23 @@
+2015-02-20  Dana Burkart  dburk...@apple.com
+
+Merged r180147. rdar://problem/19850657
+
+2015-02-16  Brent Fulgham  bfulg...@apple.com
+
+FEGaussianBlur::calculateUnscaledKernelSize does unspeakable things with signed and unsigned values
+https://bugs.webkit.org/show_bug.cgi?id=141596
+rdar://problem/19837103
+
+Reviewed by Zalan Bujtas.
+
+No new tests. Covered by css3/filters/huge-blur-value.html
+
+Avoid overflowing the signed integer values by not converting from unsigned
+until the maximum size has been clamped to the expected max.
+
+* platform/graphics/filters/FEGaussianBlur.cpp:
+(WebCore::FEGaussianBlur::calculateUnscaledKernelSize):
+
 2015-02-19  Dana Burkart  dburk...@apple.com
 
 Merged r180128. rdar://problem/19850739


Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (180417 => 180418)

--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp	2015-02-20 17:15:00 UTC (rev 180417)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp	2015-02-20 17:38:22 UTC (rev 180418)
@@ -5,6 +5,7 @@
  * Copyright (C) 2009 Dirk Schulze k...@webkit.org
  * Copyright (C) 2010 Igalia, S.L.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2015 Apple, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -468,22 +469,24 @@
 platformApplyGeneric(srcPixelArray, tmpPixelArray, kernelSizeX, kernelSizeY, paintSize);
 }
 
+static int clampedToKernelSize(float value)
+{
+// Limit the kernel size to 500. A bigger radius won't make a big difference for the result image but
+// inflates the absolute paint rect too much. This is compatible with Firefox' behavior.
+unsigned size = std::maxunsigned(2, static_castunsigned(floorf(value * gaussianKernelFactor() + 0.5f)));
+return clampToint(std::min(size, static_castunsigned(gMaxKernelSize)));
+}
+
 IntSize FEGaussianBlur::calculateUnscaledKernelSize(const FloatPoint stdDeviation)
 {
 ASSERT(stdDeviation.x() = 0  stdDeviation.y() = 0);
 IntSize kernelSize;
 
-// Limit the kernel size to 500. A bigger radius won't make a big difference for the result image but
-// inflates the absolute paint rect too much. This is compatible with Firefox' behavior.
-if (stdDeviation.x()) {
-int size = std::maxunsigned(2, static_castunsigned(floorf(stdDeviation.x() * gaussianKernelFactor() + 0.5f)));
-kernelSize.setWidth(std::min(size, gMaxKernelSize));
-}
+if (stdDeviation.x())
+kernelSize.setWidth(clampedToKernelSize(stdDeviation.x()));
 
-if (stdDeviation.y()) {
-int size = std::maxunsigned(2, static_castunsigned(floorf(stdDeviation.y() * gaussianKernelFactor() + 0.5f)));
-kernelSize.setHeight(std::min(size, gMaxKernelSize));
-}
+if (stdDeviation.y())
+kernelSize.setHeight(clampedToKernelSize(stdDeviation.y()));
 
 return kernelSize;
 }






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

[webkit-changes] [180419] branches/safari-600.5-branch

[dburkart]

Title: [180419] branches/safari-600.5-branch








Revision 180419
Author dburk...@apple.com
Date 2015-02-20 10:03:39 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180150. rdar://19894685

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h
branches/safari-600.5-branch/Source/WebCore/rendering/InlineTextBox.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderElement.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderElement.h
branches/safari-600.5-branch/Source/WebCore/rendering/RenderObject.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderObject.h
branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.h
branches/safari-600.5-branch/Source/WebCore/style/InlineTextBoxStyle.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-mixed-fonts-expected.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-mixed-fonts.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-subscript-expected.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-subscript.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-vertical-first-line-decoration-expected.html
branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-vertical-first-line-decoration.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180418 => 180419)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 17:38:22 UTC (rev 180418)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 18:03:39 UTC (rev 180419)
@@ -1,3 +1,23 @@
+2015-02-20  Dana Burkart  dburk...@apple.com
+
+Merged r180150. rdar://problem/19894685
+
+2015-02-12  David Hyatt  hy...@apple.com
+
+text-underline-position:under has multiple correctness issues
+https://bugs.webkit.org/show_bug.cgi?id=141528
+
+Reviewed by Dean Jackson.
+
+* fast/text/text-underline-first-line-decoration-expected.html: Added.
+* fast/text/text-underline-first-line-decoration.html: Added.
+* fast/text/text-underline-position-mixed-fonts-expected.html: Added.
+* fast/text/text-underline-position-mixed-fonts.html: Added.
+* fast/text/text-underline-position-subscript-expected.html: Added.
+* fast/text/text-underline-position-subscript.html: Added.
+* fast/text/text-underline-vertical-first-line-decoration-expected.html: Added.
+* fast/text/text-underline-vertical-first-line-decoration.html: Added.
+
 2015-02-19  Dana Burkart  dburk...@apple.com
 
 Merged r180128. rdar://problem/19850739


Copied: branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html (from rev 180150, trunk/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html) (0 => 180419)

--- branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration-expected.html	2015-02-20 18:03:39 UTC (rev 180419)
@@ -0,0 +1,13 @@
+?xml version=1.0 encoding=utf-8?
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.1//EN http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd
+html xmlns=http://www.w3.org/1999/xhtml xmlns:ibooks=http://apple.com/ibooks/html-extensions xmlns:epub=http://www.idpf.org/2007/ops
+head
+/head
+body style=overflow:hidden
+pTest to make sure that the decoration line paints properly underneath the subscript.
+/p
+
+p class=decorate style=font-size:24px; float:left;-webkit-text-underline-position:under; border:1px dotted orange
+span style=text-decoration:underlineThe first line span style=vertical-align:-20pxhas a decoration,/span but not /spanimg style=vertical-align:-100px; height:20px;width:20px;background-color:limespan style=text-decoration:underline under the image./spanbr
+The second line should not.
+/p


Copied: branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration.html (from rev 180150, trunk/LayoutTests/fast/text/text-underline-first-line-decoration.html) (0 => 180419)

--- branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-first-line-decoration.html	2015-02-20 18:03:39 UTC (rev 180419)
@@ -0,0 +1,16 

[webkit-changes] [180422] branches/safari-600.5-branch/Source/WebKit2

[dburkart]

Title: [180422] branches/safari-600.5-branch/Source/WebKit2








Revision 180422
Author dburk...@apple.com
Date 2015-02-20 10:29:47 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180242. rdar://19870992

Modified Paths

branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm




Diff

Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (180421 => 180422)

--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 18:22:36 UTC (rev 180421)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 18:29:47 UTC (rev 180422)
@@ -1,3 +1,23 @@
+2015-02-20  Dana Burkart  dburk...@apple.com
+
+Merged r180242. rdar://problem/19870992
+
+2015-02-17  Timothy Horton  timothy_hor...@apple.com
+
+REGRESSION (r178595): Clicking on DD highlights sometimes do not work
+https://bugs.webkit.org/show_bug.cgi?id=141728
+rdar://problem/19825372
+
+Reviewed by Beth Dakin.
+
+* UIProcess/mac/WKImmediateActionController.mm:
+(-[WKImmediateActionController _cancelImmediateActionIfNeeded]):
+(-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+The change that r178595 intended to make was purely that things that we
+have no immediate actions for should cancel the immediate action gesture recognizer.
+Moving the DataDetectors activation code as well breaks strict ordering
+of immediate action callbacks vs. shouldUseActionsWithContext: that they depend on.
+
 2015-02-19  Dana Burkart  dburk...@apple.com
 
 Merged r180115. rdar://problem/19850758


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (180421 => 180422)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-02-20 18:22:36 UTC (rev 180421)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-02-20 18:29:47 UTC (rev 180422)
@@ -105,12 +105,6 @@
 {
 if (![_immediateActionRecognizer animationController])
 [self _cancelImmediateAction];
-
-if (_currentActionContext) {
-_hasActivatedActionContext = YES;
-if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
-[self _cancelImmediateAction];
-}
 }
 
 - (void)_clearImmediateActionState
@@ -192,6 +186,12 @@
 [self _updateImmediateActionItem];
 [self _cancelImmediateActionIfNeeded];
 }
+
+if (_currentActionContext) {
+_hasActivatedActionContext = YES;
+if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
+[self _cancelImmediateAction];
+}
 }
 
 - (void)immediateActionRecognizerDidUpdateAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer






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

[webkit-changes] [180421] branches/safari-600.5-branch/Source/JavaScriptCore

[dburkart]

Title: [180421] branches/safari-600.5-branch/Source/_javascript_Core








Revision 180421
Author dburk...@apple.com
Date 2015-02-20 10:22:36 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180237. rdar://19870991

Modified Paths

branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog
branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGGraph.h
branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp




Diff

Modified: branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog (180420 => 180421)

--- branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 18:08:12 UTC (rev 180420)
+++ branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 18:22:36 UTC (rev 180421)
@@ -1,3 +1,25 @@
+2015-02-20  Dana Burkart  dburk...@apple.com
+
+Merged r180237. rdar://problem/19870991
+
+2015-02-17  Filip Pizlo  fpi...@apple.com
+
+StackLayoutPhase should use CodeBlock::usesArguments rather than FunctionExecutable::usesArguments
+https://bugs.webkit.org/show_bug.cgi?id=141721
+rdar://problem/17198633
+
+Reviewed by Michael Saboff.
+
+I've seen cases where the two are out of sync.  We know we can trust the CodeBlock::usesArguments because
+we use it everywhere else.
+
+No test because I could never reproduce the crash.
+
+* dfg/DFGGraph.h:
+(JSC::DFG::Graph::usesArguments):
+* dfg/DFGStackLayoutPhase.cpp:
+(JSC::DFG::StackLayoutPhase::run):
+
 2015-02-19  Dana Burkart  dburk...@apple.com
 
 Merged r178224. rdar://problem/19861714


Modified: branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGGraph.h (180420 => 180421)

--- branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGGraph.h	2015-02-20 18:08:12 UTC (rev 180420)
+++ branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGGraph.h	2015-02-20 18:22:36 UTC (rev 180421)
@@ -481,6 +481,14 @@
 return hasExitSite(node-origin.semantic, exitKind);
 }
 
+bool usesArguments(InlineCallFrame* inlineCallFrame)
+{
+if (!inlineCallFrame)
+return m_profiledBlock-usesArguments();
+
+return baselineCodeBlockForInlineCallFrame(inlineCallFrame)-usesArguments();
+}
+
 VirtualRegister argumentsRegisterFor(InlineCallFrame* inlineCallFrame)
 {
 if (!inlineCallFrame)


Modified: branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp (180420 => 180421)

--- branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp	2015-02-20 18:08:12 UTC (rev 180420)
+++ branches/safari-600.5-branch/Source/_javascript_Core/dfg/DFGStackLayoutPhase.cpp	2015-02-20 18:22:36 UTC (rev 180421)
@@ -105,7 +105,7 @@
 usedLocals.set(codeBlock()-activationRegister().toLocal());
 for (InlineCallFrameSet::iterator iter = m_graph.m_plan.inlineCallFrames-begin(); !!iter; ++iter) {
 InlineCallFrame* inlineCallFrame = *iter;
-if (!inlineCallFrame-executable-usesArguments())
+if (!m_graph.usesArguments(inlineCallFrame))
 continue;
 
 VirtualRegister argumentsRegister = m_graph.argumentsRegisterFor(inlineCallFrame);
@@ -171,7 +171,7 @@
 InlineVariableData data = ""
 InlineCallFrame* inlineCallFrame = data.inlineCallFrame;
 
-if (inlineCallFrame-executable-usesArguments()) {
+if (m_graph.usesArguments(inlineCallFrame)) {
 inlineCallFrame-argumentsRegister = virtualRegisterForLocal(
 allocation[m_graph.argumentsRegisterFor(inlineCallFrame).toLocal()]);
 






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

[webkit-changes] [180428] branches/safari-600.5-branch

[dburkart]

Title: [180428] branches/safari-600.5-branch








Revision 180428
Author dburk...@apple.com
Date 2015-02-20 11:16:21 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180278. rdar://19878813

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.h
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush-expected.html
branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180427 => 180428)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 19:15:48 UTC (rev 180427)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 19:16:21 UTC (rev 180428)
@@ -1,5 +1,22 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180278. rdar://problem/19878813
+
+2015-02-18  Myles C. Maxfield  mmaxfi...@apple.com
+
+Justified ruby can cause lines to grow beyond their container
+https://bugs.webkit.org/show_bug.cgi?id=141732
+
+Reviewed by David Hyatt.
+
+Make sure that the right edge of a justified ruby line matches up with
+the same line without ruby.
+
+* fast/text/ruby-justification-flush-expected.html: Added.
+* fast/text/ruby-justification-flush.html: Added.
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merged r180150. rdar://problem/19894685
 
 2015-02-12  David Hyatt  hy...@apple.com


Copied: branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush-expected.html (from rev 180278, trunk/LayoutTests/fast/text/ruby-justification-flush-expected.html) (0 => 180428)

--- branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush-expected.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush-expected.html	2015-02-20 19:16:21 UTC (rev 180428)
@@ -0,0 +1,29 @@
+!DOCTYPE html
+html
+head
+meta charset=utf-8
+style
+#outer {
+position: absolute;
+width: 500px;
+height: 500px;
+overflow: hidden;
+}
+
+#inner {
+font-size: 127px;
+text-align: justify;
+position: absolute;
+bottom: 0px;
+left: 73px;
+width: 1200px;
+font-family: Ahem;
+}
+/style
+/head
+body
+This test makes sure that ruby overhangs don't make text grow beyond the bound of the enclosing box.
+At the bottom left of this page, there are two black squares on top of each other. This test passes if the two squares are exactly vertically aligned.
+div id=outerdiv id=innerabrabrnbsp;/div/div
+/body
+/html


Copied: branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush.html (from rev 180278, trunk/LayoutTests/fast/text/ruby-justification-flush.html) (0 => 180428)

--- branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/ruby-justification-flush.html	2015-02-20 19:16:21 UTC (rev 180428)
@@ -0,0 +1,29 @@
+!DOCTYPE html
+html
+head
+meta charset=utf-8
+style
+#outer {
+position: absolute;
+width: 500px;
+height: 500px;
+overflow: hidden;
+}
+
+#inner {
+font-size: 127px;
+text-align: justify;
+position: absolute;
+bottom: 0px;
+left: -1000px;
+width: 1200px;
+font-family: Ahem;
+}
+/style
+/head
+body
+This test makes sure that ruby overhangs don't make text grow beyond the bound of the enclosing box.
+At the bottom left of this page, there are two black squares on top of each other. This test passes if the two squares are exactly vertically aligned.
+div id=outerdiv id=inneraruby a rt/rt a rt/rt/rubya a a a a a a a/div/div
+/body
+/html


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180427 => 180428)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 19:15:48 UTC (rev 180427)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 19:16:21 UTC (rev 180428)
@@ -1,5 +1,36 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180278. rdar://problem/19878813
+
+2015-02-18  Myles C. Maxfield  mmaxfi...@apple.com
+
+Justified ruby can cause lines to grow beyond their container
+https://bugs.webkit.org/show_bug.cgi?id=141732
+
+Reviewed by David Hyatt.
+
+After we re-layout RenderRubyRuns, this can change the environment upon which
+ruby's overhang calculation is sensitive to. Before this patch, we would recalculate
+the overhang after the RenderRubyRun gets relaid out. However, doing such causes the
+effective width of the RenderRubyRun to change, which causes out subsequent
+justification calculations to 

[webkit-changes] [180435] branches/safari-600.5-branch/Source/WebKit2

[dburkart]

Title: [180435] branches/safari-600.5-branch/Source/WebKit2








Revision 180435
Author dburk...@apple.com
Date 2015-02-20 11:43:08 -0800 (Fri, 20 Feb 2015)


Log Message
Merged r180293. rdar://19890148

Modified Paths

branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm




Diff

Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (180434 => 180435)

--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 19:35:46 UTC (rev 180434)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 19:43:08 UTC (rev 180435)
@@ -1,5 +1,25 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merged r180293. rdar://problem/19890148
+
+2015-02-18  Beth Dakin  bda...@apple.com
+
+iBooks immediate action blacklist should not even create the gesture recognizer
+https://bugs.webkit.org/show_bug.cgi?id=141768
+-and corresponding-
+rdar://problem/19806770
+
+Reviewed by Tim Horton.
+
+Move the runtime-application check to the point where the gesture recognizer is 
+created so that we can avoid doing so.
+* UIProcess/API/mac/WKView.mm:
+(-[WKView initWithFrame:processPool:configuration:webView:]):
+* UIProcess/mac/WKImmediateActionController.mm:
+(-[WKImmediateActionController _updateImmediateActionItem]):
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merged r180242. rdar://problem/19870992
 
 2015-02-17  Timothy Horton  timothy_hor...@apple.com


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (180434 => 180435)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-02-20 19:35:46 UTC (rev 180434)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm	2015-02-20 19:43:08 UTC (rev 180435)
@@ -94,6 +94,7 @@
 #import WebCore/PlatformEventFactoryMac.h
 #import WebCore/PlatformScreen.h
 #import WebCore/Region.h
+#import WebCore/RuntimeApplicationChecks.h
 #import WebCore/SharedBuffer.h
 #import WebCore/SoftLinking.h
 #import WebCore/TextAlternativeWithRange.h
@@ -3639,7 +3640,9 @@
 self.actionMenu.autoenablesItems = NO;
 }
 
-if (Class gestureClass = NSClassFromString(@NSImmediateActionGestureRecognizer)) {
+// FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
+Class gestureClass = NSClassFromString(@NSImmediateActionGestureRecognizer);
+if (gestureClass  !applicationIsIBooks()) {
 _data-_immediateActionGestureRecognizer = adoptNS([(NSImmediateActionGestureRecognizer *)[gestureClass alloc] initWithTarget:nil action:NULL]);
 _data-_immediateActionController = adoptNS([[WKImmediateActionController alloc] initWithPage:*_data-_page view:self recognizer:_data-_immediateActionGestureRecognizer.get()]);
 [_data-_immediateActionGestureRecognizer setDelegate:_data-_immediateActionController.get()];


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (180434 => 180435)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-02-20 19:35:46 UTC (rev 180434)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm	2015-02-20 19:43:08 UTC (rev 180435)
@@ -40,7 +40,6 @@
 #import WebCore/NSMenuSPI.h
 #import WebCore/NSPopoverSPI.h
 #import WebCore/QuickLookMacSPI.h
-#import WebCore/RuntimeApplicationChecks.h
 #import WebCore/SoftLinking.h
 #import WebCore/URL.h
 
@@ -278,8 +277,7 @@
 RefPtrWebHitTestResult hitTestResult = [self _webHitTestResult];
 id customClientAnimationController = [_wkView _immediateActionAnimationControllerForHitTestResult:toAPI(hitTestResult.get()) withType:_type userData:toAPI(_userData.get())];
 
-// FIXME: We should not permanently disable this for iBooks. rdar://problem/19585689
-if (customClientAnimationController == [NSNull null] || applicationIsIBooks()) {
+if (customClientAnimationController == [NSNull null]) {
 [self _cancelImmediateAction];
 return;
 }






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

[webkit-changes] [180444] branches/safari-600.5-branch

[dburkart]

Title: [180444] branches/safari-600.5-branch








Revision 180444
Author dburk...@apple.com
Date 2015-02-20 12:13:09 -0800 (Fri, 20 Feb 2015)


Log Message
Merge r176473. rdar://problem/19451285

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/platform/mac/TestExpectations
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in
branches/safari-600.5-branch/Source/WebCore/platform/text/LineBreakIteratorPoolICU.h
branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp
branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.h
branches/safari-600.5-branch/Source/WebCore/rendering/RenderText.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderText.h
branches/safari-600.5-branch/Source/WebCore/rendering/SimpleLineLayout.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/break_lines.h
branches/safari-600.5-branch/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180443 => 180444)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 20:10:35 UTC (rev 180443)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 20:13:09 UTC (rev 180444)
@@ -1,5 +1,18 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merge r176473.
+
+2014-11-21  Glenn Adams  gl...@skynav.com and Myles C. Maxfield  mmaxfi...@apple.com
+
+CSS3: line-break property support
+https://bugs.webkit.org/show_bug.cgi?id=89235
+
+Reviewed by Eric Seidel and Dave Hyatt.
+
+* platform/mac/TestExpectations: Mark css3/line-break tests as passing.
+
+2015-02-20  Dana Burkart  dburk...@apple.com
+
 Merged r180278. rdar://problem/19878813
 
 2015-02-18  Myles C. Maxfield  mmaxfi...@apple.com


Modified: branches/safari-600.5-branch/LayoutTests/platform/mac/TestExpectations (180443 => 180444)

--- branches/safari-600.5-branch/LayoutTests/platform/mac/TestExpectations	2015-02-20 20:10:35 UTC (rev 180443)
+++ branches/safari-600.5-branch/LayoutTests/platform/mac/TestExpectations	2015-02-20 20:13:09 UTC (rev 180444)
@@ -1494,3 +1494,8 @@
 
 # Passing Media Source tests
 [ Yosemite+ ] http/tests/media/media-source/mediasource-sourcebuffer-mode.html [ Pass ]
+
+# Verified passing, so override generic skip
+webkit.org/b/89235 css3/line-break [ Pass ]
+webkit.org/b/138115 css3/line-break/line-break-auto-hyphens.html [ ImageOnlyFailure ]
+webkit.org/b/138115 css3/line-break/line-break-auto-sound-marks.html [ ImageOnlyFailure ]


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180443 => 180444)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 20:10:35 UTC (rev 180443)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 20:13:09 UTC (rev 180444)
@@ -1,5 +1,163 @@
 2015-02-20  Dana Burkart  dburk...@apple.com
 
+Merge r176473.
+
+* rendering/SimpleLineLayout.cpp:
+(WebCore::SimpleLineLayout::canUseFor): Change from
+r176473 not listed in that ChangeLog.
+(WebCore::SimpleLineLayout::createLineRuns): Call
+nextBreakablePositionNonLoosely() in place of
+nextBreakablePosition().
+
+2014-11-21  Glenn Adams  gl...@skynav.com and Myles C. Maxfield  mmaxfi...@apple.com
+
+Add support to -webkit-line-break property for CSS3 Text line-break property values and semantics.
+https://bugs.webkit.org/show_bug.cgi?id=89235
+
+Reviewed by Eric Seidel and Dave Hyatt.
+
+This patch adds semantic support for the CSS3 line-break property (qua -webkit-line-break),
+and enables testing on (apple) mac ports. Follow on patches will enable these tests on
+other ports as they are incrementally verified.
+
+See also wiki documentation at:
+[1] http://trac.webkit.org/wiki/LineBreaking
+[2] http://trac.webkit.org/wiki/LineBreakingCSS3Mapping
+
+Tests: css3/line-break/line-break-auto-centered.html
+   css3/line-break/line-break-auto-half-kana.html
+   css3/line-break/line-break-auto-hyphens.html
+   css3/line-break/line-break-auto-inseparables.html
+   css3/line-break/line-break-auto-iteration-marks.html
+   css3/line-break/line-break-auto-postfixes.html
+   css3/line-break/line-break-auto-prefixes.html
+   css3/line-break/line-break-auto-sound-marks.html
+   css3/line-break/line-break-loose-centered.html
+   css3/line-break/line-break-loose-half-kana.html
+   css3/line-break/line-break-loose-hyphens.html
+   css3/line-break/line-break-loose-inseparables.html
+   css3/line-break/line-break-loose-iteration-marks.html
+   css3/line-break/line-break-loose-postfixes.html
+   

[webkit-changes] [180380] branches/safari-600.5-branch

[dburkart]

Title: [180380] branches/safari-600.5-branch








Revision 180380
Author dburk...@apple.com
Date 2015-02-19 21:25:30 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179933. rdar://19812926

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/url-origin-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/url-origin.html
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/html/URLUtils.h
branches/safari-600.5-branch/Source/WebCore/platform/URL.cpp
branches/safari-600.5-branch/Source/WebCore/platform/URL.h


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/url/url-credentials-escaping-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/url/url-credentials-escaping.html
branches/safari-600.5-branch/LayoutTests/http/tests/xmlhttprequest/basic-auth-credentials-escaping-expected.txt
branches/safari-600.5-branch/LayoutTests/http/tests/xmlhttprequest/basic-auth-credentials-escaping.html


Removed Paths

branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180379 => 180380)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 02:37:23 UTC (rev 180379)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 05:25:30 UTC (rev 180380)
@@ -1,5 +1,31 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179933. rdar://problem/19812926
+
+2015-02-10  Alexey Proskuryakov  a...@apple.com
+
+URL::setUser and URL::setPass don't percent encode
+https://bugs.webkit.org/show_bug.cgi?id=141453
+rdar://problem/148445031655180219623145
+
+Reviewed by Darin Adler.
+
+* fast/url/url-credentials-escaping-expected.txt: Added.
+* fast/url/url-credentials-escaping.html: Added.
+This change is most directly testable via URL API.
+
+* http/tests/xmlhttprequest/basic-auth-credentials-escaping-expected.txt: Added.
+* http/tests/xmlhttprequest/basic-auth-credentials-escaping.html: Added.
+Verify that this doesn't break XMLHttpRequest authentication.
+
+* fast/dom/DOMURL/invalid-url-getters-expected.txt: Removed.
+* fast/dom/DOMURL/invalid-url-getters.html: Removed.
+* fast/dom/DOMURL/url-origin-expected.txt:
+* fast/dom/DOMURL/url-origin.html:
+Removed tests for invalid URLs, there is no such thing with URL API.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179877. rdar://problem/19850766
 
 2015-02-07  Zalan Bujtas  za...@apple.com


Deleted: branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters-expected.txt (180379 => 180380)

--- branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters-expected.txt	2015-02-20 02:37:23 UTC (rev 180379)
+++ branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters-expected.txt	2015-02-20 05:25:30 UTC (rev 180380)
@@ -1,19 +0,0 @@
-Test what getters return on an invalid URL
-
-On success, you will see a series of PASS messages, followed by TEST COMPLETE.
-
-
-PASS invalidURL.toString() is 'http://@@:p...@www.example.com:22/bar?x#y'
-FAIL invalidURL.origin should be . Was null.
-PASS invalidURL.username is ''
-PASS invalidURL.password is ''
-PASS invalidURL.host is ''
-PASS invalidURL.hostname is ''
-PASS invalidURL.port is ''
-PASS invalidURL.pathname is ''
-PASS invalidURL.search is ''
-PASS invalidURL.hash is ''
-PASS successfullyParsed is true
-
-TEST COMPLETE
-


Deleted: branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters.html (180379 => 180380)

--- branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters.html	2015-02-20 02:37:23 UTC (rev 180379)
+++ branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/invalid-url-getters.html	2015-02-20 05:25:30 UTC (rev 180380)
@@ -1,29 +0,0 @@
-!DOCTYPE html
-html
-head
-meta charset=utf-8
-script src=""
-/head
-body
-script
-
-description(Test what getters return on an invalid URL);
-
-var invalidURL = new URL(http://u:p...@www.example.com:22/bar?x#y)
-invalidURL.username = @@;
-
-shouldBe(invalidURL.toString(), 'http://@@:p...@www.example.com:22/bar?x#y');
-shouldBe(invalidURL.origin, '');
-shouldBe(invalidURL.username, '');
-shouldBe(invalidURL.password, '');
-shouldBe(invalidURL.host, '');
-shouldBe(invalidURL.hostname, '');
-shouldBe(invalidURL.port, '');
-shouldBe(invalidURL.pathname, '');
-shouldBe(invalidURL.search, '');
-shouldBe(invalidURL.hash, '');
-
-/script
-script src=""
-/body
-/html


Modified: branches/safari-600.5-branch/LayoutTests/fast/dom/DOMURL/url-origin-expected.txt (180379 => 180380)

--- 

[webkit-changes] [180382] branches/safari-600.5-branch/Source/WebCore

[dburkart]

Title: [180382] branches/safari-600.5-branch/Source/WebCore








Revision 180382
Author dburk...@apple.com
Date 2015-02-19 21:37:05 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179937. rdar://19812932

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/page/Performance.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180381 => 180382)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 05:30:43 UTC (rev 180381)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 05:37:05 UTC (rev 180382)
@@ -1,5 +1,23 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179937. rdar://problem/19812932
+
+2015-02-11  Sam Weinig  s...@webkit.org
+
+performance.now can crash if accessed from a window that has navigated
+rdar://problem/16892506
+https://bugs.webkit.org/show_bug.cgi?id=141478
+
+Reviewed by Alexey Proskuryakov.
+
+Test: fast/performance/performance-now-crash-on-navigated-window.html
+
+* page/Performance.cpp:
+(WebCore::Performance::now):
+Check for a null frame, which can happen when the window has been navigated.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179933. rdar://problem/19812926
 
 2015-02-10  Alexey Proskuryakov  a...@apple.com


Modified: branches/safari-600.5-branch/Source/WebCore/page/Performance.cpp (180381 => 180382)

--- branches/safari-600.5-branch/Source/WebCore/page/Performance.cpp	2015-02-20 05:30:43 UTC (rev 180381)
+++ branches/safari-600.5-branch/Source/WebCore/page/Performance.cpp	2015-02-20 05:37:05 UTC (rev 180382)
@@ -228,6 +228,9 @@
 
 double Performance::now() const
 {
+if (!frame())
+return 0;
+
 return 1000.0 * m_frame-document()-loader()-timing()-monotonicTimeToZeroBasedDocumentTime(monotonicallyIncreasingTime());
 }
 






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

[webkit-changes] [180393] branches/safari-600.5-branch/Source/WebKit2

[dburkart]

Title: [180393] branches/safari-600.5-branch/Source/WebKit2








Revision 180393
Author dburk...@apple.com
Date 2015-02-19 23:28:56 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180115. rdar://19850758

Modified Paths

branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-600.5-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (180392 => 180393)

--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 07:18:54 UTC (rev 180392)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 07:28:56 UTC (rev 180393)
@@ -1,5 +1,39 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180115. rdar://problem/19850758
+
+2015-02-14  Beth Dakin  bda...@apple.com
+
+REGRESSION: Page opens with enlarged font after visiting PDF, navigating back, 
+then doing a process swap
+https://bugs.webkit.org/show_bug.cgi?id=141584
+-and corresponding-
+rdar://problem/18167729
+
+Reviewed by Tim Horton.
+
+This patch keeps the plugin zoom/scale factors separate from page zoom/scale 
+factors in the UI process since they are used for slightly different purposes for 
+plugins (i.e., PDFs) than they are for normal pages. Keeping track of the right 
+factor for the right type of document will ensure that we don’t use the wrong one.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::WebPageProxy):
+(WebKit::WebPageProxy::pageZoomFactor):
+(WebKit::WebPageProxy::pageScaleFactor):
+(WebKit::WebPageProxy::pluginScaleFactorDidChange):
+(WebKit::WebPageProxy::pluginZoomFactorDidChange):
+(WebKit::WebPageProxy::didCommitLoadForFrame):
+(WebKit::WebPageProxy::pageZoomFactorDidChange): Deleted.
+* UIProcess/WebPageProxy.h:
+(WebKit::WebPageProxy::pageZoomFactor): Deleted.
+(WebKit::WebPageProxy::pageScaleFactor): Deleted.
+* UIProcess/WebPageProxy.messages.in:
+* WebProcess/Plugins/PluginView.cpp:
+(WebKit::PluginView::setPageScaleFactor):
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r180094. rdar://problem/19850716
 
 2015-02-13  Simon Fraser  simon.fra...@apple.com


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (180392 => 180393)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-02-20 07:18:54 UTC (rev 180392)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-02-20 07:28:56 UTC (rev 180393)
@@ -291,6 +291,8 @@
 , m_textZoomFactor(1)
 , m_pageZoomFactor(1)
 , m_pageScaleFactor(1)
+, m_pluginZoomFactor(1)
+, m_pluginScaleFactor(1)
 , m_intrinsicDeviceScaleFactor(1)
 , m_customDeviceScaleFactor(0)
 , m_topContentInset(0)
@@ -2007,6 +2009,24 @@
 m_process-send(Messages::WebPage::SetPageAndTextZoomFactors(m_pageZoomFactor, m_textZoomFactor), m_pageID); 
 }
 
+double WebPageProxy::pageZoomFactor() const
+{
+// Zoom factor for non-PDF pages persists across page loads. We maintain a separate member variable for PDF
+// zoom which ensures that we don't use the PDF zoom for a normal page.
+if (m_mainFrame  m_mainFrame-isDisplayingPDFDocument())
+return m_pluginZoomFactor;
+return m_pageZoomFactor;
+}
+
+double WebPageProxy::pageScaleFactor() const
+{
+// PDF documents use zoom and scale factors to size themselves appropriately in the window. We store them
+// separately but decide which to return based on the main frame.
+if (m_mainFrame  m_mainFrame-isDisplayingPDFDocument())
+return m_pluginScaleFactor;
+return m_pageScaleFactor;
+}
+
 void WebPageProxy::scalePage(double scale, const IntPoint origin)
 {
 if (!isValid())
@@ -2265,11 +2285,16 @@
 m_pageScaleFactor = scaleFactor;
 }
 
-void WebPageProxy::pageZoomFactorDidChange(double zoomFactor)
+void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor)
 {
-m_pageZoomFactor = zoomFactor;
+m_pluginScaleFactor = pluginScaleFactor;
 }
 
+void WebPageProxy::pluginZoomFactorDidChange(double pluginZoomFactor)
+{
+m_pluginZoomFactor = pluginZoomFactor;
+}
+
 void WebPageProxy::findStringMatches(const String string, FindOptions options, unsigned maxMatchCount)
 {
 if (string.isEmpty()) {
@@ -2663,8 +2688,10 @@
 // WebPageProxy's cache of the value can get out of sync (e.g. in the case where a
 // plugin is handling page scaling itself) so we should reset it to the default
 // for standard main frame loads.
-if 

[webkit-changes] [180387] branches/safari-600.5-branch/Source/WebCore

[dburkart]

Title: [180387] branches/safari-600.5-branch/Source/WebCore








Revision 180387
Author dburk...@apple.com
Date 2015-02-19 22:31:55 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180063. rdar://19812938

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp
branches/safari-600.5-branch/Source/WebCore/page/FrameView.h
branches/safari-600.5-branch/Source/WebCore/rendering/RenderWidget.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180386 => 180387)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 06:14:08 UTC (rev 180386)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 06:31:55 UTC (rev 180387)
@@ -1,5 +1,45 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180063. rdar://problem/19812938
+
+2015-02-13  Simon Fraser  simon.fra...@apple.com
+
+Crashes under RenderLayer::hitTestLayer under determinePrimarySnapshottedPlugIn()
+https://bugs.webkit.org/show_bug.cgi?id=141551
+
+Reviewed by Zalan Bujtas.
+
+It's possible for a layout to dirty the parent frame's state, via the calls to
+ownerElement()-scheduleSetNeedsStyleRecalc() that RenderLayerCompositor does when
+iframes toggle their compositing mode.
+
+That could cause FrameView::updateLayoutAndStyleIfNeededRecursive() to fail to 
+leave all the frames in a clean state. Later on, we could enter hit testing,
+which calls document().updateLayout() on each frame's document. Document::updateLayout()
+does layout on all ancestor documents, so in the middle of hit testing, we could
+layout a subframe (dirtying an ancestor frame), then layout another frame, which
+would forcing that ancestor to be laid out while we're hit testing it, thus
+corrupting the RenderLayer tree while it's being iterated over.
+
+Fix by having FrameView::updateLayoutAndStyleIfNeededRecursive() do a second
+layout after laying out subframes, which most of the time will be a no-op.
+
+Also add a stronger assertion, that this frame and all subframes are clean
+at the end of FrameView::updateLayoutAndStyleIfNeededRecursive() for the
+main frame.
+
+Various existing frames tests hit the new assertion if the code change is removed,
+so this is covered by existing tests.
+
+* page/FrameView.cpp:
+(WebCore::FrameView::needsStyleRecalcOrLayout):
+(WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
+* page/FrameView.h:
+* rendering/RenderWidget.cpp:
+(WebCore::RenderWidget::willBeDestroyed):
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r180062. rdar://problem/19812938
 
 2015-02-12  Simon Fraser  simon.fra...@apple.com


Modified: branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp (180386 => 180387)

--- branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp	2015-02-20 06:14:08 UTC (rev 180386)
+++ branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp	2015-02-20 06:31:55 UTC (rev 180387)
@@ -2513,6 +2513,33 @@
 return m_layoutTimer.isActive();
 }
 
+bool FrameView::needsStyleRecalcOrLayout(bool includeSubframes) const
+{
+if (frame().document()  frame().document()-childNeedsStyleRecalc())
+return true;
+
+if (needsLayout())
+return true;
+
+if (!includeSubframes)
+return false;
+
+// Find child frames via the Widget tree, as updateLayoutAndStyleIfNeededRecursive() does.
+VectorRefFrameView, 16 childViews;
+childViews.reserveInitialCapacity(children().size());
+for (auto widget : children()) {
+if (widget-isFrameView())
+childViews.uncheckedAppend(toFrameView(*widget));
+}
+
+for (unsigned i = 0; i  childViews.size(); ++i) {
+if (childViews[i]-needsStyleRecalcOrLayout())
+return true;
+}
+
+return false;
+}
+
 bool FrameView::needsLayout() const
 {
 // This can return true in cases where the document does not have a body yet.
@@ -3839,10 +3866,12 @@
 for (unsigned i = 0; i  childViews.size(); ++i)
 childViews[i]-updateLayoutAndStyleIfNeededRecursive();
 
-// When frame flattening is on, child frame can mark parent frame dirty. In such case, child frame
-// needs to call layout on parent frame recursively.
-// This assert ensures that parent frames are clean, when child frames finished updating layout and style.
-ASSERT(!needsLayout());
+// A child frame may have dirtied us during its layout.
+frame().document()-updateStyleIfNeeded();
+if (needsLayout())
+layout();
+
+ASSERT(!frame().isMainFrame() || !needsStyleRecalcOrLayout());
 }
 
 bool 

[webkit-changes] [180390] branches/safari-600.5-branch/Source

[dburkart]

Title: [180390] branches/safari-600.5-branch/Source








Revision 180390
Author dburk...@apple.com
Date 2015-02-19 23:01:39 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180076. rdar://19850750

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/page/Settings.in
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp
branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/Shared/WebPageCreationParameters.cpp
branches/safari-600.5-branch/Source/WebKit2/Shared/WebPageCreationParameters.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180389 => 180390)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 06:45:52 UTC (rev 180389)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 07:01:39 UTC (rev 180390)
@@ -1,5 +1,24 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180076. rdar://problem/19850750
+
+2015-02-13  Brent Fulgham  bfulg...@apple.com
+
+[Mac, iOS] Adjust pagination behavior for Mail.app printing use
+https://bugs.webkit.org/show_bug.cgi?id=141569
+rdar://problem/14912763
+
+Reviewed by Anders Carlsson.
+
+* page/Settings.in: Add new pagination setting flag.
+* rendering/RenderBlockFlow.cpp:
+(WebCore::messageContainerName): Added.
+(WebCore::needsPaginationQuirk): Added.
+(WebCore::RenderBlockFlow::adjustLinePositionForPagination): Don't move the message content
+div to a new page when using this special printing mode.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r180063. rdar://problem/19812938
 
 2015-02-13  Simon Fraser  simon.fra...@apple.com


Modified: branches/safari-600.5-branch/Source/WebCore/page/Settings.in (180389 => 180390)

--- branches/safari-600.5-branch/Source/WebCore/page/Settings.in	2015-02-20 06:45:52 UTC (rev 180389)
+++ branches/safari-600.5-branch/Source/WebCore/page/Settings.in	2015-02-20 07:01:39 UTC (rev 180390)
@@ -230,3 +230,4 @@
 maximumSourceBufferSize type=int, initial=318767104, conditional=MEDIA_SOURCE
 
 serviceControlsEnabled initial=false, conditional=SERVICE_CONTROLS
+appleMailPaginationQuirkEnabled initial=false


Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp (180389 => 180390)

--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp	2015-02-20 06:45:52 UTC (rev 180389)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp	2015-02-20 07:01:39 UTC (rev 180390)
@@ -2,7 +2,7 @@
  * Copyright (C) 1999 Lars Knoll (kn...@kde.org)
  *   (C) 1999 Antti Koivisto (koivi...@kde.org)
  *   (C) 2007 David Smith (catfish@gmail.com)
- * Copyright (C) 2003-2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2015 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -43,9 +43,11 @@
 #include RenderTableCell.h
 #include RenderText.h
 #include RenderView.h
+#include Settings.h
 #include SimpleLineLayoutFunctions.h
 #include VerticalPositionCache.h
 #include VisiblePosition.h
+#include wtf/NeverDestroyed.h
 
 namespace WebCore {
 
@@ -1617,6 +1619,15 @@
 return lineBottom - lineTop;
 }
 
+static inline bool needsAppleMailPaginationQuirk(RootInlineBox lineBox)
+{
+bool appleMailPaginationQuirkEnabled = lineBox.renderer().document().settings()-appleMailPaginationQuirkEnabled();
+if (appleMailPaginationQuirkEnabled  lineBox.renderer().element()  lineBox.renderer().element()-idForStyleResolution() == AtomicString(messageContentContainer, AtomicString::ConstructFromLiteral))
+return true;
+
+return false;
+}
+
 void RenderBlockFlow::adjustLinePositionForPagination(RootInlineBox* lineBox, LayoutUnit delta, bool overflowsRegion, RenderFlowThread* flowThread)
 {
 // FIXME: For now we paginate using line overflow. This ensures that lines don't overlap at all when we
@@ -1699,6 +1710,8 @@
 auto firstRootBox = this-firstRootBox();
 auto firstRootBoxOverflowRect = firstRootBox-logicalVisualOverflowRect(firstRootBox-lineTop(), firstRootBox-lineBottom());
 auto firstLineUpperOverhang = std::max(-firstRootBoxOverflowRect.y(), LayoutUnit());
+if (needsAppleMailPaginationQuirk(*lineBox))
+return;
 setPaginationStrut(remainingLogicalHeight + logicalOffset + firstLineUpperOverhang);
 } else {
 delta += 

[webkit-changes] [180392] branches/safari-600.5-branch/Source/WebKit2

[dburkart]

Title: [180392] branches/safari-600.5-branch/Source/WebKit2








Revision 180392
Author dburk...@apple.com
Date 2015-02-19 23:18:54 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180094. rdar://19850716

Modified Paths

branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebContextMenuProxy.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPopupMenuProxy.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h
branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm




Diff

Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (180391 => 180392)

--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 07:04:40 UTC (rev 180391)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog	2015-02-20 07:18:54 UTC (rev 180392)
@@ -1,5 +1,47 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180094. rdar://problem/19850716
+
+2015-02-13  Simon Fraser  simon.fra...@apple.com
+
+Crash closing a tab when a context or popup menu is open
+https://bugs.webkit.org/show_bug.cgi?id=141582
+rdar://problem/17700475
+
+Reviewed by Anders Carlsson.
+
+If a context menu or a popup menu is open when a tab is programmatically closed,
+then we'd crash because both the WebContextMenuProxyMac/WebPopupMenuProxyMac
+and the WebPageProxy would be deleted while still in use, via messages
+handled via the nested event tracking runloop.
+
+Fix by protecting those things while showing the popup. Also programmatically
+dismiss the popup when closing the WebPageProxy.
+
+* UIProcess/WebContextMenuProxy.h:
+(WebKit::WebContextMenuProxy::cancelTracking):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::close):
+(WebKit::WebPageProxy::showPopupMenu): Clean up some EFL-related confusion that we don't need.
+Retaining |this| will also retain m_activePopupMenu.
+(WebKit::WebPageProxy::hidePopupMenu):
+(WebKit::WebPageProxy::showContextMenu):
+(WebKit::WebPageProxy::resetState):
+* UIProcess/WebPopupMenuProxy.h:
+(WebKit::WebPopupMenuProxy::cancelTracking):
+* UIProcess/mac/WebContextMenuProxyMac.h:
+* UIProcess/mac/WebContextMenuProxyMac.mm:
+(WebKit::WebContextMenuProxyMac::showContextMenu):
+(WebKit::WebContextMenuProxyMac::cancelTracking):
+* UIProcess/mac/WebPopupMenuProxyMac.h: For popups, we need to remember if we were
+canceled to avoid trying to send events after closing.
+* UIProcess/mac/WebPopupMenuProxyMac.mm:
+(WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
+(WebKit::WebPopupMenuProxyMac::showPopupMenu):
+(WebKit::WebPopupMenuProxyMac::cancelTracking):
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r180076. rdar://problem/19850750
 
 2015-02-13  Brent Fulgham  bfulg...@apple.com


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebContextMenuProxy.h (180391 => 180392)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-02-20 07:04:40 UTC (rev 180391)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebContextMenuProxy.h	2015-02-20 07:18:54 UTC (rev 180392)
@@ -45,6 +45,7 @@
 
 virtual void showContextMenu(const WebCore::IntPoint, const VectorWebContextMenuItemData, const ContextMenuContextData) = 0;
 virtual void hideContextMenu() = 0;
+virtual void cancelTracking() { }
 
 protected:
 WebContextMenuProxy();


Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (180391 => 180392)

--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-02-20 07:04:40 UTC (rev 180391)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp	2015-02-20 07:18:54 UTC (rev 180392)
@@ -663,6 +663,14 @@
 
 m_isClosed = true;
 
+if (m_activePopupMenu)
+m_activePopupMenu-cancelTracking();
+
+#if ENABLE(CONTEXT_MENUS)
+if (m_activeContextMenu)
+m_activeContextMenu-cancelTracking();
+#endif
+
 m_backForwardList-pageClosed();
 m_pageClient.pageClosed();
 
@@ -3673,7 +3681,7 @@
 m_activePopupMenu-hidePopupMenu();
 #endif
 m_activePopupMenu-invalidate();
-m_activePopupMenu = 0;
+m_activePopupMenu = nullptr;
 }
 
 m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
@@ -3688,14 +3696,10 @@
 UNUSED_PARAM(data);
 

[webkit-changes] [180395] branches/safari-600.5-branch

[dburkart]

Title: [180395] branches/safari-600.5-branch








Revision 180395
Author dburk...@apple.com
Date 2015-02-19 23:41:18 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180128. rdar://19850739

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt
branches/safari-600.5-branch/LayoutTests/svg/dom/SVGLengthList-basics.xhtml
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/svg/properties/SVGListPropertyTearOff.h




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180394 => 180395)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 07:35:13 UTC (rev 180394)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 07:41:18 UTC (rev 180395)
@@ -1,5 +1,56 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180128. rdar://problem/19850739
+
+2015-02-15  Said Abou-Hallawa  sabouhall...@apple.com
+
+Crash when accessing an item in SVGLengthList and then replacing it with a previous item in the list.
+https://bugs.webkit.org/show_bug.cgi?id=141552.
+
+Reviewed by Darin Adler.
+
+* svg/dom/SVGLengthList-basics-expected.txt:
+* svg/dom/SVGLengthList-basics.xhtml: Add a new test case to this test. Have a
+reference to an SVGLength in an SVGLengthList and then replace this SVGLength
+with another one which comes before it in the SVGLengthList.
+
+2015-02-14  Benjamin Poulain  benja...@webkit.org
+
+Add the initial matching implementation for attribute selectors with case-insensitive value
+https://bugs.webkit.org/show_bug.cgi?id=141615
+
+Reviewed by Andreas Kling.
+
+This covers the basics. I will add some more cases as I do the follow up patches.
+
+I avoided the problem of non-ASCII characters, this will need its own follow up
+patch that fixes all attribute matching.
+
+* fast/css/case-insensitive-attribute-selector-specificity-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-specificity.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-1-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-1.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-2-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-2.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-3-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-html-3.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-1-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-1.xhtml: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-2-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-2.xhtml: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-3-expected.html: Added.
+* fast/css/case-insensitive-attribute-selector-styling-xhtml-3.xhtml: Added.
+* fast/selectors/case-insensitive-attribute-bascis-expected.txt: Added.
+* fast/selectors/case-insensitive-attribute-bascis.html: Added.
+* fast/selectors/case-insensitive-attribute-matching-style-attribute-expected.txt: Added.
+* fast/selectors/case-insensitive-attribute-matching-style-attribute.html: Added.
+* fast/selectors/case-insensitive-attribute-style-update-expected.txt: Added.
+* fast/selectors/case-insensitive-attribute-style-update.html: Added.
+* fast/selectors/case-insensitive-attribute-with-case-sensitive-name-expected.txt: Added.
+* fast/selectors/case-insensitive-attribute-with-case-sensitive-name.html: Added.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179936. rdar://problem/19812932
 
 2015-02-11  Sam Weinig  s...@webkit.org


Modified: branches/safari-600.5-branch/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt (180394 => 180395)

--- branches/safari-600.5-branch/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt	2015-02-20 07:35:13 UTC (rev 180394)
+++ branches/safari-600.5-branch/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt	2015-02-20 07:41:18 UTC (rev 180395)
@@ -119,6 +119,22 @@
 Set x='1 2 3 4' for text1
 PASS text1.setAttribute('x', '1 2 3 4') is undefined.
 
+Test overlapping edge cases for replaceItem()
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 3) is text1.x.baseVal.getItem(2)
+PASS text1.x.baseVal.numberOfItems is 3
+PASS text1.x.baseVal.getItem(2).value is 2
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 2) is 

[webkit-changes] [180383] branches/safari-600.5-branch/Source/WebCore

[dburkart]

Title: [180383] branches/safari-600.5-branch/Source/WebCore








Revision 180383
Author dburk...@apple.com
Date 2015-02-19 21:40:21 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179956. rdar://19812935

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180382 => 180383)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 05:37:05 UTC (rev 180382)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 05:40:21 UTC (rev 180383)
@@ -1,5 +1,26 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179956. rdar://problem/19812935
+
+2015-02-11  Jer Noble  jer.no...@apple.com
+
+[MSE] SampleMap::addRange() returns an inverted iterator_range, possibly causing a crash when that iterator_range is traversed.
+https://bugs.webkit.org/show_bug.cgi?id=141479
+rdar://problem/19067597
+
+Reviewed by Chris Dumez.
+
+When looking backwards through a presentationOrder map to find samples, we then reverse our iterators
+and put them in an iterator_range to return to the caller. But in addition to reversing the iterators
+themselves, we also need to put them in the iterator_range in reverse order, so that when the caller
+iterates from iterator_range.first - iterator_range.second, they don't end up off the end of the
+the underlying storage.
+
+* Modules/mediasource/SampleMap.cpp:
+(WebCore::PresentationOrderSampleMap::findSamplesWithinPresentationRangeFromEnd):
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179937. rdar://problem/19812932
 
 2015-02-11  Sam Weinig  s...@webkit.org


Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp (180382 => 180383)

--- branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp	2015-02-20 05:37:05 UTC (rev 180382)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp	2015-02-20 05:40:21 UTC (rev 180383)
@@ -252,7 +252,7 @@
 return value.second-presentationTime() = endTime;
 });
 
-return iterator_range(rangeStart.base(), rangeEnd.base());
+return iterator_range(rangeEnd.base(), rangeStart.base());
 }
 
 DecodeOrderSampleMap::reverse_iterator_range DecodeOrderSampleMap::findDependentSamples(MediaSample* sample)






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

[webkit-changes] [180385] branches/safari-600.5-branch/Source

[dburkart]

Title: [180385] branches/safari-600.5-branch/Source








Revision 180385
Author dburk...@apple.com
Date 2015-02-19 22:06:20 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r180062. rdar://19812938

Modified Paths

branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in
branches/safari-600.5-branch/Source/WebCore/page/FrameTree.cpp
branches/safari-600.5-branch/Source/WebCore/page/FrameTree.h
branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp
branches/safari-600.5-branch/Source/WebKit2/ChangeLog
branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180384 => 180385)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 05:53:34 UTC (rev 180384)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 06:06:20 UTC (rev 180385)
@@ -1,5 +1,35 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r180062. rdar://problem/19812938
+
+2015-02-12  Simon Fraser  simon.fra...@apple.com
+
+determinePrimarySnapshottedPlugIn() should only traverse visible Frames
+https://bugs.webkit.org/show_bug.cgi?id=141547
+Part of rdar://problem/18445733.
+
+Reviewed by Anders Carlsson.
+
+There's an expectation from clients that FrameView::updateLayoutAndStyleIfNeededRecursive()
+updates layout in all frames, but it uses the widget tree, so only hits frames
+that are parented via renderers (i.e. not display:none frames or their descendants).
+
+Moving towards a future where we remove Widgets, fix by adding a FrameTree 
+traversal function that only finds rendered frames (those with an ownerRenderer).
+
+Not testable.
+
+* page/FrameTree.cpp:
+(WebCore::FrameTree::firstRenderedChild):
+(WebCore::FrameTree::nextRenderedSibling):
+(WebCore::FrameTree::traverseNextRendered):
+(printFrames):
+* page/FrameTree.h:
+* page/FrameView.cpp:
+(WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179956. rdar://problem/19812935
 
 2015-02-11  Jer Noble  jer.no...@apple.com


Modified: branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in (180384 => 180385)

--- branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in	2015-02-20 05:53:34 UTC (rev 180384)
+++ branches/safari-600.5-branch/Source/WebCore/WebCore.exp.in	2015-02-20 06:06:20 UTC (rev 180385)
@@ -2051,6 +2051,7 @@
 __ZNK7WebCore9FrameTree10childCountEv
 __ZNK7WebCore9FrameTree12traverseNextEPKNS_5FrameE
 __ZNK7WebCore9FrameTree14isDescendantOfEPKNS_5FrameE
+__ZNK7WebCore9FrameTree20traverseNextRenderedEPKNS_5FrameE
 __ZNK7WebCore9FrameTree20traverseNextWithWrapEb
 __ZNK7WebCore9FrameTree24traversePreviousWithWrapEb
 __ZNK7WebCore9FrameTree3topEv


Modified: branches/safari-600.5-branch/Source/WebCore/page/FrameTree.cpp (180384 => 180385)

--- branches/safari-600.5-branch/Source/WebCore/page/FrameTree.cpp	2015-02-20 05:53:34 UTC (rev 180384)
+++ branches/safari-600.5-branch/Source/WebCore/page/FrameTree.cpp	2015-02-20 06:06:20 UTC (rev 180385)
@@ -356,6 +356,68 @@
 return nullptr;
 }
 
+Frame* FrameTree::firstRenderedChild() const
+{
+Frame* child = firstChild();
+if (!child)
+return nullptr;
+
+if (child-ownerRenderer())
+return child;
+
+while ((child = child-tree().nextSibling())) {
+if (child-ownerRenderer())
+return child;
+}
+
+return nullptr;
+}
+
+Frame* FrameTree::nextRenderedSibling() const
+{
+Frame* sibling = m_thisFrame;
+
+while ((sibling = sibling-tree().nextSibling())) {
+if (sibling-ownerRenderer())
+return sibling;
+}
+
+return nullptr;
+}
+
+Frame* FrameTree::traverseNextRendered(const Frame* stayWithin) const
+{
+Frame* child = firstRenderedChild();
+if (child) {
+ASSERT(!stayWithin || child-tree().isDescendantOf(stayWithin));
+return child;
+}
+
+if (m_thisFrame == stayWithin)
+return nullptr;
+
+Frame* sibling = nextRenderedSibling();
+if (sibling) {
+ASSERT(!stayWithin || sibling-tree().isDescendantOf(stayWithin));
+return sibling;
+}
+
+Frame* frame = m_thisFrame;
+while (!sibling  (!stayWithin || frame-tree().parent() != stayWithin)) {
+frame = frame-tree().parent();
+if (!frame)
+return nullptr;
+sibling = frame-tree().nextRenderedSibling();
+}
+
+if (frame) {
+ASSERT(!stayWithin || !sibling || sibling-tree().isDescendantOf(stayWithin));
+return sibling;
+}
+
+return nullptr;
+}
+
 Frame* FrameTree::traverseNextWithWrap(bool wrap) const
 {
 if (Frame* result = traverseNext())
@@ 

[webkit-changes] [180381] branches/safari-600.5-branch/LayoutTests

[dburkart]

Title: [180381] branches/safari-600.5-branch/LayoutTests








Revision 180381
Author dburk...@apple.com
Date 2015-02-19 21:30:43 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179936. rdar://19812932

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html
branches/safari-600.5-branch/LayoutTests/fast/performance/resources/




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180380 => 180381)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 05:25:30 UTC (rev 180380)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 05:30:43 UTC (rev 180381)
@@ -1,5 +1,24 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179936. rdar://problem/19812932
+
+2015-02-11  Sam Weinig  s...@webkit.org
+
+performance.now can crash if accessed from a window that has navigated
+rdar://problem/16892506
+https://bugs.webkit.org/show_bug.cgi?id=141478
+
+Reviewed by Alexey Proskuryakov.
+
+* fast/performance/performance-now-crash-on-navigated-window-expected.txt: Added.
+* fast/performance/performance-now-crash-on-navigated-window.html: Added.
+* fast/performance/resources: Added.
+* fast/performance/resources/initialFrame.html: Added.
+* fast/performance/resources/secondFrame.html: Added.
+Add test for calling performance.now() on from a navigated window.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179933. rdar://problem/19812926
 
 2015-02-10  Alexey Proskuryakov  a...@apple.com


Copied: branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt (from rev 179936, trunk/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt) (0 => 180381)

--- branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window-expected.txt	2015-02-20 05:30:43 UTC (rev 180381)
@@ -0,0 +1,10 @@
+Tests how the performance object works when it's owning window is not fully active due to navigation.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS value is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Copied: branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html (from rev 179936, trunk/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html) (0 => 180381)

--- branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/performance/performance-now-crash-on-navigated-window.html	2015-02-20 05:30:43 UTC (rev 180381)
@@ -0,0 +1,38 @@
+!DOCTYPE html
+html
+head
+script src=""
+/head
+body
+script
+jsTestIsAsync = true;
+description(Tests how the performance object works when it's owning window is not fully active due to navigation.);
+
+var perfFromInitialFrame;
+
+// Called by initialFrame.html
+function initialFrameLoaded()
+{
+var otherWindow = document.getElementById(frame).contentWindow;
+perfFromInitialFrame = otherWindow.performance;
+otherWindow.location.href = ""
+}
+
+// Called by secondFrame.html
+function secondFrameLoaded()
+{
+// This should not crash.
+value = perfFromInitialFrame.now();
+
+// Note: We return 0 for this because we need the Frame to get correct timing based on the document loader, and it our
+// usual idiom to return a 'null-ish' value when the window is disconnected. Firefox returns a non-zero value here, but
+// there doesn't seem to be anything in the spec that says it must.
+shouldBe('value', '0');
+
+finishJSTest();
+}
+/script
+script src=""
+iframe id=frame src=""
+/body
+/html






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

[webkit-changes] [180374] branches/safari-600.5-branch

[dburkart]

Title: [180374] branches/safari-600.5-branch








Revision 180374
Author dburk...@apple.com
Date 2015-02-19 17:25:05 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r178224. rdar://19861714

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog
branches/safari-600.5-branch/Source/_javascript_Core/runtime/MapData.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys-expected.txt
branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys.html
branches/safari-600.5-branch/LayoutTests/js/script-tests/map-repack-with-object-keys.js




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180373 => 180374)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:10:31 UTC (rev 180373)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:25:05 UTC (rev 180374)
@@ -1,3 +1,19 @@
+2015-02-19  Dana Burkart  dburk...@apple.com
+
+Merged r178224. rdar://problem/19861714
+
+2015-01-09  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Uncaught Exception in ProbeManager deleting breakpoint
+https://bugs.webkit.org/show_bug.cgi?id=140279
+rdar://problem/19422299
+
+Reviewed by Oliver Hunt.
+
+* js/map-repack-with-object-keys-expected.txt: Added.
+* js/map-repack-with-object-keys.html: Added.
+* js/script-tests/map-repack-with-object-keys.js: Added.
+
 2015-02-18  Dean Jackson  d...@apple.com
 
 Rebaseline tests for safari-600.5-branch.


Copied: branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys-expected.txt (from rev 178224, trunk/LayoutTests/js/map-repack-with-object-keys-expected.txt) (0 => 180374)

--- branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys-expected.txt	2015-02-20 01:25:05 UTC (rev 180374)
@@ -0,0 +1,11 @@
+Tests to make sure we correctly repack a Map with object keys
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS Array.isArray(map.get(newObject1)) is true
+PASS Array.isArray(map.get(newObject1)) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Copied: branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys.html (from rev 178224, trunk/LayoutTests/js/map-repack-with-object-keys.html) (0 => 180374)

--- branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/js/map-repack-with-object-keys.html	2015-02-20 01:25:05 UTC (rev 180374)
@@ -0,0 +1,10 @@
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+script src=""
+/head
+body
+script src=""
+script src=""
+/body
+/html


Copied: branches/safari-600.5-branch/LayoutTests/js/script-tests/map-repack-with-object-keys.js (from rev 178224, trunk/LayoutTests/js/script-tests/map-repack-with-object-keys.js) (0 => 180374)

--- branches/safari-600.5-branch/LayoutTests/js/script-tests/map-repack-with-object-keys.js	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/js/script-tests/map-repack-with-object-keys.js	2015-02-20 01:25:05 UTC (rev 180374)
@@ -0,0 +1,30 @@
+description(Tests to make sure we correctly repack a Map with object keys);
+
+var map = new Map();
+function Obj(n) { this.n = n; }
+
+map.set(new Obj(0), []);
+map.set(new Obj(1), []);
+map.set(new Obj(2), []);
+map.set(new Obj(3), []);
+map.set(new Obj(4), []);
+map.set(new Obj(5), []);
+map.set(new Obj(6), []);
+map.set(new Obj(7), []);
+
+var newObject1 = new Obj(8);
+var newObject2 = new Obj(9);
+map.set(newObject1, []);
+map.set(newObject2, []);
+map.delete(newObject1);
+map.delete(newObject2);
+map.set(newObject1, []);
+map.set(newObject2, []);
+map.delete(newObject1);
+map.delete(newObject2);
+
+map.set(newObject1, []);
+shouldBeTrue(Array.isArray(map.get(newObject1)));
+
+map.set(newObject2, []);
+shouldBeTrue(Array.isArray(map.get(newObject1))); // ensure pre-existing value is still good.


Modified: branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog (180373 => 180374)

--- branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 01:10:31 UTC (rev 180373)
+++ branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog	2015-02-20 01:25:05 UTC (rev 180374)
@@ -1,3 +1,19 @@
+2015-02-19  Dana Burkart  dburk...@apple.com
+
+Merged r178224. rdar://problem/19861714
+
+2015-01-09  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Uncaught Exception in ProbeManager deleting breakpoint
+https://bugs.webkit.org/show_bug.cgi?id=140279
+rdar://problem/19422299
+
+Reviewed by Oliver Hunt.
+
+* runtime/MapData.cpp:
+(JSC::MapData::replaceAndPackBackingStore):
+

[webkit-changes] [180377] branches/safari-600.5-branch

[dburkart]

Title: [180377] branches/safari-600.5-branch








Revision 180377
Author dburk...@apple.com
Date 2015-02-19 17:41:06 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179877. rdar://19850766

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180376 => 180377)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:36:08 UTC (rev 180376)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:41:06 UTC (rev 180377)
@@ -1,5 +1,25 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179877. rdar://problem/19850766
+
+2015-02-07  Zalan Bujtas  za...@apple.com
+
+REGRESSION (r168046): Crash in WebCore::InlineBox::renderer / WebCore::RenderFlowThread::checkLinesConsistency
+https://bugs.webkit.org/show_bug.cgi?id=133462
+
+Reviewed by David Hyatt.
+
+RenderFlowThread::m_lineToRegionMap stores pointers to the root inlineboxes in the block flow.
+Normally root inlineboxes remove themselves from this map in their dtors. However when collapsing an anonymous block,
+we detach the inline tree first and destroy them after. The detached root boxes can't access
+the flowthread containing block and we end up with dangling pointers in this map.
+Call removeFlowChildInfo() before detaching the subtree to ensure proper pointer removal.
+
+* fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt: Added.
+* fast/multicol/newmulticol/crash-when-switching-to-floating.html: Added.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r179776. rdar://problem/19850771
 
 2015-02-06  Zalan Bujtas  za...@apple.com


Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt (from rev 179877, trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt) (0 => 180377)

--- branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt	2015-02-20 01:41:06 UTC (rev 180377)
@@ -0,0 +1 @@
+Pass if no crash or assert in debug build.


Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html (from rev 179877, trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html) (0 => 180377)

--- branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html	2015-02-20 01:41:06 UTC (rev 180377)
@@ -0,0 +1,31 @@
+!DOCTYPE html
+html
+head
+titleThis tests that we clean up the inline content properly after introducing floating./title 
+script
+  if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+tabletd/table
+Pass if no crash or assert in debug build.
+script
+var head = document.getElementsByTagName(head)[0];
+style = document.createElement(style);
+style.innerHTML=* { \n\
+-webkit-animation-name: name9; \n\
+-webkit-animation-duration: 10s; \n\
+} \n\
+@-webkit-keyframes name9 { \n\
+  from { \n\
+  } \n\
+  to { \n\
+-webkit-column-width: auto; \n\
+;
+head.appendChild(style);
+document.execCommand(SelectAll);
+style.innerHTML=* {float:left;};
+/script
+/body
+/html


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180376 => 180377)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 01:36:08 UTC (rev 180376)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 01:41:06 UTC (rev 180377)
@@ -1,5 +1,27 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179877. rdar://problem/19850766
+
+2015-02-07  Zalan Bujtas  za...@apple.com
+
+REGRESSION (r168046): Crash in WebCore::InlineBox::renderer / WebCore::RenderFlowThread::checkLinesConsistency
+https://bugs.webkit.org/show_bug.cgi?id=133462
+
+Reviewed by David Hyatt.
+
+RenderFlowThread::m_lineToRegionMap stores pointers to the root inlineboxes in the block flow.
+Normally root inlineboxes remove themselves from this map in their dtors. However when collapsing an anonymous block,
+we detach the inline tree first and destroy them after. The detached root boxes 

[webkit-changes] [180375] branches/safari-600.5-branch

[dburkart]

Title: [180375] branches/safari-600.5-branch








Revision 180375
Author dburk...@apple.com
Date 2015-02-19 17:31:12 -0800 (Thu, 19 Feb 2015)


Log Message
Merged r179776. rdar://19850771

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/rendering/RenderObject.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt
branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (180374 => 180375)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:25:05 UTC (rev 180374)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-02-20 01:31:12 UTC (rev 180375)
@@ -1,5 +1,35 @@
 2015-02-19  Dana Burkart  dburk...@apple.com
 
+Merged r179776. rdar://problem/19850771
+
+2015-02-06  Zalan Bujtas  za...@apple.com
+
+ASSERT repaintContainer-hasLayer() in WebCore::RenderObject::repaintUsingContainer
+https://bugs.webkit.org/show_bug.cgi?id=140750
+
+Reviewed by Simon Fraser.
+
+There's a short period of time when RenderObject::layer() still returns a valid pointer
+even though we already cleared the hasLayer() flag.
+Do not use the layer as repaint container in such cases.
+
+* compositing/repaint-container-assertion-when-toggling-compositing-expected.txt: Added.
+* compositing/repaint-container-assertion-when-toggling-compositing.html: Added.
+
+2015-02-06  Said Abou-Hallawa  sabouhall...@apple.com
+
+Invalid cast in WebCore::SVGAnimateElement::calculateAnimatedValue.
+https://bugs.webkit.org/show_bug.cgi?id=135171.
+
+Reviewed by Dean Jackson.
+
+* svg/animations/animate-montion-invalid-attribute-expected.svg: Added.
+* svg/animations/animate-montion-invalid-attribute.svg: Added.
+Make sure that adding the same attribute to animateMotion and animate, which both
+animate the same target element, will be ignored and we won't crash.
+
+2015-02-19  Dana Burkart  dburk...@apple.com
+
 Merged r178224. rdar://problem/19861714
 
 2015-01-09  Joseph Pecoraro  pecor...@apple.com


Copied: branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt (from rev 179776, trunk/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt) (0 => 180375)

--- branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing-expected.txt	2015-02-20 01:31:12 UTC (rev 180375)
@@ -0,0 +1 @@
+PASS if no crash or assert in debug mode.


Copied: branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html (from rev 179776, trunk/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html) (0 => 180375)

--- branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/compositing/repaint-container-assertion-when-toggling-compositing.html	2015-02-20 01:31:12 UTC (rev 180375)
@@ -0,0 +1,23 @@
+!DOCTYPE html
+html
+head
+titleThis tests that we don't assert while finding the repaint container for the content that just lost compositing./title
+script
+  if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+div style=-webkit-columns: 4;PASS if no crash or assert in debug mode./div
+script
+  var head = document.getElementsByTagName(head)[0];
+  var div = document.getElementsByTagName(div)[0];
+  var style = document.createElement(style);
+  style.innerHTML=div {-webkit-animation-duration: 1s; -webkit-animation-timing-function: ease-in;};
+  head.appendChild(style);
+  head.parentNode.removeChild(head);
+  document.execCommand(SelectAll);
+  div.setAttribute(style,color: red;);
+/script
+/body
+/html
\ No newline at end of file


Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180374 => 180375)

--- branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 01:25:05 UTC (rev 180374)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog	2015-02-20 01:31:12 UTC (rev 180375)
@@ -1,3 +1,23 @@
+2015-02-19  Dana Burkart  dburk...@apple.com
+
+Merged r179776. rdar://problem/19850771
+
+2015-02-06  Zalan Bujtas  za...@apple.com
+
+ASSERT repaintContainer-hasLayer() in WebCore::RenderObject::repaintUsingContainer
+

[webkit-changes] [180227] trunk/Tools

[dburkart]

Title: [180227] trunk/Tools








Revision 180227
Author dburk...@apple.com
Date 2015-02-17 10:06:25 -0800 (Tue, 17 Feb 2015)


Log Message
ASan does not like JSC::MachineThreads::tryCopyOtherThreadStack
https://bugs.webkit.org/show_bug.cgi?id=141672

Reviewed by David Kilzer.

* asan/webkit-asan-ignore.txt:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/asan/webkit-asan-ignore.txt




Diff

Modified: trunk/Tools/ChangeLog (180226 => 180227)

--- trunk/Tools/ChangeLog	2015-02-17 17:51:17 UTC (rev 180226)
+++ trunk/Tools/ChangeLog	2015-02-17 18:06:25 UTC (rev 180227)
@@ -1,3 +1,12 @@
+2015-02-17  Dana Burkart  dburk...@apple.com
+
+ASan does not like JSC::MachineThreads::tryCopyOtherThreadStack
+https://bugs.webkit.org/show_bug.cgi?id=141672
+
+Reviewed by David Kilzer.
+
+* asan/webkit-asan-ignore.txt:
+
 2015-02-17  Alex Christensen  achristen...@webkit.org
 
 Remove WebCore.exp.in and clean up.


Modified: trunk/Tools/asan/webkit-asan-ignore.txt (180226 => 180227)

--- trunk/Tools/asan/webkit-asan-ignore.txt	2015-02-17 17:51:17 UTC (rev 180226)
+++ trunk/Tools/asan/webkit-asan-ignore.txt	2015-02-17 18:06:25 UTC (rev 180227)
@@ -4,3 +4,4 @@
 # FIXME (rdar://problem/19379214): Register::jsValue() only needs to be blacklisted when
 # called from prepareOSREntry(), but there is currently no way to express this in a blacklist.
 fun:*JSC*Register*jsValue*
+fun:*JSC*MachineThreads*tryCopyOtherThreadStack*






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

[webkit-changes] [179920] trunk/LayoutTests

[dburkart]

Title: [179920] trunk/LayoutTests








Revision 179920
Author dburk...@apple.com
Date 2015-02-11 00:36:22 -0800 (Wed, 11 Feb 2015)


Log Message
http/tests/cache/disk-cache-validation.html generates a lot of Perl errors
https://bugs.webkit.org/show_bug.cgi?id=141393

Reviewed by Darin Adler.

* http/tests/cache/resources/generate-response.cgi:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/cache/resources/generate-response.cgi




Diff

Modified: trunk/LayoutTests/ChangeLog (179919 => 179920)

--- trunk/LayoutTests/ChangeLog	2015-02-11 08:01:19 UTC (rev 179919)
+++ trunk/LayoutTests/ChangeLog	2015-02-11 08:36:22 UTC (rev 179920)
@@ -1,3 +1,12 @@
+2015-02-11  Dana Burkart  dburk...@apple.com
+
+http/tests/cache/disk-cache-validation.html generates a lot of Perl errors
+https://bugs.webkit.org/show_bug.cgi?id=141393
+
+Reviewed by Darin Adler.
+
+* http/tests/cache/resources/generate-response.cgi:
+
 2015-02-10  Gyuyoung Kim  gyuyoung@samsung.com
 
 Unreviewed, EFL gardening. Tests of fast/ruby needs to have new baseline since r172874.


Modified: trunk/LayoutTests/http/tests/cache/resources/generate-response.cgi (179919 => 179920)

--- trunk/LayoutTests/http/tests/cache/resources/generate-response.cgi	2015-02-11 08:01:19 UTC (rev 179919)
+++ trunk/LayoutTests/http/tests/cache/resources/generate-response.cgi	2015-02-11 08:36:22 UTC (rev 179920)
@@ -6,7 +6,7 @@
 my $query = new CGI;
 @names = $query-param;
 
-if ($query-http(If-None-Match) eq match) {
+if ($query-http  $query-http(If-None-Match) eq match) {
 print Status: 304\n;
 }
 






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

[webkit-changes] [179775] trunk/Tools

[dburkart]

Title: [179775] trunk/Tools








Revision 179775
Author dburk...@apple.com
Date 2015-02-06 20:35:30 -0800 (Fri, 06 Feb 2015)


Log Message
dashboard: BuildbotTesterQueueView crashesOnly logic is wrong
https://bugs.webkit.org/show_bug.cgi?id=141349

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
(BuildbotTesterQueueView.prototype.update.appendBuilderQueueStatus):
(BuildbotTesterQueueView.prototype.update):

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js (179774 => 179775)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js	2015-02-07 03:06:58 UTC (rev 179774)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js	2015-02-07 04:35:30 UTC (rev 179775)
@@ -79,12 +79,12 @@
 } else if (!iteration.productive) {
 var url = ""
 var status = new StatusLineView(messageElement, StatusLineView.Status.Danger, iteration.text, undefined, url);
-} else if (queue.crashesOnly  !iteration.crashCount) {
+} else if (queue.crashesOnly  !layoutTestResults.crashCount) {
 var url = ""
 var status = new StatusLineView(messageElement, StatusLineView.Status.Good, no crashes found, undefined, url);
-} else if (queue.crashesOnly  iteration.crashCount) {
+} else if (queue.crashesOnly  layoutTestResults.crashCount) {
 var url = ""
-var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, layoutTestResults.failureCount === 1 ? crash found : crashes found, undefined, url);
+var status = new StatusLineView(messageElement, StatusLineView.Status.Bad, layoutTestResults.crashCount === 1 ? crash found : crashes found, layoutTestResults.crashCount, url);
 new PopoverTracker(status.statusBubbleElement, this._presentPopoverForLayoutTestRegressions.bind(this), iteration);
 } else if (!layoutTestResults.failureCount  !_javascript_TestResults.failureCount  !apiTestResults.failureCount  !platformAPITestResults.failureCount  !pythonTestResults.failureCount  !perlTestResults.errorOccurred  !bindingTestResults.errorOccurred) {
 // Something wrong happened, but it was not a test failure.


Modified: trunk/Tools/ChangeLog (179774 => 179775)

--- trunk/Tools/ChangeLog	2015-02-07 03:06:58 UTC (rev 179774)
+++ trunk/Tools/ChangeLog	2015-02-07 04:35:30 UTC (rev 179775)
@@ -1,3 +1,14 @@
+2015-02-06  Dana Burkart  dburk...@apple.com
+
+dashboard: BuildbotTesterQueueView crashesOnly logic is wrong
+https://bugs.webkit.org/show_bug.cgi?id=141349
+
+Reviewed by Alexey Proskuryakov.
+
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js:
+(BuildbotTesterQueueView.prototype.update.appendBuilderQueueStatus):
+(BuildbotTesterQueueView.prototype.update):
+
 2015-02-06  Alexey Proskuryakov  a...@apple.com
 
 Report network process crashes during layout tests






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

[webkit-changes] [179650] trunk/Tools

[dburkart]

Title: [179650] trunk/Tools








Revision 179650
Author dburk...@apple.com
Date 2015-02-04 16:37:36 -0800 (Wed, 04 Feb 2015)


Log Message
Botwatcher's Dashboard is cramped
https://bugs.webkit.org/show_bug.cgi?id=140273

Reviewed by Alexey Proskuryakov.

Add a heading key which will allow for arbitrary headings in builder queues.

Modified Paths

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotLeaksQueueView.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotPerformanceQueueView.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueue.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTestResults.js
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotTesterQueueView.js
trunk/Tools/ChangeLog




Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js (179649 => 179650)

--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js	2015-02-05 00:36:37 UTC (rev 179649)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotBuilderQueueView.js	2015-02-05 00:37:36 UTC (rev 179650)
@@ -103,7 +103,7 @@
 var status = new StatusLineView(message, StatusLineView.Status.Good, firstRecentUnsuccessfulIteration ? last successful build : latest build, null, url);
 this.element.appendChild(status.element);
 } else {
-var status = new StatusLineView(unknown, StatusLineView.Status.Neutral, firstRecentUnsuccessfulIteration ? last successful build : latest build);
+var status = new StatusLineView(unknown, StatusLineView.Status.Neutral, firstRecentUnsuccessfulIteration ? last successful build : latest build);
 this.element.appendChild(status.element);
 
 if (firstRecentUnsuccessfulIteration) {
@@ -113,27 +113,13 @@
 }
 }
 
-function appendBuildArchitecture(queues, label)
-{
-queues.forEach(function(queue) {
-var releaseLabel = document.createElement(a);
-releaseLabel.classList.add(queueLabel);
-releaseLabel.textContent = label;
-releaseLabel.href = ""
-releaseLabel.target = _blank;
-this.element.appendChild(releaseLabel);
+this.appendBuildStyle.call(this, this.universalReleaseQueues, this.hasMultipleReleaseBuilds ? Release (Universal) : Release, appendBuilderQueueStatus);
+this.appendBuildStyle.call(this, this.sixtyFourBitReleaseQueues, this.hasMultipleReleaseBuilds ? Release (64-bit) : Release, appendBuilderQueueStatus);
+this.appendBuildStyle.call(this, this.thirtyTwoBitReleaseQueues, this.hasMultipleReleaseBuilds ? Release (32-bit) : Release, appendBuilderQueueStatus);
 
-appendBuilderQueueStatus.call(this, queue);
-}.bind(this));
-}
-
-appendBuildArchitecture.call(this, this.universalReleaseQueues, this.hasMultipleReleaseBuilds ? Release (Universal) : Release);
-appendBuildArchitecture.call(this, this.sixtyFourBitReleaseQueues, this.hasMultipleReleaseBuilds ? Release (64-bit) : Release);
-appendBuildArchitecture.call(this, this.thirtyTwoBitReleaseQueues, this.hasMultipleReleaseBuilds ? Release (32-bit) : Release);
-
-appendBuildArchitecture.call(this, this.universalDebugQueues, this.hasMultipleDebugBuilds ? Debug (Universal) : Debug);
-appendBuildArchitecture.call(this, this.sixtyFourBitDebugQueues, this.hasMultipleDebugBuilds ? Debug (64-bit) : Debug);
-appendBuildArchitecture.call(this, this.thirtyTwoBitDebugQueues, this.hasMultipleDebugBuilds ? Debug (32-bit) : Debug);
+this.appendBuildStyle.call(this, this.universalDebugQueues, this.hasMultipleDebugBuilds ? Debug (Universal) : Debug, appendBuilderQueueStatus);
+this.appendBuildStyle.call(this, this.sixtyFourBitDebugQueues, this.hasMultipleDebugBuilds ? Debug (64-bit) : Debug, appendBuilderQueueStatus);
+this.appendBuildStyle.call(this, this.thirtyTwoBitDebugQueues, this.hasMultipleDebugBuilds ? Debug (32-bit) : Debug, appendBuilderQueueStatus);
 },
 
 _presentPopoverFailureLogs: function(element, popover, iteration)


Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (179649 => 179650)

--- 

[webkit-changes] [179312] trunk/Tools

[dburkart]

Title: [179312] trunk/Tools








Revision 179312
Author dburk...@apple.com
Date 2015-01-28 16:30:07 -0800 (Wed, 28 Jan 2015)


Log Message
asan.xcconfig should use CLANG_ADDRESS_SANITIZER=YES instead of -fsanitize=address
https://bugs.webkit.org/show_bug.cgi?id=141015

Reviewed by Alexey Proskuryakov.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/asan/asan.xcconfig




Diff

Modified: trunk/Tools/ChangeLog (179311 => 179312)

--- trunk/Tools/ChangeLog	2015-01-28 23:56:34 UTC (rev 179311)
+++ trunk/Tools/ChangeLog	2015-01-29 00:30:07 UTC (rev 179312)
@@ -1,3 +1,12 @@
+2015-01-28  Dana Burkart  dburk...@apple.com
+
+asan.xcconfig should use CLANG_ADDRESS_SANITIZER=YES instead of -fsanitize=address
+https://bugs.webkit.org/show_bug.cgi?id=141015
+
+Reviewed by Alexey Proskuryakov.
+
+* asan/asan.xcconfig:
+
 2015-01-28  Sam Weinig  s...@webkit.org
 
 Fix the build.


Modified: trunk/Tools/asan/asan.xcconfig (179311 => 179312)

--- trunk/Tools/asan/asan.xcconfig	2015-01-28 23:56:34 UTC (rev 179311)
+++ trunk/Tools/asan/asan.xcconfig	2015-01-29 00:30:07 UTC (rev 179312)
@@ -10,8 +10,9 @@
 GCC_OPTIMIZATION_LEVEL_Production = 1;
 GCC_OPTIMIZATION_LEVEL_Release = 1;
 
-ASAN_OTHER_CFLAGS = -fsanitize=address -fsanitize-blacklist=$(ASAN_IGNORE) -fno-omit-frame-pointer -g;
+CLANG_ADDRESS_SANITIZER=YES
+
+ASAN_OTHER_CFLAGS = -fsanitize-blacklist=$(ASAN_IGNORE) -fno-omit-frame-pointer -g;
 ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
-ASAN_OTHER_LDFLAGS = -fsanitize=address;
 
 GCC_ENABLE_OBJC_GC = NO;






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

[webkit-changes] [179269] trunk

[dburkart]

Title: [179269] trunk








Revision 179269
Author dburk...@apple.com
Date 2015-01-28 10:28:22 -0800 (Wed, 28 Jan 2015)


Log Message
Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
https://bugs.webkit.org/show_bug.cgi?id=136765

Reviewed by Alexey Proskuryakov.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/Base.xcconfig
trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
trunk/Source/ThirdParty/ANGLE/ChangeLog
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/Configurations/Base.xcconfig
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/Base.xcconfig
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Configurations/Base.xcconfig
trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/Base.xcconfig
trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/Configurations/Base.xcconfig
trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig
trunk/Tools/MiniBrowser/Configurations/Base.xcconfig
trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (179268 => 179269)

--- trunk/Source/_javascript_Core/ChangeLog	2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  dburk...@apple.com
+
+Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+https://bugs.webkit.org/show_bug.cgi?id=136765
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+* Configurations/DebugRelease.xcconfig:
+
 2015-01-27  Filip Pizlo  fpi...@apple.com
 
 ExitSiteData saying m_takesSlowPath shouldn't mean early returning takesSlowPath() since for the non-LLInt case we later set m_couldTakeSlowPath, which is more precise


Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (179268 => 179269)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2015-01-28 18:28:22 UTC (rev 179269)
@@ -143,3 +143,7 @@
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);


Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (179268 => 179269)

--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2015-01-28 18:28:22 UTC (rev 179269)
@@ -36,10 +36,6 @@
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;


Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (179268 => 179269)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2015-01-28 18:28:09 UTC (rev 179268)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2015-01-28 18:28:22 UTC (rev 179269)
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  dburk...@apple.com
+
+Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+https://bugs.webkit.org/show_bug.cgi?id=136765
+
+Reviewed by Alexey Proskuryakov.
+
+* Configurations/Base.xcconfig:
+* Configurations/DebugRelease.xcconfig:
+
 2014-12-26  Dan Bernstein  m...@apple.com
 
 rdar://problem/19348208 REGRESSION (r177027): iOS builds use the wrong 

[webkit-changes] [179029] branches/safari-600.5-branch

[dburkart]

Title: [179029] branches/safari-600.5-branch








Revision 179029
Author dburk...@apple.com
Date 2015-01-23 15:04:58 -0800 (Fri, 23 Jan 2015)


Log Message
Merged r174489. rdar://problem/19452129

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/platform/graphics/Font.h
branches/safari-600.5-branch/Source/WebCore/rendering/InlineBox.h
branches/safari-600.5-branch/Source/WebCore/rendering/InlineTextBox.h
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderBox.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderRubyBase.cpp
branches/safari-600.5-branch/Source/WebCore/rendering/RenderRubyRun.h


Added Paths

branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html
branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt
branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest.html
branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179028 => 179029)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-01-23 23:03:28 UTC (rev 179028)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-01-23 23:04:58 UTC (rev 179029)
@@ -1,3 +1,27 @@
+2015-01-23  Dana Burkart  dburk...@apple.com
+
+Merged r174489. rdar://problem/19452129
+
+2014-10-08  Myles C. Maxfield  mmaxfi...@apple.com
+
+Inline ruby does not get justified correctly
+https://bugs.webkit.org/show_bug.cgi?id=137421
+
+Reviewed by Dave Hyatt.
+
+Test that ruby gets spaces inside the ruby base, and that hit testing the
+ruby base gives us correct answers.
+
+* fast/ruby/ruby-justification-expected.html: Added.
+* fast/ruby/ruby-justification-hittest-expected.txt: Added.
+* fast/ruby/ruby-justification-hittest.html: Added.
+* fast/ruby/ruby-justification.html: Added.
+* platform/mac/fast/ruby/bopomofo-rl-expected.txt: Ruby text gets the CSS
+property text-align: justify, which worked prior to this patch. However, this
+patch now justifies ruby bases, so now if there is text that is both a ruby
+base and ruby text (such as ruby in ruby) it correctly gets justified. This
+test does such, and therefore needs to be rebaselined.
+
 2015-01-22  Matthew Hanson  matthew_han...@apple.com
 
 Merge r175264. rdar://problem/19451378


Copied: branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-expected.html) (0 => 179029)

--- branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-expected.html	2015-01-23 23:04:58 UTC (rev 179029)
@@ -0,0 +1,21 @@
+This test makes sure that ruby inside text-align: justify has its contents justified.
+div style=text-align: justify; font-size: 16px;
+div
+abcdefg abcdefg mmm
+/div
+div
+abcdefg abcdefg abcdefg mmm
+/div
+div
+abcdefg rubyabcdefgrtspan style=color: transparent;a/span/ruby abcdefg mmm
+/div
+/div
+div style=font-family: Ahem; font-size: 16px;
+rubyabcdefgnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;abcdefgrta/ruby m
+/div
+div style=text-align: right;
+a
+/div
+div style=text-align: justify;
+abcdefg abcdefg mmm
+/div


Copied: branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt (from rev 174489, trunk/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt) (0 => 179029)

--- branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt	2015-01-23 23:04:58 UTC (rev 179029)
@@ -0,0 +1,11 @@
+This test makes sure that hit testing works with ruby inside text-align: justify.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS right is 792
+PASS document.elementFromPoint(right - 1, bottom - 1).id is ruby
+PASS successfullyParsed is true
+
+TEST COMPLETE
+abcdefg abcdefga m


Copied: 

[webkit-changes] [179038] branches/safari-600.5-branch

[dburkart]

Title: [179038] branches/safari-600.5-branch








Revision 179038
Author dburk...@apple.com
Date 2015-01-23 16:32:01 -0800 (Fri, 23 Jan 2015)


Log Message
Rollout r178467

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm


Removed Paths

branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt
branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/bipbop/
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/french/
branches/safari-600.5-branch/LayoutTests/http/tests/media/resources/hls/spanish/
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179037 => 179038)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-01-24 00:32:01 UTC (rev 179038)
@@ -355,29 +355,6 @@
 
 2015-01-14  Dana Burkart  dburk...@apple.com
 
-Merged r174823. rdar://problem/19424155
-
-2014-10-16  Jer Noble  jer.no...@apple.com
-
-[Mac] Represent AVMediaSelectionOptions as AudioTracks
-https://bugs.webkit.org/show_bug.cgi?id=137474
-
-Reviewed by Brent Fulgham.
-
-* http/tests/media/hls/hls-audio-tracks-expected.txt: Added.
-* http/tests/media/hls/hls-audio-tracks.html: Added.
-* http/tests/media/resources/hls/audio-tracks.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/iframe_index.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/main0.ts: Added.
-* http/tests/media/resources/hls/bipbop/main1.ts: Added.
-* http/tests/media/resources/hls/bipbop/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/french/main.aac: Added.
-* http/tests/media/resources/hls/french/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/spanish/main.aac: Added.
-* http/tests/media/resources/hls/spanish/prog_index.m3u8: Added.
-
-2015-01-14  Dana Burkart  dburk...@apple.com
-
 Merged r174402. rdar://problem/19478358
 
 2014-10-07  Jer Noble  jer.no...@apple.com


Deleted: branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt (179037 => 179038)

--- branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt	2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt	2015-01-24 00:32:01 UTC (rev 179038)
@@ -1,8 +0,0 @@
-
-EVENT(canplaythrough)
-EXPECTED (video.audioTracks.length == '3') OK
-EXPECTED (video.audioTracks[0].enabled == 'true') OK
-EXPECTED (video.audioTracks[1].enabled == 'false') OK
-EXPECTED (video.audioTracks[2].enabled == 'false') OK
-END OF TEST
-


Deleted: branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html (179037 => 179038)

--- branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html	2015-01-24 00:24:26 UTC (rev 179037)
+++ branches/safari-600.5-branch/LayoutTests/http/tests/media/hls/hls-audio-tracks.html	2015-01-24 00:32:01 UTC (rev 179038)
@@ -1,30 +0,0 @@
-!DOCTYPE html
-html
-head
-script src=""
-script src=""
-script
-if (window.testRunner) {
-testRunner.dumpAsText();
-testRunner.waitUntilDone();
-}
-
-function start() {
-

[webkit-changes] [179041] tags/Safari-600.5.3

[dburkart]

Title: [179041] tags/Safari-600.5.3








Revision 179041
Author dburk...@apple.com
Date 2015-01-23 16:45:38 -0800 (Fri, 23 Jan 2015)


Log Message
Rollout r178467

Modified Paths

tags/Safari-600.5.3/LayoutTests/ChangeLog
tags/Safari-600.5.3/Source/WebCore/ChangeLog
tags/Safari-600.5.3/Source/WebCore/WebCore.xcodeproj/project.pbxproj
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm


Removed Paths

tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt
tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/bipbop/
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/french/
tags/Safari-600.5.3/LayoutTests/http/tests/media/resources/hls/spanish/
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h
tags/Safari-600.5.3/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm




Diff

Modified: tags/Safari-600.5.3/LayoutTests/ChangeLog (179040 => 179041)

--- tags/Safari-600.5.3/LayoutTests/ChangeLog	2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/ChangeLog	2015-01-24 00:45:38 UTC (rev 179041)
@@ -310,29 +310,6 @@
 
 2015-01-14  Dana Burkart  dburk...@apple.com
 
-Merged r174823. rdar://problem/19424155
-
-2014-10-16  Jer Noble  jer.no...@apple.com
-
-[Mac] Represent AVMediaSelectionOptions as AudioTracks
-https://bugs.webkit.org/show_bug.cgi?id=137474
-
-Reviewed by Brent Fulgham.
-
-* http/tests/media/hls/hls-audio-tracks-expected.txt: Added.
-* http/tests/media/hls/hls-audio-tracks.html: Added.
-* http/tests/media/resources/hls/audio-tracks.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/iframe_index.m3u8: Added.
-* http/tests/media/resources/hls/bipbop/main0.ts: Added.
-* http/tests/media/resources/hls/bipbop/main1.ts: Added.
-* http/tests/media/resources/hls/bipbop/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/french/main.aac: Added.
-* http/tests/media/resources/hls/french/prog_index.m3u8: Added.
-* http/tests/media/resources/hls/spanish/main.aac: Added.
-* http/tests/media/resources/hls/spanish/prog_index.m3u8: Added.
-
-2015-01-14  Dana Burkart  dburk...@apple.com
-
 Merged r174402. rdar://problem/19478358
 
 2014-10-07  Jer Noble  jer.no...@apple.com


Deleted: tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt (179040 => 179041)

--- tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt	2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks-expected.txt	2015-01-24 00:45:38 UTC (rev 179041)
@@ -1,8 +0,0 @@
-
-EVENT(canplaythrough)
-EXPECTED (video.audioTracks.length == '3') OK
-EXPECTED (video.audioTracks[0].enabled == 'true') OK
-EXPECTED (video.audioTracks[1].enabled == 'false') OK
-EXPECTED (video.audioTracks[2].enabled == 'false') OK
-END OF TEST
-


Deleted: tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html (179040 => 179041)

--- tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html	2015-01-24 00:43:38 UTC (rev 179040)
+++ tags/Safari-600.5.3/LayoutTests/http/tests/media/hls/hls-audio-tracks.html	2015-01-24 00:45:38 UTC (rev 179041)
@@ -1,30 +0,0 @@
-!DOCTYPE html
-html
-head
-script src=""
-script src=""
-script
-if (window.testRunner) {
-testRunner.dumpAsText();
-testRunner.waitUntilDone();
-}
-
-function start() {
-video = document.getElementById('video');
-waitForEvent('canplaythrough', canplaythrough);
-video.src = ""
-}
-
-function canplaythrough() {
-testExpected(video.audioTracks.length, 3);
-