Title: [91532] trunk/Source/WebCore/ChangeLog
Revision
91532
Author
[email protected]
Date
2011-07-21 17:00:47 -0700 (Thu, 21 Jul 2011)

Log Message

Changelog fix for 91496

Modified Paths


Diff

Modified: trunk/Source/WebCore/ChangeLog (91531 => 91532)


--- trunk/Source/WebCore/ChangeLog	2011-07-21 23:53:30 UTC (rev 91531)
+++ trunk/Source/WebCore/ChangeLog	2011-07-22 00:00:47 UTC (rev 91532)
@@ -42,47 +42,6 @@
         * rendering/RenderBlock.cpp:
         (WebCore::RenderBlock::MarginInfo::MarginInfo):
 
-2011-07-19  Matthew Delaney  <[email protected]>
-
-        Add fast path for ImageBuffer::draw
-        https://bugs.webkit.org/show_bug.cgi?id=64535
-
-        Reviewed by Simon Fraser.
-
-        No new tests. This patch doesn't change behavior; current tests are sufficient.
-
-        * platform/graphics/GraphicsContext.cpp:
-        (WebCore::GraphicsContext::drawImage): Moved the main method version next to wrapper versions.
-
-        * platform/graphics/ImageBuffer.h:
-        1) Added BackingStoreCopy enum for choosing to copy backing store or not in copyImage().
-        2) Added copyNativeImage() behind USE(CG) - same as copyImage() but gives NativeImagePtr.
-        * platform/graphics/cg/ImageBufferCG.cpp: Added new methods described above.
-
-        * platform/graphics/GraphicsContext.h: Adding drawNativeImage() for fast draw path.
-        * platform/graphics/cg/GraphicsContextCG.cpp:
-        (WebCore::GraphicsContext::drawNativeImage): Added. Draws a nativeImagePtr into context.
-
-        * platform/graphics/Image.h: Added imageWithColorSpace behind CG platform ifdef
-        * platform/graphics/cg/ImageCG.cpp:
-        (WebCore::BitmapImage::draw): Refactored out actual image drawing code into GraphicsContext,
-        so that it can be used by more than just BitmapImage without having to copy code.
-        (WebCore::Image::imageWithColorSpace): Made into an Image class function.
-
-        Updated copyImage() to for BackingStoreCopy:
-        * platform/graphics/qt/ImageBufferQt.cpp
-        * platform/graphics/filters/FETile.cpp
-        * platform/graphics/cairo/ImageBufferCairo.cpp
-        * platform/graphics/skia/ImageBufferSkia.cpp
-        * platform/graphics/wx/ImageBufferWx.cpp
-        * platform/graphics/wince/ImageBufferWinCE.cpp
-        * svg/SVGFEImageElement.cpp
-        * svg/graphics/SVGImage.cpp
-        * html/HTMLCanvasElement.cpp
-        * html/canvas/WebGLRenderingContext.cpp
-        * rendering/svg/RenderSVGResourcePattern.cpp
-
-<<<<<<< .mine
 2011-07-21  Matthew Delaney  <[email protected]>
 
         Add fast path for ImageBuffer::draw, Take 2.
@@ -110,7 +69,7 @@
         so that it can be used by more than just BitmapImage without having to copy code.
         (WebCore::Image::imageWithColorSpace): Made into an Image class function.
 
-        Updated copyImage() to for BackingStoreCopy:
+        Updated copyImage() to use BackingStoreCopy:
         * platform/graphics/qt/ImageBufferQt.cpp
         * platform/graphics/filters/FETile.cpp
         * platform/graphics/cairo/ImageBufferCairo.cpp
@@ -123,7 +82,6 @@
         * html/canvas/WebGLRenderingContext.cpp
         * rendering/svg/RenderSVGResourcePattern.cpp
 
-=======
 2011-07-21  David Kilzer  <[email protected]>
 
         <http://webkit.org/b/64972> Clean up generated HTMLEntityTable.cpp output
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to