Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove partial implementation of -moz-key-equivalent that was useful for nothing other than crashing. b=265721 r+sr=bzbarsky a=asa

Browse Source
This commit is contained in:
dbaron%dbaron.org 2004-10-24 04:32:21 +00:00
parent 2714454357
commit 52771912ef
15 changed files with 7 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/base/src/nsRuleNode.cpp
View File

@ -2459,22 +2459,6 @@ nsRuleNode::ComputeUIResetData(nsStyleStruct* aStartData,
ui->mUserSelect = parentUI->mUserSelect;
}
// key-equivalent: none, enum XXX, inherit
nsCSSValueList* keyEquiv = uiData.mKeyEquivalent;
if (keyEquiv) {
// XXX need to deal with multiple values
if (eCSSUnit_Enumerated == keyEquiv->mValue.GetUnit()) {
ui->mKeyEquivalent = PRUnichar(0); // XXX To be implemented
}
else if (eCSSUnit_None == keyEquiv->mValue.GetUnit()) {
ui->mKeyEquivalent = PRUnichar(0);
}
else if (eCSSUnit_Inherit == keyEquiv->mValue.GetUnit()) {
inherited = PR_TRUE;
ui->mKeyEquivalent = parentUI->mKeyEquivalent;
}
}
// force-broken-image-icons: integer
if (eCSSUnit_Integer == uiData.mForceBrokenImageIcon.GetUnit()) {
ui->mForceBrokenImageIcon = uiData.mForceBrokenImageIcon.GetIntValue();

5
content/base/src/nsStyleContext.cpp
View File

@ -829,9 +829,8 @@ void nsStyleContext::DumpRegressionData(nsPresContext* aPresContext, FILE* out,
// UIReset
IndentBy(out,aIndent);
const nsStyleUIReset* uiReset = GetStyleUIReset();
fprintf(out, "<uireset data=\"%d %d\" />\n",
(int)uiReset->mUserSelect,
(int)uiReset->mKeyEquivalent);
fprintf(out, "<uireset data=\"%d\" />\n",
(int)uiReset->mUserSelect);
// Column
IndentBy(out,aIndent);

3
content/html/style/src/nsCSSParser.cpp
View File

@ -4381,9 +4381,6 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
case eCSSProperty_letter_spacing:
case eCSSProperty_word_spacing:
return ParseVariant(aErrorCode, aValue, VARIANT_HL | VARIANT_NORMAL, nsnull);
case eCSSProperty_key_equivalent:
return ParseVariant(aErrorCode, aValue, VARIANT_HOK,
nsCSSProps::kKeyEquivalentKTable);
case eCSSProperty_line_height:
return ParsePositiveVariant(aErrorCode, aValue, VARIANT_HLPN | VARIANT_NORMAL, nsnull);
case eCSSProperty_list_style_image:

10
content/html/style/src/nsCSSStruct.cpp
View File

@ -1013,7 +1013,7 @@ void nsCSSContent::List(FILE* out, PRInt32 aIndent) const
// --- nsCSSUserInterface -----------------
nsCSSUserInterface::nsCSSUserInterface(void)
: mKeyEquivalent(nsnull), mCursor(nsnull)
: mCursor(nsnull)
{
MOZ_COUNT_CTOR(nsCSSUserInterface);
}
@ -1022,20 +1022,17 @@ nsCSSUserInterface::nsCSSUserInterface(const nsCSSUserInterface& aCopy)
: mUserInput(aCopy.mUserInput),
mUserModify(aCopy.mUserModify),
mUserSelect(aCopy.mUserSelect),
mKeyEquivalent(nsnull),
mUserFocus(aCopy.mUserFocus),
mCursor(nsnull),
mForceBrokenImageIcon(aCopy.mForceBrokenImageIcon)
{
MOZ_COUNT_CTOR(nsCSSUserInterface);
CSS_IF_COPY(mCursor, nsCSSValueList);
CSS_IF_COPY(mKeyEquivalent, nsCSSValueList);
}
nsCSSUserInterface::~nsCSSUserInterface(void)
{
MOZ_COUNT_DTOR(nsCSSUserInterface);
CSS_IF_DELETE(mKeyEquivalent);
CSS_IF_DELETE(mCursor);
}
@ -1049,11 +1046,6 @@ void nsCSSUserInterface::List(FILE* out, PRInt32 aIndent) const
mUserInput.AppendToString(buffer, eCSSProperty_user_input);
mUserModify.AppendToString(buffer, eCSSProperty_user_modify);
mUserSelect.AppendToString(buffer, eCSSProperty_user_select);
nsCSSValueList* keyEquiv = mKeyEquivalent;
while (nsnull != keyEquiv) {
keyEquiv->mValue.AppendToString(buffer, eCSSProperty_key_equivalent);
keyEquiv= keyEquiv->mNext;
}
mUserFocus.AppendToString(buffer, eCSSProperty_user_focus);
nsCSSValueList* cursor = mCursor;

1
content/shared/public/nsCSSPropList.h
View File

@ -355,7 +355,6 @@ CSS_PROP_FONT(font-weight, font_weight, FontWeight, Font, mWeight, eCSSType_Valu
CSS_PROP_UIRESET(-moz-force-broken-image-icon, force_broken_image_icon, MozForceBrokenImageIcon, UserInterface, mForceBrokenImageIcon, eCSSType_Value, PR_FALSE, nsnull) // bug 58646
CSS_PROP_POSITION(height, height, Height, Position, mHeight, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_LIST(-moz-image-region, image_region, MozImageRegion, List, mImageRegion, eCSSType_Rect, PR_TRUE, nsnull)
CSS_PROP_UIRESET(-moz-key-equivalent, key_equivalent, MozKeyEquivalent, UserInterface, mKeyEquivalent, eCSSType_ValueList, PR_FALSE, kKeyEquivalentKTable) // This will need some other notification, but what? // XXX bug 3935
CSS_PROP_POSITION(left, left, Left, Position, mOffset.mLeft, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_TEXT(letter-spacing, letter_spacing, LetterSpacing, Text, mLetterSpacing, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_TEXT(line-height, line_height, LineHeight, Text, mLineHeight, eCSSType_Value, PR_TRUE, nsnull)

1
content/shared/public/nsStyleStruct.h
View File

@ -1108,7 +1108,6 @@ struct nsStyleUIReset: public nsStyleStruct {
static nsChangeHint MaxDifference();
#endif
PRUnichar mKeyEquivalent; // [reset] XXX what type should this be?
PRUint8 mUserSelect; // [reset] (selection-style)
PRUint8 mForceBrokenImageIcon; // [reset] (0 if not forcing, otherwise forcing)
};

3
content/shared/src/nsStyleStruct.cpp
View File

@ -1732,14 +1732,12 @@ nsChangeHint nsStyleUserInterface::MaxDifference()
nsStyleUIReset::nsStyleUIReset(void)
{
mUserSelect = NS_STYLE_USER_SELECT_AUTO;
mKeyEquivalent = PRUnichar(0); // XXX what type should this be?
mForceBrokenImageIcon = 0;
}
nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
{
mUserSelect = aSource.mUserSelect;
mKeyEquivalent = aSource.mKeyEquivalent;
mForceBrokenImageIcon = aSource.mForceBrokenImageIcon;
}
@ -1751,7 +1749,6 @@ nsChangeHint nsStyleUIReset::CalcDifference(const nsStyleUIReset& aOther) const
{
if (mForceBrokenImageIcon == aOther.mForceBrokenImageIcon) {
if (mUserSelect == aOther.mUserSelect) {
// ignore mKeyEquivalent
return NS_STYLE_HINT_NONE;
}
return NS_STYLE_HINT_VISUAL;

5
dom/public/idl/css/nsIDOMCSS2Properties.idl
View File

@ -406,7 +406,7 @@ interface nsIDOMCSS2Properties : nsISupports
// raises(DOMException) on setting
};
[scriptable, uuid(9156b694-3c27-4e73-9990-f8d8a1634129)]
[scriptable, uuid(71c7f595-fdfe-46d7-8a93-473a1c1fbab3)]
interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
{
/* Non-DOM 2 extensions */
@ -499,9 +499,6 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
attribute DOMString MozImageRegion;
// raises(DOMException) on setting
attribute DOMString MozKeyEquivalent;
// raises(DOMException) on setting
attribute DOMString MozMarginEnd;
// raises(DOMException) on setting

3
layout/style/nsCSSParser.cpp
View File

@ -4381,9 +4381,6 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
case eCSSProperty_letter_spacing:
case eCSSProperty_word_spacing:
return ParseVariant(aErrorCode, aValue, VARIANT_HL | VARIANT_NORMAL, nsnull);
case eCSSProperty_key_equivalent:
return ParseVariant(aErrorCode, aValue, VARIANT_HOK,
nsCSSProps::kKeyEquivalentKTable);
case eCSSProperty_line_height:
return ParsePositiveVariant(aErrorCode, aValue, VARIANT_HLPN | VARIANT_NORMAL, nsnull);
case eCSSProperty_list_style_image:

1
layout/style/nsCSSPropList.h
View File

@ -355,7 +355,6 @@ CSS_PROP_FONT(font-weight, font_weight, FontWeight, Font, mWeight, eCSSType_Valu
CSS_PROP_UIRESET(-moz-force-broken-image-icon, force_broken_image_icon, MozForceBrokenImageIcon, UserInterface, mForceBrokenImageIcon, eCSSType_Value, PR_FALSE, nsnull) // bug 58646
CSS_PROP_POSITION(height, height, Height, Position, mHeight, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_LIST(-moz-image-region, image_region, MozImageRegion, List, mImageRegion, eCSSType_Rect, PR_TRUE, nsnull)
CSS_PROP_UIRESET(-moz-key-equivalent, key_equivalent, MozKeyEquivalent, UserInterface, mKeyEquivalent, eCSSType_ValueList, PR_FALSE, kKeyEquivalentKTable) // This will need some other notification, but what? // XXX bug 3935
CSS_PROP_POSITION(left, left, Left, Position, mOffset.mLeft, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_TEXT(letter-spacing, letter_spacing, LetterSpacing, Text, mLetterSpacing, eCSSType_Value, PR_TRUE, nsnull)
CSS_PROP_TEXT(line-height, line_height, LineHeight, Text, mLineHeight, eCSSType_Value, PR_TRUE, nsnull)

10
layout/style/nsCSSStruct.cpp
View File

@ -1013,7 +1013,7 @@ void nsCSSContent::List(FILE* out, PRInt32 aIndent) const
// --- nsCSSUserInterface -----------------
nsCSSUserInterface::nsCSSUserInterface(void)
: mKeyEquivalent(nsnull), mCursor(nsnull)
: mCursor(nsnull)
{
MOZ_COUNT_CTOR(nsCSSUserInterface);
}
@ -1022,20 +1022,17 @@ nsCSSUserInterface::nsCSSUserInterface(const nsCSSUserInterface& aCopy)
: mUserInput(aCopy.mUserInput),
mUserModify(aCopy.mUserModify),
mUserSelect(aCopy.mUserSelect),
mKeyEquivalent(nsnull),
mUserFocus(aCopy.mUserFocus),
mCursor(nsnull),
mForceBrokenImageIcon(aCopy.mForceBrokenImageIcon)
{
MOZ_COUNT_CTOR(nsCSSUserInterface);
CSS_IF_COPY(mCursor, nsCSSValueList);
CSS_IF_COPY(mKeyEquivalent, nsCSSValueList);
}
nsCSSUserInterface::~nsCSSUserInterface(void)
{
MOZ_COUNT_DTOR(nsCSSUserInterface);
CSS_IF_DELETE(mKeyEquivalent);
CSS_IF_DELETE(mCursor);
}
@ -1049,11 +1046,6 @@ void nsCSSUserInterface::List(FILE* out, PRInt32 aIndent) const
mUserInput.AppendToString(buffer, eCSSProperty_user_input);
mUserModify.AppendToString(buffer, eCSSProperty_user_modify);
mUserSelect.AppendToString(buffer, eCSSProperty_user_select);
nsCSSValueList* keyEquiv = mKeyEquivalent;
while (nsnull != keyEquiv) {
keyEquiv->mValue.AppendToString(buffer, eCSSProperty_key_equivalent);
keyEquiv= keyEquiv->mNext;
}
mUserFocus.AppendToString(buffer, eCSSProperty_user_focus);
nsCSSValueList* cursor = mCursor;

16
layout/style/nsRuleNode.cpp
View File

@ -2459,22 +2459,6 @@ nsRuleNode::ComputeUIResetData(nsStyleStruct* aStartData,
ui->mUserSelect = parentUI->mUserSelect;
}
// key-equivalent: none, enum XXX, inherit
nsCSSValueList* keyEquiv = uiData.mKeyEquivalent;
if (keyEquiv) {
// XXX need to deal with multiple values
if (eCSSUnit_Enumerated == keyEquiv->mValue.GetUnit()) {
ui->mKeyEquivalent = PRUnichar(0); // XXX To be implemented
}
else if (eCSSUnit_None == keyEquiv->mValue.GetUnit()) {
ui->mKeyEquivalent = PRUnichar(0);
}
else if (eCSSUnit_Inherit == keyEquiv->mValue.GetUnit()) {
inherited = PR_TRUE;
ui->mKeyEquivalent = parentUI->mKeyEquivalent;
}
}
// force-broken-image-icons: integer
if (eCSSUnit_Integer == uiData.mForceBrokenImageIcon.GetUnit()) {
ui->mForceBrokenImageIcon = uiData.mForceBrokenImageIcon.GetIntValue();

5
layout/style/nsStyleContext.cpp
View File

@ -829,9 +829,8 @@ void nsStyleContext::DumpRegressionData(nsPresContext* aPresContext, FILE* out,
// UIReset
IndentBy(out,aIndent);
const nsStyleUIReset* uiReset = GetStyleUIReset();
fprintf(out, "<uireset data=\"%d %d\" />\n",
(int)uiReset->mUserSelect,
(int)uiReset->mKeyEquivalent);
fprintf(out, "<uireset data=\"%d\" />\n",
(int)uiReset->mUserSelect);
// Column
IndentBy(out,aIndent);

3
layout/style/nsStyleStruct.cpp
View File

@ -1732,14 +1732,12 @@ nsChangeHint nsStyleUserInterface::MaxDifference()
nsStyleUIReset::nsStyleUIReset(void)
{
mUserSelect = NS_STYLE_USER_SELECT_AUTO;
mKeyEquivalent = PRUnichar(0); // XXX what type should this be?
mForceBrokenImageIcon = 0;
}
nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource)
{
mUserSelect = aSource.mUserSelect;
mKeyEquivalent = aSource.mKeyEquivalent;
mForceBrokenImageIcon = aSource.mForceBrokenImageIcon;
}
@ -1751,7 +1749,6 @@ nsChangeHint nsStyleUIReset::CalcDifference(const nsStyleUIReset& aOther) const
{
if (mForceBrokenImageIcon == aOther.mForceBrokenImageIcon) {
if (mUserSelect == aOther.mUserSelect) {
// ignore mKeyEquivalent
return NS_STYLE_HINT_NONE;
}
return NS_STYLE_HINT_VISUAL;

1
layout/style/nsStyleStruct.h
View File

@ -1108,7 +1108,6 @@ struct nsStyleUIReset: public nsStyleStruct {
static nsChangeHint MaxDifference();
#endif
PRUnichar mKeyEquivalent; // [reset] XXX what type should this be?
PRUint8 mUserSelect; // [reset] (selection-style)
PRUint8 mForceBrokenImageIcon; // [reset] (0 if not forcing, otherwise forcing)
};