Title: [201152] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 201152
- Author
- [email protected]
- Date
- 2016-05-19 01:41:15 -0700 (Thu, 19 May 2016)
Log Message
Merge r201103. rdar://problem/26339922
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201151 => 201152)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-19 08:41:12 UTC (rev 201151)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-19 08:41:15 UTC (rev 201152)
@@ -1,5 +1,16 @@
2016-05-19 Babak Shafiei <[email protected]>
+ Merge r201103. rdar://problem/26339922
+
+ 2016-05-18 Simon Fraser <[email protected]>
+
+ Remove logging inadvertently committed in r201090.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParserContext::CSSParserContext): Deleted.
+
+2016-05-19 Babak Shafiei <[email protected]>
+
Merge r200651. rdar://problem/26188642
2016-05-10 Joseph Pecoraro <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/css/CSSParser.cpp (201151 => 201152)
--- branches/safari-602.1.32-branch/Source/WebCore/css/CSSParser.cpp 2016-05-19 08:41:12 UTC (rev 201151)
+++ branches/safari-602.1.32-branch/Source/WebCore/css/CSSParser.cpp 2016-05-19 08:41:15 UTC (rev 201152)
@@ -272,7 +272,6 @@
useLegacyBackgroundSizeShorthandBehavior = settings->useLegacyBackgroundSizeShorthandBehavior();
#if ENABLE(IOS_TEXT_AUTOSIZING)
textAutosizingEnabled = settings->textAutosizingEnabled();
- WTFLogAlways("CSSParserContext %p CSSParserContext textAutosizingEnabled=%d", this, textAutosizingEnabled);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes