[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 693f9df977b46e795dfc347eec27ff7ba904fab0
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 20:43:36 2010 +0000

    Fix my badly-merged ChangeLog entry.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df00585..e7dde79 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -55,7 +55,7 @@
         * platform/graphics/filters/FEComposite.cpp:
         (WebCore::FEComposite::apply):
 
-2010-08-17  Stephen White  <senorblanco at chromium.org>
+2010-08-18  Stephen White  <senorblanco at chromium.org>
 
         Reviewed by Darin Fisher.
 
@@ -89,42 +89,6 @@
         * platform/graphics/skia/NativeImageSkia.h:
         Implement a new constructor that shallow-copies the given SkBitmap.
 
-<<<<<<< .mine
-2010-08-17  Stephen White  <senorblanco at chromium.org>
-
-        Reviewed by Darin Fisher.
-
-        [CHROMIUM] Eliminate a memcpy() from the canvas.drawImage(canvas, ...) path.
-        https://bugs.webkit.org/show_bug.cgi?id=44115
-        This is the Skia followup to Dave Hyatt's patch in r65449.
-
-        Covered by canvas layout tests.
-
-        * platform/graphics/skia/BitmapImageSingleFrameSkia.h:
-        Add a "copyPixels" argument to the create() static to indicate if
-        the caller wants the pixels to be copied or ref'ed.
-        * platform/graphics/skia/ImageBufferSkia.cpp:
-        (WebCore::ImageBuffer::drawsUsingCopy):
-        We don't use the always-copy path anymore, so return false.
-        (WebCore::ImageBuffer::copyImage):
-        Force a copy here.
-        (WebCore::ImageBuffer::draw):
-        (WebCore::ImageBuffer::drawPattern):
-        Create a temporary BitampImageSingleFrameSkia wrapped around the
-        canvas's bitmap, and draw with it immediately.  If drawing to our own
-        canvas, copy the pixels, otherwise just shallow copy.
-        * platform/graphics/skia/ImageSkia.cpp:
-        (WebCore::BitmapImageSingleFrameSkia::BitmapImageSingleFrameSkia):
-        Make the constructor take an SkBitmap to be wrapped.
-        (WebCore::BitmapImageSingleFrameSkia::create):
-        Implement the "copyPixels" flag:  if true, do a deep copy, otherwise
-        do a shallow copy.
-        * platform/graphics/skia/NativeImageSkia.cpp:
-        (WebCore::NativeImageSkia::NativeImageSkia):
-        * platform/graphics/skia/NativeImageSkia.h:
-        Implement a new constructor that shallow-copies the given SkBitmap.
-
-=======
 2010-08-18  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
 
         Reviewed by Steve Block.

-- 
WebKit Debian packaging