Title: [221684] trunk/Source/WebCore
- Revision
- 221684
- Author
- [email protected]
- Date
- 2017-09-06 10:47:29 -0700 (Wed, 06 Sep 2017)
Log Message
[Win] Compile errors in Document::updateTitleElement.
https://bugs.webkit.org/show_bug.cgi?id=176381
Reviewed by Alex Christensen.
MSVC is not able to compile the statement:
'auto result = boolExpression ? lambda1 : lambda2;'
where 'lambda1' and 'lambda2' have the same signature.
* dom/Document.cpp:
(WebCore::findHTMLTitle):
(WebCore::isHTMLTitle):
(WebCore::isHTMLTitleEligible):
(WebCore::findSVGTitle):
(WebCore::isSVGTitle):
(WebCore::isSVGTitleEligible):
(WebCore::Document::updateTitleElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (221683 => 221684)
--- trunk/Source/WebCore/ChangeLog 2017-09-06 17:30:50 UTC (rev 221683)
+++ trunk/Source/WebCore/ChangeLog 2017-09-06 17:47:29 UTC (rev 221684)
@@ -1,3 +1,23 @@
+2017-09-06 Per Arne Vollan <[email protected]>
+
+ [Win] Compile errors in Document::updateTitleElement.
+ https://bugs.webkit.org/show_bug.cgi?id=176381
+
+ Reviewed by Alex Christensen.
+
+ MSVC is not able to compile the statement:
+ 'auto result = boolExpression ? lambda1 : lambda2;'
+ where 'lambda1' and 'lambda2' have the same signature.
+
+ * dom/Document.cpp:
+ (WebCore::findHTMLTitle):
+ (WebCore::isHTMLTitle):
+ (WebCore::isHTMLTitleEligible):
+ (WebCore::findSVGTitle):
+ (WebCore::isSVGTitle):
+ (WebCore::isSVGTitleEligible):
+ (WebCore::Document::updateTitleElement):
+
2017-09-06 Brent Fulgham <[email protected]>
Deny third-party cookie creation for prevalent resources without interaction
Modified: trunk/Source/WebCore/dom/Document.cpp (221683 => 221684)
--- trunk/Source/WebCore/dom/Document.cpp 2017-09-06 17:30:50 UTC (rev 221683)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-09-06 17:47:29 UTC (rev 221684)
@@ -1542,28 +1542,38 @@
updateTitle({ title, LTR });
}
-void Document::updateTitleElement(Element& changingTitleElement)
+static Element* findHTMLTitle(Document& document)
{
- auto findHTMLTitle = [] (Document& document) -> Element* {
- return descendantsOfType<HTMLTitleElement>(document).first();
- };
- auto isHTMLTitle = [] (Element& element) {
- return is<HTMLTitleElement>(element);
- };
- auto isHTMLTitleEligible = [] (Element& element) {
- return element.isConnected() && !element.isInShadowTree();
- };
+ return descendantsOfType<HTMLTitleElement>(document).first();
+};
- auto findSVGTitle = [] (Document& document) -> Element* {
- return childrenOfType<SVGTitleElement>(*document.documentElement()).first();
- };
- auto isSVGTitle = [] (Element& element) {
- return is<SVGTitleElement>(element);
- };
- auto isSVGTitleEligible = [] (Element& element) {
- return element.parentNode() == element.document().documentElement();
- };
+static bool isHTMLTitle(Element& element)
+{
+ return is<HTMLTitleElement>(element);
+};
+static bool isHTMLTitleEligible(Element& element)
+{
+ return element.isConnected() && !element.isInShadowTree();
+};
+
+static Element* findSVGTitle(Document& document)
+{
+ return childrenOfType<SVGTitleElement>(*document.documentElement()).first();
+};
+
+static bool isSVGTitle(Element& element)
+{
+ return is<SVGTitleElement>(element);
+};
+
+static bool isSVGTitleEligible(Element& element)
+{
+ return element.parentNode() == element.document().documentElement();
+};
+
+void Document::updateTitleElement(Element& changingTitleElement)
+{
// Most documents use HTML title rules.
// Documents with SVG document elements use SVG title rules.
bool useSVGTitle = is<SVGSVGElement>(documentElement());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
