Attachment 415598 Details for Bug 312156

[patch] WIP v0.1

text-overflow-v0.1.patch (text/plain), 21.05 KB, created by Makoto Kato [:m_kato]

(hide)

Description:

Filename:

MIME Type:

Creator: Makoto Kato [:m_kato]

Size: 21.05 KB

patch

obsolete

>diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl
>--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
>+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
>@@ -51,7 +51,7 @@
>  * specification; new properties are added to nsIDOMNSCSS2Properties.
>  */
> 
>-[scriptable, uuid(529b987a-cb21-4d58-99d7-9586e7662801)]
>+[scriptable, uuid(7cf11a5f-4be5-4e31-b427-58d82746b5f5)]
> interface nsIDOMCSS2Properties : nsISupports
> {
>            attribute DOMString        azimuth;
>@@ -378,6 +378,9 @@ interface nsIDOMCSS2Properties : nsISupp
>            attribute DOMString        textIndent;
>                                         // raises(DOMException) on setting
> 
>+           attribute DOMString        textOverflow;
>+                                        // raises(DOMException) on setting
>+
>            attribute DOMString        textShadow;
>                                         // raises(DOMException) on setting
> 
>diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
>--- a/layout/base/nsStyleConsts.h
>+++ b/layout/base/nsStyleConsts.h
>@@ -638,6 +638,11 @@
> #define NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_OUT     3
> #define NS_STYLE_TRANSITION_TIMING_FUNCTION_EASE_IN_OUT  4
> 
>+// See nsStyleTextOverflow
>+#define NS_STYLE_TEXT_OVERFLOW_CLIP     0
>+#define NS_STYLE_TEXT_OVERFLOW_ELLIPSIS 1
>+#define NS_STYLE_TEXT_OVERFLOW_STRING   2
>+
> // See nsStyleText
> // Note: these values pickup after the text-align values because there
> // are a few html cases where an object can have both types of
>diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
>--- a/layout/generic/nsTextFrame.h
>+++ b/layout/generic/nsTextFrame.h
>@@ -454,6 +454,8 @@ protected:
>   };
>   TextDecorations GetTextDecorations(nsPresContext* aPresContext);
> 
>+  PRBool HasTextOverflow();
>+
>   // Set non empty rect to aRect, it should be overflow rect or frame rect.
>   // If the result rect is larger than the given rect, this returns PR_TRUE.
>   PRBool CombineSelectionUnderlineRect(nsPresContext* aPresContext,
>diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
>--- a/layout/generic/nsTextFrameThebes.cpp
>+++ b/layout/generic/nsTextFrameThebes.cpp
>@@ -1525,6 +1525,32 @@ GetHyphenTextRun(gfxTextRun* aTextRun, g
>                                       flags);
> }
> 
>+static gfxTextRun*
>+GetEllipsisTextRun(gfxTextRun* aTextRun, gfxContext* aContext, nsTextFrame* aTextFrame)
>+{
>+  nsRefPtr<gfxContext> ctx = aContext;
>+  if (!ctx) {
>+    ctx = GetReferenceRenderingContext(aTextFrame, nsnull);
>+  }
>+  if (!ctx)
>+    return nsnull;
>+
>+  gfxFontGroup* fontGroup = aTextRun->GetFontGroup();
>+  PRUint32 flags = gfxFontGroup::TEXT_IS_PERSISTENT;
>+
>+  static const PRUnichar unicodeEllipsis = 0x2026;
>+  gfxFont *font = fontGroup->GetFontAt(0);
>+  if (font && font->HasCharacter(unicodeEllipsis)) {
>+    return gfxTextRunCache::MakeTextRun(&unicodeEllipsis, 1, fontGroup, ctx,
>+                                        aTextRun->GetAppUnitsPerDevUnit(), flags);
>+  }
>+
>+  static const PRUnichar elipsis[] = L"...";
>+  return gfxTextRunCache::MakeTextRun(elipsis, 3, fontGroup, ctx,
>+                                      aTextRun->GetAppUnitsPerDevUnit(),
>+                                      flags);
>+}
>+
> static gfxFont::Metrics
> GetFirstFontMetrics(gfxFontGroup* aFontGroup)
> {
>@@ -2245,6 +2271,7 @@ public:
>   virtual gfxFloat GetHyphenWidth();
>   virtual void GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
>                                     PRPackedBool* aBreakBefore);
>+  virtual gfxFloat GetEllipsisWidth();
> 
>   void GetSpacingInternal(PRUint32 aStart, PRUint32 aLength, Spacing* aSpacing,
>                           PRBool aIgnoreTabs);
>@@ -2602,6 +2629,19 @@ PropertyProvider::GetHyphenWidth()
>   return mHyphenWidth;
> }
> 
>+gfxFloat
>+PropertyProvider::GetEllipsisWidth()
>+{
>+  gfxFloat width;
>+
>+  gfxTextRunCache::AutoTextRun textRun(GetEllipsisTextRun(mTextRun, nsnull, mFrame));
>+  width = mLetterSpacing;
>+  if (textRun.get()) {
>+    width += textRun->GetAdvanceWidth(0, textRun->GetLength(), nsnull);
>+  }
>+  return width;
>+}
>+
> void
> PropertyProvider::GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
>                                        PRPackedBool* aBreakBefore)
>@@ -4037,6 +4077,21 @@ nsTextFrame::GetTextDecorations(nsPresCo
>   return decorations;
> }
> 
>+PRBool
>+nsTextFrame::HasTextOverflow()
>+{
>+  for (nsStyleContext* context = GetStyleContext();
>+       context && context->HasTextOverflow();
>+       context = context->GetParent()) {
>+    const nsStyleTextReset* styleText = context->GetStyleTextReset();
>+
>+    if (styleText->mTextOverflow.mType != NS_STYLE_TEXT_OVERFLOW_CLIP) {
>+      return PR_TRUE;
>+    }
>+  }
>+  return PR_FALSE;
>+}
>+
> void
> nsTextFrame::UnionTextDecorationOverflow(nsPresContext* aPresContext,
>                                          PropertyProvider& aProvider,
>@@ -4458,6 +4513,24 @@ AddHyphenToMetrics(nsTextFrame* aTextFra
>   aMetrics->CombineWith(hyphenMetrics, aBaseTextRun->IsRightToLeft());
> }
> 
>+static void
>+AddEllipsisToMetrics(nsTextFrame* aTextFrame, gfxTextRun* aBaseTextRun,
>+                     gfxTextRun::Metrics* aMetrics,
>+                     gfxFont::BoundingBoxType aBoundingBoxType,
>+                     gfxContext* aContext)
>+{
>+  // Fix up metrics to include hyphen
>+  gfxTextRunCache::AutoTextRun hyphenTextRun(
>+    GetEllipsisTextRun(aBaseTextRun, aContext, aTextFrame));
>+  if (!hyphenTextRun.get())
>+    return;
>+
>+  gfxTextRun::Metrics hyphenMetrics =
>+    hyphenTextRun->MeasureText(0, hyphenTextRun->GetLength(),
>+                               aBoundingBoxType, aContext, nsnull);
>+  aMetrics->CombineWith(hyphenMetrics, aBaseTextRun->IsRightToLeft());
>+}
>+
> void
> nsTextFrame::PaintOneShadow(PRUint32 aOffset, PRUint32 aLength,
>                             nsCSSShadowItem* aShadowDetails,
>@@ -4474,6 +4547,9 @@ nsTextFrame::PaintOneShadow(PRUint32 aOf
>   if (GetStateBits() & TEXT_HYPHEN_BREAK) {
>     AddHyphenToMetrics(this, mTextRun, &shadowMetrics, gfxFont::LOOSE_INK_EXTENTS, aCtx);
>   }
>+//  if (HasTextOverflow()) {
>+//    AddEllipsisToMetrics(this, mTextRun, &shadowMetrics, gfxFont::LOOSE_INK_EXTENTS, aCtx);
>+//  }
> 
>   // This rect is the box which is equivalent to where the shadow will be painted.
>   // The origin of mBoundingBox is the text baseline left, so we must translate it by
>@@ -4802,13 +4878,61 @@ nsTextFrame::PaintText(nsIRenderingConte
>                        textPaintStyle, provider);
> }
> 
>+/**
>+ * Compute the longest prefix of text whose width is <= aWidth. Return
>+ * the length of the prefix. Also returns the width of the prefix in aFitWidth.
>+ */
>+static PRUint32
>+CountCharsFit(gfxTextRun* aTextRun, PRUint32 aStart, PRUint32 aLength,
>+              gfxFloat aWidth, PropertyProvider* aProvider,
>+              gfxFloat* aFitWidth)
>+{
>+  PRUint32 last = 0;
>+  gfxFloat width = 0;
>+  PRUint32 i;
>+  for (i = 1; i <= aLength; ++i) {
>+    if (i == aLength || aTextRun->IsClusterStart(aStart + i)) {
>+      gfxFloat nextWidth = width +
>+          aTextRun->GetAdvanceWidth(aStart + last, i - last, aProvider);
>+      if (nextWidth > aWidth)
>+        break;
>+      last = i;
>+      width = nextWidth;
>+    }
>+  }
>+  *aFitWidth = width;
>+  return last;
>+}
>+
> void
> nsTextFrame::DrawText(gfxContext* aCtx, const gfxPoint& aTextBaselinePt,
>                       PRUint32 aOffset, PRUint32 aLength,
>                       const gfxRect* aDirtyRect, PropertyProvider* aProvider,
>                       gfxFloat& aAdvanceWidth, PRBool aDrawSoftHyphen)
> {
>-  // Paint the text and soft-hyphen (if any) onto the given graphics context
>+  PRBool drawEllipsis = PR_FALSE;
>+
>+  if (HasTextOverflow()) {
>+    if (!GetStyleText()->WhiteSpaceIsSignificant()) {
>+      // Recalc text width
>+      gfxFloat width = GetParent()->GetSize().width;
>+      gfxFloat fitWidth;
>+      PRUint32 charsFit = CountCharsFit(mTextRun, aOffset, aLength, width, aProvider, &fitWidth);
>+
>+      if (charsFit != aLength) {
>+        drawEllipsis = PR_TRUE;
>+
>+        if (fitWidth + aProvider->GetEllipsisWidth() > width) {
>+            // need more space for ellipsis
>+            width -= aProvider->GetEllipsisWidth();
>+            aLength = CountCharsFit(mTextRun, aOffset, aLength, width, aProvider, &fitWidth);
>+        } else {
>+            aLength = charsFit;
>+        }
>+      }
>+    }
>+  }
>+  // Paint the text, soft-hyphen (if any) and ellipsis onto the given graphics context
>   mTextRun->Draw(aCtx, aTextBaselinePt, aOffset, aLength,
>                  aDirtyRect, aProvider, &aAdvanceWidth);
> 
>@@ -4825,6 +4949,16 @@ nsTextFrame::DrawText(gfxContext* aCtx, 
>                           0, hyphenTextRun->GetLength(), aDirtyRect, nsnull, nsnull);
>     }
>   }
>+
>+  if (drawEllipsis) {
>+    gfxTextRunCache::AutoTextRun ellipsisTextRun(GetEllipsisTextRun(mTextRun, nsnull, this));
>+    if (ellipsisTextRun.get()) {
>+      gfxFloat ellipsisBaselineX = aTextBaselinePt.x + mTextRun->GetDirection() * aAdvanceWidth -
>+        (mTextRun->IsRightToLeft() ? ellipsisTextRun->GetAdvanceWidth(0, ellipsisTextRun->GetLength(), nsnull) : 0);
>+      ellipsisTextRun->Draw(aCtx, gfxPoint(ellipsisBaselineX, aTextBaselinePt.y),
>+                          0, ellipsisTextRun->GetLength(), aDirtyRect, nsnull, nsnull);
>+    }
>+  }
> }
> 
> PRInt16
>@@ -4872,32 +5006,6 @@ nsTextFrame::IsVisibleInSelection(nsISel
>   return found;
> }
> 
>-/**
>- * Compute the longest prefix of text whose width is <= aWidth. Return
>- * the length of the prefix. Also returns the width of the prefix in aFitWidth.
>- */
>-static PRUint32
>-CountCharsFit(gfxTextRun* aTextRun, PRUint32 aStart, PRUint32 aLength,
>-              gfxFloat aWidth, PropertyProvider* aProvider,
>-              gfxFloat* aFitWidth)
>-{
>-  PRUint32 last = 0;
>-  gfxFloat width = 0;
>-  PRUint32 i;
>-  for (i = 1; i <= aLength; ++i) {
>-    if (i == aLength || aTextRun->IsClusterStart(aStart + i)) {
>-      gfxFloat nextWidth = width +
>-          aTextRun->GetAdvanceWidth(aStart + last, i - last, aProvider);
>-      if (nextWidth > aWidth)
>-        break;
>-      last = i;
>-      width = nextWidth;
>-    }
>-  }
>-  *aFitWidth = width;
>-  return last;
>-}
>-
> nsIFrame::ContentOffsets
> nsTextFrame::CalcContentOffsetsFromFramePoint(nsPoint aPoint)
> {
>@@ -6262,6 +6370,7 @@ nsTextFrame::Reflow(nsPresContext*      
>   }
>   PRUint32 transformedLastBreak = 0;
>   PRBool usedHyphenation;
>+  PRBool usedEllipsis = PR_FALSE;
>   gfxFloat trimmedWidth = 0;
>   gfxFloat availWidth = aReflowState.availableWidth;
>   PRBool canTrimTrailingWhitespace = !textStyle->WhiteSpaceIsSignificant();
>diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
>--- a/layout/style/nsCSSKeywordList.h
>+++ b/layout/style/nsCSSKeywordList.h
>@@ -225,6 +225,7 @@ CSS_KEY(center-right, center_right)
> CSS_KEY(ch, ch)
> CSS_KEY(circle, circle)
> CSS_KEY(cjk-ideographic, cjk_ideographic)
>+CSS_KEY(clip, clip)
> CSS_KEY(close-quote, close_quote)
> CSS_KEY(closest-corner, closest_corner)
> CSS_KEY(closest-side, closest_side)
>@@ -264,6 +265,7 @@ CSS_KEY(ease-out, ease_out)
> CSS_KEY(element, element)
> CSS_KEY(elements, elements)
> CSS_KEY(ellipse, ellipse)
>+CSS_KEY(ellipsis, ellipsis)
> CSS_KEY(em, em)
> CSS_KEY(embed, embed)
> CSS_KEY(enabled, enabled)
>diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
>--- a/layout/style/nsCSSParser.cpp
>+++ b/layout/style/nsCSSParser.cpp
>@@ -6022,6 +6022,9 @@ CSSParserImpl::ParseSingleValueProperty(
>     return ParseTextDecoration(aValue);
>   case eCSSProperty_text_indent:
>     return ParseVariant(aValue, VARIANT_HLP, nsnull);
>+  case eCSSProperty_text_overflow:
>+    return ParseVariant(aValue, VARIANT_HK | VARIANT_STRING,
>+                        nsCSSProps::kTextOverflowKTable);
>   case eCSSProperty_text_transform:
>     return ParseVariant(aValue, VARIANT_HK,
>                         nsCSSProps::kTextTransformKTable);
>diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
>--- a/layout/style/nsCSSPropList.h
>+++ b/layout/style/nsCSSPropList.h
>@@ -2302,6 +2302,17 @@ CSS_PROP_TEXT(
>     nsnull,
>     offsetof(nsStyleText, mTextIndent),
>     eStyleAnimType_Coord)
>+CSS_PROP_TEXTRESET(
>+    text-overflow,
>+    text_overflow,
>+    TextOverflow,
>+    0,
>+    Text,
>+    mTextOverflow,
>+    eCSSType_Value,
>+    kTextOverflowKTable,
>+    CSS_PROP_NO_OFFSET,
>+    eStyleAnimType_None)
> CSS_PROP_TEXT(
>     text-shadow,
>     text_shadow,
>diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
>--- a/layout/style/nsCSSProps.cpp
>+++ b/layout/style/nsCSSProps.cpp
>@@ -1148,6 +1148,12 @@ const PRInt32 nsCSSProps::kTextDecoratio
>   eCSSKeyword_UNKNOWN,-1
> };
> 
>+const PRInt32 nsCSSProps::kTextOverflowKTable[] = {
>+  eCSSKeyword_clip, NS_STYLE_TEXT_OVERFLOW_CLIP,
>+  eCSSKeyword_ellipsis, NS_STYLE_TEXT_OVERFLOW_ELLIPSIS,
>+  eCSSKeyword_UNKNOWN, -1
>+};
>+
> const PRInt32 nsCSSProps::kTextTransformKTable[] = {
>   eCSSKeyword_none, NS_STYLE_TEXT_TRANSFORM_NONE,
>   eCSSKeyword_capitalize, NS_STYLE_TEXT_TRANSFORM_CAPITALIZE,
>diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
>--- a/layout/style/nsCSSProps.h
>+++ b/layout/style/nsCSSProps.h
>@@ -305,6 +305,7 @@ public:
>   static const PRInt32 kTableLayoutKTable[];
>   static const PRInt32 kTextAlignKTable[];
>   static const PRInt32 kTextDecorationKTable[];
>+  static const PRInt32 kTextOverflowKTable[];
>   static const PRInt32 kTextTransformKTable[];
>   static const PRInt32 kTransitionTimingFunctionKTable[];
>   static const PRInt32 kUnicodeBidiKTable[];
>diff --git a/layout/style/nsCSSStruct.h b/layout/style/nsCSSStruct.h
>--- a/layout/style/nsCSSStruct.h
>+++ b/layout/style/nsCSSStruct.h
>@@ -340,6 +340,7 @@ struct nsCSSText : public nsCSSStruct  {
>   nsCSSValue mLetterSpacing;
>   nsCSSValue mVerticalAlign;
>   nsCSSValue mTextTransform;
>+  nsCSSValue mTextOverflow;
>   nsCSSValue mTextAlign;
>   nsCSSValue mTextIndent;
>   nsCSSValue mDecoration;
>diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
>--- a/layout/style/nsComputedDOMStyle.cpp
>+++ b/layout/style/nsComputedDOMStyle.cpp
>@@ -2453,6 +2453,25 @@ nsComputedDOMStyle::GetTextIndent(nsIDOM
> }
> 
> nsresult
>+nsComputedDOMStyle::GetTextOverflow(nsIDOMCSSValue** aValue)
>+{
>+  nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
>+  NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
>+
>+  const nsStyleTextReset *text = GetStyleTextReset();
>+
>+  if (text->mTextOverflow.mType == NS_STYLE_TEXT_OVERFLOW_STRING) {
>+    val->SetString(nsDependentString(text->mTextOverflow.mString));
>+  } else {
>+    val->SetIdent(
>+      nsCSSProps::ValueToKeywordEnum(text->mTextOverflow.mType,
>+                                     nsCSSProps::kTextOverflowKTable));
>+  }
>+
>+  return CallQueryInterface(val, aValue);
>+}
>+
>+nsresult
> nsComputedDOMStyle::GetTextShadow(nsIDOMCSSValue** aValue)
> {
>   return GetCSSShadowArray(GetStyleText()->mTextShadow,
>@@ -4481,6 +4500,7 @@ nsComputedDOMStyle::GetQueryableProperty
>     COMPUTED_STYLE_MAP_ENTRY(text_align,                    TextAlign),
>     COMPUTED_STYLE_MAP_ENTRY(text_decoration,               TextDecoration),
>     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(text_indent,            TextIndent),
>+    COMPUTED_STYLE_MAP_ENTRY(text_overflow,                 TextOverflow),
>     COMPUTED_STYLE_MAP_ENTRY(text_shadow,                   TextShadow),
>     COMPUTED_STYLE_MAP_ENTRY(text_transform,                TextTransform),
>     COMPUTED_STYLE_MAP_ENTRY_LAYOUT(top,                    Top),
>diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
>--- a/layout/style/nsComputedDOMStyle.h
>+++ b/layout/style/nsComputedDOMStyle.h
>@@ -281,6 +281,7 @@ private:
>   nsresult GetTextAlign(nsIDOMCSSValue** aValue);
>   nsresult GetTextDecoration(nsIDOMCSSValue** aValue);
>   nsresult GetTextIndent(nsIDOMCSSValue** aValue);
>+  nsresult GetTextOverflow(nsIDOMCSSValue** aValue);
>   nsresult GetTextTransform(nsIDOMCSSValue** aValue);
>   nsresult GetTextShadow(nsIDOMCSSValue** aValue);
>   nsresult GetLetterSpacing(nsIDOMCSSValue** aValue);
>diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
>--- a/layout/style/nsRuleNode.cpp
>+++ b/layout/style/nsRuleNode.cpp
>@@ -3398,6 +3398,18 @@ nsRuleNode::ComputeTextResetData(void* a
>     text->mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE;
>   }
> 
>+  // text-overflow: enum, string, inherit, initial
>+  if (eCSSUnit_String == textData.mTextOverflow.GetUnit()) {
>+    nsAutoString  value;
>+    textData.mTextOverflow.GetStringValue(value);
>+    text->mTextOverflow.mType = NS_STYLE_TEXT_OVERFLOW_STRING;
>+    text->mTextOverflow.mString = NS_strdup(value.get());
>+  } else
>+    SetDiscrete(textData.mTextOverflow, text->mTextOverflow.mType,
>+                canStoreInRuleTree,
>+                SETDSC_ENUMERATED, parentText->mTextOverflow.mType,
>+                NS_STYLE_TEXT_OVERFLOW_CLIP, 0, 0, 0, 0);
>+
>   // unicode-bidi: enum, inherit, initial
>   SetDiscrete(textData.mUnicodeBidi, text->mUnicodeBidi, canStoreInRuleTree,
>               SETDSC_ENUMERATED, parentText->mUnicodeBidi,
>diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp
>--- a/layout/style/nsStyleContext.cpp
>+++ b/layout/style/nsStyleContext.cpp
>@@ -328,6 +328,16 @@ nsStyleContext::ApplyStyleFixups(nsPresC
>       mBits |= NS_STYLE_HAS_TEXT_DECORATIONS;
>   }
> 
>+  // See if we have any text overflow.
>+  if (mParent && mParent->HasTextOverflow())
>+    mBits |= NS_STYLE_HAS_TEXT_OVERFLOW;
>+  else {
>+    // We might have defined a overflow.
>+    const nsStyleTextReset* text = GetStyleTextReset();
>+    if (text->mTextOverflow.mType != NS_STYLE_TEXT_OVERFLOW_CLIP)
>+      mBits |= NS_STYLE_HAS_TEXT_OVERFLOW;
>+  }
>+
>   if ((mParent && mParent->HasPseudoElementData()) || mPseudoTag) {
>     mBits |= NS_STYLE_HAS_PSEUDO_ELEMENT_DATA;
>   }
>diff --git a/layout/style/nsStyleContext.h b/layout/style/nsStyleContext.h
>--- a/layout/style/nsStyleContext.h
>+++ b/layout/style/nsStyleContext.h
>@@ -117,6 +117,9 @@ public:
>   PRBool HasTextDecorations() const
>     { return !!(mBits & NS_STYLE_HAS_TEXT_DECORATIONS); }
> 
>+  PRBool HasTextOverflow() const
>+    { return !!(mBits & NS_STYLE_HAS_TEXT_OVERFLOW); }
>+
>   // Does this style context represent the style for a pseudo-element or
>   // inherit data from such a style context?  Whether this returns true
>   // is equivalent to whether it or any of its ancestors returns
>diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
>--- a/layout/style/nsStyleStruct.cpp
>+++ b/layout/style/nsStyleStruct.cpp
>@@ -2282,7 +2282,8 @@ nsStyleTextReset::~nsStyleTextReset(void
> nsChangeHint nsStyleTextReset::CalcDifference(const nsStyleTextReset& aOther) const
> {
>   if (mVerticalAlign == aOther.mVerticalAlign
>-      && mUnicodeBidi == aOther.mUnicodeBidi) {
>+      && mUnicodeBidi == aOther.mUnicodeBidi
>+      && mTextOverflow == aOther.mTextOverflow) {
>     if (mTextDecoration != aOther.mTextDecoration) {
>       // Reflow for blink changes, repaint for others
>       return
>diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
>--- a/layout/style/nsStyleStruct.h
>+++ b/layout/style/nsStyleStruct.h
>@@ -83,6 +83,8 @@ class imgIContainer;
> #define NS_STYLE_HAS_TEXT_DECORATIONS     0x01000000
> // See nsStyleContext::HasPseudoElementData.
> #define NS_STYLE_HAS_PSEUDO_ELEMENT_DATA  0x02000000
>+// See nsStyleContext::HasTextOverflow
>+#define NS_STYLE_HAS_TEXT_OVERFLOW        0x04000000
> 
> // Additional bits for nsRuleNode's mDependentBits:
> #define NS_RULE_NODE_GC_MARK              0x02000000
>@@ -1066,6 +1068,36 @@ struct nsStylePosition {
>   nsStyleCoord  mZIndex;                // [reset] integer, auto
> };
> 
>+struct nsStyleTextOverflow {
>+  nsStyleTextOverflow(void) : mType(NS_STYLE_TEXT_OVERFLOW_CLIP), mString(nsnull) { };
>+  ~nsStyleTextOverflow(void) { if (mString) NS_Free(mString); };
>+  nsStyleTextOverflow(const nsStyleTextOverflow& aOther)
>+  {
>+    mType = aOther.mType;
>+    mString = aOther.mString ? NS_strdup(aOther.mString) : nsnull;
>+  };
>+  nsStyleTextOverflow& operator=(const nsStyleTextOverflow& aOther)
>+  {
>+    mType = aOther.mType;
>+    mString = aOther.mString ? NS_strdup(aOther.mString) : nsnull;
>+  };
>+
>+  PRBool operator==(const nsStyleTextOverflow& aOther) const
>+  {
>+    if (mType == aOther.mType &&
>+       (mType != NS_STYLE_TEXT_OVERFLOW_STRING || !nsCRT::strcmp(mString, aOther.mString)))
>+        return PR_TRUE;
>+    return PR_FALSE;
>+  }
>+
>+  PRBool operator!=(const nsStyleTextOverflow& aOther) const {
>+    return !(*this == aOther);
>+  }
>+
>+  PRUnichar *mString;
>+  PRUint8    mType;
>+};
>+
> struct nsStyleTextReset {
>   nsStyleTextReset(void);
>   nsStyleTextReset(const nsStyleTextReset& aOther);
>@@ -1089,6 +1121,7 @@ struct nsStyleTextReset {
>   PRUint8 mUnicodeBidi;                 // [reset] see nsStyleConsts.h
> 
>   nsStyleCoord  mVerticalAlign;         // [reset] coord, percent, enum (see nsStyleConsts.h)
>+  nsStyleTextOverflow mTextOverflow;    // [reset] see nsStyleConsts.h
> };
> 
> struct nsStyleText {
>diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
>--- a/layout/style/test/property_database.js
>+++ b/layout/style/test/property_database.js
>@@ -1932,6 +1932,14 @@ var gCSSProperties = {
> 		other_values: [ "2em", "5%", "-10px" ],
> 		invalid_values: []
> 	},
>+	"text-overflow": {
>+		domProp: "textOverflow",
>+		inherited: false,
>+		type: CSS_TYOE_LONGHAND,
>+		initial_values: [ "clip" ],
>+		other_values: ["ellipsis"],
>+		invalid_values: []
>+	},
> 	"text-shadow": {
> 		domProp: "textShadow",
> 		inherited: true,

Actions: View | Diff | Review

Attachments on bug 312156: 202163 | 291668 | 325795 | 326877 | 332428 | 387396 | 415598 | 430563 | 506179 | 525811 | 525909 | 528013 | 528014 | 528515 | 529421 | 529422 | 529429 | 529430 | 529431 | 529432 | 529449 | 530808 | 530811 | 530813 | 530898 | 530899 | 530900 | 530943 | 530945 | 530946 | 531219 | 531392 | 531423 | 531429 | 531430 | 531435 | 531438 | 531440 | 531442 | 531443 | 531722 | 532058 | 532060 | 532062 | 532064 | 532432 | 532469 | 532470 | 532471 | 532472 | 532473 | 532474 | 532475 | 532527 | 533723 | 533727 | 533730 | 533731 | 533737 | 533743 | 534500 | 534502 | 534503 | 535675 | 535676 | 535677 | 535678 | 536379 | 536388 | 536389 | 536397 | 536399 | 536452 | 536453 | 536982 | 536985 | 537027 | 537032 | 537633 | 537637 | 538787 | 538788 | 538790 | 539047 | 540029 | 540653 | 540704