Title: [185515] tags/Safari-601.1.35/Source/WebCore
- Revision
- 185515
- Author
- [email protected]
- Date
- 2015-06-12 11:19:10 -0700 (Fri, 12 Jun 2015)
Log Message
Merge r185501. rdar://problem/21129111
Modified Paths
Diff
Modified: tags/Safari-601.1.35/Source/WebCore/ChangeLog (185514 => 185515)
--- tags/Safari-601.1.35/Source/WebCore/ChangeLog 2015-06-12 17:53:35 UTC (rev 185514)
+++ tags/Safari-601.1.35/Source/WebCore/ChangeLog 2015-06-12 18:19:10 UTC (rev 185515)
@@ -1,3 +1,18 @@
+2015-06-12 Matthew Hanson <[email protected]>
+
+ Merge r185501. rdar://problem/21129111
+
+ 2015-06-12 Yoav Weiss <[email protected]>
+
+ Fix the build when the PICTURE_SIZES flag is off
+ https://bugs.webkit.org/show_bug.cgi?id=145926
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests since there's no functionality change.
+
+ * html/parser/HTMLPreloadScanner.cpp: Remove the guard around the definition of m_sizesAttribute.
+
2015-06-12 Babak Shafiei <[email protected]>
Custom patch to turn off ENABLE_PICTURE_SIZES. rdar://problem/21129111
Modified: tags/Safari-601.1.35/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (185514 => 185515)
--- tags/Safari-601.1.35/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-06-12 17:53:35 UTC (rev 185514)
+++ tags/Safari-601.1.35/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-06-12 18:19:10 UTC (rev 185515)
@@ -235,9 +235,7 @@
TagId m_tagId;
String m_urlToLoad;
String m_srcSetAttribute;
-#if ENABLE(PICTURE_SIZES)
String m_sizesAttribute;
-#endif
String m_charset;
String m_crossOriginMode;
bool m_linkIsStyleSheet;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
