Backout changeset d20023a4fda6 (bug 791434) for android R4 orange.
authorMs2ger <ms2ger@gmail.com>
Thu, 20 Sep 2012 13:56:49 +0200
changeset 107733 cf1cd486d60e976c80181a39321ccf7b1eb7758b
parent 107732 8656e7a77c0ec61a9ca40e92929be8634bcc875c
child 107734 ed7b21f9ae6af9deb340df36212642788346a909
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
bugs791434
milestone18.0a1
backs outd20023a4fda696bcc01f7c6a2ed2b96bde9e4fc1
Backout changeset d20023a4fda6 (bug 791434) for android R4 orange.
layout/generic/nsTextFrameThebes.cpp
layout/reftests/text-shadow/basic-opacity-ref.html
layout/reftests/text-shadow/basic-opacity.html
layout/reftests/text-shadow/blur-opacity-ref.html
layout/reftests/text-shadow/blur-opacity.html
layout/reftests/text-shadow/reftest.list
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -5314,31 +5314,29 @@ nsTextFrame::PaintOneShadow(uint32_t aOf
     shadowColor = aShadowDetails->mColor;
     decorationOverrideColor = &shadowColor;
   } else {
     shadowColor = aForegroundColor;
     decorationOverrideColor = nullptr;
   }
 
   aCtx->Save();
-  aCtx->NewPath();
+  aCtx->NewPath(); 
   aCtx->SetColor(gfxRGBA(shadowColor));
 
   // Draw the text onto our alpha-only surface to capture the alpha values.
   // Remember that the box blur context has a device offset on it, so we don't need to
   // translate any coordinates to fit on the surface.
   gfxFloat advanceWidth;
   gfxRect dirtyRect(aDirtyRect.x, aDirtyRect.y,
                     aDirtyRect.width, aDirtyRect.height);
   DrawText(shadowContext, dirtyRect, aFramePt + shadowOffset,
            aTextBaselinePt + shadowOffset, aOffset, aLength, *aProvider,
-           nsTextPaintStyle(this),
-           aCtx == shadowContext ? shadowColor : NS_RGB(0, 0, 0), aClipEdges,
-           advanceWidth, (GetStateBits() & TEXT_HYPHEN_BREAK) != 0,
-           decorationOverrideColor);
+           nsTextPaintStyle(this), shadowColor, aClipEdges, advanceWidth,
+           (GetStateBits() & TEXT_HYPHEN_BREAK) != 0, decorationOverrideColor);
 
   contextBoxBlur.DoPaint();
   aCtx->Restore();
 }
 
 // Paints selection backgrounds and text in the correct colors. Also computes
 // aAllTypes, the union of all selection types that are applying to this text.
 bool
deleted file mode 100644
--- a/layout/reftests/text-shadow/basic-opacity-ref.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div style="position: absolute; top: 33px; left: 33px; color: rgba(0, 0, 255, 0.2); z-index: 0;">Hello</div>
-<div style="position: absolute; top: 30px; left: 30px; color: green; z-index: 1;">Hello</div>
deleted file mode 100644
--- a/layout/reftests/text-shadow/basic-opacity.html
+++ /dev/null
@@ -1,1 +0,0 @@
-<div style="position: absolute; top: 30px; left: 30px; color: green; text-shadow: rgba(0, 0, 255, 0.2) 3px 3px;">Hello</div>
deleted file mode 100644
--- a/layout/reftests/text-shadow/blur-opacity-ref.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<style>
-@font-face {
-  font-family: Ahem;
-  src: url(../fonts/Ahem.ttf);
-}
-</style>
-<div style="font: 16px Ahem; color: transparent; text-shadow: blue 4px 4px 2px; opacity: 0.5">a</div>
deleted file mode 100644
--- a/layout/reftests/text-shadow/blur-opacity.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<style>
-@font-face {
-  font-family: Ahem;
-  src: url(../fonts/Ahem.ttf);
-}
-</style>
-<div style="font: 16px Ahem; color: transparent; text-shadow: rgba(0, 0, 255, 0.5) 4px 4px 2px">a</div>
--- a/layout/reftests/text-shadow/reftest.list
+++ b/layout/reftests/text-shadow/reftest.list
@@ -1,18 +1,16 @@
 == basic.xul basic-ref.xul
 random-if(Android) == basic-negcoord.xul basic-negcoord-ref.xul
 != blur.xul blur-notref.xul
 == color-inherit.xul color-inherit-ref.xul
 == multiple-noblur.xul multiple-noblur-ref.xul
-fuzzy(1,488) HTTP(..) == blur-opacity.html blur-opacity-ref.html
 
 == basic.html basic-ref.html
 == basic-negcoord.html basic-negcoord-ref.html
-== basic-opacity.html basic-opacity-ref.html
 != blur.html blur-notref.html
 == color-inherit.html color-inherit-ref.html
 == color-parserorder.html color-parserorder-ref.html
 == decorations-multiple-zorder.html decorations-multiple-zorder-ref.html
 == multiple-noblur.html multiple-noblur-ref.html
 == quirks-decor-noblur.html quirks-decor-noblur-ref.html
 == standards-decor-noblur.html standards-decor-noblur-ref.html
 == padding-decoration.html padding-decoration-ref.html