Implementation of the GreenWeb language extensions.

third_party/WebKit/Source/core/style/ComputedStyle.cpp

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 6cef0714c8c54393249ab3155b0119353ac869b3..ed934121e07bff8fc350a0065f809f3f53ad2e6e 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -68,11 +68,11 @@ struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
     } inherited_flags;
 
     struct NonInheritedFlags {
-        unsigned m_bitfields[2];
+        unsigned m_bitfields[3]; // at most 96 bits
     } noninherited_flags;
 };
 
-static_assert(sizeof(ComputedStyle) == sizeof(SameSizeAsComputedStyle), "ComputedStyle should stay small");
+static_assert(sizeof(ComputedStyle) <= sizeof(SameSizeAsComputedStyle), "ComputedStyle should stay small");
 
 PassRefPtr<ComputedStyle> ComputedStyle::create()
 {
@@ -110,7 +110,7 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle()
 {
     setBitDefaults(); // Would it be faster to copy this from the default style?
     static_assert((sizeof(InheritedFlags) <= 8), "InheritedFlags should not grow");
-    static_assert((sizeof(NonInheritedFlags) <= 8), "NonInheritedFlags should not grow");
+    static_assert((sizeof(NonInheritedFlags) <= 12), "NonInheritedFlags should not grow");
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(InitialStyleTag)
@@ -256,6 +256,17 @@ void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other)
     noninherited_flags.pageBreakInside = other.noninherited_flags.pageBreakInside;
     noninherited_flags.hasRemUnits = other.noninherited_flags.hasRemUnits;
 
+    noninherited_flags.OnclickQoSType = other.noninherited_flags.OnclickQoSType;
+    noninherited_flags.OnclickQoSVduration= other.noninherited_flags.OnclickQoSVduration;
+    noninherited_flags.OnscrollQoSType = other.noninherited_flags.OnscrollQoSType;
+    noninherited_flags.OnscrollQoSVduration= other.noninherited_flags.OnscrollQoSVduration;
+    noninherited_flags.OntouchstartQoSType = other.noninherited_flags.OntouchstartQoSType;
+    noninherited_flags.OntouchstartQoSVduration= other.noninherited_flags.OntouchstartQoSVduration;
+    noninherited_flags.OntouchendQoSType = other.noninherited_flags.OntouchendQoSType;
+    noninherited_flags.OntouchendQoSVduration= other.noninherited_flags.OntouchendQoSVduration;
+    noninherited_flags.OntouchmoveQoSType = other.noninherited_flags.OntouchmoveQoSType;
+    noninherited_flags.OntouchmoveQoSVduration= other.noninherited_flags.OntouchmoveQoSVduration;
+
     // Correctly set during selector matching:
     // noninherited_flags.styleType
     // noninherited_flags.pseudoBits