bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Use libjpeg_turbo instead of libjpeg (fixes Mac GYP error). 

- Fix incorrect assertion in cefclient_mac.mm.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@214 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-04-06 01:45:02 +00:00
parent 71a6f6548b
commit 36f3f3d021
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cef.gyp
View File

@ -255,7 +255,7 @@
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../third_party/libjpeg/libjpeg.gyp:libjpeg', '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng', '../third_party/libpng/libpng.gyp:libpng',
'../third_party/libxml/libxml.gyp:libxml', '../third_party/libxml/libxml.gyp:libxml',
'../third_party/libxslt/libxslt.gyp:libxslt', '../third_party/libxslt/libxslt.gyp:libxslt',
@ -504,7 +504,7 @@
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc', '../third_party/icu/icu.gyp:icuuc',
'../third_party/libjpeg/libjpeg.gyp:libjpeg', '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng', '../third_party/libpng/libpng.gyp:libpng',
'../third_party/libxml/libxml.gyp:libxml', '../third_party/libxml/libxml.gyp:libxml',
'../third_party/libxslt/libxslt.gyp:libxslt', '../third_party/libxslt/libxslt.gyp:libxslt',

2
tests/cefclient/cefclient_mac.mm
View File

@ -538,7 +538,7 @@ CefHandler::RetVal ClientHandler::HandleBeforeResourceLoad(
CefString& redirectUrl, CefRefPtr<CefStreamReader>& resourceStream, CefString& redirectUrl, CefRefPtr<CefStreamReader>& resourceStream,
CefString& mimeType, int loadFlags) CefString& mimeType, int loadFlags)
{ {
REQUIRE_UI_THREAD(); REQUIRE_IO_THREAD();
std::string url = request->GetURL(); std::string url = request->GetURL();
if(url == "http://tests/request") { if(url == "http://tests/request") {