diff options
Diffstat (limited to 'third_party/libjingle')
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 54 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_common.gypi | 204 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_nacl.gyp | 190 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/init_webrtc.cc | 6 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/init_webrtc.h | 2 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/initialize_module.cc | 6 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/basictypes.h | 102 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/constructormagic.h | 14 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/logging.cc | 311 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/logging.h | 215 | ||||
| -rw-r--r-- | third_party/libjingle/overrides/talk/base/win32socketinit.cc | 22 |
12 files changed, 228 insertions, 900 deletions
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 23647f4..5d2ed5d 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 6774 +Revision: 6825 License: BSD License File: source/talk/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 1ac789b..3e1b8cd 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -22,7 +22,7 @@ 'HAVE_SRTP', 'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VOICE', - 'LOGGING_INSIDE_LIBJINGLE', + 'LOGGING_INSIDE_WEBRTC', 'NO_MAIN_THREAD_WRAPPING', 'NO_SOUND_SYSTEM', 'SRTP_RELATIVE_PATH', @@ -40,14 +40,13 @@ }, 'include_dirs': [ './overrides', - './<(libjingle_source)', '../../third_party/webrtc/overrides', + './<(libjingle_source)', '../..', '../../testing/gtest/include', '../../third_party', '../../third_party/libyuv/include', '../../third_party/usrsctp', - '../../third_party/webrtc', ], 'dependencies': [ '<(DEPTH)/base/base.gyp:base', @@ -59,13 +58,12 @@ ], 'direct_dependent_settings': { 'include_dirs': [ + '../../third_party/webrtc/overrides', './overrides', './<(libjingle_source)', - '../../third_party/webrtc/overrides', '../..', '../../testing/gtest/include', '../../third_party', - '../../third_party/webrtc', ], 'defines': [ 'FEATURE_ENABLE_SSL', @@ -98,11 +96,25 @@ ['OS=="linux"', { 'defines': [ 'LINUX', + 'WEBRTC_LINUX', ], }], ['OS=="mac"', { 'defines': [ 'OSX', + 'WEBRTC_MAC', + ], + }], + ['OS=="ios"', { + 'defines': [ + 'IOS', + 'WEBRTC_MAC', + 'WEBRTC_IOS', + ], + }], + ['OS=="win"', { + 'defines': [ + 'WEBRTC_WIN', ], }], ['OS=="android"', { @@ -113,6 +125,7 @@ ['os_posix==1', { 'defines': [ 'POSIX', + 'WEBRTC_POSIX', ], }], ['os_bsd==1', { @@ -202,21 +215,31 @@ ['OS=="linux"', { 'defines': [ 'LINUX', + 'WEBRTC_LINUX', ], }], ['OS=="mac"', { 'defines': [ 'OSX', + 'WEBRTC_MAC', + ], + }], + ['OS=="win"', { + 'defines': [ + 'WEBRTC_WIN', ], }], ['OS=="ios"', { 'defines': [ 'IOS', + 'WEBRTC_MAC', + 'WEBRTC_IOS', ], }], ['os_posix == 1', { 'defines': [ 'POSIX', + 'WEBRTC_POSIX', ], }], ['os_bsd==1', { @@ -241,26 +264,13 @@ 'target_name': 'libjingle', 'type': 'static_library', 'includes': [ 'libjingle_common.gypi' ], - 'sources': [ - 'overrides/talk/base/basictypes.h', - 'overrides/talk/base/constructormagic.h', - 'overrides/talk/base/win32socketinit.cc', - - # Overrides logging.h/.cc because libjingle logging should be done to - # the same place as the chromium logging. - 'overrides/talk/base/logging.cc', - 'overrides/talk/base/logging.h', - ], 'sources!' : [ # Compiled as part of libjingle_p2p_constants. '<(libjingle_source)/talk/p2p/base/constants.cc', '<(libjingle_source)/talk/p2p/base/constants.h', - - # Replaced with logging.cc in the overrides. - '<(libjingle_source)/talk/base/logging.h', - '<(libjingle_source)/talk/base/logging.cc', ], 'dependencies': [ + '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base', 'libjingle_p2p_constants', '<@(libjingle_additional_deps)', ], @@ -508,10 +518,6 @@ 'conditions': [ ['OS=="win"', { 'sources': [ - '<(libjingle_source)/talk/base/win32window.cc', - '<(libjingle_source)/talk/base/win32window.h', - '<(libjingle_source)/talk/base/win32windowpicker.cc', - '<(libjingle_source)/talk/base/win32windowpicker.h', '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc', '<(libjingle_source)/talk/media/devices/win32devicemanager.cc', '<(libjingle_source)/talk/media/devices/win32devicemanager.h', @@ -519,8 +525,6 @@ }], ['OS=="linux"', { 'sources': [ - '<(libjingle_source)/talk/base/linuxwindowpicker.cc', - '<(libjingle_source)/talk/base/linuxwindowpicker.h', '<(libjingle_source)/talk/media/devices/libudevsymboltable.cc', '<(libjingle_source)/talk/media/devices/libudevsymboltable.h', '<(libjingle_source)/talk/media/devices/linuxdeviceinfo.cc', diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi index 9f6c880..c2bc1bb 100644 --- a/third_party/libjingle/libjingle_common.gypi +++ b/third_party/libjingle/libjingle_common.gypi @@ -7,186 +7,6 @@ 'nacl_untrusted_build%': 0, }, 'sources': [ - '<(libjingle_source)/talk/base/asyncfile.cc', - '<(libjingle_source)/talk/base/asyncfile.h', - '<(libjingle_source)/talk/base/asynchttprequest.cc', - '<(libjingle_source)/talk/base/asynchttprequest.h', - '<(libjingle_source)/talk/base/asyncpacketsocket.h', - '<(libjingle_source)/talk/base/asyncsocket.cc', - '<(libjingle_source)/talk/base/asyncsocket.h', - '<(libjingle_source)/talk/base/asynctcpsocket.cc', - '<(libjingle_source)/talk/base/asynctcpsocket.h', - '<(libjingle_source)/talk/base/asyncudpsocket.cc', - '<(libjingle_source)/talk/base/asyncudpsocket.h', - '<(libjingle_source)/talk/base/autodetectproxy.cc', - '<(libjingle_source)/talk/base/autodetectproxy.h', - '<(libjingle_source)/talk/base/base64.cc', - '<(libjingle_source)/talk/base/base64.h', - '<(libjingle_source)/talk/base/basicdefs.h', - '<(libjingle_source)/talk/base/bytebuffer.cc', - '<(libjingle_source)/talk/base/bytebuffer.h', - '<(libjingle_source)/talk/base/byteorder.h', - '<(libjingle_source)/talk/base/checks.cc', - '<(libjingle_source)/talk/base/checks.h', - '<(libjingle_source)/talk/base/common.cc', - '<(libjingle_source)/talk/base/common.h', - '<(libjingle_source)/talk/base/compile_assert.h', - '<(libjingle_source)/talk/base/cpumonitor.cc', - '<(libjingle_source)/talk/base/cpumonitor.h', - '<(libjingle_source)/talk/base/crc32.cc', - '<(libjingle_source)/talk/base/crc32.h', - '<(libjingle_source)/talk/base/criticalsection.h', - '<(libjingle_source)/talk/base/cryptstring.h', - '<(libjingle_source)/talk/base/diskcache.cc', - '<(libjingle_source)/talk/base/diskcache.h', - '<(libjingle_source)/talk/base/dscp.h', - '<(libjingle_source)/talk/base/event.cc', - '<(libjingle_source)/talk/base/event.h', - '<(libjingle_source)/talk/base/fileutils.cc', - '<(libjingle_source)/talk/base/fileutils.h', - '<(libjingle_source)/talk/base/firewallsocketserver.cc', - '<(libjingle_source)/talk/base/firewallsocketserver.h', - '<(libjingle_source)/talk/base/flags.cc', - '<(libjingle_source)/talk/base/flags.h', - '<(libjingle_source)/talk/base/helpers.cc', - '<(libjingle_source)/talk/base/helpers.h', - '<(libjingle_source)/talk/base/httpbase.cc', - '<(libjingle_source)/talk/base/httpbase.h', - '<(libjingle_source)/talk/base/httpclient.cc', - '<(libjingle_source)/talk/base/httpclient.h', - '<(libjingle_source)/talk/base/httpcommon-inl.h', - '<(libjingle_source)/talk/base/httpcommon.cc', - '<(libjingle_source)/talk/base/httpcommon.h', - '<(libjingle_source)/talk/base/httprequest.cc', - '<(libjingle_source)/talk/base/httprequest.h', - '<(libjingle_source)/talk/base/ifaddrs-android.cc', - '<(libjingle_source)/talk/base/ifaddrs-android.h', - '<(libjingle_source)/talk/base/ipaddress.cc', - '<(libjingle_source)/talk/base/ipaddress.h', - '<(libjingle_source)/talk/base/latebindingsymboltable.cc', - '<(libjingle_source)/talk/base/latebindingsymboltable.h', - '<(libjingle_source)/talk/base/linked_ptr.h', - '<(libjingle_source)/talk/base/linux.cc', - '<(libjingle_source)/talk/base/linux.h', - '<(libjingle_source)/talk/base/logging.cc', - '<(libjingle_source)/talk/base/logging.h', - '<(libjingle_source)/talk/base/maccocoathreadhelper.h', - '<(libjingle_source)/talk/base/maccocoathreadhelper.mm', - '<(libjingle_source)/talk/base/macconversion.cc', - '<(libjingle_source)/talk/base/macconversion.h', - '<(libjingle_source)/talk/base/macutils.cc', - '<(libjingle_source)/talk/base/macutils.h', - '<(libjingle_source)/talk/base/md5.cc', - '<(libjingle_source)/talk/base/md5.h', - '<(libjingle_source)/talk/base/md5digest.h', - '<(libjingle_source)/talk/base/messagedigest.cc', - '<(libjingle_source)/talk/base/messagedigest.h', - '<(libjingle_source)/talk/base/messagehandler.cc', - '<(libjingle_source)/talk/base/messagehandler.h', - '<(libjingle_source)/talk/base/messagequeue.cc', - '<(libjingle_source)/talk/base/messagequeue.h', - '<(libjingle_source)/talk/base/move.h', - '<(libjingle_source)/talk/base/nethelpers.cc', - '<(libjingle_source)/talk/base/nethelpers.h', - '<(libjingle_source)/talk/base/network.cc', - '<(libjingle_source)/talk/base/network.h', - '<(libjingle_source)/talk/base/nssidentity.cc', - '<(libjingle_source)/talk/base/nssidentity.h', - '<(libjingle_source)/talk/base/nssstreamadapter.cc', - '<(libjingle_source)/talk/base/nssstreamadapter.h', - '<(libjingle_source)/talk/base/nullsocketserver.h', - '<(libjingle_source)/talk/base/openssladapter.cc', - '<(libjingle_source)/talk/base/openssldigest.cc', - '<(libjingle_source)/talk/base/opensslidentity.cc', - '<(libjingle_source)/talk/base/opensslstreamadapter.cc', - '<(libjingle_source)/talk/base/pathutils.cc', - '<(libjingle_source)/talk/base/pathutils.h', - '<(libjingle_source)/talk/base/physicalsocketserver.cc', - '<(libjingle_source)/talk/base/physicalsocketserver.h', - '<(libjingle_source)/talk/base/proxydetect.cc', - '<(libjingle_source)/talk/base/proxydetect.h', - '<(libjingle_source)/talk/base/proxyinfo.cc', - '<(libjingle_source)/talk/base/proxyinfo.h', - '<(libjingle_source)/talk/base/ratelimiter.cc', - '<(libjingle_source)/talk/base/ratelimiter.h', - '<(libjingle_source)/talk/base/ratetracker.cc', - '<(libjingle_source)/talk/base/ratetracker.h', - '<(libjingle_source)/talk/base/schanneladapter.cc', - '<(libjingle_source)/talk/base/schanneladapter.h', - '<(libjingle_source)/talk/base/scoped_autorelease_pool.h', - '<(libjingle_source)/talk/base/scoped_autorelease_pool.mm', - '<(libjingle_source)/talk/base/scoped_ptr.h', - '<(libjingle_source)/talk/base/sec_buffer.h', - '<(libjingle_source)/talk/base/sha1.cc', - '<(libjingle_source)/talk/base/sha1.h', - '<(libjingle_source)/talk/base/sha1digest.h', - '<(libjingle_source)/talk/base/signalthread.cc', - '<(libjingle_source)/talk/base/signalthread.h', - '<(libjingle_source)/talk/base/sigslot.h', - '<(libjingle_source)/talk/base/sigslotrepeater.h', - '<(libjingle_source)/talk/base/socket.h', - '<(libjingle_source)/talk/base/socketadapters.cc', - '<(libjingle_source)/talk/base/socketadapters.h', - '<(libjingle_source)/talk/base/socketaddress.cc', - '<(libjingle_source)/talk/base/socketaddress.h', - '<(libjingle_source)/talk/base/socketaddresspair.cc', - '<(libjingle_source)/talk/base/socketaddresspair.h', - '<(libjingle_source)/talk/base/socketfactory.h', - '<(libjingle_source)/talk/base/socketpool.cc', - '<(libjingle_source)/talk/base/socketpool.h', - '<(libjingle_source)/talk/base/socketserver.h', - '<(libjingle_source)/talk/base/socketstream.cc', - '<(libjingle_source)/talk/base/socketstream.h', - '<(libjingle_source)/talk/base/ssladapter.cc', - '<(libjingle_source)/talk/base/ssladapter.h', - '<(libjingle_source)/talk/base/sslfingerprint.cc', - '<(libjingle_source)/talk/base/sslfingerprint.h', - '<(libjingle_source)/talk/base/sslidentity.cc', - '<(libjingle_source)/talk/base/sslidentity.h', - '<(libjingle_source)/talk/base/sslsocketfactory.cc', - '<(libjingle_source)/talk/base/sslsocketfactory.h', - '<(libjingle_source)/talk/base/sslstreamadapter.cc', - '<(libjingle_source)/talk/base/sslstreamadapter.h', - '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc', - '<(libjingle_source)/talk/base/sslstreamadapterhelper.h', - '<(libjingle_source)/talk/base/stream.cc', - '<(libjingle_source)/talk/base/stream.h', - '<(libjingle_source)/talk/base/stringencode.cc', - '<(libjingle_source)/talk/base/stringencode.h', - '<(libjingle_source)/talk/base/stringutils.cc', - '<(libjingle_source)/talk/base/stringutils.h', - '<(libjingle_source)/talk/base/systeminfo.cc', - '<(libjingle_source)/talk/base/systeminfo.h', - '<(libjingle_source)/talk/base/task.cc', - '<(libjingle_source)/talk/base/task.h', - '<(libjingle_source)/talk/base/taskparent.cc', - '<(libjingle_source)/talk/base/taskparent.h', - '<(libjingle_source)/talk/base/taskrunner.cc', - '<(libjingle_source)/talk/base/taskrunner.h', - '<(libjingle_source)/talk/base/template_util.h', - '<(libjingle_source)/talk/base/thread.cc', - '<(libjingle_source)/talk/base/thread.h', - '<(libjingle_source)/talk/base/timeutils.cc', - '<(libjingle_source)/talk/base/timeutils.h', - '<(libjingle_source)/talk/base/timing.cc', - '<(libjingle_source)/talk/base/timing.h', - '<(libjingle_source)/talk/base/unixfilesystem.cc', - '<(libjingle_source)/talk/base/unixfilesystem.h', - '<(libjingle_source)/talk/base/urlencode.cc', - '<(libjingle_source)/talk/base/urlencode.h', - '<(libjingle_source)/talk/base/win32.cc', - '<(libjingle_source)/talk/base/win32.h', - '<(libjingle_source)/talk/base/win32filesystem.cc', - '<(libjingle_source)/talk/base/win32filesystem.h', - '<(libjingle_source)/talk/base/win32securityerrors.cc', - '<(libjingle_source)/talk/base/win32window.cc', - '<(libjingle_source)/talk/base/win32window.h', - '<(libjingle_source)/talk/base/winfirewall.cc', - '<(libjingle_source)/talk/base/winfirewall.h', - '<(libjingle_source)/talk/base/winping.cc', - '<(libjingle_source)/talk/base/winping.h', - '<(libjingle_source)/talk/base/worker.cc', - '<(libjingle_source)/talk/base/worker.h', '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc', '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h', '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc', @@ -314,40 +134,16 @@ ['exclude', '/unix[a-z]+\\.(h|cc)$'], ], }], - ['OS!="linux" or nacl_untrusted_build==1', { - 'sources!': [ - '<(libjingle_source)/talk/base/latebindingsymboltable.cc', - '<(libjingle_source)/talk/base/latebindingsymboltable.h', - ], - }], - ['(OS!="linux" and OS!="android") or nacl_untrusted_build==1', { - 'sources!': [ - '<(libjingle_source)/talk/base/linux.cc', - '<(libjingle_source)/talk/base/linux.h', - ], - }], ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', { 'sources/': [ ['exclude', '/mac[a-z]+\\.(h|cc)$'], ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'], ], }], - ['OS!="android" or nacl_untrusted_build==1', { - 'sources!': [ - '<(libjingle_source)/talk/base/ifaddrs-android.cc', - '<(libjingle_source)/talk/base/ifaddrs-android.h', - ], - }], ['use_openssl!=1', { 'sources/': [ ['exclude', '/openssl[a-z]+\\.(h|cc)$'], ], }], - ['nacl_untrusted_build==1', { - 'sources!': [ - '<(libjingle_source)/talk/base/systeminfo.cc', - '<(libjingle_source)/talk/base/systeminfo.h', - ], - }], ], } diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp index 8b1b498..03f6383 100644 --- a/third_party/libjingle/libjingle_nacl.gyp +++ b/third_party/libjingle/libjingle_nacl.gyp @@ -5,6 +5,7 @@ { 'variables': { 'libjingle_source': "source", + 'webrtc_base': "../webrtc/base", }, 'includes': [ '../../native_client/build/untrusted.gypi', @@ -36,6 +37,7 @@ 'NO_MAIN_THREAD_WRAPPING', 'NO_SOUND_SYSTEM', 'POSIX', + 'WEBRTC_POSIX', 'SRTP_RELATIVE_PATH', 'SSL_USE_OPENSSL', 'USE_WEBRTC_DEV_BRANCH', @@ -52,13 +54,200 @@ }, 'include_dirs': [ './<(libjingle_source)', + '../', ], 'includes': ['libjingle_common.gypi', ], + 'sources': [ + '<(webrtc_base)/asyncfile.cc', + '<(webrtc_base)/asyncfile.h', + '<(webrtc_base)/asynchttprequest.cc', + '<(webrtc_base)/asynchttprequest.h', + '<(webrtc_base)/asyncpacketsocket.h', + '<(webrtc_base)/asyncsocket.cc', + '<(webrtc_base)/asyncsocket.h', + '<(webrtc_base)/asynctcpsocket.cc', + '<(webrtc_base)/asynctcpsocket.h', + '<(webrtc_base)/asyncudpsocket.cc', + '<(webrtc_base)/asyncudpsocket.h', + '<(webrtc_base)/autodetectproxy.cc', + '<(webrtc_base)/autodetectproxy.h', + '<(webrtc_base)/base64.cc', + '<(webrtc_base)/base64.h', + '<(webrtc_base)/basicdefs.h', + '<(webrtc_base)/bytebuffer.cc', + '<(webrtc_base)/bytebuffer.h', + '<(webrtc_base)/byteorder.h', + '<(webrtc_base)/checks.cc', + '<(webrtc_base)/checks.h', + '<(webrtc_base)/common.cc', + '<(webrtc_base)/common.h', + '<(webrtc_base)/compile_assert.h', + '<(webrtc_base)/cpumonitor.cc', + '<(webrtc_base)/cpumonitor.h', + '<(webrtc_base)/crc32.cc', + '<(webrtc_base)/crc32.h', + '<(webrtc_base)/criticalsection.h', + '<(webrtc_base)/cryptstring.h', + '<(webrtc_base)/diskcache.cc', + '<(webrtc_base)/diskcache.h', + '<(webrtc_base)/dscp.h', + '<(webrtc_base)/event.cc', + '<(webrtc_base)/event.h', + '<(webrtc_base)/fileutils.cc', + '<(webrtc_base)/fileutils.h', + '<(webrtc_base)/firewallsocketserver.cc', + '<(webrtc_base)/firewallsocketserver.h', + '<(webrtc_base)/flags.cc', + '<(webrtc_base)/flags.h', + '<(webrtc_base)/helpers.cc', + '<(webrtc_base)/helpers.h', + '<(webrtc_base)/httpbase.cc', + '<(webrtc_base)/httpbase.h', + '<(webrtc_base)/httpclient.cc', + '<(webrtc_base)/httpclient.h', + '<(webrtc_base)/httpcommon-inl.h', + '<(webrtc_base)/httpcommon.cc', + '<(webrtc_base)/httpcommon.h', + '<(webrtc_base)/httprequest.cc', + '<(webrtc_base)/httprequest.h', + '<(webrtc_base)/ipaddress.cc', + '<(webrtc_base)/ipaddress.h', + '<(webrtc_base)/linked_ptr.h', + '<(webrtc_base)/logging.cc', + '<(webrtc_base)/logging.h', + '<(webrtc_base)/maccocoathreadhelper.h', + '<(webrtc_base)/maccocoathreadhelper.mm', + '<(webrtc_base)/macconversion.cc', + '<(webrtc_base)/macconversion.h', + '<(webrtc_base)/macutils.cc', + '<(webrtc_base)/macutils.h', + '<(webrtc_base)/md5.cc', + '<(webrtc_base)/md5.h', + '<(webrtc_base)/md5digest.h', + '<(webrtc_base)/messagedigest.cc', + '<(webrtc_base)/messagedigest.h', + '<(webrtc_base)/messagehandler.cc', + '<(webrtc_base)/messagehandler.h', + '<(webrtc_base)/messagequeue.cc', + '<(webrtc_base)/messagequeue.h', + '<(webrtc_base)/move.h', + '<(webrtc_base)/nethelpers.cc', + '<(webrtc_base)/nethelpers.h', + '<(webrtc_base)/network.cc', + '<(webrtc_base)/network.h', + '<(webrtc_base)/nssidentity.cc', + '<(webrtc_base)/nssidentity.h', + '<(webrtc_base)/nssstreamadapter.cc', + '<(webrtc_base)/nssstreamadapter.h', + '<(webrtc_base)/nullsocketserver.h', + '<(webrtc_base)/openssladapter.cc', + '<(webrtc_base)/openssldigest.cc', + '<(webrtc_base)/opensslidentity.cc', + '<(webrtc_base)/opensslstreamadapter.cc', + '<(webrtc_base)/pathutils.cc', + '<(webrtc_base)/pathutils.h', + '<(webrtc_base)/physicalsocketserver.cc', + '<(webrtc_base)/physicalsocketserver.h', + '<(webrtc_base)/proxydetect.cc', + '<(webrtc_base)/proxydetect.h', + '<(webrtc_base)/proxyinfo.cc', + '<(webrtc_base)/proxyinfo.h', + '<(webrtc_base)/ratelimiter.cc', + '<(webrtc_base)/ratelimiter.h', + '<(webrtc_base)/ratetracker.cc', + '<(webrtc_base)/ratetracker.h', + '<(webrtc_base)/schanneladapter.cc', + '<(webrtc_base)/schanneladapter.h', + '<(webrtc_base)/scoped_autorelease_pool.h', + '<(webrtc_base)/scoped_autorelease_pool.mm', + '<(webrtc_base)/scoped_ptr.h', + '<(webrtc_base)/sec_buffer.h', + '<(webrtc_base)/sha1.cc', + '<(webrtc_base)/sha1.h', + '<(webrtc_base)/sha1digest.h', + '<(webrtc_base)/signalthread.cc', + '<(webrtc_base)/signalthread.h', + '<(webrtc_base)/sigslot.h', + '<(webrtc_base)/sigslotrepeater.h', + '<(webrtc_base)/socket.h', + '<(webrtc_base)/socketadapters.cc', + '<(webrtc_base)/socketadapters.h', + '<(webrtc_base)/socketaddress.cc', + '<(webrtc_base)/socketaddress.h', + '<(webrtc_base)/socketaddresspair.cc', + '<(webrtc_base)/socketaddresspair.h', + '<(webrtc_base)/socketfactory.h', + '<(webrtc_base)/socketpool.cc', + '<(webrtc_base)/socketpool.h', + '<(webrtc_base)/socketserver.h', + '<(webrtc_base)/socketstream.cc', + '<(webrtc_base)/socketstream.h', + '<(webrtc_base)/ssladapter.cc', + '<(webrtc_base)/ssladapter.h', + '<(webrtc_base)/sslfingerprint.cc', + '<(webrtc_base)/sslfingerprint.h', + '<(webrtc_base)/sslidentity.cc', + '<(webrtc_base)/sslidentity.h', + '<(webrtc_base)/sslsocketfactory.cc', + '<(webrtc_base)/sslsocketfactory.h', + '<(webrtc_base)/sslstreamadapter.cc', + '<(webrtc_base)/sslstreamadapter.h', + '<(webrtc_base)/sslstreamadapterhelper.cc', + '<(webrtc_base)/sslstreamadapterhelper.h', + '<(webrtc_base)/stream.cc', + '<(webrtc_base)/stream.h', + '<(webrtc_base)/stringencode.cc', + '<(webrtc_base)/stringencode.h', + '<(webrtc_base)/stringutils.cc', + '<(webrtc_base)/stringutils.h', + '<(webrtc_base)/task.cc', + '<(webrtc_base)/task.h', + '<(webrtc_base)/taskparent.cc', + '<(webrtc_base)/taskparent.h', + '<(webrtc_base)/taskrunner.cc', + '<(webrtc_base)/taskrunner.h', + '<(webrtc_base)/template_util.h', + '<(webrtc_base)/thread.cc', + '<(webrtc_base)/thread.h', + '<(webrtc_base)/timeutils.cc', + '<(webrtc_base)/timeutils.h', + '<(webrtc_base)/timing.cc', + '<(webrtc_base)/timing.h', + '<(webrtc_base)/unixfilesystem.cc', + '<(webrtc_base)/unixfilesystem.h', + '<(webrtc_base)/urlencode.cc', + '<(webrtc_base)/urlencode.h', + '<(webrtc_base)/win32.cc', + '<(webrtc_base)/win32.h', + '<(webrtc_base)/win32filesystem.cc', + '<(webrtc_base)/win32filesystem.h', + '<(webrtc_base)/win32securityerrors.cc', + '<(webrtc_base)/win32window.cc', + '<(webrtc_base)/win32window.h', + '<(webrtc_base)/winfirewall.cc', + '<(webrtc_base)/winfirewall.h', + '<(webrtc_base)/winping.cc', + '<(webrtc_base)/winping.h', + '<(webrtc_base)/worker.cc', + '<(webrtc_base)/worker.h', + ], 'sources!': [ # Compiled as part of libjingle_p2p_constants_nacl. '<(libjingle_source)/talk/p2p/base/constants.cc', '<(libjingle_source)/talk/p2p/base/constants.h', ], + 'sources/': [ + ['exclude', '/mac[a-z]+\\.(h|cc)$'], + ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'], + ], + 'conditions': [ + ['OS!="win"', { + 'sources/': [ + ['exclude', '/win[a-z0-9]+\\.(h|cc)$'], + ['exclude', '/schanneladapter\\.(h|cc)$'], + ], + }], + ], 'direct_dependent_settings': { 'include_dirs': [ './overrides', @@ -74,6 +263,7 @@ 'NO_MAIN_THREAD_WRAPPING', 'NO_SOUND_SYSTEM', 'POSIX', + 'WEBRTC_POSIX', 'SRTP_RELATIVE_PATH', 'SSL_USE_OPENSSL', 'USE_WEBRTC_DEV_BRANCH', diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc index 5c356ab..e11f78d 100644 --- a/third_party/libjingle/overrides/init_webrtc.cc +++ b/third_party/libjingle/overrides/init_webrtc.cc @@ -11,8 +11,8 @@ #include "base/metrics/field_trial.h" #include "base/native_library.h" #include "base/path_service.h" -#include "talk/base/basictypes.h" -#include "third_party/libjingle/overrides/talk/base/logging.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/logging.h" const unsigned char* GetCategoryGroupEnabled(const char* category_group) { return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group); @@ -136,7 +136,7 @@ bool InitializeWebRtcModule() { &init_diagnostic_logging); if (init_ok) - talk_base::SetExtraLoggingInit(init_diagnostic_logging); + rtc::SetExtraLoggingInit(init_diagnostic_logging); return init_ok; } diff --git a/third_party/libjingle/overrides/init_webrtc.h b/third_party/libjingle/overrides/init_webrtc.h index 175c067..c5c190c 100644 --- a/third_party/libjingle/overrides/init_webrtc.h +++ b/third_party/libjingle/overrides/init_webrtc.h @@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ #define THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_ +#include <string> + #include "allocator_shim/allocator_stub.h" #include "base/logging.h" #include "third_party/webrtc/system_wrappers/interface/event_tracer.h" diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc index c7ef382..ce11567 100644 --- a/third_party/libjingle/overrides/initialize_module.cc +++ b/third_party/libjingle/overrides/initialize_module.cc @@ -7,9 +7,9 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "init_webrtc.h" -#include "talk/base/basictypes.h" #include "talk/media/webrtc/webrtcmediaengine.h" -#include "third_party/libjingle/overrides/talk/base/logging.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/logging.h" #if !defined(LIBPEERCONNECTION_IMPLEMENTATION) || defined(LIBPEERCONNECTION_LIB) #error "Only compile the allocator proxy with the shared_library implementation" @@ -81,7 +81,7 @@ bool InitializeModule(const CommandLine& command_line, *create_media_engine = &CreateWebRtcMediaEngine; *destroy_media_engine = &DestroyWebRtcMediaEngine; - *init_diagnostic_logging = &talk_base::InitDiagnosticLoggingDelegateFunction; + *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction; if (CommandLine::Init(0, NULL)) { #if !defined(OS_WIN) diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h deleted file mode 100644 index d14eee5..0000000 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file overrides the inclusion of talk/base/basictypes.h to remove -// collisions with Chromium's base/basictypes.h. We then add back a few -// items that Chromium's version doesn't provide, but libjingle expects. - -#ifndef OVERRIDES_TALK_BASE_BASICTYPES_H__ -#define OVERRIDES_TALK_BASE_BASICTYPES_H__ - -#include "base/basictypes.h" -#include "build/build_config.h" - -#ifndef INT_TYPES_DEFINED -#define INT_TYPES_DEFINED - -#ifdef COMPILER_MSVC -#if _MSC_VER >= 1600 -#include <stdint.h> -#else -typedef unsigned __int64 uint64; -typedef __int64 int64; -#endif -#ifndef INT64_C -#define INT64_C(x) x ## I64 -#endif -#ifndef UINT64_C -#define UINT64_C(x) x ## UI64 -#endif -#define INT64_F "I64" -#else // COMPILER_MSVC -#ifndef INT64_C -#define INT64_C(x) x ## LL -#endif -#ifndef UINT64_C -#define UINT64_C(x) x ## ULL -#endif -#ifndef INT64_F -#define INT64_F "ll" -#endif -#endif // COMPILER_MSVC -#endif // INT_TYPES_DEFINED - -// Detect compiler is for x86 or x64. -#if defined(__x86_64__) || defined(_M_X64) || \ - defined(__i386__) || defined(_M_IX86) -#define CPU_X86 1 -#endif -// Detect compiler is for arm. -#if defined(__arm__) || defined(_M_ARM) -#define CPU_ARM 1 -#endif -#if defined(CPU_X86) && defined(CPU_ARM) -#error CPU_X86 and CPU_ARM both defined. -#endif -#if !defined(ARCH_CPU_BIG_ENDIAN) && !defined(ARCH_CPU_LITTLE_ENDIAN) -// x86, arm or GCC provided __BYTE_ORDER__ macros -#if CPU_X86 || CPU_ARM || \ - (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) -#define ARCH_CPU_LITTLE_ENDIAN -#elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#define ARCH_CPU_BIG_ENDIAN -#else -#error ARCH_CPU_BIG_ENDIAN or ARCH_CPU_LITTLE_ENDIAN should be defined. -#endif -#endif -#if defined(ARCH_CPU_BIG_ENDIAN) && defined(ARCH_CPU_LITTLE_ENDIAN) -#error ARCH_CPU_BIG_ENDIAN and ARCH_CPU_LITTLE_ENDIAN both defined. -#endif - -#ifdef WIN32 -typedef int socklen_t; -#endif - -namespace talk_base { -template<class T> inline T _min(T a, T b) { return (a > b) ? b : a; } -template<class T> inline T _max(T a, T b) { return (a < b) ? b : a; } - -// For wait functions that take a number of milliseconds, kForever indicates -// unlimited time. -const int kForever = -1; -} - -#ifdef WIN32 -#if _MSC_VER < 1700 - #define alignof(t) __alignof(t) -#endif -#else // !WIN32 -#define alignof(t) __alignof__(t) -#endif // !WIN32 -#define IS_ALIGNED(p, a) (0==(reinterpret_cast<uintptr_t>(p) & ((a)-1))) -#define ALIGNP(p, t) \ - (reinterpret_cast<uint8*>(((reinterpret_cast<uintptr_t>(p) + \ - ((t)-1)) & ~((t)-1)))) - -// LIBJINGLE_DEFINE_STATIC_LOCAL() is a libjingle's copy -// of CR_DEFINE_STATIC_LOCAL(). -#define LIBJINGLE_DEFINE_STATIC_LOCAL(type, name, arguments) \ - CR_DEFINE_STATIC_LOCAL(type, name, arguments) - -#endif // OVERRIDES_TALK_BASE_BASICTYPES_H__ diff --git a/third_party/libjingle/overrides/talk/base/constructormagic.h b/third_party/libjingle/overrides/talk/base/constructormagic.h deleted file mode 100644 index 7f1294d..0000000 --- a/third_party/libjingle/overrides/talk/base/constructormagic.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file overrides the inclusion of talk/base/constructormagic.h -// We do this because constructor magic defines DISALLOW_EVIL_CONSTRUCTORS, -// but we want to use the version from Chromium. - -#ifndef OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ -#define OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ - -#include "base/basictypes.h" - -#endif // OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ diff --git a/third_party/libjingle/overrides/talk/base/logging.cc b/third_party/libjingle/overrides/talk/base/logging.cc deleted file mode 100644 index 799d60c..0000000 --- a/third_party/libjingle/overrides/talk/base/logging.cc +++ /dev/null @@ -1,311 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "third_party/libjingle/overrides/talk/base/logging.h" - -#if defined(OS_MACOSX) && !defined(OS_IOS) -#include <CoreServices/CoreServices.h> -#endif // OS_MACOSX - -#include <iomanip> - -#include "base/atomicops.h" -#include "base/strings/string_util.h" -#include "base/threading/platform_thread.h" -#include "third_party/libjingle/source/talk/base/ipaddress.h" -#include "third_party/libjingle/source/talk/base/stream.h" -#include "third_party/libjingle/source/talk/base/stringencode.h" -#include "third_party/libjingle/source/talk/base/stringutils.h" -#include "third_party/libjingle/source/talk/base/timeutils.h" - -// From this file we can't use VLOG since it expands into usage of the __FILE__ -// macro (for correct filtering). The actual logging call from DIAGNOSTIC_LOG in -// ~DiagnosticLogMessage. Note that the second parameter to the LAZY_STREAM -// macro is true since the filter check has already been done for -// DIAGNOSTIC_LOG. -#define LOG_LAZY_STREAM_DIRECT(file_name, line_number, sev) \ - LAZY_STREAM(logging::LogMessage(file_name, line_number, \ - -sev).stream(), true) - -namespace talk_base { - -void (*g_logging_delegate_function)(const std::string&) = NULL; -void (*g_extra_logging_init_function)( - void (*logging_delegate_function)(const std::string&)) = NULL; -#ifndef NDEBUG -COMPILE_ASSERT(sizeof(base::subtle::Atomic32) == sizeof(base::PlatformThreadId), - atomic32_not_same_size_as_platformthreadid); -base::subtle::Atomic32 g_init_logging_delegate_thread_id = 0; -#endif - -///////////////////////////////////////////////////////////////////////////// -// Constant Labels -///////////////////////////////////////////////////////////////////////////// - -const char* FindLabel(int value, const ConstantLabel entries[]) { - for (int i = 0; entries[i].label; ++i) { - if (value == entries[i].value) return entries[i].label; - } - return 0; -} - -std::string ErrorName(int err, const ConstantLabel* err_table) { - if (err == 0) - return "No error"; - - if (err_table != 0) { - if (const char * value = FindLabel(err, err_table)) - return value; - } - - char buffer[16]; - base::snprintf(buffer, sizeof(buffer), "0x%08x", err); - return buffer; -} - -///////////////////////////////////////////////////////////////////////////// -// Log helper functions -///////////////////////////////////////////////////////////////////////////// - -// Generates extra information for LOG_E. -static std::string GenerateExtra(LogErrorContext err_ctx, - int err, - const char* module) { - if (err_ctx != ERRCTX_NONE) { - std::ostringstream tmp; - tmp << ": "; - tmp << "[0x" << std::setfill('0') << std::hex << std::setw(8) << err << "]"; - switch (err_ctx) { - case ERRCTX_ERRNO: - tmp << " " << strerror(err); - break; -#if defined(OS_WIN) - case ERRCTX_HRESULT: { - char msgbuf[256]; - DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM; - HMODULE hmod = GetModuleHandleA(module); - if (hmod) - flags |= FORMAT_MESSAGE_FROM_HMODULE; - if (DWORD len = FormatMessageA( - flags, hmod, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - msgbuf, sizeof(msgbuf) / sizeof(msgbuf[0]), NULL)) { - while ((len > 0) && - isspace(static_cast<unsigned char>(msgbuf[len-1]))) { - msgbuf[--len] = 0; - } - tmp << " " << msgbuf; - } - break; - } -#endif // OS_WIN -#if defined(OS_IOS) - case ERRCTX_OSSTATUS: - tmp << " " << "Unknown LibJingle error: " << err; - break; -#elif defined(OS_MACOSX) - case ERRCTX_OSSTATUS: { - tmp << " " << nonnull(GetMacOSStatusErrorString(err), "Unknown error"); - if (const char* desc = GetMacOSStatusCommentString(err)) { - tmp << ": " << desc; - } - break; - } -#endif // OS_MACOSX - default: - break; - } - return tmp.str(); - } - return ""; -} - -DiagnosticLogMessage::DiagnosticLogMessage(const char* file, - int line, - LoggingSeverity severity, - bool log_to_chrome, - LogErrorContext err_ctx, - int err) - : file_name_(file), - line_(line), - severity_(severity), - log_to_chrome_(log_to_chrome) { - extra_ = GenerateExtra(err_ctx, err, NULL); -} - -DiagnosticLogMessage::DiagnosticLogMessage(const char* file, - int line, - LoggingSeverity severity, - bool log_to_chrome, - LogErrorContext err_ctx, - int err, - const char* module) - : file_name_(file), - line_(line), - severity_(severity), - log_to_chrome_(log_to_chrome) { - extra_ = GenerateExtra(err_ctx, err, module); -} - -DiagnosticLogMessage::~DiagnosticLogMessage() { - print_stream_ << extra_; - const std::string& str = print_stream_.str(); - if (log_to_chrome_) - LOG_LAZY_STREAM_DIRECT(file_name_, line_, severity_) << str; - if (g_logging_delegate_function && severity_ <= LS_INFO) { - g_logging_delegate_function(str); - } -} - -// Note: this function is a copy from the overriden libjingle implementation. -void LogMultiline(LoggingSeverity level, const char* label, bool input, - const void* data, size_t len, bool hex_mode, - LogMultilineState* state) { - if (!LOG_CHECK_LEVEL_V(level)) - return; - - const char * direction = (input ? " << " : " >> "); - - // NULL data means to flush our count of unprintable characters. - if (!data) { - if (state && state->unprintable_count_[input]) { - LOG_V(level) << label << direction << "## " - << state->unprintable_count_[input] - << " consecutive unprintable ##"; - state->unprintable_count_[input] = 0; - } - return; - } - - // The ctype classification functions want unsigned chars. - const unsigned char* udata = static_cast<const unsigned char*>(data); - - if (hex_mode) { - const size_t LINE_SIZE = 24; - char hex_line[LINE_SIZE * 9 / 4 + 2], asc_line[LINE_SIZE + 1]; - while (len > 0) { - memset(asc_line, ' ', sizeof(asc_line)); - memset(hex_line, ' ', sizeof(hex_line)); - size_t line_len = _min(len, LINE_SIZE); - for (size_t i = 0; i < line_len; ++i) { - unsigned char ch = udata[i]; - asc_line[i] = isprint(ch) ? ch : '.'; - hex_line[i*2 + i/4] = hex_encode(ch >> 4); - hex_line[i*2 + i/4 + 1] = hex_encode(ch & 0xf); - } - asc_line[sizeof(asc_line)-1] = 0; - hex_line[sizeof(hex_line)-1] = 0; - LOG_V(level) << label << direction - << asc_line << " " << hex_line << " "; - udata += line_len; - len -= line_len; - } - return; - } - - size_t consecutive_unprintable = state ? state->unprintable_count_[input] : 0; - - const unsigned char* end = udata + len; - while (udata < end) { - const unsigned char* line = udata; - const unsigned char* end_of_line = strchrn<unsigned char>(udata, - end - udata, - '\n'); - if (!end_of_line) { - udata = end_of_line = end; - } else { - udata = end_of_line + 1; - } - - bool is_printable = true; - - // If we are in unprintable mode, we need to see a line of at least - // kMinPrintableLine characters before we'll switch back. - const ptrdiff_t kMinPrintableLine = 4; - if (consecutive_unprintable && ((end_of_line - line) < kMinPrintableLine)) { - is_printable = false; - } else { - // Determine if the line contains only whitespace and printable - // characters. - bool is_entirely_whitespace = true; - for (const unsigned char* pos = line; pos < end_of_line; ++pos) { - if (isspace(*pos)) - continue; - is_entirely_whitespace = false; - if (!isprint(*pos)) { - is_printable = false; - break; - } - } - // Treat an empty line following unprintable data as unprintable. - if (consecutive_unprintable && is_entirely_whitespace) { - is_printable = false; - } - } - if (!is_printable) { - consecutive_unprintable += (udata - line); - continue; - } - // Print out the current line, but prefix with a count of prior unprintable - // characters. - if (consecutive_unprintable) { - LOG_V(level) << label << direction << "## " << consecutive_unprintable - << " consecutive unprintable ##"; - consecutive_unprintable = 0; - } - // Strip off trailing whitespace. - while ((end_of_line > line) && isspace(*(end_of_line-1))) { - --end_of_line; - } - // Filter out any private data - std::string substr(reinterpret_cast<const char*>(line), end_of_line - line); - std::string::size_type pos_private = substr.find("Email"); - if (pos_private == std::string::npos) { - pos_private = substr.find("Passwd"); - } - if (pos_private == std::string::npos) { - LOG_V(level) << label << direction << substr; - } else { - LOG_V(level) << label << direction << "## omitted for privacy ##"; - } - } - - if (state) { - state->unprintable_count_[input] = consecutive_unprintable; - } -} - -void InitDiagnosticLoggingDelegateFunction( - void (*delegate)(const std::string&)) { -#ifndef NDEBUG - // Ensure that this function is always called from the same thread. - base::subtle::NoBarrier_CompareAndSwap(&g_init_logging_delegate_thread_id, 0, - static_cast<base::subtle::Atomic32>(base::PlatformThread::CurrentId())); - DCHECK_EQ(g_init_logging_delegate_thread_id, - base::PlatformThread::CurrentId()); -#endif - CHECK(delegate); - // This function may be called with the same argument several times if the - // page is reloaded or there are several PeerConnections on one page with - // logging enabled. This is OK, we simply don't have to do anything. - if (delegate == g_logging_delegate_function) - return; - CHECK(!g_logging_delegate_function); -#ifdef NDEBUG - IPAddress::set_strip_sensitive(true); -#endif - g_logging_delegate_function = delegate; - - if (g_extra_logging_init_function) - g_extra_logging_init_function(delegate); -} - -void SetExtraLoggingInit( - void (*function)(void (*delegate)(const std::string&))) { - CHECK(function); - CHECK(!g_extra_logging_init_function); - g_extra_logging_init_function = function; -} - -} // namespace talk_base diff --git a/third_party/libjingle/overrides/talk/base/logging.h b/third_party/libjingle/overrides/talk/base/logging.h deleted file mode 100644 index 3f20a0a..0000000 --- a/third_party/libjingle/overrides/talk/base/logging.h +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file overrides the logging macros in libjingle (talk/base/logging.h). -// Instead of using libjingle's logging implementation, the libjingle macros are -// mapped to the corresponding base/logging.h macro (chromium's VLOG). -// If this file is included outside of libjingle (e.g. in wrapper code) it -// should be included after base/logging.h (if any) or compiler error or -// unexpected behavior may occur (macros that have the same name in libjingle as -// in chromium will use the libjingle definition if this file is included -// first). - -// Setting the LoggingSeverity (and lower) that should be written to file should -// be done via command line by specifying the flags: -// --vmodule or --v please see base/logging.h for details on how to use them. -// Specifying what file to write to is done using InitLogging also in -// base/logging.h. - -// The macros and classes declared in here are not described as they are -// NOT TO BE USED outside of libjingle. - -#ifndef THIRD_PARTY_LIBJINGLE_OVERRIDES_TALK_BASE_LOGGING_H_ -#define THIRD_PARTY_LIBJINGLE_OVERRIDES_TALK_BASE_LOGGING_H_ - -#include <sstream> -#include <string> - -#include "base/logging.h" -#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h" - -namespace talk_base { - -/////////////////////////////////////////////////////////////////////////////// -// ConstantLabel can be used to easily generate string names from constant -// values. This can be useful for logging descriptive names of error messages. -// Usage: -// const ConstantLabel LIBRARY_ERRORS[] = { -// KLABEL(SOME_ERROR), -// KLABEL(SOME_OTHER_ERROR), -// ... -// LASTLABEL -// } -// -// int err = LibraryFunc(); -// LOG(LS_ERROR) << "LibraryFunc returned: " -// << ErrorName(err, LIBRARY_ERRORS); - -struct ConstantLabel { - int value; - const char* label; -}; -#define KLABEL(x) { x, #x } -#define LASTLABEL { 0, 0 } - -const char* FindLabel(int value, const ConstantLabel entries[]); -std::string ErrorName(int err, const ConstantLabel* err_table); - -////////////////////////////////////////////////////////////////////// -// Note that the non-standard LoggingSeverity aliases exist because they are -// still in broad use. The meanings of the levels are: -// LS_SENSITIVE: Information which should only be logged with the consent -// of the user, due to privacy concerns. -// LS_VERBOSE: This level is for data which we do not want to appear in the -// normal debug log, but should appear in diagnostic logs. -// LS_INFO: Chatty level used in debugging for all sorts of things, the default -// in debug builds. -// LS_WARNING: Something that may warrant investigation. -// LS_ERROR: Something that should not have occurred. -// Note that LoggingSeverity is mapped over to chromiums verbosity levels where -// anything lower than or equal to the current verbosity level is written to -// file which is the opposite of logging severity in libjingle where higher -// severity numbers than or equal to the current severity level are written to -// file. Also, note that the values are explicitly defined here for convenience -// since the command line flag must be set using numerical values. -enum LoggingSeverity { LS_ERROR = 1, - LS_WARNING = 2, - LS_INFO = 3, - LS_VERBOSE = 4, - LS_SENSITIVE = 5, - INFO = LS_INFO, - WARNING = LS_WARNING, - LERROR = LS_ERROR }; - -// LogErrorContext assists in interpreting the meaning of an error value. -enum LogErrorContext { - ERRCTX_NONE, - ERRCTX_ERRNO, // System-local errno - ERRCTX_HRESULT, // Windows HRESULT - ERRCTX_OSSTATUS, // MacOS OSStatus - - // Abbreviations for LOG_E macro - ERRCTX_EN = ERRCTX_ERRNO, // LOG_E(sev, EN, x) - ERRCTX_HR = ERRCTX_HRESULT, // LOG_E(sev, HR, x) - ERRCTX_OS = ERRCTX_OSSTATUS, // LOG_E(sev, OS, x) -}; - -// Class that writes a log message to the logging delegate ("WebRTC logging -// stream" in Chrome) and to Chrome's logging stream. -class DiagnosticLogMessage { - public: - DiagnosticLogMessage(const char* file, int line, LoggingSeverity severity, - bool log_to_chrome, LogErrorContext err_ctx, int err); - DiagnosticLogMessage(const char* file, int line, LoggingSeverity severity, - bool log_to_chrome, LogErrorContext err_ctx, int err, - const char* module); - ~DiagnosticLogMessage(); - - void CreateTimestamp(); - - std::ostream& stream() { return print_stream_; } - - private: - const char* file_name_; - const int line_; - const LoggingSeverity severity_; - const bool log_to_chrome_; - - std::string extra_; - - std::ostringstream print_stream_; -}; - -// This class is used to explicitly ignore values in the conditional -// logging macros. This avoids compiler warnings like "value computed -// is not used" and "statement has no effect". -class LogMessageVoidify { - public: - LogMessageVoidify() { } - // This has to be an operator with a precedence lower than << but - // higher than ?: - void operator&(std::ostream&) { } -}; - -////////////////////////////////////////////////////////////////////// -// Logging Helpers -////////////////////////////////////////////////////////////////////// - -class LogMultilineState { - public: - size_t unprintable_count_[2]; - LogMultilineState() { - unprintable_count_[0] = unprintable_count_[1] = 0; - } -}; - -// When possible, pass optional state variable to track various data across -// multiple calls to LogMultiline. Otherwise, pass NULL. -void LogMultiline(LoggingSeverity level, const char* label, bool input, - const void* data, size_t len, bool hex_mode, - LogMultilineState* state); - -// TODO(grunell): Change name to InitDiagnosticLoggingDelegate or -// InitDiagnosticLogging. Change also in init_webrtc.h/cc. -// TODO(grunell): typedef the delegate function. -void InitDiagnosticLoggingDelegateFunction( - void (*delegate)(const std::string&)); - -void SetExtraLoggingInit( - void (*function)(void (*delegate)(const std::string&))); -} // namespace talk_base - -////////////////////////////////////////////////////////////////////// -// Libjingle macros which are mapped over to their VLOG equivalent in -// base/logging.h -////////////////////////////////////////////////////////////////////// - -#if defined(LOGGING_INSIDE_LIBJINGLE) - -#define DIAGNOSTIC_LOG(sev, ctx, err, ...) \ - talk_base::DiagnosticLogMessage( \ - __FILE__, __LINE__, sev, VLOG_IS_ON(sev), \ - talk_base::ERRCTX_ ## ctx, err, ##__VA_ARGS__).stream() - -#define LOG_CHECK_LEVEL(sev) VLOG_IS_ON(talk_base::sev) -#define LOG_CHECK_LEVEL_V(sev) VLOG_IS_ON(sev) - -#define LOG_V(sev) DIAGNOSTIC_LOG(sev, NONE, 0) -#undef LOG -#define LOG(sev) DIAGNOSTIC_LOG(talk_base::sev, NONE, 0) - -// The _F version prefixes the message with the current function name. -#if defined(__GNUC__) && defined(_DEBUG) -#define LOG_F(sev) LOG(sev) << __PRETTY_FUNCTION__ << ": " -#else -#define LOG_F(sev) LOG(sev) << __FUNCTION__ << ": " -#endif - -#define LOG_E(sev, ctx, err, ...) \ - DIAGNOSTIC_LOG(talk_base::sev, ctx, err, ##__VA_ARGS__) - -#undef LOG_ERRNO_EX -#define LOG_ERRNO_EX(sev, err) LOG_E(sev, ERRNO, err) -#undef LOG_ERRNO -#define LOG_ERRNO(sev) LOG_ERRNO_EX(sev, errno) - -#if defined(OS_WIN) -#define LOG_GLE_EX(sev, err) LOG_E(sev, HRESULT, err) -#define LOG_GLE(sev) LOG_GLE_EX(sev, GetLastError()) -#define LOG_GLEM(sev, mod) LOG_E(sev, HRESULT, GetLastError(), mod) -#define LOG_ERR_EX(sev, err) LOG_GLE_EX(sev, err) -#define LOG_ERR(sev) LOG_GLE(sev) -#define LAST_SYSTEM_ERROR (::GetLastError()) -#else -#define LOG_ERR_EX(sev, err) LOG_ERRNO_EX(sev, err) -#define LOG_ERR(sev) LOG_ERRNO(sev) -#define LAST_SYSTEM_ERROR (errno) -#endif // OS_WIN - -#undef PLOG -#define PLOG(sev, err) LOG_ERR_EX(sev, err) - -#endif // LOGGING_INSIDE_LIBJINGLE - -#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_TALK_BASE_LOGGING_H_ diff --git a/third_party/libjingle/overrides/talk/base/win32socketinit.cc b/third_party/libjingle/overrides/talk/base/win32socketinit.cc deleted file mode 100644 index e8434f6..0000000 --- a/third_party/libjingle/overrides/talk/base/win32socketinit.cc +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Redirect Libjingle's winsock initialization activity into Chromium's -// singleton object that managest precisely that for the browser. - -#include "talk/base/win32socketinit.h" - -#include "net/base/winsock_init.h" - -#ifndef WIN32 -#error "Only compile this on Windows" -#endif - -namespace talk_base { - -void EnsureWinsockInit() { - net::EnsureWinsockInit(); -} - -} // namespace talk_base |