summaryrefslogtreecommitdiffstats
path: root/content/content_child.gypi
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:21:14 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 18:21:14 +0000
commite689cf25ca05a97fa1a5015a09282c7ce5b0a3fe (patch)
treebf5c2e49bce9e840b1aa682fa247071fff17b0f1 /content/content_child.gypi
parentc695feae983423e0a5c81c8d1d9761e4a308ef6c (diff)
downloadchromium_src-e689cf25ca05a97fa1a5015a09282c7ce5b0a3fe.zip
chromium_src-e689cf25ca05a97fa1a5015a09282c7ce5b0a3fe.tar.gz
chromium_src-e689cf25ca05a97fa1a5015a09282c7ce5b0a3fe.tar.bz2
Move image_decoder.cc/.h from webkit\glue to content\child.
This also brings in a new content API DecodeImage which is declared in content\public\child\image_decoder_utils.h. Used by chrome\browser code which runs mostly in the utilty process to decode icons. We still have issues with single process mode which results in chrome\browser depending on content_child. This will be addressed in a subsequent change. This is continuation of the ongoing work for bug https://code.google.com/p/chromium/issues/detail?can=2&q=237249 which is to split chrome.dll into a browser and a renderer/child component due to build issues on Windows. To achieve this we need to ensure that the browser code does not depend on webkit. This mostly comes through webkit\glue. BUG=237249 R=jam@chromium.org, jamesr@chromium.org Review URL: https://codereview.chromium.org/17704002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_child.gypi')
-rw-r--r--content/content_child.gypi3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 5175385..dad6a97 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -16,6 +16,7 @@
'../base/base.gyp:base',
],
'sources': [
+ 'public/child/image_decoder_utils.h',
'child/android/child_jni_registrar.cc',
'child/android/child_jni_registrar.h',
'child/appcache_backend_proxy.cc',
@@ -40,6 +41,8 @@
'child/fileapi/webfilesystem_impl.h',
'child/fileapi/webfilewriter_impl.cc',
'child/fileapi/webfilewriter_impl.h',
+ 'child/image_decoder.cc',
+ 'child/image_decoder.h',
'child/indexed_db/indexed_db_dispatcher.cc',
'child/indexed_db/indexed_db_dispatcher.h',
'child/indexed_db/indexed_db_message_filter.cc',