Updated to 15.0 and engmail to 1.4.4

[packages/thunderbird.git] / system-cairo.patch

diff --git a/system-cairo.patch b/system-cairo.patch
index 9ae0888005edb047de5f9f4166545599ed8fa811..d3958220f1295df279a2d71fcddc17ede1739685 100644 (file)
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -25,21 +25,16 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
  {
    void *userData = aSurface->GetData(&kSourceSurface);
  
-@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
-         NS_RUNTIMEABORT("Invalid surface format!");
-     }
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
  
-     srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
-                                                      IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
-                                                      imgSurface->Stride(),
-                                                      format);
+     }
  
 -    cairo_surface_t *nullSurf =
 -      cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
 -    cairo_surface_set_user_data(nullSurf,
--                              &kSourceSurface,
--                              imgSurface,
--                              NULL);
+-                                &kSourceSurface,
+-                                imgSurface,
+-                                NULL);
 -    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
 -    cairo_surface_destroy(nullSurf);
 +    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
@@ -47,8 +42,3 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
    }
  
    srcBuffer->AddRef();
-   aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
- 
-   return srcBuffer;
- }
-