Commit fd191873 authored by L. David Baron's avatar L. David Baron
Browse files

Fix serialization bugs with text-decoration:-moz-anchor-decoration. (Bug 481596) r+sr=bzbarsky

parent a9baf2d0

layout/base/nsStyleConsts.h

+4 −2
Original line number Diff line number Diff line
@@ -605,8 +605,10 @@ 
#define NS_STYLE_TEXT_DECORATION_OVERLINE       NS_FONT_DECORATION_OVERLINE

#define NS_STYLE_TEXT_DECORATION_LINE_THROUGH   NS_FONT_DECORATION_LINE_THROUGH

#define NS_STYLE_TEXT_DECORATION_BLINK          0x08

#define NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL   0x10

#define NS_STYLE_TEXT_DECORATION_PREF_ANCHORS   0x20

#define NS_STYLE_TEXT_DECORATION_PREF_ANCHORS   0x10

// OVERRIDE_ALL does not occur in stylesheets; it only comes from HTML

// attribute mapping (and thus appears in computed data)

#define NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL   0x20

#define NS_STYLE_TEXT_DECORATION_LINES_MASK     (NS_STYLE_TEXT_DECORATION_UNDERLINE | NS_STYLE_TEXT_DECORATION_OVERLINE | NS_STYLE_TEXT_DECORATION_LINE_THROUGH)



// See nsStyleText

layout/style/nsCSSDeclaration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty, 
                        "none should be parsed as eCSSUnit_None");

      PRInt32 mask;

      for (mask = NS_STYLE_TEXT_DECORATION_UNDERLINE;

           mask <= NS_STYLE_TEXT_DECORATION_BLINK; 

           mask <= NS_STYLE_TEXT_DECORATION_PREF_ANCHORS; 

           mask <<= 1) {

        if ((mask & intValue) == mask) {

          AppendASCIItoUTF16(nsCSSProps::LookupPropertyValue(aProperty, mask), aResult);

layout/style/test/property_database.js

+1 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ var gCSSProperties = { 
		inherited: false,

		type: CSS_TYPE_LONGHAND,

		initial_values: [ "none" ],

		other_values: [ "underline", "overline", "line-through", "blink line-through underline", "underline overline line-through blink" ],

		other_values: [ "underline", "overline", "line-through", "blink line-through underline", "underline overline line-through blink", "-moz-anchor-decoration", "blink -moz-anchor-decoration" ],

		invalid_values: [ "underline none", "none underline", "line-through blink line-through" ]

	},

	"text-indent": {