74913 2011-12-19 21:58:38 -0800 Implement CSS clip property in CSSStyleApplyProperty. 2012-01-23 21:44:43 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson dglazkov gustavo kling macpherson webkit.review.bot xan.lopez oldest_to_newest 524437 0 macpherson 2011-12-19 21:58:38 -0800 Implement CSS clip property in CSSStyleApplyProperty. 524438 1 119988 macpherson 2011-12-19 22:01:31 -0800 Created attachment 119988 Patch 524440 2 119988 webkit-ews 2011-12-19 22:10:03 -0800 Comment on attachment 119988 Patch Attachment 119988 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10967460 524442 3 119988 gyuyoung.kim 2011-12-19 22:15:19 -0800 Comment on attachment 119988 Patch Attachment 119988 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10965452 524448 4 119988 gustavo 2011-12-19 22:28:00 -0800 Comment on attachment 119988 Patch Attachment 119988 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/10964470 524804 5 119988 webkit.review.bot 2011-12-20 13:59:36 -0800 Comment on attachment 119988 Patch Attachment 119988 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10994337 524922 6 120107 macpherson 2011-12-20 16:03:19 -0800 Created attachment 120107 Patch 539604 7 120107 kling 2012-01-20 10:21:40 -0800 Comment on attachment 120107 Patch Lookin' good! One step closer to tossing the applyProperty() spaghetti :) 540684 8 120107 webkit.review.bot 2012-01-23 11:20:38 -0800 Comment on attachment 120107 Patch Rejecting attachment 120107 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: .h Hunk #2 succeeded at 3674 (offset 40 lines). patching file Source/WebCore/css/CSSStyleApplyProperty.cpp Hunk #3 succeeded at 1791 (offset 80 lines). patching file Source/WebCore/css/CSSStyleSelector.cpp Hunk #1 FAILED at 2687. Hunk #2 succeeded at 3767 (offset 90 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/css/CSSStyleSelector.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Andreas Kling', u'--fo..." exit_code: 1 Full output: http://queues.webkit.org/results/11118432 540888 9 123636 macpherson 2012-01-23 15:32:13 -0800 Created attachment 123636 Patch for landing 541121 10 123636 webkit.review.bot 2012-01-23 21:44:38 -0800 Comment on attachment 123636 Patch for landing Clearing flags on attachment: 123636 Committed r105693: <http://trac.webkit.org/changeset/105693> 541122 11 webkit.review.bot 2012-01-23 21:44:43 -0800 All reviewed patches have been landed. Closing bug. 119988 2011-12-19 22:01:31 -0800 2011-12-20 16:03:08 -0800 Patch bug-74913-20111220170129.patch text/plain 9459 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzMwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTE5ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBjbGlwIHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0OTEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8gcmVmYWN0 b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5oOgorICAgICAg ICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRvTGVuZ3RoKToKKyAgICAgICAgVGhpcyBuZXcgZnVu Y3Rpb24gYWltcyB0byBwcm92aWRlIGEgc2luZ2xlIGNhbGwgZm9yIGNvbnZlcnRpbmcgbWFueSBD U1NQcmltaXRpdmVWYWx1ZQorICAgICAgICB2YWx1ZXMgdG8gTGVuZ3Rocy4gSXQgaXMgdGVtcGxh dGVkIHRvIGFsbG93IHRoZSBjYWxsZXIgdG8gc3BlY2lmeSB3aGljaCBjb252ZXJzaW9ucworICAg ICAgICBhcmUgYXBwcm9wcmlhdGUgZGVwZW5kaW5nIG9uIHRoZSBjb250ZXh0IGluIHdoaWNoIHRo ZSB2YWx1ZSBpcyB1c2VkLgorICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmNvbnZlcnRUb0xlbmd0aCk6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q2xpcDo6YXBwbHlJbmhlcml0VmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmFwcGx5SW5pdGlhbFZhbHVl KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDbGlwOjphcHBseVZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDbGlwOjpjcmVhdGVIYW5kbGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5 KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKwogMjAxMS0xMi0xOSAgTGVvIFlh bmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnld IFVwc3RyZWFtIHRoZSBCbGFja0JlcnJ5IGNoYW5nZSB0byBOZXR3b3JrU3RhdGVOb3RpZmllci5o CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkocmV2aXNpb24gMTAz MzAyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE2Miw2ICsxNjIsOSBAQCBwdWJsaWM6CiAgICAgICovCiAgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVD4gVCBjb21wdXRlTGVuZ3RoKFJlbmRlclN0eWxlKiBjdXJyU3R5bGUsIFJlbmRl clN0eWxlKiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyID0gMS4wLCBib29sIGNvbXB1dGlu Z0ZvbnRTaXplID0gZmFsc2UpOwogCisgICAgLy8gQ29udmVydHMgdG8gYSBMZW5ndGgsIG1hcHBp bmcgdmFyaW91cyB1bml0IHR5cGVzIGFwcHJvcHJpYXRlbHkuCisgICAgdGVtcGxhdGU8aW50PiBM ZW5ndGggY29udmVydFRvTGVuZ3RoKFJlbmRlclN0eWxlKiBjdXJyU3R5bGUsIFJlbmRlclN0eWxl KiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyID0gMS4wLCBib29sIGNvbXB1dGluZ0ZvbnRT aXplID0gZmFsc2UpOworCiAgICAgLy8gdXNlIHdpdGggY2FyZSEhIQogICAgIHZvaWQgc2V0UHJp bWl0aXZlVHlwZSh1bnNpZ25lZCBzaG9ydCB0eXBlKSB7IG1fcHJpbWl0aXZlVW5pdFR5cGUgPSB0 eXBlOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBp bmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVl TWFwcGluZ3MuaAkocmV2aXNpb24gMTAzMzAyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1By aW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzYzMyw2ICszNjMzLDIx IEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGUKICAgICB9CiB9CiAK K2VudW0gTGVuZ3RoQ29udmVyc2lvbiB7IFVuc3VwcG9ydGVkQ29udmVyc2lvbiA9IDAsIEZpeGVk Q29udmVyc2lvbiA9IDEsIEF1dG9Db252ZXJzaW9uID0gMiwgUGVyY2VudENvbnZlcnNpb24gPSA0 LCBGcmFjdGlvbkNvbnZlcnNpb24gPSA4fTsKK3RlbXBsYXRlPGludCBzdXBwb3J0ZWQ+IExlbmd0 aCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRvTGVuZ3RoKFJlbmRlclN0eWxlKiBzdHlsZSwg UmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5n Rm9udFNpemUpCit7CisgICAgaWYgKChzdXBwb3J0ZWQgJiBGaXhlZENvbnZlcnNpb24pICYmIGlz TGVuZ3RoKCkpCisgICAgICAgIHJldHVybiBjb21wdXRlTGVuZ3RoPExlbmd0aD4oc3R5bGUsIHJv b3RTdHlsZSwgbXVsdGlwbGllciwgY29tcHV0aW5nRm9udFNpemUpOworICAgIGlmICgoc3VwcG9y dGVkICYgUGVyY2VudENvbnZlcnNpb24pICYmIGlzUGVyY2VudGFnZSgpKQorICAgICAgICByZXR1 cm4gTGVuZ3RoKGdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOworICAgIGlmICgoc3VwcG9ydGVk ICYgRnJhY3Rpb25Db252ZXJzaW9uKSAmJiBpc051bWJlcigpKQorICAgICAgICByZXR1cm4gTGVu Z3RoKGdldERvdWJsZVZhbHVlKCkgKiAxMDAuMCwgUGVyY2VudCk7CisgICAgaWYgKChzdXBwb3J0 ZWQgJiBBdXRvQ29udmVyc2lvbikgJiYgZ2V0SWRlbnQoKSA9PSBDU1NWYWx1ZUF1dG8pCisgICAg ICAgIHJldHVybiBMZW5ndGgoQXV0byk7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg cmV0dXJuIExlbmd0aChVbmRlZmluZWQpOworfQorCiAjaWYgRU5BQkxFKFNWRykKIAogdGVtcGxh dGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEVDb2xvcklu dGVycG9sYXRpb24gZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJv cGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5 UHJvcGVydHkuY3BwCShyZXZpc2lvbiAxMDMzMDIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAog I2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIlBh aXIuaCIKKyNpbmNsdWRlICJSZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5j bHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgpAQCAtMjEyLDYgKzIx Myw1MSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVy KCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5p dGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KIH07CiAKK2NsYXNzIEFwcGx5UHJvcGVydHlDbGlw IHsKK3ByaXZhdGU6CisgICAgc3RhdGljIExlbmd0aCBjb252ZXJ0VG9MZW5ndGgoQ1NTU3R5bGVT ZWxlY3Rvciogc2VsZWN0b3IsIENTU1ByaW1pdGl2ZVZhbHVlKiB2YWx1ZSkKKyAgICB7CisgICAg ICAgIHJldHVybiB2YWx1ZS0+Y29udmVydFRvTGVuZ3RoPEZpeGVkQ29udmVyc2lvbiB8IFBlcmNl bnRDb252ZXJzaW9uIHwgRnJhY3Rpb25Db252ZXJzaW9uIHwgQXV0b0NvbnZlcnNpb24+KHNlbGVj dG9yLT5zdHlsZSgpLCBzZWxlY3Rvci0+cm9vdEVsZW1lbnRTdHlsZSgpLCBzZWxlY3Rvci0+c3R5 bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKTsKKyAgICB9CitwdWJsaWM6CisgICAgc3RhdGljIHZvaWQg YXBwbHlJbmhlcml0VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCisgICAgeworICAg ICAgICBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSBzZWxlY3Rvci0+cGFyZW50U3R5bGUoKTsK KyAgICAgICAgaWYgKCFwYXJlbnRTdHlsZS0+aGFzQ2xpcCgpKQorICAgICAgICAgICAgcmV0dXJu IGFwcGx5SW5pdGlhbFZhbHVlKHNlbGVjdG9yKTsKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCkt PnNldENsaXAocGFyZW50U3R5bGUtPmNsaXBUb3AoKSwgcGFyZW50U3R5bGUtPmNsaXBSaWdodCgp LCBwYXJlbnRTdHlsZS0+Y2xpcEJvdHRvbSgpLCBwYXJlbnRTdHlsZS0+Y2xpcExlZnQoKSk7Cisg ICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRIYXNDbGlwKHRydWUpOworICAgIH0KKworICAg IHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9y KQorICAgIHsKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldENsaXAoTGVuZ3RoKCksIExl bmd0aCgpLCBMZW5ndGgoKSwgTGVuZ3RoKCkpOworICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+ c2V0SGFzQ2xpcChmYWxzZSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShD U1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAg ICAgaWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgcmV0dXJuOwor CisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0 PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworCisgICAgICAgIGlmIChSZWN0KiByZWN0ID0g cHJpbWl0aXZlVmFsdWUtPmdldFJlY3RWYWx1ZSgpKSB7CisgICAgICAgICAgICBMZW5ndGggdG9w ID0gY29udmVydFRvTGVuZ3RoKHNlbGVjdG9yLCByZWN0LT50b3AoKSk7CisgICAgICAgICAgICBM ZW5ndGggcmlnaHQgPSBjb252ZXJ0VG9MZW5ndGgoc2VsZWN0b3IsIHJlY3QtPnJpZ2h0KCkpOwor ICAgICAgICAgICAgTGVuZ3RoIGJvdHRvbSA9IGNvbnZlcnRUb0xlbmd0aChzZWxlY3RvciwgcmVj dC0+Ym90dG9tKCkpOworICAgICAgICAgICAgTGVuZ3RoIGxlZnQgPSBjb252ZXJ0VG9MZW5ndGgo c2VsZWN0b3IsIHJlY3QtPmxlZnQoKSk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+ c2V0Q2xpcCh0b3AsIHJpZ2h0LCBib3R0b20sIGxlZnQpOworICAgICAgICAgICAgc2VsZWN0b3It PnN0eWxlKCktPnNldEhhc0NsaXAodHJ1ZSk7CisgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZl VmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRvKSB7CisgICAgICAgICAgICBzZWxlY3Rv ci0+c3R5bGUoKS0+c2V0Q2xpcChMZW5ndGgoKSwgTGVuZ3RoKCksIExlbmd0aCgpLCBMZW5ndGgo KSk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0SGFzQ2xpcCh0cnVlKTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxl cigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0VmFsdWUsICZhcHBseUlu aXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9Cit9OworCiBlbnVtIENvbG9ySW5oZXJpdCB7Tm9J bmhlcml0RnJvbVBhcmVudCA9IDAsIEluaGVyaXRGcm9tUGFyZW50fTsKIENvbG9yIGRlZmF1bHRJ bml0aWFsQ29sb3IoKTsKIENvbG9yIGRlZmF1bHRJbml0aWFsQ29sb3IoKSB7IHJldHVybiBDb2xv cigpOyB9CkBAIC0xNjY1LDYgKzE3MTEsOCBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0 eWxlQXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5TGV0dGVyU3Bh Y2luZywgQXBwbHlQcm9wZXJ0eUNvbXB1dGVMZW5ndGg8aW50LCAmUmVuZGVyU3R5bGU6OmxldHRl clNwYWNpbmcsICZSZW5kZXJTdHlsZTo6c2V0TGV0dGVyU3BhY2luZywgJlJlbmRlclN0eWxlOjpp bml0aWFsTGV0dGVyV29yZFNwYWNpbmcsIE5vcm1hbEVuYWJsZWQsIFRoaWNrbmVzc0Rpc2FibGVk LCBTVkdab29tRW5hYmxlZD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5k bGVyKENTU1Byb3BlcnR5V29yZFNwYWNpbmcsIEFwcGx5UHJvcGVydHlDb21wdXRlTGVuZ3RoPGlu dCwgJlJlbmRlclN0eWxlOjp3b3JkU3BhY2luZywgJlJlbmRlclN0eWxlOjpzZXRXb3JkU3BhY2lu ZywgJlJlbmRlclN0eWxlOjppbml0aWFsTGV0dGVyV29yZFNwYWNpbmcsIE5vcm1hbEVuYWJsZWQs IFRoaWNrbmVzc0Rpc2FibGVkLCBTVkdab29tRW5hYmxlZD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAK KyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlDbGlwLCBBcHBseVByb3BlcnR5Q2xp cDo6Y3JlYXRlSGFuZGxlcigpKTsKKwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eUN1cnNvciwgQXBwbHlQcm9wZXJ0eUN1cnNvcjo6Y3JlYXRlSGFuZGxlcigpKTsKIAogICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNvdW50ZXJJbmNyZW1lbnQsIEFwcGx5UHJvcGVy dHlDb3VudGVyPEluY3JlbWVudD46OmNyZWF0ZUhhbmRsZXIoKSk7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiAxMDMzMDIpCisrKyBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2ODcs NDcgKzI2ODcsNiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eU9ycGhhbnM6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9J TklUSUFMX0FORF9QUklNSVRJVkUob3JwaGFucywgT3JwaGFucykKICAgICAgICAgcmV0dXJuOwot Ly8gcmVjdAotICAgIGNhc2UgQ1NTUHJvcGVydHlDbGlwOgotICAgIHsKLSAgICAgICAgTGVuZ3Ro IHRvcDsKLSAgICAgICAgTGVuZ3RoIHJpZ2h0OwotICAgICAgICBMZW5ndGggYm90dG9tOwotICAg ICAgICBMZW5ndGggbGVmdDsKLSAgICAgICAgYm9vbCBoYXNDbGlwID0gdHJ1ZTsKLSAgICAgICAg aWYgKGlzSW5oZXJpdCkgewotICAgICAgICAgICAgaWYgKG1fcGFyZW50U3R5bGUtPmhhc0NsaXAo KSkgewotICAgICAgICAgICAgICAgIHRvcCA9IG1fcGFyZW50U3R5bGUtPmNsaXBUb3AoKTsKLSAg ICAgICAgICAgICAgICByaWdodCA9IG1fcGFyZW50U3R5bGUtPmNsaXBSaWdodCgpOwotICAgICAg ICAgICAgICAgIGJvdHRvbSA9IG1fcGFyZW50U3R5bGUtPmNsaXBCb3R0b20oKTsKLSAgICAgICAg ICAgICAgICBsZWZ0ID0gbV9wYXJlbnRTdHlsZS0+Y2xpcExlZnQoKTsKLSAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgaGFzQ2xpcCA9IGZhbHNlOwotICAgICAgICAgICAgICAg IHRvcCA9IHJpZ2h0ID0gYm90dG9tID0gbGVmdCA9IExlbmd0aCgpOwotICAgICAgICAgICAgfQot ICAgICAgICB9IGVsc2UgaWYgKGlzSW5pdGlhbCkgewotICAgICAgICAgICAgaGFzQ2xpcCA9IGZh bHNlOwotICAgICAgICAgICAgdG9wID0gcmlnaHQgPSBib3R0b20gPSBsZWZ0ID0gTGVuZ3RoKCk7 Ci0gICAgICAgIH0gZWxzZSBpZiAoIXByaW1pdGl2ZVZhbHVlKSB7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9 PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JFQ1QpIHsKLSAgICAgICAgICAgIFJlY3QqIHJlY3Qg PSBwcmltaXRpdmVWYWx1ZS0+Z2V0UmVjdFZhbHVlKCk7Ci0gICAgICAgICAgICBpZiAoIXJlY3Qp Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdG9wID0gY29udmVydFRvSW50 TGVuZ3RoKHJlY3QtPnRvcCgpLCBzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0 b3IpOwotICAgICAgICAgICAgcmlnaHQgPSBjb252ZXJ0VG9JbnRMZW5ndGgocmVjdC0+cmlnaHQo KSwgc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKLSAgICAgICAgICAg IGJvdHRvbSA9IGNvbnZlcnRUb0ludExlbmd0aChyZWN0LT5ib3R0b20oKSwgc3R5bGUoKSwgbV9y b290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKLSAgICAgICAgICAgIGxlZnQgPSBjb252ZXJ0 VG9JbnRMZW5ndGgocmVjdC0+bGVmdCgpLCBzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpv b21GYWN0b3IpOwotICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgp ICE9IENTU1ZhbHVlQXV0bykgewotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAg ICAgIG1fc3R5bGUtPnNldENsaXAodG9wLCByaWdodCwgYm90dG9tLCBsZWZ0KTsKLSAgICAgICAg bV9zdHlsZS0+c2V0SGFzQ2xpcChoYXNDbGlwKTsKLQotICAgICAgICAvLyByZWN0LCBpZGVudAot ICAgICAgICByZXR1cm47Ci0gICAgfQotCiAvLyBsaXN0cwogICAgIGNhc2UgQ1NTUHJvcGVydHlD b250ZW50OgogICAgICAgICAvLyBsaXN0IG9mIHN0cmluZywgdXJpLCBjb3VudGVyLCBhdHRyLCBp CkBAIC0zNjc3LDYgKzM2MzYsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVy dHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlclNwYWNpbmc6CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEJvcmRlckhvcml6b250YWxTcGFjaW5nOgogICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRCb3JkZXJWZXJ0aWNhbFNwYWNpbmc6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUNsaXA6 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNvdW50ZXJJbmNyZW1lbnQ6CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eUNvdW50ZXJSZXNldDoKICAgICBjYXNlIENTU1Byb3BlcnR5TGV0dGVyU3BhY2luZzoK 120107 2011-12-20 16:03:19 -0800 2012-01-23 15:32:02 -0800 Patch bug-74913-20111221110316.patch text/plain 9654 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzM1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDExLTEyLTE5ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBjbGlwIHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0OTEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8gcmVmYWN0 b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5oOgorICAgICAg ICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpD U1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRvTGVuZ3RoKToKKyAgICAgICAgVGhpcyBuZXcgZnVu Y3Rpb24gYWltcyB0byBwcm92aWRlIGEgc2luZ2xlIGNhbGwgZm9yIGNvbnZlcnRpbmcgbWFueSBD U1NQcmltaXRpdmVWYWx1ZQorICAgICAgICB2YWx1ZXMgdG8gTGVuZ3Rocy4gSXQgaXMgdGVtcGxh dGVkIHRvIGFsbG93IHRoZSBjYWxsZXIgdG8gc3BlY2lmeSB3aGljaCBjb252ZXJzaW9ucworICAg ICAgICBhcmUgYXBwcm9wcmlhdGUgZGVwZW5kaW5nIG9uIHRoZSBjb250ZXh0IGluIHdoaWNoIHRo ZSB2YWx1ZSBpcyB1c2VkLgorICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmNvbnZlcnRUb0xlbmd0aCk6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q2xpcDo6YXBwbHlJbmhlcml0VmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmFwcGx5SW5pdGlhbFZhbHVl KToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDbGlwOjphcHBseVZhbHVlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDbGlwOjpjcmVhdGVIYW5kbGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5 KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKwogMjAxMS0xMi0yMCAgVG9ueSBD aGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIHNpemVvZihSZW5kZXJTdHlsZSkg aXMgNjQgaW5zdGVhZCBvZiA1NiBvbiBXaW5kb3dzICh4ODYpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkocmV2aXNpb24gMTAzMzUzKQorKysgU291cmNlL1dlYkNv cmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2Miw2ICsxNjIs OSBAQCBwdWJsaWM6CiAgICAgICovCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gVCBjb21wdXRl TGVuZ3RoKFJlbmRlclN0eWxlKiBjdXJyU3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRv dWJsZSBtdWx0aXBsaWVyID0gMS4wLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplID0gZmFsc2UpOwog CisgICAgLy8gQ29udmVydHMgdG8gYSBMZW5ndGgsIG1hcHBpbmcgdmFyaW91cyB1bml0IHR5cGVz IGFwcHJvcHJpYXRlbHkuCisgICAgdGVtcGxhdGU8aW50PiBMZW5ndGggY29udmVydFRvTGVuZ3Ro KFJlbmRlclN0eWxlKiBjdXJyU3R5bGUsIFJlbmRlclN0eWxlKiByb290U3R5bGUsIGRvdWJsZSBt dWx0aXBsaWVyID0gMS4wLCBib29sIGNvbXB1dGluZ0ZvbnRTaXplID0gZmFsc2UpOworCiAgICAg Ly8gdXNlIHdpdGggY2FyZSEhIQogICAgIHZvaWQgc2V0UHJpbWl0aXZlVHlwZSh1bnNpZ25lZCBz aG9ydCB0eXBlKSB7IG1fcHJpbWl0aXZlVW5pdFR5cGUgPSB0eXBlOyB9CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAkocmV2aXNpb24g MTAzMzUzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkZvbnREZXNjcmlw dGlvbi5oIgogI2luY2x1ZGUgIkZvbnRTbW9vdGhpbmdNb2RlLmgiCiAjaW5jbHVkZSAiR3JhcGhp Y3NUeXBlcy5oIgorI2luY2x1ZGUgIkxlbmd0aC5oIgogI2luY2x1ZGUgIlBhdGguaCIKICNpbmNs dWRlICJSZW5kZXJTdHlsZUNvbnN0YW50cy5oIgogI2luY2x1ZGUgIlNWR1JlbmRlclN0eWxlRGVm cy5oIgpAQCAtMzYzMyw2ICszNjM0LDIxIEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2 ZVZhbHVlOjpvcGUKICAgICB9CiB9CiAKK2VudW0gTGVuZ3RoQ29udmVyc2lvbiB7IFVuc3VwcG9y dGVkQ29udmVyc2lvbiA9IDAsIEZpeGVkQ29udmVyc2lvbiA9IDEsIEF1dG9Db252ZXJzaW9uID0g MiwgUGVyY2VudENvbnZlcnNpb24gPSA0LCBGcmFjdGlvbkNvbnZlcnNpb24gPSA4fTsKK3RlbXBs YXRlPGludCBzdXBwb3J0ZWQ+IExlbmd0aCBDU1NQcmltaXRpdmVWYWx1ZTo6Y29udmVydFRvTGVu Z3RoKFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11 bHRpcGxpZXIsIGJvb2wgY29tcHV0aW5nRm9udFNpemUpCit7CisgICAgaWYgKChzdXBwb3J0ZWQg JiBGaXhlZENvbnZlcnNpb24pICYmIGlzTGVuZ3RoKCkpCisgICAgICAgIHJldHVybiBjb21wdXRl TGVuZ3RoPExlbmd0aD4oc3R5bGUsIHJvb3RTdHlsZSwgbXVsdGlwbGllciwgY29tcHV0aW5nRm9u dFNpemUpOworICAgIGlmICgoc3VwcG9ydGVkICYgUGVyY2VudENvbnZlcnNpb24pICYmIGlzUGVy Y2VudGFnZSgpKQorICAgICAgICByZXR1cm4gTGVuZ3RoKGdldERvdWJsZVZhbHVlKCksIFBlcmNl bnQpOworICAgIGlmICgoc3VwcG9ydGVkICYgRnJhY3Rpb25Db252ZXJzaW9uKSAmJiBpc051bWJl cigpKQorICAgICAgICByZXR1cm4gTGVuZ3RoKGdldERvdWJsZVZhbHVlKCkgKiAxMDAuMCwgUGVy Y2VudCk7CisgICAgaWYgKChzdXBwb3J0ZWQgJiBBdXRvQ29udmVyc2lvbikgJiYgZ2V0SWRlbnQo KSA9PSBDU1NWYWx1ZUF1dG8pCisgICAgICAgIHJldHVybiBMZW5ndGgoQXV0byk7CisgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIExlbmd0aChVbmRlZmluZWQpOworfQorCiAj aWYgRU5BQkxFKFNWRykKIAogdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U1ByaW1pdGl2ZVZhbHVlKEVDb2xvckludGVycG9sYXRpb24gZSkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCShyZXZpc2lvbiAxMDMzNTMpCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAi RWxlbWVudC5oIgogI2luY2x1ZGUgIlBhaXIuaCIKKyNpbmNsdWRlICJSZWN0LmgiCiAjaW5jbHVk ZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJT ZXR0aW5ncy5oIgpAQCAtMjEyLDYgKzIxMyw1MSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByb3Bl cnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBs eUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KIH07CiAK K2NsYXNzIEFwcGx5UHJvcGVydHlDbGlwIHsKK3ByaXZhdGU6CisgICAgc3RhdGljIExlbmd0aCBj b252ZXJ0VG9MZW5ndGgoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IsIENTU1ByaW1pdGl2ZVZh bHVlKiB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiB2YWx1ZS0+Y29udmVydFRvTGVuZ3Ro PEZpeGVkQ29udmVyc2lvbiB8IFBlcmNlbnRDb252ZXJzaW9uIHwgRnJhY3Rpb25Db252ZXJzaW9u IHwgQXV0b0NvbnZlcnNpb24+KHNlbGVjdG9yLT5zdHlsZSgpLCBzZWxlY3Rvci0+cm9vdEVsZW1l bnRTdHlsZSgpLCBzZWxlY3Rvci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKTsKKyAgICB9Citw dWJsaWM6CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0VmFsdWUoQ1NTU3R5bGVTZWxlY3Rv ciogc2VsZWN0b3IpCisgICAgeworICAgICAgICBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSBz ZWxlY3Rvci0+cGFyZW50U3R5bGUoKTsKKyAgICAgICAgaWYgKCFwYXJlbnRTdHlsZS0+aGFzQ2xp cCgpKQorICAgICAgICAgICAgcmV0dXJuIGFwcGx5SW5pdGlhbFZhbHVlKHNlbGVjdG9yKTsKKyAg ICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldENsaXAocGFyZW50U3R5bGUtPmNsaXBUb3AoKSwg cGFyZW50U3R5bGUtPmNsaXBSaWdodCgpLCBwYXJlbnRTdHlsZS0+Y2xpcEJvdHRvbSgpLCBwYXJl bnRTdHlsZS0+Y2xpcExlZnQoKSk7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRIYXND bGlwKHRydWUpOworICAgIH0KKworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFZhbHVlKENT U1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQorICAgIHsKKyAgICAgICAgc2VsZWN0b3ItPnN0eWxl KCktPnNldENsaXAoTGVuZ3RoKCksIExlbmd0aCgpLCBMZW5ndGgoKSwgTGVuZ3RoKCkpOworICAg ICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0SGFzQ2xpcChmYWxzZSk7CisgICAgfQorCisgICAg c3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFs dWUqIHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgp KQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmlt aXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworCisg ICAgICAgIGlmIChSZWN0KiByZWN0ID0gcHJpbWl0aXZlVmFsdWUtPmdldFJlY3RWYWx1ZSgpKSB7 CisgICAgICAgICAgICBMZW5ndGggdG9wID0gY29udmVydFRvTGVuZ3RoKHNlbGVjdG9yLCByZWN0 LT50b3AoKSk7CisgICAgICAgICAgICBMZW5ndGggcmlnaHQgPSBjb252ZXJ0VG9MZW5ndGgoc2Vs ZWN0b3IsIHJlY3QtPnJpZ2h0KCkpOworICAgICAgICAgICAgTGVuZ3RoIGJvdHRvbSA9IGNvbnZl cnRUb0xlbmd0aChzZWxlY3RvciwgcmVjdC0+Ym90dG9tKCkpOworICAgICAgICAgICAgTGVuZ3Ro IGxlZnQgPSBjb252ZXJ0VG9MZW5ndGgoc2VsZWN0b3IsIHJlY3QtPmxlZnQoKSk7CisgICAgICAg ICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0Q2xpcCh0b3AsIHJpZ2h0LCBib3R0b20sIGxlZnQp OworICAgICAgICAgICAgc2VsZWN0b3ItPnN0eWxlKCktPnNldEhhc0NsaXAodHJ1ZSk7CisgICAg ICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBdXRv KSB7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0Q2xpcChMZW5ndGgoKSwgTGVu Z3RoKCksIExlbmd0aCgpLCBMZW5ndGgoKSk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUo KS0+c2V0SGFzQ2xpcCh0cnVlKTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHN0YXRpYyBQcm9w ZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBw bHlJbmhlcml0VmFsdWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9Cit9Owor CiBlbnVtIENvbG9ySW5oZXJpdCB7Tm9Jbmhlcml0RnJvbVBhcmVudCA9IDAsIEluaGVyaXRGcm9t UGFyZW50fTsKIENvbG9yIGRlZmF1bHRJbml0aWFsQ29sb3IoKTsKIENvbG9yIGRlZmF1bHRJbml0 aWFsQ29sb3IoKSB7IHJldHVybiBDb2xvcigpOyB9CkBAIC0xNjY1LDYgKzE3MTEsOCBAQCBDU1NT dHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5k bGVyKENTU1Byb3BlcnR5TGV0dGVyU3BhY2luZywgQXBwbHlQcm9wZXJ0eUNvbXB1dGVMZW5ndGg8 aW50LCAmUmVuZGVyU3R5bGU6OmxldHRlclNwYWNpbmcsICZSZW5kZXJTdHlsZTo6c2V0TGV0dGVy U3BhY2luZywgJlJlbmRlclN0eWxlOjppbml0aWFsTGV0dGVyV29yZFNwYWNpbmcsIE5vcm1hbEVu YWJsZWQsIFRoaWNrbmVzc0Rpc2FibGVkLCBTVkdab29tRW5hYmxlZD46OmNyZWF0ZUhhbmRsZXIo KSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V29yZFNwYWNpbmcsIEFwcGx5 UHJvcGVydHlDb21wdXRlTGVuZ3RoPGludCwgJlJlbmRlclN0eWxlOjp3b3JkU3BhY2luZywgJlJl bmRlclN0eWxlOjpzZXRXb3JkU3BhY2luZywgJlJlbmRlclN0eWxlOjppbml0aWFsTGV0dGVyV29y ZFNwYWNpbmcsIE5vcm1hbEVuYWJsZWQsIFRoaWNrbmVzc0Rpc2FibGVkLCBTVkdab29tRW5hYmxl ZD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlDbGlwLCBBcHBseVByb3BlcnR5Q2xpcDo6Y3JlYXRlSGFuZGxlcigpKTsKKwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUN1cnNvciwgQXBwbHlQcm9wZXJ0eUN1cnNvcjo6Y3Jl YXRlSGFuZGxlcigpKTsKIAogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNvdW50 ZXJJbmNyZW1lbnQsIEFwcGx5UHJvcGVydHlDb3VudGVyPEluY3JlbWVudD46OmNyZWF0ZUhhbmRs ZXIoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZp c2lvbiAxMDMzNTMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2ODcsNDcgKzI2ODcsNiBAQCB2b2lkIENTU1N0eWxlU2VsZWN0 b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eU9ycGhhbnM6CiAgICAg ICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkUob3JwaGFucywgT3Jw aGFucykKICAgICAgICAgcmV0dXJuOwotLy8gcmVjdAotICAgIGNhc2UgQ1NTUHJvcGVydHlDbGlw OgotICAgIHsKLSAgICAgICAgTGVuZ3RoIHRvcDsKLSAgICAgICAgTGVuZ3RoIHJpZ2h0OwotICAg ICAgICBMZW5ndGggYm90dG9tOwotICAgICAgICBMZW5ndGggbGVmdDsKLSAgICAgICAgYm9vbCBo YXNDbGlwID0gdHJ1ZTsKLSAgICAgICAgaWYgKGlzSW5oZXJpdCkgewotICAgICAgICAgICAgaWYg KG1fcGFyZW50U3R5bGUtPmhhc0NsaXAoKSkgewotICAgICAgICAgICAgICAgIHRvcCA9IG1fcGFy ZW50U3R5bGUtPmNsaXBUb3AoKTsKLSAgICAgICAgICAgICAgICByaWdodCA9IG1fcGFyZW50U3R5 bGUtPmNsaXBSaWdodCgpOwotICAgICAgICAgICAgICAgIGJvdHRvbSA9IG1fcGFyZW50U3R5bGUt PmNsaXBCb3R0b20oKTsKLSAgICAgICAgICAgICAgICBsZWZ0ID0gbV9wYXJlbnRTdHlsZS0+Y2xp cExlZnQoKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgaGFzQ2xpcCA9 IGZhbHNlOwotICAgICAgICAgICAgICAgIHRvcCA9IHJpZ2h0ID0gYm90dG9tID0gbGVmdCA9IExl bmd0aCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKGlzSW5pdGlhbCkgewot ICAgICAgICAgICAgaGFzQ2xpcCA9IGZhbHNlOwotICAgICAgICAgICAgdG9wID0gcmlnaHQgPSBi b3R0b20gPSBsZWZ0ID0gTGVuZ3RoKCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoIXByaW1pdGl2ZVZh bHVlKSB7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZl VmFsdWUtPnByaW1pdGl2ZVR5cGUoKSA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JFQ1QpIHsK LSAgICAgICAgICAgIFJlY3QqIHJlY3QgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0UmVjdFZhbHVlKCk7 Ci0gICAgICAgICAgICBpZiAoIXJlY3QpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgdG9wID0gY29udmVydFRvSW50TGVuZ3RoKHJlY3QtPnRvcCgpLCBzdHlsZSgpLCBtX3Jv b3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgICAgICAgICAgcmlnaHQgPSBjb252ZXJ0 VG9JbnRMZW5ndGgocmVjdC0+cmlnaHQoKSwgc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6 b29tRmFjdG9yKTsKLSAgICAgICAgICAgIGJvdHRvbSA9IGNvbnZlcnRUb0ludExlbmd0aChyZWN0 LT5ib3R0b20oKSwgc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKLSAg ICAgICAgICAgIGxlZnQgPSBjb252ZXJ0VG9JbnRMZW5ndGgocmVjdC0+bGVmdCgpLCBzdHlsZSgp LCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgICAgICB9IGVsc2UgaWYgKHBy aW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpICE9IENTU1ZhbHVlQXV0bykgewotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB9Ci0gICAgICAgIG1fc3R5bGUtPnNldENsaXAodG9wLCByaWdodCwg Ym90dG9tLCBsZWZ0KTsKLSAgICAgICAgbV9zdHlsZS0+c2V0SGFzQ2xpcChoYXNDbGlwKTsKLQot ICAgICAgICAvLyByZWN0LCBpZGVudAotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAvLyBsaXN0 cwogICAgIGNhc2UgQ1NTUHJvcGVydHlDb250ZW50OgogICAgICAgICAvLyBsaXN0IG9mIHN0cmlu ZywgdXJpLCBjb3VudGVyLCBhdHRyLCBpCkBAIC0zNjc3LDYgKzM2MzYsNyBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRl clNwYWNpbmc6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckhvcml6b250YWxTcGFj aW5nOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJWZXJ0aWNhbFNwYWNpbmc6Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eUNsaXA6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNvdW50ZXJJbmNy ZW1lbnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNvdW50ZXJSZXNldDoKICAgICBjYXNlIENTU1By b3BlcnR5TGV0dGVyU3BhY2luZzoK 123636 2012-01-23 15:32:13 -0800 2012-01-23 21:44:38 -0800 Patch for landing bug-74913-20120124103210.patch text/plain 9586 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNTY0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTAxLTIzICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBjbGlwIHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0OTEzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAgICAgICBObyBuZXcgdGVzdHMgLyByZWZhY3Rv cmluZyBvbmx5LgorCisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmg6CisgICAgICAg ICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U1ByaW1pdGl2ZVZhbHVlOjpjb252ZXJ0VG9MZW5ndGgpOgorICAgICAgICBUaGlzIG5ldyBmdW5j dGlvbiBhaW1zIHRvIHByb3ZpZGUgYSBzaW5nbGUgY2FsbCBmb3IgY29udmVydGluZyBtYW55IENT U1ByaW1pdGl2ZVZhbHVlCisgICAgICAgIHZhbHVlcyB0byBMZW5ndGhzLiBJdCBpcyB0ZW1wbGF0 ZWQgdG8gYWxsb3cgdGhlIGNhbGxlciB0byBzcGVjaWZ5IHdoaWNoIGNvbnZlcnNpb25zCisgICAg ICAgIGFyZSBhcHByb3ByaWF0ZSBkZXBlbmRpbmcgb24gdGhlIGNvbnRleHQgaW4gd2hpY2ggdGhl IHZhbHVlIGlzIHVzZWQuCisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q2xpcDo6Y29udmVydFRvTGVuZ3RoKToK KyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlDbGlwOjphcHBseUluaGVyaXRWYWx1ZSk6 CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q2xpcDo6YXBwbHlJbml0aWFsVmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmFwcGx5VmFsdWUpOgorICAg ICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXA6OmNyZWF0ZUhhbmRsZXIpOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5OjpDU1NTdHlsZUFwcGx5UHJvcGVydHkp OgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorCiAyMDEyLTAxLTIzICBBbmRyZWFz IEtsaW5nICA8YXdlc29tZWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1 aWxkZml4IGZvciBFTkFCTEUoTVVUQVRJT05fT0JTRVJWRVJTKSBmb2xsb3dpbmcgcjEwNTY0Mi4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCShyZXZpc2lvbiAxMDU2 NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkod29ya2luZyBj b3B5KQpAQCAtMjAzLDYgKzIwMyw5IEBAIHB1YmxpYzoKICAgICAgKi8KICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBUIGNvbXB1dGVMZW5ndGgoUmVuZGVyU3R5bGUqIGN1cnJTdHlsZSwgUmVuZGVy U3R5bGUqIHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIgPSAxLjAsIGJvb2wgY29tcHV0aW5n Rm9udFNpemUgPSBmYWxzZSk7CiAKKyAgICAvLyBDb252ZXJ0cyB0byBhIExlbmd0aCwgbWFwcGlu ZyB2YXJpb3VzIHVuaXQgdHlwZXMgYXBwcm9wcmlhdGVseS4KKyAgICB0ZW1wbGF0ZTxpbnQ+IExl bmd0aCBjb252ZXJ0VG9MZW5ndGgoUmVuZGVyU3R5bGUqIGN1cnJTdHlsZSwgUmVuZGVyU3R5bGUq IHJvb3RTdHlsZSwgZG91YmxlIG11bHRpcGxpZXIgPSAxLjAsIGJvb2wgY29tcHV0aW5nRm9udFNp emUgPSBmYWxzZSk7CisKICAgICAvLyB1c2Ugd2l0aCBjYXJlISEhCiAgICAgdm9pZCBzZXRQcmlt aXRpdmVUeXBlKHVuc2lnbmVkIHNob3J0IHR5cGUpIHsgbV9wcmltaXRpdmVVbml0VHlwZSA9IHR5 cGU7IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGlu Z3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVN YXBwaW5ncy5oCShyZXZpc2lvbiAxMDU2NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJp bWl0aXZlVmFsdWVNYXBwaW5ncy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBACiAj aW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiRm9udFNtb290aGluZ01vZGUu aCIKICNpbmNsdWRlICJHcmFwaGljc1R5cGVzLmgiCisjaW5jbHVkZSAiTGVuZ3RoLmgiCiAjaW5j bHVkZSAiUGF0aC5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlQ29uc3RhbnRzLmgiCiAjaW5jbHVk ZSAiU1ZHUmVuZGVyU3R5bGVEZWZzLmgiCkBAIC0zNjczLDYgKzM2NzQsMjEgQEAgdGVtcGxhdGU8 PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZQogICAgIH0KIH0KIAorZW51bSBMZW5ndGhD b252ZXJzaW9uIHsgVW5zdXBwb3J0ZWRDb252ZXJzaW9uID0gMCwgRml4ZWRDb252ZXJzaW9uID0g MSwgQXV0b0NvbnZlcnNpb24gPSAyLCBQZXJjZW50Q29udmVyc2lvbiA9IDQsIEZyYWN0aW9uQ29u dmVyc2lvbiA9IDh9OwordGVtcGxhdGU8aW50IHN1cHBvcnRlZD4gTGVuZ3RoIENTU1ByaW1pdGl2 ZVZhbHVlOjpjb252ZXJ0VG9MZW5ndGgoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSog cm9vdFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciwgYm9vbCBjb21wdXRpbmdGb250U2l6ZSkKK3sK KyAgICBpZiAoKHN1cHBvcnRlZCAmIEZpeGVkQ29udmVyc2lvbikgJiYgaXNMZW5ndGgoKSkKKyAg ICAgICAgcmV0dXJuIGNvbXB1dGVMZW5ndGg8TGVuZ3RoPihzdHlsZSwgcm9vdFN0eWxlLCBtdWx0 aXBsaWVyLCBjb21wdXRpbmdGb250U2l6ZSk7CisgICAgaWYgKChzdXBwb3J0ZWQgJiBQZXJjZW50 Q29udmVyc2lvbikgJiYgaXNQZXJjZW50YWdlKCkpCisgICAgICAgIHJldHVybiBMZW5ndGgoZ2V0 RG91YmxlVmFsdWUoKSwgUGVyY2VudCk7CisgICAgaWYgKChzdXBwb3J0ZWQgJiBGcmFjdGlvbkNv bnZlcnNpb24pICYmIGlzTnVtYmVyKCkpCisgICAgICAgIHJldHVybiBMZW5ndGgoZ2V0RG91Ymxl VmFsdWUoKSAqIDEwMC4wLCBQZXJjZW50KTsKKyAgICBpZiAoKHN1cHBvcnRlZCAmIEF1dG9Db252 ZXJzaW9uKSAmJiBnZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKKyAgICAgICAgcmV0dXJuIExl bmd0aChBdXRvKTsKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gTGVuZ3Ro KFVuZGVmaW5lZCk7Cit9CisKICNpZiBFTkFCTEUoU1ZHKQogCiB0ZW1wbGF0ZTw+IGlubGluZSBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRUNvbG9ySW50ZXJwb2xhdGlvbiBl KQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJ KHJldmlzaW9uIDEwNTY0NSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJv cGVydHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiRG9j dW1lbnQuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCiAjaW5jbHVkZSAiUGFpci5oIgorI2luY2x1 ZGUgIlJlY3QuaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKICNpbmNsdWRlICJSZW5kZXJT dHlsZS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC0yMTIsNiArMjEzLDUxIEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKSB7IHJldHVybiBQ cm9wZXJ0eUhhbmRsZXIoJmFwcGx5SW5oZXJpdFZhbHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZh cHBseVZhbHVlKTsgfQogfTsKIAorY2xhc3MgQXBwbHlQcm9wZXJ0eUNsaXAgeworcHJpdmF0ZToK KyAgICBzdGF0aWMgTGVuZ3RoIGNvbnZlcnRUb0xlbmd0aChDU1NTdHlsZVNlbGVjdG9yKiBzZWxl Y3RvciwgQ1NTUHJpbWl0aXZlVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHZh bHVlLT5jb252ZXJ0VG9MZW5ndGg8Rml4ZWRDb252ZXJzaW9uIHwgUGVyY2VudENvbnZlcnNpb24g fCBGcmFjdGlvbkNvbnZlcnNpb24gfCBBdXRvQ29udmVyc2lvbj4oc2VsZWN0b3ItPnN0eWxlKCks IHNlbGVjdG9yLT5yb290RWxlbWVudFN0eWxlKCksIHNlbGVjdG9yLT5zdHlsZSgpLT5lZmZlY3Rp dmVab29tKCkpOworICAgIH0KK3B1YmxpYzoKKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRW YWx1ZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvcikKKyAgICB7CisgICAgICAgIFJlbmRlclN0 eWxlKiBwYXJlbnRTdHlsZSA9IHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpOworICAgICAgICBpZiAo IXBhcmVudFN0eWxlLT5oYXNDbGlwKCkpCisgICAgICAgICAgICByZXR1cm4gYXBwbHlJbml0aWFs VmFsdWUoc2VsZWN0b3IpOworICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0Q2xpcChwYXJl bnRTdHlsZS0+Y2xpcFRvcCgpLCBwYXJlbnRTdHlsZS0+Y2xpcFJpZ2h0KCksIHBhcmVudFN0eWxl LT5jbGlwQm90dG9tKCksIHBhcmVudFN0eWxlLT5jbGlwTGVmdCgpKTsKKyAgICAgICAgc2VsZWN0 b3ItPnN0eWxlKCktPnNldEhhc0NsaXAodHJ1ZSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQg YXBwbHlJbml0aWFsVmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCisgICAgeworICAg ICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0Q2xpcChMZW5ndGgoKSwgTGVuZ3RoKCksIExlbmd0 aCgpLCBMZW5ndGgoKSk7CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRIYXNDbGlwKGZh bHNlKTsKKyAgICB9CisKKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1N0eWxlU2VsZWN0 b3IqIHNlbGVjdG9yLCBDU1NWYWx1ZSogdmFsdWUpCisgICAgeworICAgICAgICBpZiAoIXZhbHVl LT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgQ1NT UHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZl VmFsdWUqPih2YWx1ZSk7CisKKyAgICAgICAgaWYgKFJlY3QqIHJlY3QgPSBwcmltaXRpdmVWYWx1 ZS0+Z2V0UmVjdFZhbHVlKCkpIHsKKyAgICAgICAgICAgIExlbmd0aCB0b3AgPSBjb252ZXJ0VG9M ZW5ndGgoc2VsZWN0b3IsIHJlY3QtPnRvcCgpKTsKKyAgICAgICAgICAgIExlbmd0aCByaWdodCA9 IGNvbnZlcnRUb0xlbmd0aChzZWxlY3RvciwgcmVjdC0+cmlnaHQoKSk7CisgICAgICAgICAgICBM ZW5ndGggYm90dG9tID0gY29udmVydFRvTGVuZ3RoKHNlbGVjdG9yLCByZWN0LT5ib3R0b20oKSk7 CisgICAgICAgICAgICBMZW5ndGggbGVmdCA9IGNvbnZlcnRUb0xlbmd0aChzZWxlY3RvciwgcmVj dC0+bGVmdCgpKTsKKyAgICAgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRDbGlwKHRvcCwg cmlnaHQsIGJvdHRvbSwgbGVmdCk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0 SGFzQ2xpcCh0cnVlKTsKKyAgICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRl bnQoKSA9PSBDU1NWYWx1ZUF1dG8pIHsKKyAgICAgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5z ZXRDbGlwKExlbmd0aCgpLCBMZW5ndGgoKSwgTGVuZ3RoKCksIExlbmd0aCgpKTsKKyAgICAgICAg ICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRIYXNDbGlwKHRydWUpOworICAgICAgICB9CisgICAg fQorCisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4g UHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAm YXBwbHlWYWx1ZSk7IH0KK307CisKIGVudW0gQ29sb3JJbmhlcml0IHtOb0luaGVyaXRGcm9tUGFy ZW50ID0gMCwgSW5oZXJpdEZyb21QYXJlbnR9OwogQ29sb3IgZGVmYXVsdEluaXRpYWxDb2xvcigp OwogQ29sb3IgZGVmYXVsdEluaXRpYWxDb2xvcigpIHsgcmV0dXJuIENvbG9yKCk7IH0KQEAgLTE3 NDUsNiArMTc5MSw4IEBAIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3AK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlMZXR0ZXJTcGFjaW5nLCBBcHBseVBy b3BlcnR5Q29tcHV0ZUxlbmd0aDxpbnQsICZSZW5kZXJTdHlsZTo6bGV0dGVyU3BhY2luZywgJlJl bmRlclN0eWxlOjpzZXRMZXR0ZXJTcGFjaW5nLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxMZXR0ZXJX b3JkU3BhY2luZywgTm9ybWFsRW5hYmxlZCwgVGhpY2tuZXNzRGlzYWJsZWQsIFNWR1pvb21FbmFi bGVkPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlXb3JkU3BhY2luZywgQXBwbHlQcm9wZXJ0eUNvbXB1dGVMZW5ndGg8aW50LCAmUmVuZGVyU3R5 bGU6OndvcmRTcGFjaW5nLCAmUmVuZGVyU3R5bGU6OnNldFdvcmRTcGFjaW5nLCAmUmVuZGVyU3R5 bGU6OmluaXRpYWxMZXR0ZXJXb3JkU3BhY2luZywgTm9ybWFsRW5hYmxlZCwgVGhpY2tuZXNzRGlz YWJsZWQsIFNWR1pvb21FbmFibGVkPjo6Y3JlYXRlSGFuZGxlcigpKTsKIAorICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNsaXAsIEFwcGx5UHJvcGVydHlDbGlwOjpjcmVhdGVIYW5k bGVyKCkpOworCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q3Vyc29yLCBBcHBs eVByb3BlcnR5Q3Vyc29yOjpjcmVhdGVIYW5kbGVyKCkpOwogCiAgICAgc2V0UHJvcGVydHlIYW5k bGVyKENTU1Byb3BlcnR5Q291bnRlckluY3JlbWVudCwgQXBwbHlQcm9wZXJ0eUNvdW50ZXI8SW5j cmVtZW50Pjo6Y3JlYXRlSGFuZGxlcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDEwNTY0NSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc5MSw0NiArMjc5MSw2IEBA IHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1By b3BlcnR5T3JwaGFuczoKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BS SU1JVElWRShvcnBoYW5zLCBPcnBoYW5zKQogICAgICAgICByZXR1cm47Ci0vLyByZWN0Ci0gICAg Y2FzZSBDU1NQcm9wZXJ0eUNsaXA6Ci0gICAgewotICAgICAgICBMZW5ndGggdG9wOwotICAgICAg ICBMZW5ndGggcmlnaHQ7Ci0gICAgICAgIExlbmd0aCBib3R0b207Ci0gICAgICAgIExlbmd0aCBs ZWZ0OwotICAgICAgICBib29sIGhhc0NsaXAgPSB0cnVlOwotICAgICAgICBpZiAoaXNJbmhlcml0 KSB7Ci0gICAgICAgICAgICBpZiAobV9wYXJlbnRTdHlsZS0+aGFzQ2xpcCgpKSB7Ci0gICAgICAg ICAgICAgICAgdG9wID0gbV9wYXJlbnRTdHlsZS0+Y2xpcFRvcCgpOwotICAgICAgICAgICAgICAg IHJpZ2h0ID0gbV9wYXJlbnRTdHlsZS0+Y2xpcFJpZ2h0KCk7Ci0gICAgICAgICAgICAgICAgYm90 dG9tID0gbV9wYXJlbnRTdHlsZS0+Y2xpcEJvdHRvbSgpOwotICAgICAgICAgICAgICAgIGxlZnQg PSBtX3BhcmVudFN0eWxlLT5jbGlwTGVmdCgpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgICAgICBoYXNDbGlwID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgdG9wID0gcmlnaHQg PSBib3R0b20gPSBsZWZ0ID0gTGVuZ3RoKCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxz ZSBpZiAoaXNJbml0aWFsKSB7Ci0gICAgICAgICAgICBoYXNDbGlwID0gZmFsc2U7Ci0gICAgICAg ICAgICB0b3AgPSByaWdodCA9IGJvdHRvbSA9IGxlZnQgPSBMZW5ndGgoKTsKLSAgICAgICAgfSBl bHNlIGlmICghcHJpbWl0aXZlVmFsdWUpIHsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNSZWN0KCkpIHsKLSAgICAgICAgICAgIFJlY3Qq IHJlY3QgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0UmVjdFZhbHVlKCk7Ci0gICAgICAgICAgICBpZiAo IXJlY3QpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgdG9wID0gY29udmVy dFRvSW50TGVuZ3RoKHJlY3QtPnRvcCgpLCBzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpv b21GYWN0b3IpOwotICAgICAgICAgICAgcmlnaHQgPSBjb252ZXJ0VG9JbnRMZW5ndGgocmVjdC0+ cmlnaHQoKSwgc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKLSAgICAg ICAgICAgIGJvdHRvbSA9IGNvbnZlcnRUb0ludExlbmd0aChyZWN0LT5ib3R0b20oKSwgc3R5bGUo KSwgbV9yb290RWxlbWVudFN0eWxlLCB6b29tRmFjdG9yKTsKLSAgICAgICAgICAgIGxlZnQgPSBj b252ZXJ0VG9JbnRMZW5ndGgocmVjdC0+bGVmdCgpLCBzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5 bGUsIHpvb21GYWN0b3IpOwotICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJ ZGVudCgpICE9IENTU1ZhbHVlQXV0bykgewotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9 Ci0gICAgICAgIG1fc3R5bGUtPnNldENsaXAodG9wLCByaWdodCwgYm90dG9tLCBsZWZ0KTsKLSAg ICAgICAgbV9zdHlsZS0+c2V0SGFzQ2xpcChoYXNDbGlwKTsKLQotICAgICAgICAvLyByZWN0LCBp ZGVudAotICAgICAgICByZXR1cm47Ci0gICAgfQogCiAvLyBsaXN0cwogICAgIGNhc2UgQ1NTUHJv cGVydHlDb250ZW50OgpAQCAtMzc2Nyw2ICszNzI3LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9y OjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJTcGFjaW5nOgog ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJIb3Jpem9udGFsU3BhY2luZzoKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyVmVydGljYWxTcGFjaW5nOgorICAgIGNhc2UgQ1NT UHJvcGVydHlDbGlwOgogICAgIGNhc2UgQ1NTUHJvcGVydHlDb3VudGVySW5jcmVtZW50OgogICAg IGNhc2UgQ1NTUHJvcGVydHlDb3VudGVyUmVzZXQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUxldHRl clNwYWNpbmc6Cg==