Backing out e481b6ffc60b (bug 691061) because it breaks 'save as pdf' in Fennec (bug 704185)
authorMark Finkle <mfinkle@mozilla.com>
Fri, 13 Apr 2012 12:30:33 -0400
changeset 94899 aa3b4c2feb4203a4e0975ffac47e6cd7b56b057a
parent 94898 cc61009b3f06dcbdebcae392d4d2376adbdf2b5c
child 94900 018cac438918308ccc7b72fb96c0bff4889f1aff
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs691061, 704185
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backing out e481b6ffc60b (bug 691061) because it breaks 'save as pdf' in Fennec (bug 704185)
gfx/thebes/gfxDrawable.cpp
--- a/gfx/thebes/gfxDrawable.cpp
+++ b/gfx/thebes/gfxDrawable.cpp
@@ -79,31 +79,16 @@ PreparePatternForUntiledDrawing(gfxPatte
         return;
     }
 
     // In theory we can handle this using cairo's EXTEND_PAD,
     // but implementation limitations mean we have to consult
     // the surface type.
     switch (currentTarget->GetType()) {
 
-        // The printing surfaces don't natively support or need
-        // EXTEND_PAD for padding the edges. Using EXTEND_PAD this way
-        // is suboptimal as it will result in the printing surface
-        // creating a new image for each fill operation. The pattern
-        // will be painted to the image to pad out the pattern, then
-        // the new image will be used as the source. This increases
-        // printing time and memory use, and prevents the use of mime
-        // data from cairo_surface_set_mime_data(). Bug 691061.
-        case gfxASurface::SurfaceTypePDF:
-        case gfxASurface::SurfaceTypePS:
-        case gfxASurface::SurfaceTypeWin32Printing:
-            aPattern->SetExtend(gfxPattern::EXTEND_NONE);
-            aPattern->SetFilter(aDefaultFilter);
-            break;
-
 #ifdef MOZ_X11
         case gfxASurface::SurfaceTypeXlib:
         {
             // See bugs 324698, 422179, and 468496.  This is a workaround for
             // XRender's RepeatPad not being implemented correctly on old X
             // servers.
             //
             // In this situation, cairo avoids XRender and instead reads back