128947 2014-02-17 18:43:40 -0800 [iOS, WebKit2] Add settings and correct default values for settings important on iOS 2014-02-18 11:52:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam simon.fraser oldest_to_newest 981747 0 sam 2014-02-17 18:43:40 -0800 [iOS, WebKit2] Add settings and correct default values for settings important on iOS 981748 1 224454 sam 2014-02-17 18:45:10 -0800 Created attachment 224454 Patch 981752 2 224456 sam 2014-02-17 19:00:49 -0800 Created attachment 224456 Patch 981760 3 sam 2014-02-17 19:45:23 -0800 Committed r164267: <http://trac.webkit.org/changeset/164267> 981978 4 ap 2014-02-18 10:35:27 -0800 This patch appears to have broken OS X, compositing/tiling/huge-layer-img.html regression test now asserts every time. 981994 5 simon.fraser 2014-02-18 11:11:57 -0800 Odd, I don't think any of those prefs would affect compositing. 982032 6 ap 2014-02-18 11:52:40 -0800 The reason is that this patch added a settings.setMaximumDecodedImageSize() call on Mac, which exposed bug 127029, previously iOS only. Sam is going to remove the setMaximumDecodedImageSize() call for now. 224454 2014-02-17 18:45:10 -0800 2014-02-17 18:54:36 -0800 Patch bug-128947-20140217184510.patch text/plain 10520 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI2NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW2lPUywgV2ViS2l0Ml0gQWRkIHNldHRp bmdzIGFuZCBjb3JyZWN0IGRlZmF1bHQgdmFsdWVzIGZvciBzZXR0aW5ncyBpbXBvcnRhbnQgb24g aU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5 NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNo YXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcDoKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVy ZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorCiAyMDE0LTAy LTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdW3drMl0gQ3VzdG9tIGxheWVycyBhcmUgc29tZXRpbWVzIHB1dCBvbi1zY3JlZW4gd2l0aG91 dCBiZWluZyBwYXJlbnRlZApJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVm ZXJlbmNlc1N0b3JlLmNwcAkocmV2aXNpb24gMTY0MjU1KQorKysgU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSwx MCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJE ZXN0cm95ZWQuaD4KIAorI2lmIFBMQVRGT1JNKElPUykKKyNpbXBvcnQgPFdlYktpdFN5c3RlbUlu dGVyZmFjZUlPUy5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBuYW1lc3BhY2Ug V2ViUHJlZmVyZW5jZXNLZXkgewpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZl cmVuY2VzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oCShyZXZpc2lvbiAxNjQyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw4ICs2NiwyMCBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogI2lmIFBMQVRGT1JNKElPUykKICNkZWZpbmUgREVGQVVM VF9GUkFNRV9GTEFUVEVOSU5HX0VOQUJMRUQgdHJ1ZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9Q UklOVF9CQUNLR1JPVU5EUyB0cnVlCisjZGVmaW5lIERFRkFVTFRfVEVYVF9BUkVBU19BUkVfUkVT SVpBQkxFIGZhbHNlCisjZGVmaW5lIERFRkFVTFRfSkFWQVNDUklQVF9DQU5fT1BFTl9XSU5ET1dT X0FVVE9NQVRJQ0FMTFkgZmFsc2UKKyNkZWZpbmUgREVGQVVMVF9TSE9VTERfUkVTUEVDVF9JTUFH RV9PUklFTlRBVElPTiB0cnVlCisjZGVmaW5lIERFRkFVTFRfTUlOSU1VTV9GT05UX1pPT01fU0la RSBXS0dldE1pbmltdW1ab29tRm9udFNpemUoKQorI2RlZmluZSBERUZBVUxUX1BBU1NXT1JEX0VD SE9fRU5BQkxFRCB0cnVlCiAjZWxzZQogI2RlZmluZSBERUZBVUxUX0ZSQU1FX0ZMQVRURU5JTkdf RU5BQkxFRCBmYWxzZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9QUklOVF9CQUNLR1JPVU5EUyBm YWxzZQorI2RlZmluZSBERUZBVUxUX1RFWFRfQVJFQVNfQVJFX1JFU0laQUJMRSB0cnVlCisjZGVm aW5lIERFRkFVTFRfSkFWQVNDUklQVF9DQU5fT1BFTl9XSU5ET1dTX0FVVE9NQVRJQ0FMTFkgdHJ1 ZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9SRVNQRUNUX0lNQUdFX09SSUVOVEFUSU9OIGZhbHNl CisjZGVmaW5lIERFRkFVTFRfTUlOSU1VTV9GT05UX1pPT01fU0laRSAwCisjZGVmaW5lIERFRkFV TFRfUEFTU1dPUkRfRUNIT19FTkFCTEVEIGZhbHNlCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP UykgJiYgIVBMQVRGT1JNKElPU19TSU1VTEFUT1IpCkBAIC05OCw4ICsxMTAsOCBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICBtYWNybyhEZXZlbG9wZXJFeHRyYXNFbmFibGVkLCBkZXZlbG9wZXJF eHRyYXNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEphdmFTY3JpcHRF eHBlcmltZW50c0VuYWJsZWQsIGphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWQsIEJvb2wsIGJv b2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgcHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKLSAgICBtYWNybyhUZXh0QXJlYXNB cmVSZXNpemFibGUsIHRleHRBcmVhc0FyZVJlc2l6YWJsZSwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAot ICAgIG1hY3JvKEphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHksIGphdmFTY3Jp cHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHksIEJvb2wsIGJvb2wsIHRydWUpIFwKKyAgICBt YWNybyhUZXh0QXJlYXNBcmVSZXNpemFibGUsIHRleHRBcmVhc0FyZVJlc2l6YWJsZSwgQm9vbCwg Ym9vbCwgREVGQVVMVF9URVhUX0FSRUFTX0FSRV9SRVNJWkFCTEUpIFwKKyAgICBtYWNybyhKYXZh U2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5LCBqYXZhU2NyaXB0Q2FuT3BlbldpbmRv d3NBdXRvbWF0aWNhbGx5LCBCb29sLCBib29sLCBERUZBVUxUX0pBVkFTQ1JJUFRfQ0FOX09QRU5f V0lORE9XU19BVVRPTUFUSUNBTExZKSBcCiAgICAgbWFjcm8oSHlwZXJsaW5rQXVkaXRpbmdFbmFi bGVkLCBoeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIHRydWUpIFwKICAgICBt YWNybyhOZWVkc1NpdGVTcGVjaWZpY1F1aXJrcywgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIEJv b2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQsIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCkBA IC0xNDAsNyArMTUyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgbWFjcm8oSW5zcGVjdG9y U3RhcnRzQXR0YWNoZWQsIGluc3BlY3RvclN0YXJ0c0F0dGFjaGVkLCBCb29sLCBib29sLCB0cnVl KSBcCiAgICAgbWFjcm8oU2hvd3NUb29sVGlwT3ZlclRydW5jYXRlZFRleHQsIHNob3dzVG9vbFRp cE92ZXJUcnVuY2F0ZWRUZXh0LCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKE1vY2tT Y3JvbGxiYXJzRW5hYmxlZCwgbW9ja1Njcm9sbGJhcnNFbmFibGVkLCBCb29sLCBib29sLCBmYWxz ZSkgXAotICAgIG1hY3JvKFdlYkF1ZGlvRW5hYmxlZCwgd2ViQXVkaW9FbmFibGVkLCBCb29sLCBi b29sLCBmYWxzZSkgXAorICAgIG1hY3JvKFdlYkF1ZGlvRW5hYmxlZCwgd2ViQXVkaW9FbmFibGVk LCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oQXBwbGljYXRpb25DaHJvbWVNb2RlRW5h YmxlZCwgYXBwbGljYXRpb25DaHJvbWVNb2RlLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1h Y3JvKFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZywgc3VwcHJlc3Nlc0luY3JlbWVudGFs UmVuZGVyaW5nLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEJhY2tzcGFjZUtleU5h dmlnYXRpb25FbmFibGVkLCBiYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCwgQm9vbCwgYm9v bCwgdHJ1ZSkgXApAQCAtMTQ5LDcgKzE2MSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIG1h Y3JvKFNob3VsZERpc3BsYXlDYXB0aW9ucywgc2hvdWxkRGlzcGxheUNhcHRpb25zLCBCb29sLCBi b29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFNob3VsZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zLCBz aG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9ucywgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBt YWNybyhOb3RpZmljYXRpb25zRW5hYmxlZCwgbm90aWZpY2F0aW9uc0VuYWJsZWQsIEJvb2wsIGJv b2wsIHRydWUpIFwKLSAgICBtYWNybyhTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgc2hv dWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFj cm8oU2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVu dGF0aW9uLCBCb29sLCBib29sLCBERUZBVUxUX1NIT1VMRF9SRVNQRUNUX0lNQUdFX09SSUVOVEFU SU9OKSBcCiAgICAgbWFjcm8oV2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciwg d2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciwgQm9vbCwgYm9vbCwgZmFsc2Up IFwKICAgICBtYWNybyhSZXF1ZXN0QW5pbWF0aW9uRnJhbWVFbmFibGVkLCByZXF1ZXN0QW5pbWF0 aW9uRnJhbWVFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oRGlhZ25vc3Rp Y0xvZ2dpbmdFbmFibGVkLCBkaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZh bHNlKSBcCkBAIC0xOTEsMTUgKzIwMywyNCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNy byhNZWRpYVNvdXJjZUVuYWJsZWQsIG1lZGlhU291cmNlRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFs c2UpIFwKICAgICBtYWNybyhWaWV3R2VzdHVyZURlYnVnZ2luZ0VuYWJsZWQsIHZpZXdHZXN0dXJl RGVidWdnaW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhTaG91bGRD b252ZXJ0UG9zaXRpb25TdHlsZU9uQ29weSwgc2hvdWxkQ29udmVydFBvc2l0aW9uU3R5bGVPbkNv cHksIEJvb2wsIGJvb2wsIGZhbHNlKSBcCi0gICAgXAorICAgIG1hY3JvKFN0YW5kYWxvbmUsIHN0 YW5kYWxvbmUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8oVGVsZXBob25lTnVtYmVy UGFyc2luZ0VuYWJsZWQsIHRlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVkLCBCb29sLCBib29s LCBmYWxzZSkgXAorICAgIG1hY3JvKEFsd2F5c1VzZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udCwgYWx3 YXlzVXNlQmFzZWxpbmVPZlByaW1hcnlGb250LCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1h Y3JvKEFsbG93TXVsdGlFbGVtZW50SW1wbGljaXRTdWJtaXNzaW9uLCBhbGxvd011bHRpRWxlbWVu dEltcGxpY2l0U3VibWlzc2lvbiwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhBbHdh eXNVc2VBY2NlbGVyYXRlZE92ZXJmbG93U2Nyb2xsLCBhbHdheXNVc2VBY2NlbGVyYXRlZE92ZXJm bG93U2Nyb2xsLCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1hY3JvKFBhc3N3b3JkRWNob0Vu YWJsZWQsIHBhc3N3b3JkRWNob0VuYWJsZWQsIEJvb2wsIGJvb2wsIERFRkFVTFRfUEFTU1dPUkRf RUNIT19FTkFCTEVEKQogCiAjZGVmaW5lIEZPUl9FQUNIX1dFQktJVF9ET1VCTEVfUFJFRkVSRU5D RShtYWNybykgXAogICAgIG1hY3JvKFBERlNjYWxlRmFjdG9yLCBwZGZTY2FsZUZhY3RvciwgRG91 YmxlLCBkb3VibGUsIDApIFwKICAgICBtYWNybyhJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNz aW9uVGltZW91dCwgaW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXQsIERvdWJs ZSwgZG91YmxlLCA1KSBcCiAgICAgbWFjcm8oTWluaW11bUZvbnRTaXplLCBtaW5pbXVtRm9udFNp emUsIERvdWJsZSwgZG91YmxlLCAwKSBcCiAgICAgbWFjcm8oTWluaW11bUxvZ2ljYWxGb250U2l6 ZSwgbWluaW11bUxvZ2ljYWxGb250U2l6ZSwgRG91YmxlLCBkb3VibGUsIDkpIFwKKyAgICBtYWNy byhNaW5pbXVtWm9vbUZvbnRTaXplLCBtaW5pbXVtWm9vbUZvbnRTaXplLCBEb3VibGUsIGRvdWJs ZSwgREVGQVVMVF9NSU5JTVVNX0ZPTlRfWk9PTV9TSVpFKSBcCiAgICAgbWFjcm8oRGVmYXVsdEZv bnRTaXplLCBkZWZhdWx0Rm9udFNpemUsIERvdWJsZSwgZG91YmxlLCAxNikgXAogICAgIG1hY3Jv KERlZmF1bHRGaXhlZEZvbnRTaXplLCBkZWZhdWx0Rml4ZWRGb250U2l6ZSwgRG91YmxlLCBkb3Vi bGUsIDEzKSBcCisgICAgbWFjcm8oTGF5b3V0SW50ZXJ2YWwsIGxheW91dEludGVydmFsLCBEb3Vi bGUsIGRvdWJsZSwgLTEpIFwKKyAgICBtYWNybyhNYXhQYXJzZUR1cmF0aW9uLCBtYXhQYXJzZUR1 cmF0aW9uLCBEb3VibGUsIGRvdWJsZSwgLTEpIFwKKyAgICBtYWNybyhQYXNzd29yZEVjaG9EdXJh dGlvbiwgcGFzc3dvcmRFY2hvRHVyYXRpb24sIERvdWJsZSwgZG91YmxlLCAyKSBcCiAgICAgXAog CiAjZGVmaW5lIEZPUl9FQUNIX1dFQktJVF9GTE9BVF9QUkVGRVJFTkNFKG1hY3JvKSBcCkBAIC0y MTUsMTMgKzIzNiwyMyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhJbnNwZWN0b3JB dHRhY2hlZEhlaWdodCwgaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQsIFVJbnQzMiwgdWludDMyX3Qs IDMwMCkgXAogICAgIG1hY3JvKEluc3BlY3RvckF0dGFjaGVkV2lkdGgsIGluc3BlY3RvckF0dGFj aGVkV2lkdGgsIFVJbnQzMiwgdWludDMyX3QsIDc1MCkgXAogICAgIG1hY3JvKEluc3BlY3RvckF0 dGFjaG1lbnRTaWRlLCBpbnNwZWN0b3JBdHRhY2htZW50U2lkZSwgVUludDMyLCB1aW50MzJfdCwg MCkgXAorICAgIG1hY3JvKE1heGltdW1EZWNvZGVkSW1hZ2VTaXplLCBtYXhpbXVtRGVjb2RlZElt YWdlU2l6ZSwgVUludDMyLCB1aW50MzJfdCwgMjAgKiAxMDI0ICogMTAyNCkgXAogICAgIFwKIAog I2lmIFBMQVRGT1JNKENPQ09BKQogCisjaWYgUExBVEZPUk0oSU9TKQorI2RlZmluZSBERUZBVUxU X0NVUlNJVkVfRk9OVF9GQU1JTFkgIlNuZWxsIFJvdW5kaGFuZCIKKyNkZWZpbmUgREVGQVVMVF9Q SUNUT0dSQVBIX0ZPTlRfRkFNSUxZICJBcHBsZUNvbG9yRW1vamkiCisjZWxzZQorI2RlZmluZSBE RUZBVUxUX0NVUlNJVkVfRk9OVF9GQU1JTFkgIkFwcGxlIENoYW5jZXJ5IgorI2RlZmluZSBERUZB VUxUX1BJQ1RPR1JBUEhfRk9OVF9GQU1JTFkgIkFwcGxlIENvbG9yIEVtb2ppIgorI2VuZGlmCisK KwogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfRk9OVF9GQU1JTFlfUFJFRkVSRU5DRShtYWNybykg XAogICAgIG1hY3JvKFN0YW5kYXJkRm9udEZhbWlseSwgc3RhbmRhcmRGb250RmFtaWx5LCBTdHJp bmcsIFN0cmluZywgIlRpbWVzIikgXAotICAgIG1hY3JvKEN1cnNpdmVGb250RmFtaWx5LCBjdXJz aXZlRm9udEZhbWlseSwgU3RyaW5nLCBTdHJpbmcsICJBcHBsZSBDaGFuY2VyeSIpIFwKKyAgICBt YWNybyhDdXJzaXZlRm9udEZhbWlseSwgY3Vyc2l2ZUZvbnRGYW1pbHksIFN0cmluZywgU3RyaW5n LCBERUZBVUxUX0NVUlNJVkVfRk9OVF9GQU1JTFkpIFwKICAgICBtYWNybyhGYW50YXN5Rm9udEZh bWlseSwgZmFudGFzeUZvbnRGYW1pbHksIFN0cmluZywgU3RyaW5nLCAiUGFweXJ1cyIpIFwKICAg ICBtYWNybyhGaXhlZEZvbnRGYW1pbHksIGZpeGVkRm9udEZhbWlseSwgU3RyaW5nLCBTdHJpbmcs ICJDb3VyaWVyIikgXAogICAgIG1hY3JvKFNhbnNTZXJpZkZvbnRGYW1pbHksIHNhbnNTZXJpZkZv bnRGYW1pbHksIFN0cmluZywgU3RyaW5nLCAiSGVsdmV0aWNhIikgXApJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTY0MjU1 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNDQ0LDYgKzI0NDQsNyBAQCB2b2lkIFdlYlBhZ2U6OnVwZGF0ZVByZWZl cmVuY2VzKGNvbnN0IFdlCiAKICAgICBzZXR0aW5ncy5zZXRNaW5pbXVtRm9udFNpemUoc3RvcmUu Z2V0RG91YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1pbmltdW1Gb250U2l6ZUtl eSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShzdG9yZS5nZXRE b3VibGVWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bWluaW11bUxvZ2ljYWxGb250U2l6 ZUtleSgpKSk7CisgICAgc2V0dGluZ3Muc2V0TWluaW11bVpvb21Gb250U2l6ZShzdG9yZS5nZXRE b3VibGVWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bWluaW11bVpvb21Gb250U2l6ZUtl eSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0RGVmYXVsdEZvbnRTaXplKHN0b3JlLmdldERvdWJsZVZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpkZWZhdWx0Rm9udFNpemVLZXkoKSkpOwogICAg IHNldHRpbmdzLnNldERlZmF1bHRGaXhlZEZvbnRTaXplKHN0b3JlLmdldERvdWJsZVZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpkZWZhdWx0Rml4ZWRGb250U2l6ZUtleSgpKSk7CiAgICAg c2V0dGluZ3Muc2V0U2NyZWVuRm9udFN1YnN0aXR1dGlvbkVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZh bHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpzY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5hYmxl ZEtleSgpKQpAQCAtMjU3Nyw2ICsyNTc4LDE5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVy ZW5jZXMoY29uc3QgV2UKIAogICAgIHNldHRpbmdzLnNldFNob3VsZENvbnZlcnRQb3NpdGlvblN0 eWxlT25Db3B5KHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2hv dWxkQ29udmVydFBvc2l0aW9uU3R5bGVPbkNvcHlLZXkoKSkpOwogCisgICAgc2V0dGluZ3Muc2V0 U3RhbmRhbG9uZShzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnN0 YW5kYWxvbmVLZXkoKSkpOworICAgIHNldHRpbmdzLnNldFRlbGVwaG9uZU51bWJlclBhcnNpbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dGVsZXBo b25lTnVtYmVyUGFyc2luZ0VuYWJsZWRLZXkoKSkpOworICAgIHNldHRpbmdzLnNldEFsd2F5c1Vz ZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVy ZW5jZXNLZXk6OmFsd2F5c1VzZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udEtleSgpKSk7CisgICAgc2V0 dGluZ3Muc2V0QWxsb3dNdWx0aUVsZW1lbnRJbXBsaWNpdFN1Ym1pc3Npb24oc3RvcmUuZ2V0Qm9v bFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphbGxvd011bHRpRWxlbWVudEltcGxpY2l0 U3VibWlzc2lvbktleSgpKSk7CisgICAgc2V0dGluZ3Muc2V0QWx3YXlzVXNlQWNjZWxlcmF0ZWRP dmVyZmxvd1Njcm9sbChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6 OmFsd2F5c1VzZUFjY2VsZXJhdGVkT3ZlcmZsb3dTY3JvbGxLZXkoKSkpOworCisgICAgc2V0dGlu Z3Muc2V0UGFzc3dvcmRFY2hvRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OnBhc3N3b3JkRWNob0VuYWJsZWRLZXkoKSkpOworICAgIHNldHRpbmdzLnNl dFBhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKHN0b3JlLmdldERvdWJsZVZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5OjpwYXNzd29yZEVjaG9EdXJhdGlvbktleSgpKSk7CisgICAgCisg ICAgc2V0dGluZ3Muc2V0TGF5b3V0SW50ZXJ2YWwoc3RkOjpjaHJvbm86OmR1cmF0aW9uX2Nhc3Q8 c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcz4oc3RkOjpjaHJvbm86OmR1cmF0aW9uPGRvdWJsZT4o c3RvcmUuZ2V0RG91YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxheW91dEludGVy dmFsS2V5KCkpKSkpOworICAgIHNldHRpbmdzLnNldE1heFBhcnNlRHVyYXRpb24oc3RvcmUuZ2V0 RG91YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1heFBhcnNlRHVyYXRpb25LZXko KSkpOworICAgIHNldHRpbmdzLnNldE1heGltdW1EZWNvZGVkSW1hZ2VTaXplKHN0b3JlLmdldFVJ bnQzMlZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjptYXhpbXVtRGVjb2RlZEltYWdlU2l6 ZUtleSgpKSk7CisKICAgICBpZiAoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjpwYWdlVmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZEtleSgp KSkgewogICAgICAgICBpZiAobV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEJ5V2ViUHJlZmVy ZW5jZS5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxl ZEJ5V2ViUHJlZmVyZW5jZS5lbmRBY3Rpdml0eSgpOwo= 224456 2014-02-17 19:00:49 -0800 2014-02-17 19:07:04 -0800 Patch bug-128947-20140217190049.patch text/plain 10178 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDI2NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW2lPUywgV2ViS2l0Ml0gQWRkIHNldHRp bmdzIGFuZCBjb3JyZWN0IGRlZmF1bHQgdmFsdWVzIGZvciBzZXR0aW5ncyBpbXBvcnRhbnQgb24g aU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg5 NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNo YXJlZC9XZWJQcmVmZXJlbmNlc1N0b3JlLmNwcDoKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVy ZW5jZXNTdG9yZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMpOgorCiAyMDE0LTAy LTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdW3drMl0gQ3VzdG9tIGxheWVycyBhcmUgc29tZXRpbWVzIHB1dCBvbi1zY3JlZW4gd2l0aG91 dCBiZWluZyBwYXJlbnRlZApJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVu Y2VzU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVm ZXJlbmNlc1N0b3JlLmNwcAkocmV2aXNpb24gMTY0MjU1KQorKysgU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSwx MCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJE ZXN0cm95ZWQuaD4KIAorI2lmIFBMQVRGT1JNKElPUykKKyNpbXBvcnQgPFdlYktpdFN5c3RlbUlu dGVyZmFjZUlPUy5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBuYW1lc3BhY2Ug V2ViUHJlZmVyZW5jZXNLZXkgewpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZl cmVuY2VzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oCShyZXZpc2lvbiAxNjQyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUHJlZmVyZW5jZXNTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw4ICs2NiwyMCBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogI2lmIFBMQVRGT1JNKElPUykKICNkZWZpbmUgREVGQVVM VF9GUkFNRV9GTEFUVEVOSU5HX0VOQUJMRUQgdHJ1ZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9Q UklOVF9CQUNLR1JPVU5EUyB0cnVlCisjZGVmaW5lIERFRkFVTFRfVEVYVF9BUkVBU19BUkVfUkVT SVpBQkxFIGZhbHNlCisjZGVmaW5lIERFRkFVTFRfSkFWQVNDUklQVF9DQU5fT1BFTl9XSU5ET1dT X0FVVE9NQVRJQ0FMTFkgZmFsc2UKKyNkZWZpbmUgREVGQVVMVF9TSE9VTERfUkVTUEVDVF9JTUFH RV9PUklFTlRBVElPTiB0cnVlCisjZGVmaW5lIERFRkFVTFRfTUlOSU1VTV9GT05UX1pPT01fU0la RSBXS0dldE1pbmltdW1ab29tRm9udFNpemUoKQorI2RlZmluZSBERUZBVUxUX1BBU1NXT1JEX0VD SE9fRU5BQkxFRCB0cnVlCiAjZWxzZQogI2RlZmluZSBERUZBVUxUX0ZSQU1FX0ZMQVRURU5JTkdf RU5BQkxFRCBmYWxzZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9QUklOVF9CQUNLR1JPVU5EUyBm YWxzZQorI2RlZmluZSBERUZBVUxUX1RFWFRfQVJFQVNfQVJFX1JFU0laQUJMRSB0cnVlCisjZGVm aW5lIERFRkFVTFRfSkFWQVNDUklQVF9DQU5fT1BFTl9XSU5ET1dTX0FVVE9NQVRJQ0FMTFkgdHJ1 ZQorI2RlZmluZSBERUZBVUxUX1NIT1VMRF9SRVNQRUNUX0lNQUdFX09SSUVOVEFUSU9OIGZhbHNl CisjZGVmaW5lIERFRkFVTFRfTUlOSU1VTV9GT05UX1pPT01fU0laRSAwCisjZGVmaW5lIERFRkFV TFRfUEFTU1dPUkRfRUNIT19FTkFCTEVEIGZhbHNlCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElP UykgJiYgIVBMQVRGT1JNKElPU19TSU1VTEFUT1IpCkBAIC05OCw4ICsxMTAsOCBAQCBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICBtYWNybyhEZXZlbG9wZXJFeHRyYXNFbmFibGVkLCBkZXZlbG9wZXJF eHRyYXNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEphdmFTY3JpcHRF eHBlcmltZW50c0VuYWJsZWQsIGphdmFTY3JpcHRFeHBlcmltZW50c0VuYWJsZWQsIEJvb2wsIGJv b2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgcHJpdmF0ZUJy b3dzaW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKLSAgICBtYWNybyhUZXh0QXJlYXNB cmVSZXNpemFibGUsIHRleHRBcmVhc0FyZVJlc2l6YWJsZSwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAot ICAgIG1hY3JvKEphdmFTY3JpcHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHksIGphdmFTY3Jp cHRDYW5PcGVuV2luZG93c0F1dG9tYXRpY2FsbHksIEJvb2wsIGJvb2wsIHRydWUpIFwKKyAgICBt YWNybyhUZXh0QXJlYXNBcmVSZXNpemFibGUsIHRleHRBcmVhc0FyZVJlc2l6YWJsZSwgQm9vbCwg Ym9vbCwgREVGQVVMVF9URVhUX0FSRUFTX0FSRV9SRVNJWkFCTEUpIFwKKyAgICBtYWNybyhKYXZh U2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5LCBqYXZhU2NyaXB0Q2FuT3BlbldpbmRv d3NBdXRvbWF0aWNhbGx5LCBCb29sLCBib29sLCBERUZBVUxUX0pBVkFTQ1JJUFRfQ0FOX09QRU5f V0lORE9XU19BVVRPTUFUSUNBTExZKSBcCiAgICAgbWFjcm8oSHlwZXJsaW5rQXVkaXRpbmdFbmFi bGVkLCBoeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIHRydWUpIFwKICAgICBt YWNybyhOZWVkc1NpdGVTcGVjaWZpY1F1aXJrcywgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIEJv b2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJs ZWQsIGFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCkBA IC0xNDAsNyArMTUyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgbWFjcm8oSW5zcGVjdG9y U3RhcnRzQXR0YWNoZWQsIGluc3BlY3RvclN0YXJ0c0F0dGFjaGVkLCBCb29sLCBib29sLCB0cnVl KSBcCiAgICAgbWFjcm8oU2hvd3NUb29sVGlwT3ZlclRydW5jYXRlZFRleHQsIHNob3dzVG9vbFRp cE92ZXJUcnVuY2F0ZWRUZXh0LCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKE1vY2tT Y3JvbGxiYXJzRW5hYmxlZCwgbW9ja1Njcm9sbGJhcnNFbmFibGVkLCBCb29sLCBib29sLCBmYWxz ZSkgXAotICAgIG1hY3JvKFdlYkF1ZGlvRW5hYmxlZCwgd2ViQXVkaW9FbmFibGVkLCBCb29sLCBi b29sLCBmYWxzZSkgXAorICAgIG1hY3JvKFdlYkF1ZGlvRW5hYmxlZCwgd2ViQXVkaW9FbmFibGVk LCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oQXBwbGljYXRpb25DaHJvbWVNb2RlRW5h YmxlZCwgYXBwbGljYXRpb25DaHJvbWVNb2RlLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1h Y3JvKFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZywgc3VwcHJlc3Nlc0luY3JlbWVudGFs UmVuZGVyaW5nLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEJhY2tzcGFjZUtleU5h dmlnYXRpb25FbmFibGVkLCBiYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZCwgQm9vbCwgYm9v bCwgdHJ1ZSkgXApAQCAtMTQ5LDcgKzE2MSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIG1h Y3JvKFNob3VsZERpc3BsYXlDYXB0aW9ucywgc2hvdWxkRGlzcGxheUNhcHRpb25zLCBCb29sLCBi b29sLCBmYWxzZSkgXAogICAgIG1hY3JvKFNob3VsZERpc3BsYXlUZXh0RGVzY3JpcHRpb25zLCBz aG91bGREaXNwbGF5VGV4dERlc2NyaXB0aW9ucywgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBt YWNybyhOb3RpZmljYXRpb25zRW5hYmxlZCwgbm90aWZpY2F0aW9uc0VuYWJsZWQsIEJvb2wsIGJv b2wsIHRydWUpIFwKLSAgICBtYWNybyhTaG91bGRSZXNwZWN0SW1hZ2VPcmllbnRhdGlvbiwgc2hv dWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFj cm8oU2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24sIHNob3VsZFJlc3BlY3RJbWFnZU9yaWVu dGF0aW9uLCBCb29sLCBib29sLCBERUZBVUxUX1NIT1VMRF9SRVNQRUNUX0lNQUdFX09SSUVOVEFU SU9OKSBcCiAgICAgbWFjcm8oV2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciwg d2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvciwgQm9vbCwgYm9vbCwgZmFsc2Up IFwKICAgICBtYWNybyhSZXF1ZXN0QW5pbWF0aW9uRnJhbWVFbmFibGVkLCByZXF1ZXN0QW5pbWF0 aW9uRnJhbWVFbmFibGVkLCBCb29sLCBib29sLCB0cnVlKSBcCiAgICAgbWFjcm8oRGlhZ25vc3Rp Y0xvZ2dpbmdFbmFibGVkLCBkaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZh bHNlKSBcCkBAIC0xOTEsMTUgKzIwMywyNCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNy byhNZWRpYVNvdXJjZUVuYWJsZWQsIG1lZGlhU291cmNlRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFs c2UpIFwKICAgICBtYWNybyhWaWV3R2VzdHVyZURlYnVnZ2luZ0VuYWJsZWQsIHZpZXdHZXN0dXJl RGVidWdnaW5nRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhTaG91bGRD b252ZXJ0UG9zaXRpb25TdHlsZU9uQ29weSwgc2hvdWxkQ29udmVydFBvc2l0aW9uU3R5bGVPbkNv cHksIEJvb2wsIGJvb2wsIGZhbHNlKSBcCi0gICAgXAorICAgIG1hY3JvKFN0YW5kYWxvbmUsIHN0 YW5kYWxvbmUsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCisgICAgbWFjcm8oVGVsZXBob25lTnVtYmVy UGFyc2luZ0VuYWJsZWQsIHRlbGVwaG9uZU51bWJlclBhcnNpbmdFbmFibGVkLCBCb29sLCBib29s LCBmYWxzZSkgXAorICAgIG1hY3JvKEFsd2F5c1VzZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udCwgYWx3 YXlzVXNlQmFzZWxpbmVPZlByaW1hcnlGb250LCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1h Y3JvKEFsbG93TXVsdGlFbGVtZW50SW1wbGljaXRTdWJtaXNzaW9uLCBhbGxvd011bHRpRWxlbWVu dEltcGxpY2l0U3VibWlzc2lvbiwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKKyAgICBtYWNybyhBbHdh eXNVc2VBY2NlbGVyYXRlZE92ZXJmbG93U2Nyb2xsLCBhbHdheXNVc2VBY2NlbGVyYXRlZE92ZXJm bG93U2Nyb2xsLCBCb29sLCBib29sLCBmYWxzZSkgXAorICAgIG1hY3JvKFBhc3N3b3JkRWNob0Vu YWJsZWQsIHBhc3N3b3JkRWNob0VuYWJsZWQsIEJvb2wsIGJvb2wsIERFRkFVTFRfUEFTU1dPUkRf RUNIT19FTkFCTEVEKQogCiAjZGVmaW5lIEZPUl9FQUNIX1dFQktJVF9ET1VCTEVfUFJFRkVSRU5D RShtYWNybykgXAogICAgIG1hY3JvKFBERlNjYWxlRmFjdG9yLCBwZGZTY2FsZUZhY3RvciwgRG91 YmxlLCBkb3VibGUsIDApIFwKICAgICBtYWNybyhJbmNyZW1lbnRhbFJlbmRlcmluZ1N1cHByZXNz aW9uVGltZW91dCwgaW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXQsIERvdWJs ZSwgZG91YmxlLCA1KSBcCiAgICAgbWFjcm8oTWluaW11bUZvbnRTaXplLCBtaW5pbXVtRm9udFNp emUsIERvdWJsZSwgZG91YmxlLCAwKSBcCiAgICAgbWFjcm8oTWluaW11bUxvZ2ljYWxGb250U2l6 ZSwgbWluaW11bUxvZ2ljYWxGb250U2l6ZSwgRG91YmxlLCBkb3VibGUsIDkpIFwKKyAgICBtYWNy byhNaW5pbXVtWm9vbUZvbnRTaXplLCBtaW5pbXVtWm9vbUZvbnRTaXplLCBEb3VibGUsIGRvdWJs ZSwgREVGQVVMVF9NSU5JTVVNX0ZPTlRfWk9PTV9TSVpFKSBcCiAgICAgbWFjcm8oRGVmYXVsdEZv bnRTaXplLCBkZWZhdWx0Rm9udFNpemUsIERvdWJsZSwgZG91YmxlLCAxNikgXAogICAgIG1hY3Jv KERlZmF1bHRGaXhlZEZvbnRTaXplLCBkZWZhdWx0Rml4ZWRGb250U2l6ZSwgRG91YmxlLCBkb3Vi bGUsIDEzKSBcCisgICAgbWFjcm8oTGF5b3V0SW50ZXJ2YWwsIGxheW91dEludGVydmFsLCBEb3Vi bGUsIGRvdWJsZSwgLTEpIFwKKyAgICBtYWNybyhNYXhQYXJzZUR1cmF0aW9uLCBtYXhQYXJzZUR1 cmF0aW9uLCBEb3VibGUsIGRvdWJsZSwgLTEpIFwKKyAgICBtYWNybyhQYXNzd29yZEVjaG9EdXJh dGlvbiwgcGFzc3dvcmRFY2hvRHVyYXRpb24sIERvdWJsZSwgZG91YmxlLCAyKSBcCiAgICAgXAog CiAjZGVmaW5lIEZPUl9FQUNIX1dFQktJVF9GTE9BVF9QUkVGRVJFTkNFKG1hY3JvKSBcCkBAIC0y MTUsMTMgKzIzNiwyMyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhJbnNwZWN0b3JB dHRhY2hlZEhlaWdodCwgaW5zcGVjdG9yQXR0YWNoZWRIZWlnaHQsIFVJbnQzMiwgdWludDMyX3Qs IDMwMCkgXAogICAgIG1hY3JvKEluc3BlY3RvckF0dGFjaGVkV2lkdGgsIGluc3BlY3RvckF0dGFj aGVkV2lkdGgsIFVJbnQzMiwgdWludDMyX3QsIDc1MCkgXAogICAgIG1hY3JvKEluc3BlY3RvckF0 dGFjaG1lbnRTaWRlLCBpbnNwZWN0b3JBdHRhY2htZW50U2lkZSwgVUludDMyLCB1aW50MzJfdCwg MCkgXAorICAgIG1hY3JvKE1heGltdW1EZWNvZGVkSW1hZ2VTaXplLCBtYXhpbXVtRGVjb2RlZElt YWdlU2l6ZSwgVUludDMyLCB1aW50MzJfdCwgMjAgKiAxMDI0ICogMTAyNCkgXAogICAgIFwKIAog I2lmIFBMQVRGT1JNKENPQ09BKQogCisjaWYgUExBVEZPUk0oSU9TKQorI2RlZmluZSBERUZBVUxU X0NVUlNJVkVfRk9OVF9GQU1JTFkgIlNuZWxsIFJvdW5kaGFuZCIKKyNkZWZpbmUgREVGQVVMVF9Q SUNUT0dSQVBIX0ZPTlRfRkFNSUxZICJBcHBsZUNvbG9yRW1vamkiCisjZWxzZQorI2RlZmluZSBE RUZBVUxUX0NVUlNJVkVfRk9OVF9GQU1JTFkgIkFwcGxlIENoYW5jZXJ5IgorI2RlZmluZSBERUZB VUxUX1BJQ1RPR1JBUEhfRk9OVF9GQU1JTFkgIkFwcGxlIENvbG9yIEVtb2ppIgorI2VuZGlmCisK KwogI2RlZmluZSBGT1JfRUFDSF9XRUJLSVRfRk9OVF9GQU1JTFlfUFJFRkVSRU5DRShtYWNybykg XAogICAgIG1hY3JvKFN0YW5kYXJkRm9udEZhbWlseSwgc3RhbmRhcmRGb250RmFtaWx5LCBTdHJp bmcsIFN0cmluZywgIlRpbWVzIikgXAotICAgIG1hY3JvKEN1cnNpdmVGb250RmFtaWx5LCBjdXJz aXZlRm9udEZhbWlseSwgU3RyaW5nLCBTdHJpbmcsICJBcHBsZSBDaGFuY2VyeSIpIFwKKyAgICBt YWNybyhDdXJzaXZlRm9udEZhbWlseSwgY3Vyc2l2ZUZvbnRGYW1pbHksIFN0cmluZywgU3RyaW5n LCBERUZBVUxUX0NVUlNJVkVfRk9OVF9GQU1JTFkpIFwKICAgICBtYWNybyhGYW50YXN5Rm9udEZh bWlseSwgZmFudGFzeUZvbnRGYW1pbHksIFN0cmluZywgU3RyaW5nLCAiUGFweXJ1cyIpIFwKICAg ICBtYWNybyhGaXhlZEZvbnRGYW1pbHksIGZpeGVkRm9udEZhbWlseSwgU3RyaW5nLCBTdHJpbmcs ICJDb3VyaWVyIikgXAogICAgIG1hY3JvKFNhbnNTZXJpZkZvbnRGYW1pbHksIHNhbnNTZXJpZkZv bnRGYW1pbHksIFN0cmluZywgU3RyaW5nLCAiSGVsdmV0aWNhIikgXApJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTY0MjU1 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNTA4LDYgKzI1MDgsMTAgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVm ZXJlbmNlcyhjb25zdCBXZQogICAgIHNldHRpbmdzLnNldEFWS2l0RW5hYmxlZCh0cnVlKTsKICNl bmRpZgogCisjaWYgRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCisgICAgc2V0dGluZ3Muc2V0 TWluaW11bVpvb21Gb250U2l6ZShzdG9yZS5nZXREb3VibGVWYWx1ZUZvcktleShXZWJQcmVmZXJl bmNlc0tleTo6bWluaW11bVpvb21Gb250U2l6ZUtleSgpKSk7CisjZW5kaWYKKwogI2lmIEVOQUJM RShXRUJfQVVESU8pCiAgICAgc2V0dGluZ3Muc2V0V2ViQXVkaW9FbmFibGVkKHN0b3JlLmdldEJv b2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6d2ViQXVkaW9FbmFibGVkS2V5KCkpKTsK ICNlbmRpZgpAQCAtMjU3Nyw2ICsyNTgxLDE5IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlUHJlZmVy ZW5jZXMoY29uc3QgV2UKIAogICAgIHNldHRpbmdzLnNldFNob3VsZENvbnZlcnRQb3NpdGlvblN0 eWxlT25Db3B5KHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6c2hv dWxkQ29udmVydFBvc2l0aW9uU3R5bGVPbkNvcHlLZXkoKSkpOwogCisgICAgc2V0dGluZ3Muc2V0 U3RhbmRhbG9uZShzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnN0 YW5kYWxvbmVLZXkoKSkpOworICAgIHNldHRpbmdzLnNldFRlbGVwaG9uZU51bWJlclBhcnNpbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6dGVsZXBo b25lTnVtYmVyUGFyc2luZ0VuYWJsZWRLZXkoKSkpOworICAgIHNldHRpbmdzLnNldEFsd2F5c1Vz ZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVy ZW5jZXNLZXk6OmFsd2F5c1VzZUJhc2VsaW5lT2ZQcmltYXJ5Rm9udEtleSgpKSk7CisgICAgc2V0 dGluZ3Muc2V0QWxsb3dNdWx0aUVsZW1lbnRJbXBsaWNpdFN1Ym1pc3Npb24oc3RvcmUuZ2V0Qm9v bFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphbGxvd011bHRpRWxlbWVudEltcGxpY2l0 U3VibWlzc2lvbktleSgpKSk7CisgICAgc2V0dGluZ3Muc2V0QWx3YXlzVXNlQWNjZWxlcmF0ZWRP dmVyZmxvd1Njcm9sbChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6 OmFsd2F5c1VzZUFjY2VsZXJhdGVkT3ZlcmZsb3dTY3JvbGxLZXkoKSkpOworCisgICAgc2V0dGlu Z3Muc2V0UGFzc3dvcmRFY2hvRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJl ZmVyZW5jZXNLZXk6OnBhc3N3b3JkRWNob0VuYWJsZWRLZXkoKSkpOworICAgIHNldHRpbmdzLnNl dFBhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKHN0b3JlLmdldERvdWJsZVZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5OjpwYXNzd29yZEVjaG9EdXJhdGlvbktleSgpKSk7CisgICAgCisg ICAgc2V0dGluZ3Muc2V0TGF5b3V0SW50ZXJ2YWwoc3RkOjpjaHJvbm86OmR1cmF0aW9uX2Nhc3Q8 c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kcz4oc3RkOjpjaHJvbm86OmR1cmF0aW9uPGRvdWJsZT4o c3RvcmUuZ2V0RG91YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmxheW91dEludGVy dmFsS2V5KCkpKSkpOworICAgIHNldHRpbmdzLnNldE1heFBhcnNlRHVyYXRpb24oc3RvcmUuZ2V0 RG91YmxlVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1heFBhcnNlRHVyYXRpb25LZXko KSkpOworICAgIHNldHRpbmdzLnNldE1heGltdW1EZWNvZGVkSW1hZ2VTaXplKHN0b3JlLmdldFVJ bnQzMlZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjptYXhpbXVtRGVjb2RlZEltYWdlU2l6 ZUtleSgpKSk7CisKICAgICBpZiAoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjpwYWdlVmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZEtleSgp KSkgewogICAgICAgICBpZiAobV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEJ5V2ViUHJlZmVy ZW5jZS5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxl ZEJ5V2ViUHJlZmVyZW5jZS5lbmRBY3Rpdml0eSgpOwo=