Title: [114696] trunk/Source/WebCore
- Revision
- 114696
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-19 16:54:49 -0700 (Thu, 19 Apr 2012)
Log Message
[Cairo] Remove rgb24-hacks.txt and scale-removal.txt
https://bugs.webkit.org/show_bug.cgi?id=83475
Patch by Martin Robinson <mrobin...@igalia.com> on 2012-04-19
Reviewed by Daniel Bates.
No new tests. This does not change functionality.
Remove some obsolete patch files for Cairo that were used in some
very old versions of Safari for Windows.
* platform/graphics/cairo/rgb24-hacks.txt: Removed.
* platform/graphics/cairo/scale-removal.txt: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114695 => 114696)
--- trunk/Source/WebCore/ChangeLog 2012-04-19 23:52:46 UTC (rev 114695)
+++ trunk/Source/WebCore/ChangeLog 2012-04-19 23:54:49 UTC (rev 114696)
@@ -1,3 +1,18 @@
+2012-04-19 Martin Robinson <mrobin...@igalia.com>
+
+ [Cairo] Remove rgb24-hacks.txt and scale-removal.txt
+ https://bugs.webkit.org/show_bug.cgi?id=83475
+
+ Reviewed by Daniel Bates.
+
+ No new tests. This does not change functionality.
+
+ Remove some obsolete patch files for Cairo that were used in some
+ very old versions of Safari for Windows.
+
+ * platform/graphics/cairo/rgb24-hacks.txt: Removed.
+ * platform/graphics/cairo/scale-removal.txt: Removed.
+
2012-04-19 Peter Beverloo <pe...@chromium.org>
Use sqrtf instead of sqrt in CanvasRenderingContext2D.cpp
Deleted: trunk/Source/WebCore/platform/graphics/cairo/rgb24-hacks.txt (114695 => 114696)
--- trunk/Source/WebCore/platform/graphics/cairo/rgb24-hacks.txt 2012-04-19 23:52:46 UTC (rev 114695)
+++ trunk/Source/WebCore/platform/graphics/cairo/rgb24-hacks.txt 2012-04-19 23:54:49 UTC (rev 114696)
@@ -1,32 +0,0 @@
-Index: cairo/src/cairo-win32-surface.c
-===================================================================
---- cairo/src/cairo-win32-surface.c (revision 14498)
-+++ cairo/src/cairo-win32-surface.c (working copy)
-@@ -824,8 +824,13 @@
- * to figure out when we can use GDI. We don't have that checking
- * anywhere at the moment, so just bail and use the fallback
- * paths. */
-- if (surface->format != CAIRO_FORMAT_RGB24)
-- return CAIRO_INT_STATUS_UNSUPPORTED;
-+ //if (surface->format != CAIRO_FORMAT_RGB24)
-+ // return CAIRO_INT_STATUS_UNSUPPORTED;
-+ // FIXME: We'll go ahead and optimize this now and just assume we're ok if
-+ // the color has no alpha. Probably need to check various composite operators to
-+ // get this exactly right.
-+ if (color->alpha != 1.0)
-+ return CAIRO_INT_STATUS_UNSUPPORTED;
-
- /* Optimize for no destination alpha (surface->pixman_image is non-NULL for all
- * surfaces with alpha.)
-@@ -1016,8 +1021,9 @@
-
- /* We can only handle operator SOURCE or OVER with the destination
- * having no alpha */
-- if ((op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_OVER) ||
-- (dst->format != CAIRO_FORMAT_RGB24))
-+ if ((op != CAIRO_OPERATOR_SOURCE && op != CAIRO_OPERATOR_OVER))
-+ // FIXME: It's not clear why ExtTextOut can't be called when the
-+ // destination has alpha. Remove the RGB24 restriction. || (dst->format != CAIRO_FORMAT_RGB24))
- return CAIRO_INT_STATUS_UNSUPPORTED;
-
- /* If we have a fallback mask clip set on the dst, we have
Deleted: trunk/Source/WebCore/platform/graphics/cairo/scale-removal.txt (114695 => 114696)
--- trunk/Source/WebCore/platform/graphics/cairo/scale-removal.txt 2012-04-19 23:52:46 UTC (rev 114695)
+++ trunk/Source/WebCore/platform/graphics/cairo/scale-removal.txt 2012-04-19 23:54:49 UTC (rev 114696)
@@ -1,13 +0,0 @@
-Index: cairo/src/cairo-win32-private.h
-===================================================================
---- cairo/src/cairo-win32-private.h (revision 14582)
-+++ cairo/src/cairo-win32-private.h (working copy)
-@@ -39,7 +39,7 @@
- #include <cairo-win32.h>
- #include <cairoint.h>
-
--#define WIN32_FONT_LOGICAL_SCALE 32
-+#define WIN32_FONT_LOGICAL_SCALE 1
-
- typedef struct _cairo_win32_surface {
- cairo_surface_t base;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
