summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 02:09:57 +0000
committeryuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-21 02:09:57 +0000
commit7baf2a59aed93553893350b24660c931c97a5796 (patch)
tree2efa576fa6dfa7da4d0ef3f51d7f47b6194a0730
parent326828b11895bb9753bbd9efd42800a9f4d67d6d (diff)
downloadchromium_src-7baf2a59aed93553893350b24660c931c97a5796.zip
chromium_src-7baf2a59aed93553893350b24660c931c97a5796.tar.gz
chromium_src-7baf2a59aed93553893350b24660c931c97a5796.tar.bz2
WebKit roll 97838:97950
The same roll by cr106480 has been rolled back due to Webkit Mac (valgrind) build error. See below. I believe ld has tried to link stale LocalMediaStream.o and others. ( http://trac.webkit.org/changeset/97904 ). Hence I try to do the same roll again. Undefined symbols: "WebCore::MediaStreamFrameController::stopGeneratedStream(WTF::String const&)", referenced from: WebCore::LocalMediaStream::stop() in libwebcore_dom.a(LocalMediaStream.o) "WebCore::MediaStreamFrameController::setMediaStreamTrackEnabled(WTF::String const&, bool)", referenced from: WebCore::MediaStreamTrack::setEnabled(bool) in libwebcore_dom.a(MediaStreamTrack.o) "WebCore::MessageEvent::initMessageEvent(WTF::AtomicString const&, bool, bool, WebCore::ScriptValue const&, WTF::String const&, WTF::String const&, WebCore::DOMWindow*, WTF::PassOwnPtr<WTF::Vector<WTF::RefPtr<WebCore::MessagePort>, 1ul> >)", referenced from: WebCore::V8MessageEvent::initMessageEventCallback(v8::Arguments const&) in libwebcore_remaining.a(V8MessageEventCustom.o) "WebCore::MediaStream::readyState() const", referenced from: WebCore::MediaStreamInternal::readyStateAttrGetter(v8::Local<v8::String>, v8::AccessorInfo const&) in libwebcore_bindings.a(V8DerivedSources11.o) "WebCore::MediaStream::create(WebCore::ScriptExecutionContext*, WTF::PassRefPtr<WebCore::MediaStreamDescriptor>)", referenced from: WebCore::PeerConnection::remoteStreamAdded(WTF::PassRefPtr<WebCore::MediaStreamDescriptor>) in libwebcore_remaining.a(PeerConnection.o) "WebCore::Node::isContentRichlyEditable()", referenced from: WebCore::prepareClipboardForImageDrag(WebCore::Frame*, WebCore::Clipboard*, WebCore::Element*, WebCore::KURL const&, WebCore::KURL const&, WTF::String const&)in libwebcore_remaining.a(DragController.o) ld: symbol(s) not found BUG=none TEST=none TBR=jchaffraix,dpranke Review URL: http://codereview.chromium.org/8360024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106659 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index f365936..04f6ed3 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "97838",
+ "webkit_revision": "97950",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "6965",