13 Commits

Author SHA1 Message Date
henrike@webrtc.org
4e5f65a4c6 Rebase webrtc/base with r6345 version of talk/base:
cd webrtc/base
svn diff -r 6249:6300 http://webrtc.googlecode.com/svn/trunk/talk/base >
6300.diff
patch -p0 -i 6300.diff
ls genericslot* | xargs rm
cp ../../talk/base/sigslottester* .
manual edits of sigslottester* to get rid of talk and talk_base.

BUG=3379
TBR=jiayang

Review URL: https://webrtc-codereview.appspot.com/19649004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6347 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-05 20:40:11 +00:00
henrike@webrtc.org
caa01b172e Rebase webrtc/base with r6250:
cd webrtc/base
svn diff -r 6249:6250 http://webrtc.googlecode.com/svn/trunk/talk/base >
6250.diff
patch -p0 -i 6250.diff

BUG=3379
TBR=phoglund@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/16589004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6271 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-29 15:53:39 +00:00
henrike@webrtc.org
ddc79d0418 Rebase webrtc/base with r6232:
cd webrtc/base
svn diff -r 6231:6232 http://webrtc.googlecode.com/svn/trunk/talk/base > 6232.diff
patch -p0 -i 6232.diff

BUG=3379
TBR=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14599004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6239 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-23 18:40:46 +00:00
fischman@webrtc.org
e5063b1733 Thread: delete racy API (Release()) and fix racy code (started()).
- Thread::Release() wrote a local variable on the calling thread but read it on
  another thread, with no synchronization.  Happily it has no non-test callers
  so deleting it instead of trying to fix it (see bug for details).
- Thread::started_ similarly was racily being written to; replaced with a
  running_ Event, and hid the accessor except for tests & legacy callers,
  with a note about why it's a bad idea.

webrtc/base patched with:
git diff origin --relative=talk/base | patch -p1 -dwebrtc/base
followed by manual merge of 3 thunks that ran afoul of naming differences
between talk/base and webrtc/base.

BUG=3388
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14589005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6236 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-23 17:28:50 +00:00
henrike@webrtc.org
99b4162ccf Rebase webrtc/base 6163:6216 (svn diff -r 6163:6216 http://webrtc.googlecode.com/svn/trunk/talk/base, apply diff manually)
BUG=3379
TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17619004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6217 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-21 20:42:17 +00:00
henrike@webrtc.org
a148704b4b Rename webrtc/base's IS_ALIGNED macro to RTC_IS_ALIGNED to avoid conflict between webrtc/base/basictypes.h and third_party/.../vpx_codec.h.
BUG=3380
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17579005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6215 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-21 16:52:14 +00:00
tkchin@webrtc.org
7ca1edb31d Remove IOKit linkage from iOS builds.
IOKit has been removed in iOS7, so link fails. iOS build succeeds after removing this setting and the corresponding one in talk/libjingle.gyp. Presubmit script tells me that CLs aren't allowed to touch both talk/ and webrtc/ at the same time so doing this separately.

BUG=
R=fischman@webrtc.org, niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20509005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6191 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-19 21:05:10 +00:00
henrike@webrtc.org
14abcc7322 libvpx's UNUSED macro conflicts with webrtc/base's. Added missing include of assert.h. Globally defined function "Unused" in talk/base and its copy (webrtc/base) is causing a conflict.
libvpx macro (UNUSED) can be found here:
http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/libvpx/source/libvpx/vpx/vpx_codec.h

BUG=N/A
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17489004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6185 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-16 16:54:44 +00:00
henrike@webrtc.org
cfdf420e21 Rebase webrtc/base 6129:6163 (svn diff -r 6129:6163 http://webrtc.googlecode.com/svn/trunk/talk/base apply diff manually)
BUG=N/A
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15519004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6175 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-15 16:33:04 +00:00
henrike@webrtc.org
c50bf7cbd0 Added namespace rtc to some base classes and functions. It was causing linker error in the FYI bots: http://chromegw.corp.google.com/i/internal.chromium.webrtc.fyi/builders/Android%20Builder%20%28dbg%29/builds/1808/steps/compile/logs/stdio but also, not doing it pollutes the global namespace.
BUG=N/A
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19479005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6157 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-14 18:24:13 +00:00
henrike@webrtc.org
f048872e91 Adds a modified copy of talk/base to webrtc/base. It is the first step in
migrating talk/base to webrtc/base.

BUG=N/A
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17479005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6129 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-13 18:00:26 +00:00
perkj@webrtc.org
e9a604accd Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-13 08:15:48 +00:00
henrike@webrtc.org
2c7d1b39b9 Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
BUG=N/A
R=andrew@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12199004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6107 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-12 18:03:09 +00:00