Merge 193326 "Revert of Add helper to validate JPEG decode subsa..."

Merge 193326 "Revert of Add helper to validate JPEG decode subsa..."

> Revert of Add helper to validate JPEG decode subsampling factors (patchset #1 id:1 of https://codereview.chromium.org/1039503003/)
>
> Reason for revert:
> Per the bug, Factor 3 images are acceptable to libjpeg6b and users can even create them using its well-known cjpeg tool.
>
> Original issue's description:
> > Add helper to validate JPEG subsampling factors
> >
> > Use it to turn the invalid horizontal/vertical subsampling factor 3 to a
> > 1, which is fine for both the YUV decoding path (it won't turn on if any
> > of the component subsamplings is 3) and the normal JPEG decode path.
> >
> > TEST=Covered by the test added in r192900
> > BUG=398235
> >
> > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=192980
>
> TBR=sugoi@chromium.org,reveman@chromium.org,pdr@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=398235
>
> Review URL: https://codereview.chromium.org/1069083003

git-svn-id: svn://svn.chromium.org/blink/trunk@193326 bbb929c8-8fbe-4397-9dbb-9b2b20218538
(cherry picked from commit 8a5bed0d225efcb2e7fbd96deb2b0307bff04679)

Merge blink r193326 into M43 branch 2357

TBR=vangelis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=486508

[Noel Gordon, 2015-05-22 08:00:12]

The CQ bit was checked by noel@chromium.org

[commit-bot: I haz the power, 2015-05-22 08:00:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1152183003/1

[commit-bot: I haz the power, 2015-05-22 08:00:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-22 08:00:55]

Failed to apply patch for
Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
  Hunk #1 FAILED at 299.
  Hunk #2 FAILED at 411.
  Hunk #3 FAILED at 448.
  3 out of 3 hunks FAILED -- saving rejects to file
Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp.rej

Patch:       Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
Index: Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
diff --git a/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
b/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index
a244c936b78683a5cd049947106e37ce9377d05c..87923f6ef115839345b8e5b49ddfe3ad0c117ade
100644
--- a/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -299,21 +299,6 @@ static yuv_subsampling yuvSubsampling(const
jpeg_decompress_struct& info)
     return YUV_UNKNOWN;
 }
 
-bool validateSubsampling(const jpeg_decompress_struct* cinfo)
-{
-    ASSERT(cinfo->num_components);
-
-    jpeg_component_info* component = cinfo->comp_info;
-    for (int c = 0; c < cinfo->num_components; ++c, ++component) {
-        if (component->h_samp_factor == 3)
-            component->h_samp_factor = 1;
-        if (component->v_samp_factor == 3)
-            component->v_samp_factor = 1;
-    }
-
-    return true;
-}
-
 class JPEGImageReader {
     WTF_MAKE_FAST_ALLOCATED(JPEGImageReader);
 public:
@@ -411,7 +396,6 @@ public:
             return m_decoder->setFailed();
 
         J_COLOR_SPACE overrideColorSpace = JCS_UNKNOWN;
-
         switch (m_state) {
         case JPEG_HEADER:
             // Read file parameters with jpeg_read_header().
@@ -448,9 +432,6 @@ public:
                 return m_decoder->setFailed();
             }
 
-            if (!validateSubsampling(&m_info))
-                return m_decoder->setFailed();
-
             m_state = JPEG_START_DECOMPRESS;
 
             // We can fill in the size now that the header is available.

[commit-bot: I haz the power, 2015-05-22 08:01:02]

The CQ bit was unchecked by commit-bot@chromium.org

[Noel Gordon, 2015-05-22 08:23:22]

@vangelis, same issue as you. I think you just land these changes manually.  Let
me advise the bug.

[Noel Gordon, 2015-05-22 08:25:34]

Currently compiling the change locally ...

[Noel Gordon, 2015-05-22 09:03:25]

Skia wouldn't build :/ for it's own reasons.

[Noel Gordon, 2015-05-22 10:13:17]

Committed as https://src.chromium.org/viewvc/blink?revision=195776