Commit 959de6c3 authored by Wes Kocher's avatar Wes Kocher
Browse files

Backed out 9 changesets (bug 1340627) for graphical glitches a=backout 

Backed out changeset 0b1371055c7f (bug 1340627)
Backed out changeset f152be1fadb7 (bug 1340627)
Backed out changeset c691e2ab6a0c (bug 1340627)
Backed out changeset 3cb4bceb8d79 (bug 1340627)
Backed out changeset 026aadd76d06 (bug 1340627)
Backed out changeset fdbd5d281287 (bug 1340627)
Backed out changeset 75fb0d9858a9 (bug 1340627)
Backed out changeset 0d4ec7d38a00 (bug 1340627)
Backed out changeset af6f19870b2a (bug 1340627)

MozReview-Commit-ID: 9dHr7xMZezY

--HG--
rename : gfx/skia/skia/src/core/SkBlitRow.h => gfx/skia/skia/include/core/SkBlitRow.h
rename : gfx/skia/skia/src/effects/SkGaussianEdgeShader.h => gfx/skia/skia/include/effects/SkGaussianEdgeShader.h
rename : gfx/skia/skia/src/xml/SkXMLParser.h => gfx/skia/skia/include/xml/SkXMLParser.h
rename : gfx/skia/skia/include/private/SkMessageBus.h => gfx/skia/skia/src/core/SkMessageBus.h
rename : gfx/skia/skia/src/gpu/ops/GrAAConvexPathRenderer.h => gfx/skia/skia/src/gpu/batches/GrAAConvexPathRenderer.h
rename : gfx/skia/skia/src/gpu/ops/GrAAConvexTessellator.h => gfx/skia/skia/src/gpu/batches/GrAAConvexTessellator.h
rename : gfx/skia/skia/src/gpu/ops/GrAAHairLinePathRenderer.h => gfx/skia/skia/src/gpu/batches/GrAAHairLinePathRenderer.h
rename : gfx/skia/skia/src/gpu/ops/GrAALinearizingConvexPathRenderer.h => gfx/skia/skia/src/gpu/batches/GrAALinearizingConvexPathRenderer.h
rename : gfx/skia/skia/src/gpu/ops/GrPathStencilSettings.h => gfx/skia/skia/src/gpu/batches/GrPathStencilSettings.h
rename : gfx/skia/skia/src/gpu/ops/GrStencilAndCoverPathRenderer.h => gfx/skia/skia/src/gpu/batches/GrStencilAndCoverPathRenderer.h
rename : gfx/skia/skia/include/private/GrGLSL_impl.h => gfx/skia/skia/src/gpu/glsl/GrGLSL_impl.h
extra : source : 761b3f55f10f3df16601ce62e4d15b0c558c0cfb
parent c415d093

CLOBBER

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,4 +22,4 @@ 
# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# don't change CLOBBER for WebIDL changes any more.

# don't change CLOBBER for WebIDL changes any more.





Bug 1340627 - clobber for Skia update
 
Bug 1356927 - Mac builds in automation require a clobber for a change in which ranlib they use

dom/canvas/test/reftest/reftest.list

+1 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ skip-if(!winWidget) pref(webgl.disable-angle,true) == webgl-color-test.html?nat 




# Bug 1255062

# Bug 1255062

== clip-multiple-move-1.html clip-multiple-move-1-ref.html

== clip-multiple-move-1.html clip-multiple-move-1-ref.html

fuzzy-if(skiaContent,1,150) == clip-multiple-move-2.html clip-multiple-move-2-ref.html

== clip-multiple-move-2.html clip-multiple-move-2-ref.html





# Bug 815648

# Bug 815648

== stroketext-shadow.html stroketext-shadow-ref.html

== stroketext-shadow.html stroketext-shadow-ref.html

editor/reftests/reftest.list

+1 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,7 @@ random-if(Android) needs-focus fails-if(stylo) != spellcheck-textarea-property-d 
needs-focus == caret_on_focus.html caret_on_focus-ref.html

needs-focus == caret_on_focus.html caret_on_focus-ref.html

needs-focus fails-if(stylo) != caret_on_textarea_lastline.html caret_on_textarea_lastline-ref.html

needs-focus fails-if(stylo) != caret_on_textarea_lastline.html caret_on_textarea_lastline-ref.html

needs-focus fails-if(stylo) == input-text-onfocus-reframe.html input-text-onfocus-reframe-ref.html

needs-focus fails-if(stylo) == input-text-onfocus-reframe.html input-text-onfocus-reframe-ref.html

fuzzy-if(skiaContent,3,1) needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe-ref.html

needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe-ref.html

needs-focus fails-if(stylo) == caret_after_reframe.html caret_after_reframe-ref.html

needs-focus fails-if(stylo) == caret_after_reframe.html caret_after_reframe-ref.html

== nobogusnode-1.html nobogusnode-ref.html

== nobogusnode-1.html nobogusnode-ref.html

== nobogusnode-2.html nobogusnode-ref.html

== nobogusnode-2.html nobogusnode-ref.html

gfx/2d/DrawTargetSkia.cpp

+210 −87

File changed.

Preview size limit exceeded, changes collapsed.

gfx/2d/DrawTargetSkia.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -205,7 +205,7 @@ private: 




  IntSize mSize;

  IntSize mSize;

  sk_sp<SkSurface> mSurface;

  sk_sp<SkSurface> mSurface;

  SkCanvas* mCanvas;

  sk_sp<SkCanvas> mCanvas;

  SourceSurfaceSkia* mSnapshot;

  SourceSurfaceSkia* mSnapshot;





#ifdef MOZ_WIDGET_COCOA

#ifdef MOZ_WIDGET_COCOA