summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle/libjingle.gyp
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 00:52:50 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-16 00:52:50 +0000
commitc20610d3cba2e3eaeb01927f39cc9cc21dfa1d33 (patch)
tree7e137e9114786f2dc98869b8723c5a5ccdf3488d /third_party/libjingle/libjingle.gyp
parentdac3823fca2dd4d2b0aa2184ef918d27cfb536e6 (diff)
downloadchromium_src-c20610d3cba2e3eaeb01927f39cc9cc21dfa1d33.zip
chromium_src-c20610d3cba2e3eaeb01927f39cc9cc21dfa1d33.tar.gz
chromium_src-c20610d3cba2e3eaeb01927f39cc9cc21dfa1d33.tar.bz2
Within libjingle, add an abstraction of winsock initialization.
When building chrome, override the default implementation so that we share the winsock initialization singleton with net/base. Trigger the winsock initialization lazily in a few places. This is intended to fix a startup perf regression that appeared when sync (and libjingle) became linked into chrome.dll, rather than a separate delay-loaded sync dll. BUG=24448 TEST=Verified deferred winsock initialization via debugger. Measured before and after time of the StartupTest.PerfTest. Verified sync notification still work. Review URL: http://codereview.chromium.org/267089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle/libjingle.gyp')
-rw-r--r--third_party/libjingle/libjingle.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 8730ca3..b360568 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -61,6 +61,7 @@
# 'files/talk/base/natserver_main.cc', # has a main()
# 'files/talk/base/openssladapter.cc', # openssl
# 'files/talk/base/openssladapter.h', # openssl
+ # 'files/talk/base/winsock_initializer.cc', # overridden
'files/talk/base/asynchttprequest.cc',
'files/talk/base/asynchttprequest.h',
'files/talk/base/asyncpacketsocket.cc',
@@ -164,6 +165,7 @@
'files/talk/base/urlencode.h',
'files/talk/base/virtualsocketserver.cc',
'files/talk/base/virtualsocketserver.h',
+ 'files/talk/base/winsock_initializer.h',
'files/talk/p2p/base/candidate.h',
'files/talk/p2p/base/common.h',
'files/talk/p2p/base/constants.cc',
@@ -266,6 +268,7 @@
'files/talk/base/winfirewall.h',
'files/talk/base/winping.cc',
'files/talk/base/winping.h',
+ 'overrides/talk/base/winsock_initializer.cc',
],
}],
['OS=="linux" or OS=="mac"', {