Attachment 67146 Details for Bug 45517 – Patch

[patch] Patch

bug-45517-20100910120612.patch (text/plain), 6.17 KB, created by Kent Tamura on 2010-09-09 20:06:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kent Tamura

Created: 2010-09-09 20:06:14 PDT

Size: 6.17 KB

patch

obsolete

>diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
>index e9f6354b8d98a5dbd57d92f6075e2ac60460f8f6..b184dee79ed40b26e0c3b2bf2e4c6a9f7f540c83 100644
>--- a/WebKit/chromium/ChangeLog
>+++ b/WebKit/chromium/ChangeLog
>@@ -1,3 +1,13 @@
>+2010-09-09  Kent Tamura  <tkent@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [DRT/Chromium] Remove dependency to base/string16.h and gfx/codec/png_codec.h
>+        https://bugs.webkit.org/show_bug.cgi?id=45517
>+
>+        * DEPS: Roll Chromium revision to r59033 to have webkit_support_gfx.h.
>+        * WebKit.gyp:
>+
> 2010-09-08  Darin Adler  <darin@apple.com>
> 
>         Reviewed by Adam Barth.
>diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
>index 2fc218bd4fdd9b978e875650ac9ecb332dc8e709..33bb9b240f72f05de83c09b8084ce6506b1a424d 100644
>--- a/WebKit/chromium/DEPS
>+++ b/WebKit/chromium/DEPS
>@@ -32,7 +32,7 @@
> 
> vars = {
>   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
>-  'chromium_rev': '58277',
>+  'chromium_rev': '59033',
> }
> 
> deps = {
>diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
>index 11246fa151fc8a791eac502e257b5716e8144622..032e7bf76943001403d67c4c6fdaa64675ef5e76 100644
>--- a/WebKit/chromium/WebKit.gyp
>+++ b/WebKit/chromium/WebKit.gyp
>@@ -781,7 +781,7 @@
>             'dependencies': [
>                 'webkit',
>                 '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
>-                '<(chromium_src_dir)/gfx/gfx.gyp:gfx',
>+                '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
>             ],
>             'include_dirs': [
>                 '../../JavaScriptCore',
>diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
>index e4fe819fd49768cf0ece531ec2665ba3c4a679c3..81cd1784560a3ae1f79f79e91e6bd49b9e3394f5 100644
>--- a/WebKitTools/ChangeLog
>+++ b/WebKitTools/ChangeLog
>@@ -1,3 +1,19 @@
>+2010-09-09  Kent Tamura  <tkent@chromium.org>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [DRT/Chromium] Remove dependency to base/string16.h and gfx/codec/png_codec.h
>+        https://bugs.webkit.org/show_bug.cgi?id=45517
>+
>+        Use webkit_support_gfx.h for PNG encoding/decoding instead of png_codec.h
>+
>+        * DumpRenderTree/chromium/ImageDiff.cpp:
>+        (Image::craeteFromStdin):
>+        (Image::createFromFilename):
>+        (diffImages):
>+        * DumpRenderTree/chromium/TestShell.cpp:
>+        (TestShell::dumpImage):
>+
> 2010-09-09  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r67119.
>diff --git a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
>index d1adc3deddc4bb10a4408ebbd7a76aeb4e9e76fb..f2875dd99bff01811cc985233c49033fc5edb992 100644
>--- a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
>+++ b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp
>@@ -36,7 +36,7 @@
> 
> #include "config.h"
> 
>-#include "gfx/codec/png_codec.h"
>+#include "webkit/support/webkit_support_gfx.h"
> #include <algorithm>
> #include <stdio.h>
> #include <string.h>
>@@ -49,7 +49,6 @@
> #define PATH_MAX MAX_PATH
> #endif
> 
>-using namespace gfx;
> using namespace std;
> 
> // Causes the app to remain open, waiting for pairs of filenames on stdin.
>@@ -93,8 +92,7 @@ public:
>         if (fread(source.get(), 1, byteLength, stdin) != byteLength)
>             return false;
> 
>-        if (!PNGCodec::Decode(source.get(), byteLength, PNGCodec::FORMAT_RGBA,
>-                              &m_data, &m_width, &m_height)) {
>+        if (!webkit_support::DecodePNG(source.get(), byteLength, &m_data, &m_width, &m_height)) {
>             clear();
>             return false;
>         }
>@@ -118,8 +116,7 @@ public:
> 
>         fclose(f);
> 
>-        if (!PNGCodec::Decode(&compressed[0], compressed.size(),
>-                              PNGCodec::FORMAT_RGBA, &m_data, &m_width, &m_height)) {
>+        if (!webkit_support::DecodePNG(&compressed[0], compressed.size(), &m_data, &m_width, &m_height)) {
>             clear();
>             return false;
>         }
>@@ -353,8 +350,8 @@ int diffImages(const char* file1, const char* file2, const char* outFile)
>         return statusSame;
> 
>     vector<unsigned char> pngData;
>-    PNGCodec::Encode(diffImage.data(), PNGCodec::FORMAT_RGBA, diffImage.width(),
>-                     diffImage.height(), diffImage.width() * 4, false, &pngData);
>+    webkit_support::EncodeRGBAPNG(diffImage.data(), diffImage.width(), diffImage.height(),
>+                                  diffImage.width() * 4, &pngData);
>     if (!writeFile(outFile, &pngData.front(), pngData.size()))
>         return statusError;
>     return statusDifferent;
>diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
>index 4557803b68916e26f115771520db2e89f702c771..fd169d05c5c419a80fa17c93a8dc2a948e5fc2ec 100644
>--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
>+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
>@@ -35,8 +35,6 @@
> #include "DRTDevToolsClient.h"
> #include "LayoutTestController.h"
> #include "WebViewHost.h"
>-#include "base/string16.h"
>-#include "gfx/codec/png_codec.h" // FIXME: Remove dependecy. WebCore/platform/image-encoder is better?
> #include "public/WebDataSource.h"
> #include "public/WebDocument.h"
> #include "public/WebElement.h"
>@@ -55,6 +53,7 @@
> #include "skia/ext/bitmap_platform_device.h"
> #include "skia/ext/platform_canvas.h"
> #include "webkit/support/webkit_support.h"
>+#include "webkit/support/webkit_support_gfx.h"
> #include <algorithm>
> #include <cctype>
> #include <vector>
>@@ -619,10 +618,9 @@ void TestShell::dumpImage(skia::PlatformCanvas* canvas) const
>     // is really expensive.
>     if (md5hash.compare(m_params.pixelHash)) {
>         std::vector<unsigned char> png;
>-        gfx::PNGCodec::ColorFormat colorFormat = gfx::PNGCodec::FORMAT_BGRA;
>-        gfx::PNGCodec::Encode(
>+        webkit_support::EncodeBGRAPNG(
>             reinterpret_cast<const unsigned char*>(sourceBitmap.getPixels()),
>-            colorFormat, sourceBitmap.width(), sourceBitmap.height(),
>+            sourceBitmap.width(), sourceBitmap.height(),
>             static_cast<int>(sourceBitmap.rowBytes()), discardTransparency, &png);
> 
>         m_printer->handleImage(md5hash.c_str(), m_params.pixelHash.c_str(), &png[0], png.size(), m_params.pixelFileName.c_str());

Actions: View | Formatted Diff | Diff

Attachments on bug 45517: 67146