Title: [99491] trunk/Source/WebCore
- Revision
- 99491
- Author
- [email protected]
- Date
- 2011-11-07 15:39:29 -0800 (Mon, 07 Nov 2011)
Log Message
Unreviewed Windows build fix after r99468.
* css/CSSPrimitiveValue.h: Unmark single-argument constructors
as explicit, since this conflicts with the template constructors
in CSSPrimitiveValueMappings.h.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99490 => 99491)
--- trunk/Source/WebCore/ChangeLog 2011-11-07 23:25:52 UTC (rev 99490)
+++ trunk/Source/WebCore/ChangeLog 2011-11-07 23:39:29 UTC (rev 99491)
@@ -1,3 +1,11 @@
+2011-11-07 Andreas Kling <[email protected]>
+
+ Unreviewed Windows build fix after r99468.
+
+ * css/CSSPrimitiveValue.h: Unmark single-argument constructors
+ as explicit, since this conflicts with the template constructors
+ in CSSPrimitiveValueMappings.h.
+
2011-11-07 Jer Noble <[email protected]>
Build fix due to a erroneous search-and-replace.
@@ -3031,6 +3039,24 @@
2011-11-03 Andreas Kling <[email protected]>
+ CSSRuleList: Move rule orphaning from deleteRule() out to callers.
+ https://bugs.webkit.org/show_bug.cgi?id=71470
+
+ Reviewed by Antti Koivisto.
+
+ Rule parenting is the responsibility of the owner rule (the rule containing
+ the rule list), so move parent clearing out of CSSRuleList::deleteRule() and
+ into the (two) call sites.
+
+ * css/CSSMediaRule.cpp:
+ (WebCore::CSSMediaRule::deleteRule):
+ * css/CSSRuleList.cpp:
+ (WebCore::CSSRuleList::deleteRule):
+ * css/WebKitCSSKeyframesRule.cpp:
+ (WebCore::WebKitCSSKeyframesRule::deleteRule):
+
+2011-11-03 Andreas Kling <[email protected]>
+
Unreviewed build fix, sigh.
* css/CSSFontFaceRule.h:
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (99490 => 99491)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2011-11-07 23:25:52 UTC (rev 99490)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2011-11-07 23:39:29 UTC (rev 99491)
@@ -220,9 +220,9 @@
private:
CSSPrimitiveValue();
// FIXME: int vs. unsigned overloading is too subtle to distinguish the color and identifier cases.
- explicit CSSPrimitiveValue(int ident);
- explicit CSSPrimitiveValue(unsigned color); // RGB value
- explicit CSSPrimitiveValue(const Length&);
+ CSSPrimitiveValue(int ident);
+ CSSPrimitiveValue(unsigned color); // RGB value
+ CSSPrimitiveValue(const Length&);
CSSPrimitiveValue(const String&, UnitTypes);
CSSPrimitiveValue(double, UnitTypes);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
