117803 2013-06-19 10:53:30 -0700 Fix a few missed renames from Exclusions -> Shapes 2013-06-19 13:11:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe betravis commit-queue esprehn+autocc glenn oldest_to_newest 901852 0 bjonesbe 2013-06-19 10:53:30 -0700 Fix a few missed renames from Exclusions -> Shapes 901854 1 205015 bjonesbe 2013-06-19 10:55:06 -0700 Created attachment 205015 Patch Fix missed renames 901879 2 205015 hyatt 2013-06-19 11:42:41 -0700 Comment on attachment 205015 Patch r=me 901882 3 bjonesbe 2013-06-19 11:45:53 -0700 Bear, FYI. 901902 4 205015 commit-queue 2013-06-19 13:11:50 -0700 Comment on attachment 205015 Patch Clearing flags on attachment: 205015 Committed r151750: <http://trac.webkit.org/changeset/151750> 901903 5 commit-queue 2013-06-19 13:11:52 -0700 All reviewed patches have been landed. Closing bug. 205015 2013-06-19 10:55:06 -0700 2013-06-19 13:11:49 -0700 Patch bug-117803-20130619105316.patch text/plain 8767 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY2OTkwODc0NTI5MGE0 NzdjZWM2NTJkY2I3Y2IwOWZiNDhhNjcyNy4uYjUwZjc0NGUzMTRmYmQ1MDgyMTQ4MDZmYTMwZjY4 NGM0YzFkNDAzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA2LTE5ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIEZpeCBhIGZldyBtaXNz ZWQgcmVuYW1lcyBmcm9tIEV4Y2x1c2lvbnMgLT4gU2hhcGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc4MDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgZ3JlYXQgQ1NTIEV4Y2x1c2lvbnMg dG8gQ1NTIFNoYXBlcyByZW5hbWUsIGEgZmV3IGluc3RhbmNlcyB3ZXJlCisgICAgICAgIG1pc3Nl ZC4gVGhpcyBmaXhlcyB0aG9zZSBpbnN0YW5jZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBu byBiZWhhdmlvciBjaGFuZ2UsIGp1c3QgcmVuYW1lcy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6dXBkYXRlUmVn aW9uc0FuZFNoYXBlc0JlZm9yZUNoaWxkTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjp1cGRhdGVSZWdpb25zQW5kU2hhcGVzQWZ0ZXJDaGlsZExheW91dCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQmxvY2s6OmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZSk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9jazo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZSk6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxl eGlibGVCb3g6OmxheW91dEJsb2NrKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmxheW91dEJs b2NrKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJHcmlkOjpsYXlvdXRCbG9jayk6CisKIDIwMTMtMDYtMTkgIFJvYmVydCBIb2dh biAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIEluY29ycmVjdCBjb21wdXRhdGlvbiBv ZiBzaHJpbmstdG8tZml0IHdpZHRoIGZvciBibG9jayB3aXRoIHdoaXRlLXNwYWNlOm5vd3JhcCBh bmQgZmxvYXRpbmcgY2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCmluZGV4IGM1MDgyOTE0YzBmODVjODhiYjk1OWE0NDMwYjFiM2FiZTliNTA3ZGIuLjlkNmEw ZDkzZjUwNWZhYjBjY2YwMDFjNWM2YTliMDU5YjAxYTllZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtMTQ4MSw3ICsxNDgxLDcgQEAgc3RhdGljIGlubGlu ZSBib29sIHNoYXBlSW5mb1JlcXVpcmVzUmVsYXlvdXQoY29uc3QgUmVuZGVyQmxvY2sqIGJsb2Nr KQogI2VuZGlmCiB9CiAKLWJvb2wgUmVuZGVyQmxvY2s6OnVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNp b25zQmVmb3JlQ2hpbGRMYXlvdXQoUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCkKK2Jvb2wg UmVuZGVyQmxvY2s6OnVwZGF0ZVJlZ2lvbnNBbmRTaGFwZXNCZWZvcmVDaGlsZExheW91dChSZW5k ZXJGbG93VGhyZWFkKiBmbG93VGhyZWFkKQogewogI2lmIEVOQUJMRShDU1NfU0hBUEVTKQogICAg IGlmICghZmxvd1RocmVhZCAmJiAhc2hhcGVJbnNpZGVJbmZvKCkpCkBAIC0xNTIzLDcgKzE1MjMs NyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlU2hhcGVTaXplKCkKIH0KICNlbmRpZgogCi12 b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVSZWdpb25zQW5kRXhjbHVzaW9uc0FmdGVyQ2hpbGRMYXlv dXQoUmVuZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCwgYm9vbCBoZWlnaHRDaGFuZ2VkKQordm9p ZCBSZW5kZXJCbG9jazo6dXBkYXRlUmVnaW9uc0FuZFNoYXBlc0FmdGVyQ2hpbGRMYXlvdXQoUmVu ZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCwgYm9vbCBoZWlnaHRDaGFuZ2VkKQogewogI2lmIEVO QUJMRShDU1NfU0hBUEVTKQogICAgIC8vIEEgcHJldmlvdXMgc2libGluZyBoYXMgY2hhbmdlZCBk aW1lbnNpb24sIHNvIHdlIG5lZWQgdG8gcmVsYXlvdXQgdGhlIHNoYXBlIHdpdGggdGhlIGNvbnRl bnQKQEAgLTE2MjEsNyArMTYyMSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrKGJv b2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdoCiAgICAgUmVu ZGVyRmxvd1RocmVhZCogZmxvd1RocmVhZCA9IGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKTsK ICAgICBpZiAobG9naWNhbFdpZHRoQ2hhbmdlZEluUmVnaW9ucyhmbG93VGhyZWFkKSkKICAgICAg ICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7Ci0gICAgaWYgKHVwZGF0ZVJlZ2lvbnNBbmRFeGNs dXNpb25zQmVmb3JlQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCkpCisgICAgaWYgKHVwZGF0ZVJlZ2lv bnNBbmRTaGFwZXNCZWZvcmVDaGlsZExheW91dChmbG93VGhyZWFkKSkKICAgICAgICAgcmVsYXlv dXRDaGlsZHJlbiA9IHRydWU7CiAKICAgICAvLyBXZSB1c2UgZm91ciB2YWx1ZXMsIG1heFRvcFBv cywgbWF4VG9wTmVnLCBtYXhCb3R0b21Qb3MsIGFuZCBtYXhCb3R0b21OZWcsIHRvIHRyYWNrCkBA IC0xNjkxLDcgKzE2OTEsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRCbG9jayhib29sIHJl bGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQgcGFnZUxvZ2ljYWxIZWlnaAogCiAgICAgbGF5b3V0 UG9zaXRpb25lZE9iamVjdHMocmVsYXlvdXRDaGlsZHJlbiB8fCBpc1Jvb3QoKSk7CiAKLSAgICB1 cGRhdGVSZWdpb25zQW5kRXhjbHVzaW9uc0FmdGVyQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCwgaGVp Z2h0Q2hhbmdlZCk7CisgICAgdXBkYXRlUmVnaW9uc0FuZFNoYXBlc0FmdGVyQ2hpbGRMYXlvdXQo Zmxvd1RocmVhZCwgaGVpZ2h0Q2hhbmdlZCk7CiAKICAgICAvLyBBZGQgb3ZlcmZsb3cgZnJvbSBj aGlsZHJlbiAodW5sZXNzIHdlJ3JlIG11bHRpLWNvbHVtbiwgc2luY2UgaW4gdGhhdCBjYXNlIGFs bCBvdXIgY2hpbGQgb3ZlcmZsb3cgaXMgY2xpcHBlZCBhbnl3YXkpLgogICAgIGNvbXB1dGVPdmVy ZmxvdyhvbGRDbGllbnRBZnRlckVkZ2UpOwpAQCAtNDQzMyw3ICs0NDMzLDcgQEAgTGF5b3V0VW5p dCBSZW5kZXJCbG9jazo6bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yQ29udGVudChSZW5kZXJSZWdpb24q IHJlZ2lvbikgY29uc3QKIAogTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6bG9naWNhbExlZnRPZmZz ZXRGb3JMaW5lKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBmaXhlZE9mZnNldCwg Ym9vbCBhcHBseVRleHRJbmRlbnQsIExheW91dFVuaXQqIGhlaWdodFJlbWFpbmluZywgTGF5b3V0 VW5pdCBsb2dpY2FsSGVpZ2h0LCBTaGFwZU91dHNpZGVGbG9hdE9mZnNldE1vZGUgb2Zmc2V0TW9k ZSkgY29uc3QKIHsKLSNpZiAhRU5BQkxFKENTU19FWENMVVNJT05TKQorI2lmICFFTkFCTEUoQ1NT X1NIQVBFUykKICAgICBVTlVTRURfUEFSQU0ob2Zmc2V0TW9kZSk7CiAjZW5kaWYKICAgICBMYXlv dXRVbml0IGxlZnQgPSBmaXhlZE9mZnNldDsKQEAgLTQ0OTMsNyArNDQ5Myw3IEBAIExheW91dFVu aXQgUmVuZGVyQmxvY2s6OmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShMYXlvdXRVbml0IGxvZ2lj YWxUb3AsIExheW91dFVuCiAKIExheW91dFVuaXQgUmVuZGVyQmxvY2s6OmxvZ2ljYWxSaWdodE9m ZnNldEZvckxpbmUoTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGZpeGVkT2Zmc2V0 LCBib29sIGFwcGx5VGV4dEluZGVudCwgTGF5b3V0VW5pdCogaGVpZ2h0UmVtYWluaW5nLCBMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHQsIFNoYXBlT3V0c2lkZUZsb2F0T2Zmc2V0TW9kZSBvZmZzZXRN b2RlKSBjb25zdAogewotI2lmICFFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCisjaWYgIUVOQUJMRShD U1NfU0hBUEVTKQogICAgIFVOVVNFRF9QQVJBTShvZmZzZXRNb2RlKTsKICNlbmRpZgogICAgIExh eW91dFVuaXQgcmlnaHQgPSBmaXhlZE9mZnNldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmgKaW5kZXggYjFmNTdhOGE3ZjVlYjNkOWMwNzAyZDA5MzFmMTEyNDFkMDU3ZGZjOC4u MzNlYzFjOTFjNDc2MzFlYTg5Mzg2ZjIyOWJjODA1ODEwZDA3YjU5MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTU3Niw4ICs1NzYsOCBAQCBwcm90ZWN0ZWQ6CiAg ICAgfQogI2VuZGlmCiAKLSAgICBib29sIHVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNpb25zQmVmb3Jl Q2hpbGRMYXlvdXQoUmVuZGVyRmxvd1RocmVhZCopOwotICAgIHZvaWQgdXBkYXRlUmVnaW9uc0Fu ZEV4Y2x1c2lvbnNBZnRlckNoaWxkTGF5b3V0KFJlbmRlckZsb3dUaHJlYWQqLCBib29sIGhlaWdo dENoYW5nZWQgPSBmYWxzZSk7CisgICAgYm9vbCB1cGRhdGVSZWdpb25zQW5kU2hhcGVzQmVmb3Jl Q2hpbGRMYXlvdXQoUmVuZGVyRmxvd1RocmVhZCopOworICAgIHZvaWQgdXBkYXRlUmVnaW9uc0Fu ZFNoYXBlc0FmdGVyQ2hpbGRMYXlvdXQoUmVuZGVyRmxvd1RocmVhZCosIGJvb2wgaGVpZ2h0Q2hh bmdlZCA9IGZhbHNlKTsKICAgICB2b2lkIGNvbXB1dGVSZWdpb25SYW5nZUZvckJsb2NrKFJlbmRl ckZsb3dUaHJlYWQqKTsKIAogICAgIHZvaWQgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9y ZUxheW91dChib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFJlbmRlckJveCopOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNw cAppbmRleCAyYmRiYTliOGNjMmIzZTM3ZDlmOTI2ZGU4MThlNGNiOTBjNGJiNThkLi5jMDA1Yzdk MGU3OGIxZTBiZDc5ZjM2NmIzZjMzYWVlYjliMzM5NzdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcApAQCAt MzA1LDcgKzMwNSw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRC bG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgUmVuZGVyRmxvd1Ro cmVhZCogZmxvd1RocmVhZCA9IGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKTsKICAgICBpZiAo bG9naWNhbFdpZHRoQ2hhbmdlZEluUmVnaW9ucyhmbG93VGhyZWFkKSkKICAgICAgICAgcmVsYXlv dXRDaGlsZHJlbiA9IHRydWU7Ci0gICAgaWYgKHVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNpb25zQmVm b3JlQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCkpCisgICAgaWYgKHVwZGF0ZVJlZ2lvbnNBbmRTaGFw ZXNCZWZvcmVDaGlsZExheW91dChmbG93VGhyZWFkKSkKICAgICAgICAgcmVsYXlvdXRDaGlsZHJl biA9IHRydWU7CiAKICAgICBMYXlvdXRTaXplIHByZXZpb3VzU2l6ZSA9IHNpemUoKTsKQEAgLTM0 Nyw3ICszNDcsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0Qmxv Y2soYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0KQogCiAgICAgbGF5b3V0UG9zaXRp b25lZE9iamVjdHMocmVsYXlvdXRDaGlsZHJlbiB8fCBpc1Jvb3QoKSk7CiAKLSAgICB1cGRhdGVS ZWdpb25zQW5kRXhjbHVzaW9uc0FmdGVyQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCk7CisgICAgdXBk YXRlUmVnaW9uc0FuZFNoYXBlc0FmdGVyQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCk7CiAKICAgICBp ZiAoIWlzRmxvYXRpbmdPck91dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBoZWlnaHQoKSA9PSAwKSB7 CiAgICAgICAgIC8vIFdlIGFyZSBhIGJsb2NrIHdpdGggbm8gYm9yZGVyIGFuZCBwYWRkaW5nIGFu ZCBhIGNvbXB1dGVkIGhlaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHAKaW5kZXggN2M2NDgxMGZhZWUzZmEwZTE5ODUyYjJmMmJhNjYzMmZjMjM3 NWI3OS4uYTFlYTQ3NjdhOTM3YTkwYTk3NjU2ZGY0ZmE4ZjQ4NzgzYTE1MzBhOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC0zNDIsNyAr MzQyLDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91 dENoaWxkcmVuLCBMYXlvdXRVbml0KQogICAgIFJlbmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQg PSBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCk7CiAgICAgaWYgKGxvZ2ljYWxXaWR0aENoYW5n ZWRJblJlZ2lvbnMoZmxvd1RocmVhZCkpCiAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVl OwotICAgIGlmICh1cGRhdGVSZWdpb25zQW5kRXhjbHVzaW9uc0JlZm9yZUNoaWxkTGF5b3V0KGZs b3dUaHJlYWQpKQorICAgIGlmICh1cGRhdGVSZWdpb25zQW5kU2hhcGVzQmVmb3JlQ2hpbGRMYXlv dXQoZmxvd1RocmVhZCkpCiAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogCiAgICAg bV9udW1iZXJPZkluRmxvd0NoaWxkcmVuT25GaXJzdExpbmUgPSAtMTsKQEAgLTM2OCw3ICszNjgs NyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRCbG9jayhib29sIHJlbGF5b3V0Q2hp bGRyZW4sIExheW91dFVuaXQpCiAKICAgICBsYXlvdXRQb3NpdGlvbmVkT2JqZWN0cyhyZWxheW91 dENoaWxkcmVuIHx8IGlzUm9vdCgpKTsKIAotICAgIHVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNpb25z QWZ0ZXJDaGlsZExheW91dChmbG93VGhyZWFkKTsKKyAgICB1cGRhdGVSZWdpb25zQW5kU2hhcGVz QWZ0ZXJDaGlsZExheW91dChmbG93VGhyZWFkKTsKIAogICAgIHJlcGFpbnRDaGlsZHJlbkR1cmlu Z0xheW91dElmTW92ZWQob2xkQ2hpbGRSZWN0cyk7CiAgICAgLy8gRklYTUU6IGNzczMvZmxleGJv eC9yZXBhaW50LXJ0bC1jb2x1bW4uaHRtbCBzZWVtcyB0byByZXBhaW50IG1vcmUgb3ZlcmZsb3cg dGhhbiBpdCBuZWVkcyB0by4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApp bmRleCA2OGNlZTU2YjNiOGE4N2E4ZjZjMDU4OWE4NzNmNWIwYmU4NWJlNzJiLi5hNjU5NDE1NTIw MDYyZThiYmQwOWQ3ZTA0MmE2NDkxZjkwY2I5YmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwCkBAIC0xNTMsNyArMTUzLDcgQEAgdm9pZCBSZW5kZXJHcmlkOjpsYXlv dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAgICAgUmVuZGVyRmxv d1RocmVhZCogZmxvd1RocmVhZCA9IGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKTsKICAgICBp ZiAobG9naWNhbFdpZHRoQ2hhbmdlZEluUmVnaW9ucyhmbG93VGhyZWFkKSkKICAgICAgICAgcmVs YXlvdXRDaGlsZHJlbiA9IHRydWU7Ci0gICAgaWYgKHVwZGF0ZVJlZ2lvbnNBbmRFeGNsdXNpb25z QmVmb3JlQ2hpbGRMYXlvdXQoZmxvd1RocmVhZCkpCisgICAgaWYgKHVwZGF0ZVJlZ2lvbnNBbmRT aGFwZXNCZWZvcmVDaGlsZExheW91dChmbG93VGhyZWFkKSkKICAgICAgICAgcmVsYXlvdXRDaGls ZHJlbiA9IHRydWU7CiAKICAgICBMYXlvdXRTaXplIHByZXZpb3VzU2l6ZSA9IHNpemUoKTsKQEAg LTE3MSw3ICsxNzEsNyBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlv dXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgIGxheW91dFBvc2l0aW9uZWRPYmplY3RzKHJl bGF5b3V0Q2hpbGRyZW4gfHwgaXNSb290KCkpOwogCi0gICAgdXBkYXRlUmVnaW9uc0FuZEV4Y2x1 c2lvbnNBZnRlckNoaWxkTGF5b3V0KGZsb3dUaHJlYWQpOworICAgIHVwZGF0ZVJlZ2lvbnNBbmRT aGFwZXNBZnRlckNoaWxkTGF5b3V0KGZsb3dUaHJlYWQpOwogCiAgICAgY29tcHV0ZU92ZXJmbG93 KG9sZENsaWVudEFmdGVyRWRnZSk7CiAgICAgc3RhdGVQdXNoZXIucG9wKCk7Cg==