Changeset 67363 in webkit

Timestamp:

Sep 12, 2010 9:21:26 PM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-09-12 Kent Tamura <​tkent@chromium.org>

Reviewed by Tony Chang.

[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-12 Kent Tamura <​tkent@chromium.org>

Reviewed by Tony Chang.

[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):

Location:

trunk

Files:

• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/DEPS (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp (modified) (5 diffs)
• WebKitTools/DumpRenderTree/chromium/TestShell.cpp (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-09-12  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [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-10  MORITA Hajime  <morrita@google.com>
 

trunk/WebKit/chromium/DEPS

@@ -33 +33 @@
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '58277',
+  'chromium_rev': '59033',
 }
 

trunk/WebKit/chromium/WebKit.gyp

@@ -782 +782 @@
                 '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': [

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-12  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [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-10  MORITA Hajime  <morrita@google.com>
 

trunk/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp

@@ -37 +37 @@
 #include "config.h"
 
-#include "gfx/codec/png_codec.h"
+#include "webkit/support/webkit_support_gfx.h"
 #include <algorithm>
 #include <stdio.h>
@@ -50 +50 @@
 #endif
 
-using namespace gfx;
 using namespace std;
 
@@ -94 +93 @@
             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;
@@ -119 +117 @@
         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;
@@ -354 +351 @@
 
     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;

trunk/WebKitTools/DumpRenderTree/chromium/TestShell.cpp

@@ -36 +36 @@
 #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"
@@ -56 +54 @@
 #include "skia/ext/platform_canvas.h"
 #include "webkit/support/webkit_support.h"
+#include "webkit/support/webkit_support_gfx.h"
 #include <algorithm>
 #include <cctype>
@@ -620 +619 @@
     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);