Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(531)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 1835303002: Implementation of the GreenWeb language extensions. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change GreenWeb-related CSS property names such that they apply in the desired order at runtime. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index c4f0ede35f0eab737422471c78fdadbbc3db2db8..8ba5271df32f6343c723627075eec7420c190442 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -285,6 +285,20 @@ protected:
mutable unsigned hasRemUnits : 1;
// If you add more style bits here, you will also need to update ComputedStyle::copyNonInheritedFromCached()
// 63 bits
+
+ // GreenWeb QoS flags
+ // continuous: true (1, CONTINUOUS), single: false (0, DISCRETE). Here is what we defined: enum EQoSType { DISCRETE, CONTINUOUS };
+ unsigned OnclickQoSType : 1;
+ // long: true (1, LONG), short: false (0, SHORT). Here is what we defined: enum EQoSDuration { SHORT, LONG };
+ unsigned OnclickQoSVduration : 1;
+ unsigned OnscrollQoSType : 1;
+ unsigned OnscrollQoSVduration : 1;
+ unsigned OntouchstartQoSType : 1;
+ unsigned OntouchstartQoSVduration : 1;
+ unsigned OntouchendQoSType : 1;
+ unsigned OntouchendQoSVduration : 1;
+ unsigned OntouchmoveQoSType : 1;
+ unsigned OntouchmoveQoSVduration : 1;
} noninherited_flags;
// !END SYNC!
@@ -335,6 +349,16 @@ protected:
noninherited_flags.affectedByDrag = false;
noninherited_flags.isLink = false;
noninherited_flags.hasRemUnits = false;
+ noninherited_flags.OnclickQoSType = false;
+ noninherited_flags.OnclickQoSVduration = false;
+ noninherited_flags.OnscrollQoSType = true;
+ noninherited_flags.OnscrollQoSVduration = false;
+ noninherited_flags.OntouchstartQoSType = false;
+ noninherited_flags.OntouchstartQoSVduration = false;
+ noninherited_flags.OntouchendQoSType = false;
+ noninherited_flags.OntouchendQoSVduration = false;
+ noninherited_flags.OntouchmoveQoSType = true;
+ noninherited_flags.OntouchmoveQoSVduration = false;
}
private:
@@ -453,6 +477,31 @@ public:
// attribute getter methods
+ EOnclickType onclickType() const { return static_cast<EOnclickType>(noninherited_flags.OnclickQoSType); }
+ EOnclickVduration onclickVduration() const { return static_cast<EOnclickVduration>(noninherited_flags.OnclickQoSVduration); }
+ int onclickVpi() const { return rareNonInheritedData->m_onclickVpi; }
+ int onclickVpu() const { return rareNonInheritedData->m_onclickVpu; }
+
+ EOnscrollType onscrollType() const { return static_cast<EOnscrollType>(noninherited_flags.OnscrollQoSType); }
+ EOnscrollVduration onscrollVduration() const { return static_cast<EOnscrollVduration>(noninherited_flags.OnscrollQoSVduration); }
+ int onscrollVpi() const { return rareNonInheritedData->m_onscrollVpi; }
+ int onscrollVpu() const { return rareNonInheritedData->m_onscrollVpu; }
+
+ EOntouchstartType ontouchstartType() const { return static_cast<EOntouchstartType>(noninherited_flags.OntouchstartQoSType); }
+ EOntouchstartVduration ontouchstartVduration() const { return static_cast<EOntouchstartVduration>(noninherited_flags.OntouchstartQoSVduration); }
+ int ontouchstartVpi() const { return rareNonInheritedData->m_ontouchstartVpi; }
+ int ontouchstartVpu() const { return rareNonInheritedData->m_ontouchstartVpu; }
+
+ EOntouchendType ontouchendType() const { return static_cast<EOntouchendType>(noninherited_flags.OntouchendQoSType); }
+ EOntouchendVduration ontouchendVduration() const { return static_cast<EOntouchendVduration>(noninherited_flags.OntouchendQoSVduration); }
+ int ontouchendVpi() const { return rareNonInheritedData->m_ontouchendVpi; }
+ int ontouchendVpu() const { return rareNonInheritedData->m_ontouchendVpu; }
+
+ EOntouchmoveType ontouchmoveType() const { return static_cast<EOntouchmoveType>(noninherited_flags.OntouchmoveQoSType); }
+ EOntouchmoveVduration ontouchmoveVduration() const { return static_cast<EOntouchmoveVduration>(noninherited_flags.OntouchmoveQoSVduration); }
+ int ontouchmoveVpi() const { return rareNonInheritedData->m_ontouchmoveVpi; }
+ int ontouchmoveVpu() const { return rareNonInheritedData->m_ontouchmoveVpu; }
+
EDisplay display() const { return static_cast<EDisplay>(noninherited_flags.effectiveDisplay); }
EDisplay originalDisplay() const { return static_cast<EDisplay>(noninherited_flags.originalDisplay); }
@@ -987,7 +1036,142 @@ public:
bool hasWillChangeTransformHint() const;
bool subtreeWillChangeContents() const { return rareInheritedData->m_subtreeWillChangeContents; }
-// attribute setter methods
+ // attribute setter methods
+
+ void setOnclickType(EOnclickType v)
+ {
+ noninherited_flags.OnclickQoSType = v;
+ if (v == DISCRETE) {
+ setOnclickVpi(100);
+ setOnclickVpu(300);
+ } else {
+ ASSERT(v == CONTINUOUS);
+ setOnclickVpi(16);
+ setOnclickVpu(33);
+ }
+ }
+ void setOnclickVduration(EOnclickVduration v)
+ {
+ noninherited_flags.OnclickQoSVduration = v;
+ if (v == SHORT) {
+ setOnclickVpi(100);
+ setOnclickVpu(300);
+ } else {
+ ASSERT(v == LONG);
+ setOnclickVpi(1000);
+ setOnclickVpu(10000);
+ }
+ }
+ void setOnclickVpi(int pi) { if (pi >= 0) { SET_VAR(rareNonInheritedData, m_onclickVpi, pi); } }
+ void setOnclickVpu(int pu) { if (pu >= 0) { SET_VAR(rareNonInheritedData, m_onclickVpu, pu); } }
+
+ void setOnscrollType(EOnscrollType v)
+ {
+ noninherited_flags.OnscrollQoSType = v;
+ if (v == DISCRETE) {
+ setOnscrollVpi(100);
+ setOnscrollVpu(300);
+ } else {
+ ASSERT(v == CONTINUOUS);
+ setOnscrollVpi(16);
+ setOnscrollVpu(33);
+ }
+ }
+ void setOnscrollVduration(EOnscrollVduration v)
+ {
+ noninherited_flags.OnscrollQoSVduration = v;
+ if (v == SHORT) {
+ setOnscrollVpi(100);
+ setOnscrollVpu(300);
+ } else {
+ ASSERT(v == LONG);
+ setOnscrollVpi(1000);
+ setOnscrollVpu(10000);
+ }
+ }
+ void setOnscrollVpi(int pi) { if (pi >= 0) { SET_VAR(rareNonInheritedData, m_onscrollVpi, pi); } }
+ void setOnscrollVpu(int pu) { if (pu >= 0) { SET_VAR(rareNonInheritedData, m_onscrollVpu, pu); } }
+
+ void setOntouchstartType(EOntouchstartType v)
+ {
+ noninherited_flags.OntouchstartQoSType = v;
+ if (v == DISCRETE) {
+ setOntouchstartVpi(100);
+ setOntouchstartVpu(300);
+ } else {
+ ASSERT(v == CONTINUOUS);
+ setOntouchstartVpi(16);
+ setOntouchstartVpu(33);
+ }
+ }
+ void setOntouchstartVduration(EOntouchstartVduration v)
+ {
+ noninherited_flags.OntouchstartQoSVduration = v;
+ if (v == SHORT) {
+ setOntouchstartVpi(100);
+ setOntouchstartVpu(300);
+ } else {
+ ASSERT(v == LONG);
+ setOntouchstartVpi(1000);
+ setOntouchstartVpu(10000);
+ }
+ }
+ void setOntouchstartVpi(int pi) { if (pi >= 0) { SET_VAR(rareNonInheritedData, m_ontouchstartVpi, pi); } }
+ void setOntouchstartVpu(int pu) { if (pu >= 0) { SET_VAR(rareNonInheritedData, m_ontouchstartVpu, pu); } }
+
+ void setOntouchendType(EOntouchendType v)
+ {
+ noninherited_flags.OntouchendQoSType = v;
+ if (v == DISCRETE) {
+ setOntouchendVpi(100);
+ setOntouchendVpu(300);
+ } else {
+ ASSERT(v == CONTINUOUS);
+ setOntouchendVpi(16);
+ setOntouchendVpu(33);
+ }
+ }
+ void setOntouchendVduration(EOntouchendVduration v)
+ {
+ noninherited_flags.OntouchendQoSVduration = v;
+ if (v == SHORT) {
+ setOntouchendVpi(100);
+ setOntouchendVpu(300);
+ } else {
+ ASSERT(v == LONG);
+ setOntouchendVpi(1000);
+ setOntouchendVpu(10000);
+ }
+ }
+ void setOntouchendVpi(int pi) { if (pi >= 0) { SET_VAR(rareNonInheritedData, m_ontouchendVpi, pi); } }
+ void setOntouchendVpu(int pu) { if (pu >= 0) { SET_VAR(rareNonInheritedData, m_ontouchendVpu, pu); } }
+
+ void setOntouchmoveType(EOntouchmoveType v)
+ {
+ noninherited_flags.OntouchmoveQoSType = v;
+ if (v == DISCRETE) {
+ setOntouchmoveVpi(100);
+ setOntouchmoveVpu(300);
+ } else {
+ ASSERT(v == CONTINUOUS);
+ setOntouchmoveVpi(16);
+ setOntouchmoveVpu(33);
+ }
+ }
+ void setOntouchmoveVduration(EOntouchmoveVduration v)
+ {
+ noninherited_flags.OntouchmoveQoSVduration = v;
+ if (v == SHORT) {
+ setOntouchmoveVpi(100);
+ setOntouchmoveVpu(300);
+ } else {
+ ASSERT(v == LONG);
+ setOntouchmoveVpi(1000);
+ setOntouchmoveVpu(10000);
+ }
+ }
+ void setOntouchmoveVpi(int pi) { if (pi >= 0) { SET_VAR(rareNonInheritedData, m_ontouchmoveVpi, pi); } }
+ void setOntouchmoveVpu(int pu) { if (pu >= 0) { SET_VAR(rareNonInheritedData, m_ontouchmoveVpu, pu); } }
void setDisplay(EDisplay v) { noninherited_flags.effectiveDisplay = v; }
void setOriginalDisplay(EDisplay v) { noninherited_flags.originalDisplay = v; }
@@ -1607,6 +1791,31 @@ public:
bool hasAuthorBorder() const { return rareNonInheritedData->m_hasAuthorBorder; };
// Initial values for all the properties
+ static EOnclickType initialOnclickType() { return DISCRETE; }
+ static EOnclickVduration initialOnclickVduration() { return SHORT; }
+ static int initialOnclickVpi() { return 100; }
+ static int initialOnclickVpu() { return 300; }
+
+ static EOnscrollType initialOnscrollType() { return CONTINUOUS; }
+ static EOnscrollVduration initialOnscrollVduration() { return SHORT; }
+ static int initialOnscrollVpi() { return 16; }
+ static int initialOnscrollVpu() { return 33; }
+
+ static EOntouchstartType initialOntouchstartType() { return DISCRETE; }
+ static EOntouchstartVduration initialOntouchstartVduration() { return SHORT; }
+ static int initialOntouchstartVpi() { return 100; }
+ static int initialOntouchstartVpu() { return 300; }
+
+ static EOntouchendType initialOntouchendType() { return DISCRETE; }
+ static EOntouchendVduration initialOntouchendVduration() { return SHORT; }
+ static int initialOntouchendVpi() { return 100; }
+ static int initialOntouchendVpu() { return 300; }
+
+ static EOntouchmoveType initialOntouchmoveType() { return CONTINUOUS; }
+ static EOntouchmoveVduration initialOntouchmoveVduration() { return SHORT; }
+ static int initialOntouchmoveVpi() { return 16; }
+ static int initialOntouchmoveVpu() { return 33; }
+
static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
static EBorderStyle initialBorderStyle() { return BNONE; }
static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698