27628 2009-07-23 15:52:22 -0700 [v8] Simplify weak handlers callback 2009-07-28 01:27:09 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 antonm webkit-unassigned abarth ager christian.plesner.hansen iposva oldest_to_newest 134297 0 antonm 2009-07-23 15:52:22 -0700 As current wisdom is Nodes should be only managed from main thread, that simplifies management of near to death DOM nodes notably. 134303 1 33390 antonm 2009-07-23 16:11:20 -0700 Created attachment 33390 Initial version I'd say management of DOM node map should be simplidied, esp. fi Adam's patcj is in. 134351 2 33390 antonm 2009-07-23 19:34:54 -0700 Comment on attachment 33390 Initial version Sorry, forgot to mark as a patch 134352 3 33390 antonm 2009-07-23 19:36:11 -0700 Comment on attachment 33390 Initial version > Index: third_party/WebKit/WebCore/ChangeLog > =================================================================== > --- third_party/WebKit/WebCore/ChangeLog (revision 46295) > +++ third_party/WebKit/WebCore/ChangeLog (working copy) > @@ -1,3 +1,13 @@ > +2009-07-23 Anton Muhin <antonm@chromium.org> > + > + Reviewed by NOBODY (OOPS!). > + > + Simplify management of Nodes in weak handles callbacks. > + https://bugs.webkit.org/show_bug.cgi?id=27628 > + > + * bindings/v8/V8DOMMap.cpp: > + (WebCore::weakNodeCallback): > + > 2009-07-23 Dan Bernstein <mitz@apple.com> > > Reviewed by Dave Hyatt. > Index: third_party/WebKit/WebCore/bindings/v8/V8DOMMap.cpp > =================================================================== > --- third_party/WebKit/WebCore/bindings/v8/V8DOMMap.cpp (revision 46194) > +++ third_party/WebKit/WebCore/bindings/v8/V8DOMMap.cpp (working copy) > @@ -504,9 +504,12 @@ void weakActiveDOMObjectCallback(v8::Per > > static void weakNodeCallback(v8::Persistent<v8::Value> v8Object, void* domObject) > { > - v8::HandleScope scope; > - ASSERT(v8Object->IsObject()); > - DOMData::handleWeakObject<Node>(DOMDataStore::DOMNodeMap, v8::Handle<v8::Object>::Cast(v8Object), static_cast<Node*>(domObject)); > + DOMDataStore* store = DOMDataStore::allStores()[0]; > + DOMDataStore::InternalDOMWrapperMap<Node>& domMap = store->domNodeMap(); > + Node* node = static_cast<Node*>(domObject); > + v8Object.Dispose(); > + domMap.impl().remove(node); > + node->deref(); // Nobody overrides Node::deref so it's safe > } > > #if ENABLE(SVG) The code to retrieve DOM Node map should be merged with Adam's patch obviously. 134399 4 33390 abarth 2009-07-23 23:47:26 -0700 Comment on attachment 33390 Initial version + DOMDataStore* store = DOMDataStore::allStores()[0]; Why is it sufficient only to look in the zeroth DOMDataStore? What about the DOMDataStore for isolated worlds? 134438 5 christian.plesner.hansen 2009-07-24 01:03:27 -0700 I'm still a little unclear on how the dom node mappings work. This only works for nodes on the main thread right? So with Adam's changes you would use DOMData::getCurrentMainThread()->getStore().domNodeMap() instead? 134443 6 abarth 2009-07-24 01:12:12 -0700 (In reply to comment #5) > I'm still a little unclear on how the dom node mappings work. This only works > for nodes on the main thread right? So with Adam's changes you would use > DOMData::getCurrentMainThread()->getStore().domNodeMap() instead? You can try that, but it will crash because we're in the middle of a GC. :) That's why we iterate currently. 134451 7 christian.plesner.hansen 2009-07-24 01:25:40 -0700 Okay. Maybe not such a good idea then. 134472 8 33415 antonm 2009-07-24 02:22:32 -0700 Created attachment 33415 Addressing Adam's comments Thanks a lot, Adam. May you have another look? 134479 9 33415 abarth 2009-07-24 02:45:59 -0700 Comment on attachment 33415 Addressing Adam's comments This patch is still incorrect. - v8::HandleScope scope; Don't we need a handle scope before talking to handles? - ASSERT(v8Object->IsObject()); Why drop this assert? + ASSERT(store->domData()->owningThread() == WTF::currentThread()); This assert is bogus. Some of DOMDataStores belong to worker threads. Here's what you should do: 1) Acquire the mutex before iterating through the list because items might be inserted or removed on another thread. 2) Move the ASSERT to after + if (it == domMapImpl.end() || it->second != *v8Object) At that point, you've found a DOMDataStore that holds a Node and it must be on the main thread. 134502 10 33424 antonm 2009-07-24 04:14:14 -0700 Created attachment 33424 Second round Thanks a lot for another round, Adam. Answering in comments. 134503 11 antonm 2009-07-24 04:16:10 -0700 (In reply to comment #9) > (From update of attachment 33415 [details]) > This patch is still incorrect. > > - v8::HandleScope scope; > > Don't we need a handle scope before talking to handles? We don't create any handles and thus I don't think we need it, but, please, double check. > > - ASSERT(v8Object->IsObject()); > > Why drop this assert? I can easily revive it. My thought was it was originally necessary due to the cast below (which would check the type anyway, btw). No I don't do that cast and hence why ASSERT? > > + ASSERT(store->domData()->owningThread() == WTF::currentThread()); > > This assert is bogus. Some of DOMDataStores belong to worker threads. > > Here's what you should do: > > 1) Acquire the mutex before iterating through the list because items might be > inserted or removed on another thread. > > 2) Move the ASSERT to after > > + if (it == domMapImpl.end() || it->second != *v8Object) > > At that point, you've found a DOMDataStore that holds a Node and it must be on > the main thread. You're absolutely right, I wasn't attentive enough. 134595 12 33424 abarth 2009-07-24 10:41:21 -0700 Comment on attachment 33424 Second round I think you mistakenly uploaded the old version of the patch. 134840 13 33518 antonm 2009-07-26 21:59:28 -0700 Created attachment 33518 The right one 134841 14 33519 antonm 2009-07-26 22:08:37 -0700 Created attachment 33519 Fixing a minor type (should have used plural) 134842 15 antonm 2009-07-26 22:09:07 -0700 (In reply to comment #12) > (From update of attachment 33424 [details]) > I think you mistakenly uploaded the old version of the patch. I am very sorry, Adam, may you have a look now? 134843 16 33519 abarth 2009-07-26 22:19:21 -0700 Comment on attachment 33519 Fixing a minor type (should have used plural) This is great. Thanks for iterating on this. 134860 17 antonm 2009-07-27 01:34:18 -0700 (In reply to comment #16) > (From update of attachment 33519 [details]) > This is great. Thanks for iterating on this. Thanks a lot for review, Adam! 134871 18 abarth 2009-07-27 02:12:45 -0700 I would land this, except the canary isn't compiling. 134874 19 antonm 2009-07-27 02:36:48 -0700 (In reply to comment #18) > I would land this, except the canary isn't compiling. It used to compile. Let me sync to the most recent version and update the patch. 134875 20 abarth 2009-07-27 02:37:56 -0700 Oh, the patch is probably fine. The tree is red: http://build.chromium.org/buildbot/waterfall.fyi/waterfall?builder=Webkit%20(webkit.org)&builder=Webkit%20Mac%20(webkit.org)&builder=Webkit%20Linux%20(webkit.org) 135136 21 abarth 2009-07-28 01:27:09 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/v8/DOMDataStore.cpp Committed r46462 M WebCore/ChangeLog M WebCore/bindings/v8/DOMDataStore.cpp r46462 = f0f290bb233ca9ad7eef395908089c6c4f307085 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46462 33390 2009-07-23 16:11:20 -0700 2009-07-24 02:22:32 -0700 Initial version webcore.patch text/plain 1560 antonm SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2Mjk1KQor KysgdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjMgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBtYW5hZ2VtZW50IG9mIE5vZGVzIGluIHdlYWsgaGFuZGxlcyBjYWxsYmFja3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyOAorCisg ICAgICAgICogYmluZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2Vh a05vZGVDYWxsYmFjayk6CisKIDIwMDktMDctMjMgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0LgpJbmRleDogdGhpcmRfcGFy dHkvV2ViS2l0L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmNwcAkocmV2 aXNpb24gNDYxOTQpCisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9iaW5kaW5ncy92OC9W OERPTU1hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwNCw5ICs1MDQsMTIgQEAgdm9pZCB3ZWFr QWN0aXZlRE9NT2JqZWN0Q2FsbGJhY2sodjg6OlBlcgogCiBzdGF0aWMgdm9pZCB3ZWFrTm9kZUNh bGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdjhPYmplY3QsIHZvaWQqIGRvbU9iamVj dCkKIHsKLSAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7Ci0gICAgQVNTRVJUKHY4T2JqZWN0LT5J c09iamVjdCgpKTsKLSAgICBET01EYXRhOjpoYW5kbGVXZWFrT2JqZWN0PE5vZGU+KERPTURhdGFT dG9yZTo6RE9NTm9kZU1hcCwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2OE9iamVjdCks IHN0YXRpY19jYXN0PE5vZGUqPihkb21PYmplY3QpKTsKKyAgICBET01EYXRhU3RvcmUqIHN0b3Jl ID0gRE9NRGF0YVN0b3JlOjphbGxTdG9yZXMoKVswXTsKKyAgICBET01EYXRhU3RvcmU6OkludGVy bmFsRE9NV3JhcHBlck1hcDxOb2RlPiYgZG9tTWFwID0gc3RvcmUtPmRvbU5vZGVNYXAoKTsKKyAg ICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGRvbU9iamVjdCk7CisgICAgdjhPYmpl Y3QuRGlzcG9zZSgpOworICAgIGRvbU1hcC5pbXBsKCkucmVtb3ZlKG5vZGUpOworICAgIG5vZGUt PmRlcmVmKCk7ICAvLyBOb2JvZHkgb3ZlcnJpZGVzIE5vZGU6OmRlcmVmIHNvIGl0J3Mgc2FmZQog fQogCiAjaWYgRU5BQkxFKFNWRykK 33415 2009-07-24 02:22:32 -0700 2009-07-24 04:14:14 -0700 Addressing Adam's comments webcore.patch text/plain 1977 antonm SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzQ2KQor KysgdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjMgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBtYW5hZ2VtZW50IG9mIE5vZGVzIGluIHdlYWsgaGFuZGxlcyBjYWxsYmFja3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyOAorCisg ICAgICAgICogYmluZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2Vh a05vZGVDYWxsYmFjayk6CisKIDIwMDktMDctMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiB0aGlyZF9wYXJ0 eS9XZWJLaXQvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTU1hcC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCShyZXZp c2lvbiA0NjI4OCkKKysrIHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NTWFwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEwLDkgKzUxMCwyMCBAQCB2b2lkIHdlYWtB Y3RpdmVET01PYmplY3RDYWxsYmFjayh2ODo6UGVyCiAKIHN0YXRpYyB2b2lkIHdlYWtOb2RlQ2Fs bGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB2OE9iamVjdCwgdm9pZCogZG9tT2JqZWN0 KQogewotICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKLSAgICBBU1NFUlQodjhPYmplY3QtPklz T2JqZWN0KCkpOwotICAgIERPTURhdGE6OmhhbmRsZVdlYWtPYmplY3Q8Tm9kZT4oRE9NRGF0YVN0 b3JlOjpET01Ob2RlTWFwLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHY4T2JqZWN0KSwg c3RhdGljX2Nhc3Q8Tm9kZSo+KGRvbU9iamVjdCkpOworICAgIE5vZGUqIG5vZGUgPSBzdGF0aWNf Y2FzdDxOb2RlKj4oZG9tT2JqZWN0KTsKKyAgICBET01EYXRhTGlzdCYgbGlzdCA9IERPTURhdGFT dG9yZTo6YWxsU3RvcmVzKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0LnNpemUo KTsgKytpKSB7CisgICAgICAgIERPTURhdGFTdG9yZSogc3RvcmUgPSBsaXN0W2ldOworICAgICAg ICBBU1NFUlQoc3RvcmUtPmRvbURhdGEoKS0+b3duaW5nVGhyZWFkKCkgPT0gV1RGOjpjdXJyZW50 VGhyZWFkKCkpOworICAgICAgICBIYXNoTWFwPE5vZGUqLCB2ODo6T2JqZWN0Kj4mIGRvbU1hcElt cGwgPSBzdG9yZS0+ZG9tTm9kZU1hcCgpLmltcGwoKTsKKyAgICAgICAgSGFzaE1hcDxOb2RlKiwg djg6Ok9iamVjdCo+OjppdGVyYXRvciBpdCA9IGRvbU1hcEltcGwuZmluZChub2RlKTsKKyAgICAg ICAgaWYgKGl0ID09IGRvbU1hcEltcGwuZW5kKCkgfHwgaXQtPnNlY29uZCAhPSAqdjhPYmplY3Qp CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgdjhPYmplY3QuRGlzcG9zZSgpOworICAg ICAgICBkb21NYXBJbXBsLnJlbW92ZShpdCk7CisgICAgICAgIG5vZGUtPmRlcmVmKCk7ICAvLyBO b2JvZHkgb3ZlcnJpZGVzIE5vZGU6OmRlcmVmIHNvIGl0J3Mgc2FmZQorICAgICAgICBicmVhazsg IC8vIFRoZXJlIG1pZ2h0IGJlIGF0IG1vc3Qgb25lIHdyYXBwZXIgZm9yIHRoZSBub2RlIGluIHdv cmxkJ3MgbWFwCisgICAgfQogfQogCiAjaWYgRU5BQkxFKFNWRykK 33424 2009-07-24 04:14:14 -0700 2009-07-26 21:59:28 -0700 Second round webcore.patch text/plain 1977 antonm SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzQ2KQor KysgdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjMgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBtYW5hZ2VtZW50IG9mIE5vZGVzIGluIHdlYWsgaGFuZGxlcyBjYWxsYmFja3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyOAorCisg ICAgICAgICogYmluZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2Vh a05vZGVDYWxsYmFjayk6CisKIDIwMDktMDctMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiB0aGlyZF9wYXJ0 eS9XZWJLaXQvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTU1hcC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCShyZXZp c2lvbiA0NjI4OCkKKysrIHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NTWFwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEwLDkgKzUxMCwyMCBAQCB2b2lkIHdlYWtB Y3RpdmVET01PYmplY3RDYWxsYmFjayh2ODo6UGVyCiAKIHN0YXRpYyB2b2lkIHdlYWtOb2RlQ2Fs bGJhY2sodjg6OlBlcnNpc3RlbnQ8djg6OlZhbHVlPiB2OE9iamVjdCwgdm9pZCogZG9tT2JqZWN0 KQogewotICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKLSAgICBBU1NFUlQodjhPYmplY3QtPklz T2JqZWN0KCkpOwotICAgIERPTURhdGE6OmhhbmRsZVdlYWtPYmplY3Q8Tm9kZT4oRE9NRGF0YVN0 b3JlOjpET01Ob2RlTWFwLCB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0KHY4T2JqZWN0KSwg c3RhdGljX2Nhc3Q8Tm9kZSo+KGRvbU9iamVjdCkpOworICAgIE5vZGUqIG5vZGUgPSBzdGF0aWNf Y2FzdDxOb2RlKj4oZG9tT2JqZWN0KTsKKyAgICBET01EYXRhTGlzdCYgbGlzdCA9IERPTURhdGFT dG9yZTo6YWxsU3RvcmVzKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0LnNpemUo KTsgKytpKSB7CisgICAgICAgIERPTURhdGFTdG9yZSogc3RvcmUgPSBsaXN0W2ldOworICAgICAg ICBBU1NFUlQoc3RvcmUtPmRvbURhdGEoKS0+b3duaW5nVGhyZWFkKCkgPT0gV1RGOjpjdXJyZW50 VGhyZWFkKCkpOworICAgICAgICBIYXNoTWFwPE5vZGUqLCB2ODo6T2JqZWN0Kj4mIGRvbU1hcElt cGwgPSBzdG9yZS0+ZG9tTm9kZU1hcCgpLmltcGwoKTsKKyAgICAgICAgSGFzaE1hcDxOb2RlKiwg djg6Ok9iamVjdCo+OjppdGVyYXRvciBpdCA9IGRvbU1hcEltcGwuZmluZChub2RlKTsKKyAgICAg ICAgaWYgKGl0ID09IGRvbU1hcEltcGwuZW5kKCkgfHwgaXQtPnNlY29uZCAhPSAqdjhPYmplY3Qp CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgdjhPYmplY3QuRGlzcG9zZSgpOworICAg ICAgICBkb21NYXBJbXBsLnJlbW92ZShpdCk7CisgICAgICAgIG5vZGUtPmRlcmVmKCk7ICAvLyBO b2JvZHkgb3ZlcnJpZGVzIE5vZGU6OmRlcmVmIHNvIGl0J3Mgc2FmZQorICAgICAgICBicmVhazsg IC8vIFRoZXJlIG1pZ2h0IGJlIGF0IG1vc3Qgb25lIHdyYXBwZXIgZm9yIHRoZSBub2RlIGluIHdv cmxkJ3MgbWFwCisgICAgfQogfQogCiAjaWYgRU5BQkxFKFNWRykK 33518 2009-07-26 21:59:28 -0700 2009-07-26 22:08:37 -0700 The right one webcore.patch text/plain 2081 antonm SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzY5KQor KysgdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjMgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBtYW5hZ2VtZW50IG9mIE5vZGVzIGluIHdlYWsgaGFuZGxlcyBjYWxsYmFja3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyOAorCisg ICAgICAgICogYmluZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2Vh a05vZGVDYWxsYmFjayk6CisKIDIwMDktMDctMjQgIERyZXcgV2lsc29uICA8YXR3aWxzb25AZ29v Z2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogdGhpcmRf cGFydHkvV2ViS2l0L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmNwcAko cmV2aXNpb24gNDYzNjkpCisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOERPTU1hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxMCw5ICs1MTAsMjQgQEAgdm9pZCB3 ZWFrQWN0aXZlRE9NT2JqZWN0Q2FsbGJhY2sodjg6OlBlcgogCiBzdGF0aWMgdm9pZCB3ZWFrTm9k ZUNhbGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdjhPYmplY3QsIHZvaWQqIGRvbU9i amVjdCkKIHsKLSAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7Ci0gICAgQVNTRVJUKHY4T2JqZWN0 LT5Jc09iamVjdCgpKTsKLSAgICBET01EYXRhOjpoYW5kbGVXZWFrT2JqZWN0PE5vZGU+KERPTURh dGFTdG9yZTo6RE9NTm9kZU1hcCwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2OE9iamVj dCksIHN0YXRpY19jYXN0PE5vZGUqPihkb21PYmplY3QpKTsKKyAgICBBU1NFUlQoV1RGOjppc01h aW5UaHJlYWQoKSk7CisKKyAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGRvbU9i amVjdCk7CisKKyAgICBXVEY6Ok11dGV4TG9ja2VyIGxvY2tlcihET01EYXRhU3RvcmU6OmFsbFN0 b3Jlc011dGV4KCkpOworICAgIERPTURhdGFMaXN0JiBsaXN0ID0gRE9NRGF0YVN0b3JlOjphbGxT dG9yZXMoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgRE9NRGF0YVN0b3JlKiBzdG9yZSA9IGxpc3RbaV07CisgICAgICAgIEhhc2hNYXA8 Tm9kZSosIHY4OjpPYmplY3QqPiYgZG9tTWFwSW1wbCA9IHN0b3JlLT5kb21Ob2RlTWFwKCkuaW1w bCgpOworICAgICAgICBIYXNoTWFwPE5vZGUqLCB2ODo6T2JqZWN0Kj46Oml0ZXJhdG9yIGl0ID0g ZG9tTWFwSW1wbC5maW5kKG5vZGUpOworICAgICAgICBpZiAoaXQgPT0gZG9tTWFwSW1wbC5lbmQo KSB8fCBpdC0+c2Vjb25kICE9ICp2OE9iamVjdCkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICBBU1NFUlQoc3RvcmUtPmRvbURhdGEoKS0+b3duaW5nVGhyZWFkKCkgPT0gV1RGOjpjdXJy ZW50VGhyZWFkKCkpOworICAgICAgICB2OE9iamVjdC5EaXNwb3NlKCk7CisgICAgICAgIGRvbU1h cEltcGwucmVtb3ZlKGl0KTsKKyAgICAgICAgbm9kZS0+ZGVyZWYoKTsgIC8vIE5vYm9keSBvdmVy cmlkZXMgTm9kZTo6ZGVyZWYgc28gaXQncyBzYWZlCisgICAgICAgIGJyZWFrOyAgLy8gVGhlcmUg bWlnaHQgYmUgYXQgbW9zdCBvbmUgd3JhcHBlciBmb3IgdGhlIG5vZGUgaW4gd29ybGQncyBtYXAK KyAgICB9CiB9CiAKICNpZiBFTkFCTEUoU1ZHKQo= 33519 2009-07-26 22:08:37 -0700 2009-07-26 22:19:20 -0700 Fixing a minor type (should have used plural) webcore.patch text/plain 2082 antonm SW5kZXg6IHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzY5KQor KysgdGhpcmRfcGFydHkvV2ViS2l0L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjMgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT aW1wbGlmeSBtYW5hZ2VtZW50IG9mIE5vZGVzIGluIHdlYWsgaGFuZGxlcyBjYWxsYmFja3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYyOAorCisg ICAgICAgICogYmluZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d2Vh a05vZGVDYWxsYmFjayk6CisKIDIwMDktMDctMjQgIERyZXcgV2lsc29uICA8YXR3aWxzb25AZ29v Z2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpJbmRleDogdGhpcmRf cGFydHkvV2ViS2l0L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHRoaXJkX3BhcnR5L1dlYktpdC9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmNwcAko cmV2aXNpb24gNDYzNjkpCisrKyB0aGlyZF9wYXJ0eS9XZWJLaXQvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOERPTU1hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxMCw5ICs1MTAsMjQgQEAgdm9pZCB3 ZWFrQWN0aXZlRE9NT2JqZWN0Q2FsbGJhY2sodjg6OlBlcgogCiBzdGF0aWMgdm9pZCB3ZWFrTm9k ZUNhbGxiYWNrKHY4OjpQZXJzaXN0ZW50PHY4OjpWYWx1ZT4gdjhPYmplY3QsIHZvaWQqIGRvbU9i amVjdCkKIHsKLSAgICB2ODo6SGFuZGxlU2NvcGUgc2NvcGU7Ci0gICAgQVNTRVJUKHY4T2JqZWN0 LT5Jc09iamVjdCgpKTsKLSAgICBET01EYXRhOjpoYW5kbGVXZWFrT2JqZWN0PE5vZGU+KERPTURh dGFTdG9yZTo6RE9NTm9kZU1hcCwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdCh2OE9iamVj dCksIHN0YXRpY19jYXN0PE5vZGUqPihkb21PYmplY3QpKTsKKyAgICBBU1NFUlQoV1RGOjppc01h aW5UaHJlYWQoKSk7CisKKyAgICBOb2RlKiBub2RlID0gc3RhdGljX2Nhc3Q8Tm9kZSo+KGRvbU9i amVjdCk7CisKKyAgICBXVEY6Ok11dGV4TG9ja2VyIGxvY2tlcihET01EYXRhU3RvcmU6OmFsbFN0 b3Jlc011dGV4KCkpOworICAgIERPTURhdGFMaXN0JiBsaXN0ID0gRE9NRGF0YVN0b3JlOjphbGxT dG9yZXMoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpc3Quc2l6ZSgpOyArK2kpIHsK KyAgICAgICAgRE9NRGF0YVN0b3JlKiBzdG9yZSA9IGxpc3RbaV07CisgICAgICAgIEhhc2hNYXA8 Tm9kZSosIHY4OjpPYmplY3QqPiYgZG9tTWFwSW1wbCA9IHN0b3JlLT5kb21Ob2RlTWFwKCkuaW1w bCgpOworICAgICAgICBIYXNoTWFwPE5vZGUqLCB2ODo6T2JqZWN0Kj46Oml0ZXJhdG9yIGl0ID0g ZG9tTWFwSW1wbC5maW5kKG5vZGUpOworICAgICAgICBpZiAoaXQgPT0gZG9tTWFwSW1wbC5lbmQo KSB8fCBpdC0+c2Vjb25kICE9ICp2OE9iamVjdCkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICBBU1NFUlQoc3RvcmUtPmRvbURhdGEoKS0+b3duaW5nVGhyZWFkKCkgPT0gV1RGOjpjdXJy ZW50VGhyZWFkKCkpOworICAgICAgICB2OE9iamVjdC5EaXNwb3NlKCk7CisgICAgICAgIGRvbU1h cEltcGwucmVtb3ZlKGl0KTsKKyAgICAgICAgbm9kZS0+ZGVyZWYoKTsgIC8vIE5vYm9keSBvdmVy cmlkZXMgTm9kZTo6ZGVyZWYgc28gaXQncyBzYWZlCisgICAgICAgIGJyZWFrOyAgLy8gVGhlcmUg bWlnaHQgYmUgYXQgbW9zdCBvbmUgd3JhcHBlciBmb3IgdGhlIG5vZGUgaW4gd29ybGQncyBtYXBz CisgICAgfQogfQogCiAjaWYgRU5BQkxFKFNWRykK