44036 2010-08-15 12:59:34 -0700 Port Chromium's WebEntities to HTMLEntityTable 2010-08-16 04:57:34 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 43949 1 eric eric abarth commit-queue fishd hamaji japhet jnd mihaip webkit.review.bot yaar yutak oldest_to_newest 264867 0 eric 2010-08-15 12:59:34 -0700 Remove Chromium's broken WebEntities code since it depends on removed WebCore files 264868 1 64452 eric 2010-08-15 13:07:25 -0700 Created attachment 64452 Patch 264869 2 eric 2010-08-15 13:08:33 -0700 CCing the current webkit gardner. 264870 3 mihaip 2010-08-15 13:10:09 -0700 +Yaar, Darin and Johnny, since WebEntities was added by Yaar and reviewed by Darin in http://trac.webkit.org/changeset/52268 based on code written by Johnny, in case any of them have opinions on how to best re-implement this. 264873 4 64452 abarth 2010-08-15 13:18:08 -0700 Comment on attachment 64452 Patch This patch is pretty lame. We should have someone who knows what this code is for comment on whether this is the right approach. 264875 5 eric 2010-08-15 13:37:24 -0700 I'm in no rush anywhere. Mostly posting this for the gardner, since the chromium build is broken for anyone who does a clean build. 264885 6 fishd 2010-08-15 14:34:01 -0700 This looks like it is going to break chromium's page-save-as code. Can the breaking changes made to WebCore be reverted until this is sorted out properly? The whole point of this code living in WebKit was to allow for both changes to be made _together_. 264887 7 abarth 2010-08-15 14:40:42 -0700 > This looks like it is going to break chromium's page-save-as code. Can the breaking changes made to WebCore be reverted until this is sorted out properly? I'd rather not. This change required surgery to all the build systems and updates to a bunch of test expectations. > The whole point of this code living in WebKit was to allow for both changes to be made _together_. It seems better to port the code to the new entity representation, as I suggested in https://bugs.webkit.org/show_bug.cgi?id=43949#c35 The code will still be wrong, but at least it will compile. 264890 8 64457 abarth 2010-08-15 15:30:49 -0700 Created attachment 64457 Patch 264891 9 webkit.review.bot 2010-08-15 15:36:23 -0700 Attachment 64457 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/chromium/src/WebEntities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 264893 10 64458 abarth 2010-08-15 15:55:46 -0700 Created attachment 64458 Patch 264895 11 webkit.review.bot 2010-08-15 15:59:02 -0700 Attachment 64458 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/chromium/src/WebEntities.cpp:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 264903 12 abarth 2010-08-15 17:27:45 -0700 btw, I think this patch is wrong. I probably prints out an extra ";" after each entity. 264907 13 eric 2010-08-15 17:43:17 -0700 I think I might take a stab at moving the lokup down to HTMLEnitySearch.h/cpp. Then this WebEntity code can have its own blacklist. That ends up being a function call per character... which is a bad idea, but no worse than any of the rest of this. :) 264911 14 64458 eric 2010-08-15 18:30:18 -0700 Comment on attachment 64458 Patch It likely does add an extra ';'. I'm tired of fighting this code. James says this is mostly vestigial. 264912 15 64458 commit-queue 2010-08-15 18:49:18 -0700 Comment on attachment 64458 Patch Clearing flags on attachment: 64458 Committed r65388: <http://trac.webkit.org/changeset/65388> 264913 16 commit-queue 2010-08-15 18:49:23 -0700 All reviewed patches have been landed. Closing bug. 265017 17 yutak 2010-08-16 04:39:12 -0700 (In reply to comment #15) > (From update of attachment 64458 [details]) > Clearing flags on attachment: 64458 > > Committed r65388: <http://trac.webkit.org/changeset/65388> r65388 broke Chromium's test_shell_tests (DomSerializerTests.* will timeout). It loops infinitely inside while loop of populateMapFromHTMLEntityTable function (it seems "entry" variable does not change inside the loop). Fix seems easy, so I'll try to fix this... 265020 18 64484 yutak 2010-08-16 04:51:53 -0700 Created attachment 64484 Fix for test_shell_tests 265022 19 64484 hamaji 2010-08-16 04:55:30 -0700 Comment on attachment 64484 Fix for test_shell_tests rs=me 265024 20 hamaji 2010-08-16 04:57:34 -0700 Committed r65411: <http://trac.webkit.org/changeset/65411> 64452 2010-08-15 13:07:25 -0700 2010-08-15 15:30:45 -0700 Patch bug-44036-20100815150723.patch text/plain 6861 eric ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE0MzEzOWY5ZjIwOGNhZDZiMzcwZDgyODY1YzdiMjBhNDY4ZTdmOTYu LjUzMjFkZWYyN2RmYzM1Nzg1M2E0NGU0MTgxNjNjYmM5Y2U0NDhiNDEgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDQ0IEBACisyMDEwLTA4LTE1ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1v dmUgQ2hyb21pdW0ncyBicm9rZW4gV2ViRW50aXRpZXMgY29kZSBzaW5jZSBpdCBkZXBlbmRzIG9u IHJlbW92ZWQgV2ViQ29yZSBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDQwMzYKKworICAgICAgICBDaHJvbWl1bSBoYWQgc29tZSBXZWJLaXQg Y29kZSB3aGljaCBkZXBlbmRlZCBkaXJlY3RseSBvbiBXZWJDb3JlJ3MKKyAgICAgICAgb2xkIGVu dGl0eSBoYXNoLiAgVGhpcyBicm9rZSB3aGVuIHdlIHJlbW92ZWQgdGhpcyBlbnRpdHkgaGFzaCwg YnV0CisgICAgICAgIHdlIG9ubHkgbm90aWNlZCBhIGZldyBkYXlzIGxhdGVyIGFzIGZvbGtzIHN0 YXJ0ZWQgZG9pbmcgY2xlYW4gYnVpbGRzLgorCisgICAgICAgIEZvciBub3cgSSd2ZSByZW1vdmVk IHRoZSBicm9rZW4gY29kZS4gIFRoaXMgd2UgdW5kb3VidGFibHkgYnJlYWsKKyAgICAgICAgdW5p dCB0ZXN0cyBpbiBDaHJvbWl1bSdzIHVwc3RyZWFtIHJlcG9zaXRvcnkuICBIb3dldmVyIHRoZXJl IGlzIG5vdGhpbmcKKyAgICAgICAgSSBjYW4gcmVwbGFjZSB0aGlzIGNvZGUgd2l0aCB3aGljaCB3 b24ndCBhbHNvIGJlIGxpa2VseSB0byBicmVhaworICAgICAgICBhbnkgdW5pdCB0ZXN0cy4KKwor ICAgICAgICBIVE1MRW50aXR5TmFtZXMuY3BwIHVzZWQgdG8gYmUgZ2VuZXJhdGVkIGJ5IGdwZXJm IGFzIGEgcGVyZmVjdCBoYXNoIG9mCisgICAgICAgIGh0bWwgZW50aXR5IG5hbWVzIHRvIHV0ZjE2 IGNvZGUgcG9pbnRzLgorICAgICAgICBOb3cgd2UgdXNlIEhUTUxFbnRpdHlUYWJsZSwgd2hpY2gg aW5jbHVkZXMgbWFueSBtb3JlIGVudGl0aWVzIChmb3IgSFRNTDUgY29tcGF0aWJpbGl0eSkKKyAg ICAgICAgYW5kIG1hcHMgdG8gMzItYml0IHVuaWNvZGUgY29kZSBwb2ludHMuCisKKyAgICAgICAg T25lIGNvdWxkIGJ1aWxkIGEgY29kZS10by1uYW1lIGxvb2t1cCBhZ2FpbiBvbiB0b3Agb2YgSFRN TEVudGl0eVRhYmxlLmNwcCwgYnV0IG5vdAorICAgICAgICB3aXRob3V0IGluYXBwcm9wcmlhdGVs eSByZWFjaGluZyBpbnRvIFdlYkNvcmUgZGF0YSBmaWxlcy4KKyAgICAgICAgV2UgY2FuJ3QgYnVp bGQgYW4gaWRlbnRpY2FsIGxvb2t1cCBpbiBXZWJDb3JlLCBiZWNhdXNlIHRoaXMgZmlsZSB1c2Vk IGFuIGFyYml0cmFyeQorICAgICAgICBibGFja2xpc3Qgb2YgZW50aXRpZXMgbm90IHRvIHJlcGxh Y2UgKHdpdGggbm8gZXhwbGFudGF0aW9uIG9mIHdoeSkuCisKKyAgICAgICAgVGhlIGJlc3Qgc29s dXRpb24gaXMgZm9yIENocm9taXVtIHRvIG1vdmUgbW9yZSB0b3dhcmRzIHNoYXJpbmcgc2VyaWFs aXphdGlvbgorICAgICAgICBjb2RlIHdpdGggYWxsIHRoZSByZXN0IG9mIHRoZSBXZWJLaXQgcG9y dHMgKG1hcmt1cC5jcHApLgorCisgICAgICAgIEEgc2Vjb25kLWJlc3Qgc29sdXRpb24gd291bGQg YmUgZm9yIENocm9taXVtIHRvIG1vdmUgdG8gYSB3aGl0ZS1saXN0IG9mIGVudGl0aWVzCisgICAg ICAgIHRvIHJlcGxhY2UgKHNpbWlsYXIgdG8gdGhlIDUgdGhhdCBtYXJrdXAuY3BwIHVzZXMpIGlu c3RlYWQgb2YgdGhlIGJsYWNrLWxpc3QKKyAgICAgICAgbGlrZSBDaHJvbWl1bSB3YXMgdXNpbmcu CisKKyAgICAgICAgSW4gZWl0aGVyIGNhc2UsIEkgbGVhdmUgdGhpcyB0byBDaHJvbWl1bSdzIHVw c3RyZWFtIG1haW50YWluZXJzIHRvIGRlY2lkZS4KKyAgICAgICAgVGhpcyBjaGFuZ2Ugc2hvdWxk IGF0IGxlYXN0IGZpeCB0aGVpciB3ZWJraXQub3JnIGJ1aWxkLgorCisgICAgICAgICogc3JjL1dl YkVudGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRW50aXRpZXM6OldlYkVudGl0aWVz KToKKyAgICAgICAgKFdlYktpdDo6V2ViRW50aXRpZXM6OmVudGl0eU5hbWVCeUNvZGUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJFbnRpdGllczo6Y29udmVydEVudGl0aWVzSW5TdHJpbmcpOgorCiAy MDEwLTA4LTEzICBTYXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJFbnRpdGllcy5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0aWVzLmNw cAppbmRleCAzMGI2MTliYmNhZDUwMTQ4Mzk0NGRmZjMxODgxYzljMGRhOTVhMmNmLi45YTZkY2I1 YTUzNDZiN2Y2NzIxOThiMWNmOWM3MDMzZGRmNzY3YjY3IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkVudGl0aWVzLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVu dGl0aWVzLmNwcApAQCAtMzEsMTAzICszMSw0NCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2lu Y2x1ZGUgIldlYkVudGl0aWVzLmgiCiAKLSNpbmNsdWRlIDxzdHJpbmcuaD4KLQogI2luY2x1ZGUg IlBsYXRmb3JtU3RyaW5nLmgiCi0jaW5jbHVkZSAiU3RyaW5nQnVpbGRlci5oIgotI2luY2x1ZGUg PHd0Zi9IYXNoTWFwLmg+Ci0KICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKIAogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiAKLW5hbWVzcGFjZSB7Ci0vLyBOb3RlIHRoYXQgdGhpcyBmaWxlIGlzIGFs c28gaW5jbHVkZWQgYnkgTGVnYWN5SFRNTERvY3VtZW50UGFyc2VyLmNwcCBzbyB3ZSBhcmUgZ2V0 dGluZwotLy8gdHdvIGNvcGllcyBvZiB0aGUgZGF0YSBpbiBtZW1vcnkuICBXZSBjYW4gZml4IHRo aXMgYnkgY2hhbmdpbmcgdGhlIHNjcmlwdAotLy8gdGhhdCBnZW5lcmF0ZWQgdGhlIGFycmF5IHRv IGNyZWF0ZSBhIHN0YXRpYyBjb25zdCB0aGF0IGlzIGl0cyBsZW5ndGgsIGJ1dAotLy8gdGhpcyBp cyBsb3cgcHJpb3JpdHkgc2luY2UgdGhlIGRhdGEgaXMgbGVzcyB0aGFuIDRLLiBXZSB1c2UgYW5v bnltb3VzCi0vLyBuYW1lc3BhY2UgdG8gcHJldmVudCBuYW1lIGNvbGxpc2lvbnMuCi0jaW5jbHVk ZSAiSFRNTEVudGl0eU5hbWVzLmNwcCIgLy8gTk9MSU5UCi19Ci0KIG5hbWVzcGFjZSBXZWJLaXQg ewogCi12b2lkIHBvcHVsYXRlTWFwKFdURjo6SGFzaE1hcDxpbnQsIFdURjo6U3RyaW5nPiYgbWFw LAotICAgICAgICAgICAgICAgICBjb25zdCBFbnRpdHkqIGVudGl0aWVzLAotICAgICAgICAgICAg ICAgICBzaXplX3QgZW50aXRpZXNDb3VudCwKLSAgICAgICAgICAgICAgICAgYm9vbCBzdGFuZGFy ZEhUTUwpCitXZWJFbnRpdGllczo6V2ViRW50aXRpZXMoYm9vbCkKIHsKLSAgICBBU1NFUlQobWFw LmlzRW1wdHkoKSk7Ci0gICAgY29uc3QgRW50aXR5KiBlbnRpdHkgPSAmZW50aXRpZXNbMF07Ci0g ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBlbnRpdGllc0NvdW50OyBpKyssIGVudGl0eSsrKSB7 Ci0gICAgICAgIGludCBjb2RlID0gZW50aXR5LT5jb2RlOwotICAgICAgICBTdHJpbmcgbmFtZSA9 IGVudGl0eS0+bmFtZTsKLSAgICAgICAgLy8gRm9yIGNvbnNpc3RlbmN5LCB1c2UgdGhlIGxvd2Ug Y2FzZSBmb3IgZW50aXRpZXMgdGhhdCBoYXZlIGJvdGguCi0gICAgICAgIGlmIChtYXAuY29udGFp bnMoY29kZSkgJiYgbWFwLmdldChjb2RlKSA9PSBuYW1lLmxvd2VyKCkpCi0gICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgLy8gRG9uJ3QgcmVnaXN0ZXIgJnBlcmNudDssICZuc3VwOyBhbmQg JnN1cGw7LgotICAgICAgICBpZiAoc3RhbmRhcmRIVE1MICYmIChjb2RlID09ICclJyB8fCBjb2Rl ID09IDB4MjI4NSB8fCBjb2RlID09IDB4MDBiOSkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgbWFwLnNldChjb2RlLCBuYW1lKTsKLSAgICB9Ci0gICAgaWYgKHN0YW5kYXJkSFRNTCkK LSAgICAgICAgbWFwLnNldChzdGF0aWNfY2FzdDxpbnQ+KDB4MDAyNyksIFN0cmluZygiIzM5Iikp OwogfQogCi1zdGF0aWMgY29uc3QgRW50aXR5IHhtbEJ1aWx0SW5FbnRpdHlDb2Rlc1tdID0gewot ICAgIHsgImx0IiwgMHgwMDNjIH0sCi0gICAgeyAiZ3QiLCAweDAwM2UgfSwKLSAgICB7ICJhbXAi LCAweDAwMjYgfSwKLSAgICB7ICJhcG9zIiwgMHgwMDI3IH0sCi0gICAgeyAicXVvdCIsIDB4MDAy MiB9Ci19OwotCi1XZWJFbnRpdGllczo6V2ViRW50aXRpZXMoYm9vbCB4bWxFbnRpdGllcykKK1N0 cmluZyBXZWJFbnRpdGllczo6ZW50aXR5TmFtZUJ5Q29kZShpbnQpIGNvbnN0CiB7Ci0gICAgaWYg KHhtbEVudGl0aWVzKQotICAgICAgICBwb3B1bGF0ZU1hcChtX2VudGl0aWVzTWFwLAotICAgICAg ICAgICAgICAgICAgICB4bWxCdWlsdEluRW50aXR5Q29kZXMsCi0gICAgICAgICAgICAgICAgICAg IHNpemVvZih4bWxCdWlsdEluRW50aXR5Q29kZXMpIC8gc2l6ZW9mKEVudGl0eSksCi0gICAgICAg ICAgICAgICAgICAgIGZhbHNlKTsKLSAgICBlbHNlCi0gICAgICAgIHBvcHVsYXRlTWFwKG1fZW50 aXRpZXNNYXAsCi0gICAgICAgICAgICAgICAgICAgIHdvcmRsaXN0LAotICAgICAgICAgICAgICAg ICAgICBzaXplb2Yod29yZGxpc3QpIC8gc2l6ZW9mKEVudGl0eSksCi0gICAgICAgICAgICAgICAg ICAgIHRydWUpOwotfQotCi1TdHJpbmcgV2ViRW50aXRpZXM6OmVudGl0eU5hbWVCeUNvZGUoaW50 IGNvZGUpIGNvbnN0Ci17Ci0gICAgaWYgKG1fZW50aXRpZXNNYXAuY29udGFpbnMoY29kZSkpCi0g ICAgICAgIHJldHVybiBtX2VudGl0aWVzTWFwLmdldChjb2RlKTsKICAgICByZXR1cm4gIiI7CiB9 CiAKIFN0cmluZyBXZWJFbnRpdGllczo6Y29udmVydEVudGl0aWVzSW5TdHJpbmcoY29uc3QgU3Ry aW5nJiB2YWx1ZSkgY29uc3QKIHsKLSAgICB1bnNpZ25lZCBsZW4gPSB2YWx1ZS5sZW5ndGgoKTsK LSAgICBjb25zdCBVQ2hhciogc3RhcnRQb3MgPSB2YWx1ZS5jaGFyYWN0ZXJzKCk7Ci0gICAgY29u c3QgVUNoYXIqIGN1clBvcyA9IHN0YXJ0UG9zOworICAgIC8vIEZJWE1FOiBUaGlzIGNsYXNzIHVz ZWQgdG8gdXNlIHNvbWUgbm9uLXNlbnNpY2FsIGNvZGUgdG8gcmVwbGFjZQorICAgIC8vIGVudGl0 aWVzIGluIGEgU3RyaW5nIGJhc2VkIG9uIHRoZSBlbnRpdHkgaGFzaCBpbiBIVE1MRW50aXR5TmFt ZXMuCisgICAgLy8gTm93IGl0IGhhcyBubyBjb2RlLiAgVGhhdCB3aWxsIGxpa2VseSBicmVhayBD aHJvbWl1bSB1bml0IHRlc3RzLgorCisgICAgLy8gVGhpcyBjb2RlIGhhZCBhIGJsYWNrLWxpc3Qg b2YgZW50aXRpZXMgbm90IHRvIHJlcGxhY2UsIGNvbnRyb2xsZWQgYnkKKyAgICAvLyB0aGUgInht bEVudGl0aWVzIiBib29sIGluIHRoZSBjb25zdHJ1Y3Rvci4KKyAgICAvLyBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDM5NDkgcmVtb3ZlZCBIVE1MRW50aXR5TmFtZXMu Y3BwCisgICAgLy8gYW5kIHJlcGxhY2VkIGl0IHdpdGggSFRNTEVudGl0eVRhYmxlLmNwcCB3aGlj aCBpbmNsdWRlcyBhbGwgb2YgdGhlCisgICAgLy8gSFRNTDUgZW50aXRpZXMuCisKKyAgICAvLyAx LiAgVGhlcmUgaXMgbm8gcmVhc29uIGZvciBDaHJvbWl1bSB0byBoYXZlIHNlcGFyYXRlIERPTSBz ZXJpYWxpemF0aW9uCisgICAgLy8gaW4gaXRzIHdlYmtpdCBsYXllci4KKworICAgIC8vIDIuICBE aXJlY3QgYWNjZXNzIHRvIFdlYkNvcmUgZGF0YSBmaWxlcyBmcm9tIFdlYktpdCBpcyBhIGNvbXBs ZXRlIGFuZCB0b3RhbCBuby1uby4KIAotICAgIC8vIEZJWE1FOiBPcHRpbWl6ZSAtIGNyZWF0ZSBT dHJpbmdCdWlsZGVyIG9ubHkgaWYgdmFsdWUgaGFzIGFueSBlbnRpdGllcy4KLSAgICBTdHJpbmdC dWlsZGVyIHJlc3VsdDsKLSAgICB3aGlsZSAobGVuLS0pIHsKLSAgICAgICAgaWYgKG1fZW50aXRp ZXNNYXAuY29udGFpbnMoKmN1clBvcykpIHsKLSAgICAgICAgICAgIC8vIEFwcGVuZCBjb250ZW50 IGJlZm9yZSBlbnRpdHkgY29kZS4KLSAgICAgICAgICAgIGlmIChjdXJQb3MgPiBzdGFydFBvcykK LSAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKFN0cmluZyhzdGFydFBvcywgY3VyUG9zIC0g c3RhcnRQb3MpKTsKLSAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoIiYiKTsKLSAgICAgICAgICAg IHJlc3VsdC5hcHBlbmQobV9lbnRpdGllc01hcC5nZXQoKmN1clBvcykpOwotICAgICAgICAgICAg cmVzdWx0LmFwcGVuZCgiOyIpOwotICAgICAgICAgICAgc3RhcnRQb3MgPSArK2N1clBvczsKLSAg ICAgICAgfSBlbHNlCi0gICAgICAgICAgICBjdXJQb3MrKzsKLSAgICB9Ci0gICAgLy8gQXBwZW5k IHRoZSByZW1haW5pbmcgY29udGVudC4KLSAgICBpZiAoY3VyUG9zID4gc3RhcnRQb3MpCi0gICAg ICAgIHJlc3VsdC5hcHBlbmQoU3RyaW5nKHN0YXJ0UG9zLCBjdXJQb3MgLSBzdGFydFBvcykpOwor ICAgIC8vIDMuIFVzaW5nIGEgYmxhY2stbGlzdCBpbnN0ZWFkIG9mIGEgd2hpdGUtbGlzdCBmb3Ig ZW50aXRpZXMgbGlrZWx5IHdhcyBjYXVzaW5nCisgICAgLy8gdGhpcyBjb2RlIHRvIHJlcGxhY2Ug KndheSogbW9yZSBlbnRpdGllcyB0aGFuIGl0IHdvdWxkIG1ha2Ugc2Vuc2UgdG8uCisgICAgLy8g bWFya3VwLmNwcCBmb3IgZXhhbXBsZSBvbmx5IHJlcGxhY2VzIDUgZW50aXRpZXMgdG90YWwuCiAK LSAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CisgICAgcmV0dXJuIHZhbHVlOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQK 64457 2010-08-15 15:30:49 -0700 2010-08-15 15:55:42 -0700 Patch bug-44036-20100815153048.patch text/plain 4894 abarth ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE0MzEzOWY5ZjIwOGNhZDZiMzcwZDgyODY1YzdiMjBhNDY4ZTdmOTYu LjI1ZmFkYmNkYjc2MWU3YmY4ZTdhMzE2M2Q5MzBmNzk2MTNiNWRhOGIgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEwLTA4LTE1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUG9y dCBDaHJvbWl1bSdzIFdlYkVudGl0aWVzIHRvIEhUTUxFbnRpdHlUYWJsZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQwMzYKKworICAgICAgICBUaGlz IGNvZGUgaXMgd3JvbmcgYW5kIG5lZWRzIHRvIGJlIHJlbW92ZWQuICBIb3dldmVyLCBhdCBsZWFz dCBhZnRlcgorICAgICAgICB0aGlzIHBhdGNoLCBpdCB3aWxsIGNvbXBpbGUuCisKKyAgICAgICAg KiBzcmMvV2ViRW50aXRpZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2Vi S2l0OjpXZWJFbnRpdGllczo6V2ViRW50aXRpZXMpOgorICAgICAgICAqIHNyYy9XZWJFbnRpdGll cy5oOgorCiAyMDEwLTA4LTEzICBTYXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJFbnRpdGllcy5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVu dGl0aWVzLmNwcAppbmRleCAzMGI2MTliYmNhZDUwMTQ4Mzk0NGRmZjMxODgxYzljMGRhOTVhMmNm Li5mNGYxYWRhNzk0ODc3MTkwYjQxZDU3OGM4MjhiM2JlMjViMWViMjRjIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0aWVzLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkVudGl0aWVzLmNwcApAQCAtMzMsNiArMzMsNyBAQAogCiAjaW5jbHVkZSA8c3RyaW5n Lmg+CiAKKyNpbmNsdWRlICJIVE1MRW50aXR5VGFibGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0 cmluZy5oIgogI2luY2x1ZGUgIlN0cmluZ0J1aWxkZXIuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1h cC5oPgpAQCAtNDEsNTkgKzQyLDUxIEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCitu YW1lc3BhY2UgV2ViS2l0IHsKKwogbmFtZXNwYWNlIHsKLS8vIE5vdGUgdGhhdCB0aGlzIGZpbGUg aXMgYWxzbyBpbmNsdWRlZCBieSBMZWdhY3lIVE1MRG9jdW1lbnRQYXJzZXIuY3BwIHNvIHdlIGFy ZSBnZXR0aW5nCi0vLyB0d28gY29waWVzIG9mIHRoZSBkYXRhIGluIG1lbW9yeS4gIFdlIGNhbiBm aXggdGhpcyBieSBjaGFuZ2luZyB0aGUgc2NyaXB0Ci0vLyB0aGF0IGdlbmVyYXRlZCB0aGUgYXJy YXkgdG8gY3JlYXRlIGEgc3RhdGljIGNvbnN0IHRoYXQgaXMgaXRzIGxlbmd0aCwgYnV0Ci0vLyB0 aGlzIGlzIGxvdyBwcmlvcml0eSBzaW5jZSB0aGUgZGF0YSBpcyBsZXNzIHRoYW4gNEsuIFdlIHVz ZSBhbm9ueW1vdXMKLS8vIG5hbWVzcGFjZSB0byBwcmV2ZW50IG5hbWUgY29sbGlzaW9ucy4KLSNp bmNsdWRlICJIVE1MRW50aXR5TmFtZXMuY3BwIiAvLyBOT0xJTlQKLX0KIAotbmFtZXNwYWNlIFdl YktpdCB7Cit2b2lkIHBvcHVsYXRlTWFwRnJvbVhNTEVudGl0aWVzKFdURjo6SGFzaE1hcDxpbnQs IFdURjo6U3RyaW5nPiYgbWFwKQoreworICAgIEFTU0VSVChtYXAuaXNFbXB0eSgpKTsKKyAgICBt YXAuc2V0KDB4MDAzYywgImx0Iik7CisgICAgbWFwLnNldCgweDAwM2UsICJndCIpOworICAgIG1h cC5zZXQoMHgwMDI2LCAiYW1wIik7CisgICAgbWFwLnNldCgweDAwMjcsICJhcG9zIik7CisgICAg bWFwLnNldCgweDAwMjIsICJxdW90Iik7Cit9CiAKLXZvaWQgcG9wdWxhdGVNYXAoV1RGOjpIYXNo TWFwPGludCwgV1RGOjpTdHJpbmc+JiBtYXAsCi0gICAgICAgICAgICAgICAgIGNvbnN0IEVudGl0 eSogZW50aXRpZXMsCi0gICAgICAgICAgICAgICAgIHNpemVfdCBlbnRpdGllc0NvdW50LAotICAg ICAgICAgICAgICAgICBib29sIHN0YW5kYXJkSFRNTCkKK3ZvaWQgcG9wdWxhdGVNYXBGcm9tSFRN TEVudGl0eVRhYmxlKFdURjo6SGFzaE1hcDxpbnQsIFdURjo6U3RyaW5nPiYgbWFwKQogewogICAg IEFTU0VSVChtYXAuaXNFbXB0eSgpKTsKLSAgICBjb25zdCBFbnRpdHkqIGVudGl0eSA9ICZlbnRp dGllc1swXTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGVudGl0aWVzQ291bnQ7IGkrKywg ZW50aXR5KyspIHsKLSAgICAgICAgaW50IGNvZGUgPSBlbnRpdHktPmNvZGU7Ci0gICAgICAgIFN0 cmluZyBuYW1lID0gZW50aXR5LT5uYW1lOwotICAgICAgICAvLyBGb3IgY29uc2lzdGVuY3ksIHVz ZSB0aGUgbG93ZSBjYXNlIGZvciBlbnRpdGllcyB0aGF0IGhhdmUgYm90aC4KLSAgICAgICAgaWYg KG1hcC5jb250YWlucyhjb2RlKSAmJiBtYXAuZ2V0KGNvZGUpID09IG5hbWUubG93ZXIoKSkKKyAg ICBIVE1MRW50aXR5VGFibGVFbnRyeSogZW50cnkgPSBIVE1MRW50aXR5VGFibGU6OmZpcnN0RW50 cnkoKTsKKyAgICBIVE1MRW50aXR5VGFibGVFbnRyeSogZW5kID0gSFRNTEVudGl0eVRhYmxlOjps YXN0RW50cnkoKSArIDE7CisgICAgd2hpbGUgKGVudHJ5ICE9IGVuZCkgeworICAgICAgICBTdHJp bmcgZW50aXR5ID0gZW50cnktPmVudGl0eTsKKyAgICAgICAgaW50IHZhbHVlID0gZW50cnktPnZh bHVlOworICAgICAgICBBU1NFUlQodmFsdWUgJiYgIWVudGl0eS5pc0VtcHR5KCkpOworICAgICAg ICBpZiAoZW50aXR5W2VudGl0eS5sZW5ndGgoKSAtIDFdICE9ICc7JykKKyAgICAgICAgICAgIGNv bnRpbnVlOyAvLyBXZSB3YW50IHRoZSBjYW5vbmljYWwgdmVyc2lvbiB0aGF0IGVuZHMgaW4gOwor ICAgICAgICAvLyBGb3IgY29uc2lzdGVuY3ksIHVzZSB0aGUgbG93ZXIgY2FzZSBmb3IgZW50aXRp ZXMgdGhhdCBoYXZlIGJvdGguCisgICAgICAgIGlmIChtYXAuY29udGFpbnModmFsdWUpICYmIG1h cC5nZXQodmFsdWUpID09IGVudGl0eS5sb3dlcigpKQogICAgICAgICAgICAgY29udGludWU7Ci0g ICAgICAgIC8vIERvbid0IHJlZ2lzdGVyICZwZXJjbnQ7LCAmbnN1cDsgYW5kICZzdXBsOy4KLSAg ICAgICAgaWYgKHN0YW5kYXJkSFRNTCAmJiAoY29kZSA9PSAnJScgfHwgY29kZSA9PSAweDIyODUg fHwgY29kZSA9PSAweDAwYjkpKQorICAgICAgICAvLyBEb24ndCByZWdpc3RlciAmcGVyY250Oywg Jm5zdXA7IGFuZCAmc3VwbDsgZm9yIHNvbWUgdW5rbm93biByZWFzb24uCisgICAgICAgIGlmICh2 YWx1ZSA9PSAnJScgfHwgdmFsdWUgPT0gMHgyMjg1IHx8IHZhbHVlID09IDB4MDBiOSkKICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBtYXAuc2V0KGNvZGUsIG5hbWUpOworICAgICAgICBt YXAuc2V0KHZhbHVlLCBlbnRpdHkpOwogICAgIH0KLSAgICBpZiAoc3RhbmRhcmRIVE1MKQotICAg ICAgICBtYXAuc2V0KHN0YXRpY19jYXN0PGludD4oMHgwMDI3KSwgU3RyaW5nKCIjMzkiKSk7Cisg ICAgLy8gV2UgYWRkICMzOSBmb3Igc29tZSB1bmtub3duIHJlYXNvbi4KKyAgICBtYXAuc2V0KDB4 MDAyNywgU3RyaW5nKCIjMzkiKSk7CiB9CiAKLXN0YXRpYyBjb25zdCBFbnRpdHkgeG1sQnVpbHRJ bkVudGl0eUNvZGVzW10gPSB7Ci0gICAgeyAibHQiLCAweDAwM2MgfSwKLSAgICB7ICJndCIsIDB4 MDAzZSB9LAotICAgIHsgImFtcCIsIDB4MDAyNiB9LAotICAgIHsgImFwb3MiLCAweDAwMjcgfSwK LSAgICB7ICJxdW90IiwgMHgwMDIyIH0KLX07Cit9CiAKIFdlYkVudGl0aWVzOjpXZWJFbnRpdGll cyhib29sIHhtbEVudGl0aWVzKQogewogICAgIGlmICh4bWxFbnRpdGllcykKLSAgICAgICAgcG9w dWxhdGVNYXAobV9lbnRpdGllc01hcCwKLSAgICAgICAgICAgICAgICAgICAgeG1sQnVpbHRJbkVu dGl0eUNvZGVzLAotICAgICAgICAgICAgICAgICAgICBzaXplb2YoeG1sQnVpbHRJbkVudGl0eUNv ZGVzKSAvIHNpemVvZihFbnRpdHkpLAotICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CisgICAg ICAgIHBvcHVsYXRlTWFwRnJvbVhNTEVudGl0aWVzKG1fZW50aXRpZXNNYXApOwogICAgIGVsc2UK LSAgICAgICAgcG9wdWxhdGVNYXAobV9lbnRpdGllc01hcCwKLSAgICAgICAgICAgICAgICAgICAg d29yZGxpc3QsCi0gICAgICAgICAgICAgICAgICAgIHNpemVvZih3b3JkbGlzdCkgLyBzaXplb2Yo RW50aXR5KSwKLSAgICAgICAgICAgICAgICAgICAgdHJ1ZSk7CisgICAgICAgIHBvcHVsYXRlTWFw RnJvbUhUTUxFbnRpdHlUYWJsZShtX2VudGl0aWVzTWFwKTsKIH0KIAogU3RyaW5nIFdlYkVudGl0 aWVzOjplbnRpdHlOYW1lQnlDb2RlKGludCBjb2RlKSBjb25zdApkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJFbnRpdGllcy5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJFbnRp dGllcy5oCmluZGV4IGEwMWNjNWQ2NGIwZWQwNGZhMWEyZmM2M2Q4MWFiZGZmZGQyYjRmN2QuLmYy MTA1NjY2NGUxMzUzMGI3OTAwMDJjMTAyZWQyMjk5NzBlM2FhZDUgMTAwNjQ0Ci0tLSBhL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRW50aXRpZXMuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkVudGl0aWVzLmgKQEAgLTM2LDYgKzM2LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKKy8v IEZJWE1FOiBUaGlzIGNsYXNzIGlzIHdyb25nIGFuZCBuZWVkcyB0byBiZSByZW1vdmVkLgogY2xh c3MgV2ViRW50aXRpZXMgewogcHVibGljOgogICAgIC8vICZhcG9zOywgJnBlcmNudDssICZuc3Vw OywgJnN1cGw7IGFyZSBub3QgZGVmaW5lZCBieSB0aGUgSFRNTCBzdGFuZGFyZHMuCg== 64458 2010-08-15 15:55:46 -0700 2010-08-15 18:49:18 -0700 Patch bug-44036-20100815155544.patch text/plain 4906 abarth ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGE0MzEzOWY5ZjIwOGNhZDZiMzcwZDgyODY1YzdiMjBhNDY4ZTdmOTYu LjI1ZmFkYmNkYjc2MWU3YmY4ZTdhMzE2M2Q5MzBmNzk2MTNiNWRhOGIgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEwLTA4LTE1ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUG9y dCBDaHJvbWl1bSdzIFdlYkVudGl0aWVzIHRvIEhUTUxFbnRpdHlUYWJsZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQwMzYKKworICAgICAgICBUaGlz IGNvZGUgaXMgd3JvbmcgYW5kIG5lZWRzIHRvIGJlIHJlbW92ZWQuICBIb3dldmVyLCBhdCBsZWFz dCBhZnRlcgorICAgICAgICB0aGlzIHBhdGNoLCBpdCB3aWxsIGNvbXBpbGUuCisKKyAgICAgICAg KiBzcmMvV2ViRW50aXRpZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjopOgorICAgICAgICAoV2Vi S2l0OjpXZWJFbnRpdGllczo6V2ViRW50aXRpZXMpOgorICAgICAgICAqIHNyYy9XZWJFbnRpdGll cy5oOgorCiAyMDEwLTA4LTEzICBTYXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJFbnRpdGllcy5jcHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVu dGl0aWVzLmNwcAppbmRleCAzMGI2MTliYmNhZDUwMTQ4Mzk0NGRmZjMxODgxYzljMGRhOTVhMmNm Li5kODQ1YjcxYTcxNmQ0MTAwYmI3NDQ0NzRlNzJjZDAzM2VkY2I0NjZkIDEwMDY0NAotLS0gYS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0aWVzLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkVudGl0aWVzLmNwcApAQCAtMzMsNiArMzMsNyBAQAogCiAjaW5jbHVkZSA8c3RyaW5n Lmg+CiAKKyNpbmNsdWRlICJIVE1MRW50aXR5VGFibGUuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0 cmluZy5oIgogI2luY2x1ZGUgIlN0cmluZ0J1aWxkZXIuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1h cC5oPgpAQCAtNDEsNTkgKzQyLDUxIEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCitu YW1lc3BhY2UgV2ViS2l0IHsKKwogbmFtZXNwYWNlIHsKLS8vIE5vdGUgdGhhdCB0aGlzIGZpbGUg aXMgYWxzbyBpbmNsdWRlZCBieSBMZWdhY3lIVE1MRG9jdW1lbnRQYXJzZXIuY3BwIHNvIHdlIGFy ZSBnZXR0aW5nCi0vLyB0d28gY29waWVzIG9mIHRoZSBkYXRhIGluIG1lbW9yeS4gIFdlIGNhbiBm aXggdGhpcyBieSBjaGFuZ2luZyB0aGUgc2NyaXB0Ci0vLyB0aGF0IGdlbmVyYXRlZCB0aGUgYXJy YXkgdG8gY3JlYXRlIGEgc3RhdGljIGNvbnN0IHRoYXQgaXMgaXRzIGxlbmd0aCwgYnV0Ci0vLyB0 aGlzIGlzIGxvdyBwcmlvcml0eSBzaW5jZSB0aGUgZGF0YSBpcyBsZXNzIHRoYW4gNEsuIFdlIHVz ZSBhbm9ueW1vdXMKLS8vIG5hbWVzcGFjZSB0byBwcmV2ZW50IG5hbWUgY29sbGlzaW9ucy4KLSNp bmNsdWRlICJIVE1MRW50aXR5TmFtZXMuY3BwIiAvLyBOT0xJTlQKLX0KIAotbmFtZXNwYWNlIFdl YktpdCB7Cit2b2lkIHBvcHVsYXRlTWFwRnJvbVhNTEVudGl0aWVzKFdURjo6SGFzaE1hcDxpbnQs IFdURjo6U3RyaW5nPiYgbWFwKQoreworICAgIEFTU0VSVChtYXAuaXNFbXB0eSgpKTsKKyAgICBt YXAuc2V0KDB4MDAzYywgImx0Iik7CisgICAgbWFwLnNldCgweDAwM2UsICJndCIpOworICAgIG1h cC5zZXQoMHgwMDI2LCAiYW1wIik7CisgICAgbWFwLnNldCgweDAwMjcsICJhcG9zIik7CisgICAg bWFwLnNldCgweDAwMjIsICJxdW90Iik7Cit9CiAKLXZvaWQgcG9wdWxhdGVNYXAoV1RGOjpIYXNo TWFwPGludCwgV1RGOjpTdHJpbmc+JiBtYXAsCi0gICAgICAgICAgICAgICAgIGNvbnN0IEVudGl0 eSogZW50aXRpZXMsCi0gICAgICAgICAgICAgICAgIHNpemVfdCBlbnRpdGllc0NvdW50LAotICAg ICAgICAgICAgICAgICBib29sIHN0YW5kYXJkSFRNTCkKK3ZvaWQgcG9wdWxhdGVNYXBGcm9tSFRN TEVudGl0eVRhYmxlKFdURjo6SGFzaE1hcDxpbnQsIFdURjo6U3RyaW5nPiYgbWFwKQogewogICAg IEFTU0VSVChtYXAuaXNFbXB0eSgpKTsKLSAgICBjb25zdCBFbnRpdHkqIGVudGl0eSA9ICZlbnRp dGllc1swXTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGVudGl0aWVzQ291bnQ7IGkrKywg ZW50aXR5KyspIHsKLSAgICAgICAgaW50IGNvZGUgPSBlbnRpdHktPmNvZGU7Ci0gICAgICAgIFN0 cmluZyBuYW1lID0gZW50aXR5LT5uYW1lOwotICAgICAgICAvLyBGb3IgY29uc2lzdGVuY3ksIHVz ZSB0aGUgbG93ZSBjYXNlIGZvciBlbnRpdGllcyB0aGF0IGhhdmUgYm90aC4KLSAgICAgICAgaWYg KG1hcC5jb250YWlucyhjb2RlKSAmJiBtYXAuZ2V0KGNvZGUpID09IG5hbWUubG93ZXIoKSkKKyAg ICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogZW50cnkgPSBIVE1MRW50aXR5VGFibGU6OmZp cnN0RW50cnkoKTsKKyAgICBjb25zdCBIVE1MRW50aXR5VGFibGVFbnRyeSogZW5kID0gSFRNTEVu dGl0eVRhYmxlOjpsYXN0RW50cnkoKSArIDE7CisgICAgd2hpbGUgKGVudHJ5ICE9IGVuZCkgewor ICAgICAgICBTdHJpbmcgZW50aXR5ID0gZW50cnktPmVudGl0eTsKKyAgICAgICAgaW50IHZhbHVl ID0gZW50cnktPnZhbHVlOworICAgICAgICBBU1NFUlQodmFsdWUgJiYgIWVudGl0eS5pc0VtcHR5 KCkpOworICAgICAgICBpZiAoZW50aXR5W2VudGl0eS5sZW5ndGgoKSAtIDFdICE9ICc7JykKKyAg ICAgICAgICAgIGNvbnRpbnVlOyAvLyBXZSB3YW50IHRoZSBjYW5vbmljYWwgdmVyc2lvbiB0aGF0 IGVuZHMgaW4gOworICAgICAgICAvLyBGb3IgY29uc2lzdGVuY3ksIHVzZSB0aGUgbG93ZXIgY2Fz ZSBmb3IgZW50aXRpZXMgdGhhdCBoYXZlIGJvdGguCisgICAgICAgIGlmIChtYXAuY29udGFpbnMo dmFsdWUpICYmIG1hcC5nZXQodmFsdWUpID09IGVudGl0eS5sb3dlcigpKQogICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgIC8vIERvbid0IHJlZ2lzdGVyICZwZXJjbnQ7LCAmbnN1cDsgYW5k ICZzdXBsOy4KLSAgICAgICAgaWYgKHN0YW5kYXJkSFRNTCAmJiAoY29kZSA9PSAnJScgfHwgY29k ZSA9PSAweDIyODUgfHwgY29kZSA9PSAweDAwYjkpKQorICAgICAgICAvLyBEb24ndCByZWdpc3Rl ciAmcGVyY250OywgJm5zdXA7IGFuZCAmc3VwbDsgZm9yIHNvbWUgdW5rbm93biByZWFzb24uCisg ICAgICAgIGlmICh2YWx1ZSA9PSAnJScgfHwgdmFsdWUgPT0gMHgyMjg1IHx8IHZhbHVlID09IDB4 MDBiOSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBtYXAuc2V0KGNvZGUsIG5hbWUp OworICAgICAgICBtYXAuc2V0KHZhbHVlLCBlbnRpdHkpOwogICAgIH0KLSAgICBpZiAoc3RhbmRh cmRIVE1MKQotICAgICAgICBtYXAuc2V0KHN0YXRpY19jYXN0PGludD4oMHgwMDI3KSwgU3RyaW5n KCIjMzkiKSk7CisgICAgLy8gV2UgYWRkICMzOSBmb3Igc29tZSB1bmtub3duIHJlYXNvbi4KKyAg ICBtYXAuc2V0KDB4MDAyNywgU3RyaW5nKCIjMzkiKSk7CiB9CiAKLXN0YXRpYyBjb25zdCBFbnRp dHkgeG1sQnVpbHRJbkVudGl0eUNvZGVzW10gPSB7Ci0gICAgeyAibHQiLCAweDAwM2MgfSwKLSAg ICB7ICJndCIsIDB4MDAzZSB9LAotICAgIHsgImFtcCIsIDB4MDAyNiB9LAotICAgIHsgImFwb3Mi LCAweDAwMjcgfSwKLSAgICB7ICJxdW90IiwgMHgwMDIyIH0KLX07Cit9CiAKIFdlYkVudGl0aWVz OjpXZWJFbnRpdGllcyhib29sIHhtbEVudGl0aWVzKQogewogICAgIGlmICh4bWxFbnRpdGllcykK LSAgICAgICAgcG9wdWxhdGVNYXAobV9lbnRpdGllc01hcCwKLSAgICAgICAgICAgICAgICAgICAg eG1sQnVpbHRJbkVudGl0eUNvZGVzLAotICAgICAgICAgICAgICAgICAgICBzaXplb2YoeG1sQnVp bHRJbkVudGl0eUNvZGVzKSAvIHNpemVvZihFbnRpdHkpLAotICAgICAgICAgICAgICAgICAgICBm YWxzZSk7CisgICAgICAgIHBvcHVsYXRlTWFwRnJvbVhNTEVudGl0aWVzKG1fZW50aXRpZXNNYXAp OwogICAgIGVsc2UKLSAgICAgICAgcG9wdWxhdGVNYXAobV9lbnRpdGllc01hcCwKLSAgICAgICAg ICAgICAgICAgICAgd29yZGxpc3QsCi0gICAgICAgICAgICAgICAgICAgIHNpemVvZih3b3JkbGlz dCkgLyBzaXplb2YoRW50aXR5KSwKLSAgICAgICAgICAgICAgICAgICAgdHJ1ZSk7CisgICAgICAg IHBvcHVsYXRlTWFwRnJvbUhUTUxFbnRpdHlUYWJsZShtX2VudGl0aWVzTWFwKTsKIH0KIAogU3Ry aW5nIFdlYkVudGl0aWVzOjplbnRpdHlOYW1lQnlDb2RlKGludCBjb2RlKSBjb25zdApkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJFbnRpdGllcy5oIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJFbnRpdGllcy5oCmluZGV4IGEwMWNjNWQ2NGIwZWQwNGZhMWEyZmM2M2Q4MWFiZGZm ZGQyYjRmN2QuLmYyMTA1NjY2NGUxMzUzMGI3OTAwMDJjMTAyZWQyMjk5NzBlM2FhZDUgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRW50aXRpZXMuaAorKysgYi9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkVudGl0aWVzLmgKQEAgLTM2LDYgKzM2LDcgQEAKIAogbmFtZXNwYWNlIFdl YktpdCB7CiAKKy8vIEZJWE1FOiBUaGlzIGNsYXNzIGlzIHdyb25nIGFuZCBuZWVkcyB0byBiZSBy ZW1vdmVkLgogY2xhc3MgV2ViRW50aXRpZXMgewogcHVibGljOgogICAgIC8vICZhcG9zOywgJnBl cmNudDssICZuc3VwOywgJnN1cGw7IGFyZSBub3QgZGVmaW5lZCBieSB0aGUgSFRNTCBzdGFuZGFy ZHMuCg== 64484 2010-08-16 04:51:53 -0700 2010-08-16 04:55:30 -0700 Fix for test_shell_tests bug-44036-20100816205152.patch text/plain 1354 yutak ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGEzYWE3NDliOGNiNTYwMTExNzlhYTJjNjk2YjkxMGQxNWFlZWI3OTcu LjQ0OGRmZDQzM2JhZDRlOTgzMjA1NTAyMmE5M2RkMGFjYmUwZTQ0YTQgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE1IEBACisyMDEwLTA4LTE2ICBZdXRhIEtpdGFtdXJhICA8eXV0YWtAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEF0dGVtcHQgdG8gZml4IENocm9taXVtJ3MgdGVzdF9zaGVsbF90ZXN0cy4KKworICAgICAgICBQ b3J0IENocm9taXVtJ3MgV2ViRW50aXRpZXMgdG8gSFRNTEVudGl0eVRhYmxlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDAzNgorCisgICAgICAgICog c3JjL1dlYkVudGl0aWVzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6KToKKwogMjAxMC0wOC0xNSAg QWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJFbnRpdGllcy5j cHAgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0aWVzLmNwcAppbmRleCBkODQ1YjcxYTcx NmQ0MTAwYmI3NDQ0NzRlNzJjZDAzM2VkY2I0NjZkLi4yZTA1ZDUyOTk3MWZmNjVlZmI0OTY4ODlk OTYzODE4YjMyOWRjMzE2IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0 aWVzLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkVudGl0aWVzLmNwcApAQCAtNjEs NyArNjEsNyBAQCB2b2lkIHBvcHVsYXRlTWFwRnJvbUhUTUxFbnRpdHlUYWJsZShXVEY6Okhhc2hN YXA8aW50LCBXVEY6OlN0cmluZz4mIG1hcCkKICAgICBBU1NFUlQobWFwLmlzRW1wdHkoKSk7CiAg ICAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGVudHJ5ID0gSFRNTEVudGl0eVRhYmxlOjpm aXJzdEVudHJ5KCk7CiAgICAgY29uc3QgSFRNTEVudGl0eVRhYmxlRW50cnkqIGVuZCA9IEhUTUxF bnRpdHlUYWJsZTo6bGFzdEVudHJ5KCkgKyAxOwotICAgIHdoaWxlIChlbnRyeSAhPSBlbmQpIHsK KyAgICBmb3IgKDsgZW50cnkgIT0gZW5kOyArK2VudHJ5KSB7CiAgICAgICAgIFN0cmluZyBlbnRp dHkgPSBlbnRyeS0+ZW50aXR5OwogICAgICAgICBpbnQgdmFsdWUgPSBlbnRyeS0+dmFsdWU7CiAg ICAgICAgIEFTU0VSVCh2YWx1ZSAmJiAhZW50aXR5LmlzRW1wdHkoKSk7Cg==