Title: [136446] trunk/Source/WebCore
Revision
136446
Author
[email protected]
Date
2012-12-03 15:33:20 -0800 (Mon, 03 Dec 2012)

Log Message

Unreviewed, rolling out r136444.
http://trac.webkit.org/changeset/136444
https://bugs.webkit.org/show_bug.cgi?id=103938

broke chromium build (Requested by zhenyao_wfh on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-12-03

* Target.pri:
* platform/image-decoders/ImageDecoder.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (136445 => 136446)


--- trunk/Source/WebCore/ChangeLog	2012-12-03 23:11:54 UTC (rev 136445)
+++ trunk/Source/WebCore/ChangeLog	2012-12-03 23:33:20 UTC (rev 136446)
@@ -1,3 +1,14 @@
+2012-12-03  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r136444.
+        http://trac.webkit.org/changeset/136444
+        https://bugs.webkit.org/show_bug.cgi?id=103938
+
+        broke chromium build (Requested by zhenyao_wfh on #webkit).
+
+        * Target.pri:
+        * platform/image-decoders/ImageDecoder.cpp:
+
 2012-12-03  Pierre Rossi  <[email protected]>
 
         [Qt] Unreviewed build fix after r136410

Modified: trunk/Source/WebCore/Target.pri (136445 => 136446)


--- trunk/Source/WebCore/Target.pri	2012-12-03 23:11:54 UTC (rev 136445)
+++ trunk/Source/WebCore/Target.pri	2012-12-03 23:33:20 UTC (rev 136446)
@@ -2211,6 +2211,7 @@
     platform/image-decoders/ico/ICOImageDecoder.h \
     platform/image-decoders/gif/GIFImageDecoder.h \
     platform/image-decoders/gif/GIFImageReader.h \
+    platform/image-decoders/jpeg/JPEGImageDecoder.h \
     platform/image-decoders/png/PNGImageDecoder.h \
     platform/KillRing.h \
     platform/KURL.h \
@@ -4047,7 +4048,6 @@
 }
 
 use?(LIBJPEG) {
-    HEADERS += platform/image-decoders/jpeg/JPEGImageDecoder.h
     SOURCES += platform/image-decoders/jpeg/JPEGImageDecoder.cpp
 }
 

Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp (136445 => 136446)


--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp	2012-12-03 23:11:54 UTC (rev 136445)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp	2012-12-03 23:33:20 UTC (rev 136446)
@@ -28,9 +28,7 @@
 #if PLATFORM(QT)
 #include "ImageDecoderQt.h"
 #endif
-#if USE(LIBJPEG)
 #include "JPEGImageDecoder.h"
-#endif
 #include "PNGImageDecoder.h"
 #include "PlatformMemoryInstrumentation.h"
 #include "SharedBuffer.h"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to