135671 2014-08-06 14:16:48 -0700 [iOS] Make document marker assets not specific to particular scale factors 2014-08-06 18:00:04 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield dino jonlee simon.fraser thorton webkit-bug-importer oldest_to_newest 1027298 0 mmaxfield 2014-08-06 14:16:48 -0700 [iOS] Make document marker assets not specific to particular scale factors 1027299 1 webkit-bug-importer 2014-08-06 14:21:06 -0700 <rdar://problem/17936546> 1027300 2 webkit-bug-importer 2014-08-06 14:21:49 -0700 <rdar://problem/17936564> 1027302 3 jonlee 2014-08-06 14:25:57 -0700 <rdar://problem/17855327> 1027307 4 236138 mmaxfield 2014-08-06 14:51:07 -0700 Created attachment 236138 Patch 1027311 5 236138 simon.fraser 2014-08-06 14:56:36 -0700 Comment on attachment 236138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236138&action=review > Source/WebCore/platform/ios/wak/WKGraphics.mm:96 > + NSString *fileName = scaleFactor == 1 ? [NSString stringWithUTF8String:imageFile] : [NSString stringWithFormat:@"%s@%dx", imageFile, scaleFactor]; You've removed the fallback that used to be here. I think it would be better to reinstate the fallback, but assert when the correct image is not found. 1027313 6 236139 mmaxfield 2014-08-06 15:05:26 -0700 Created attachment 236139 Patch 1027314 7 236139 simon.fraser 2014-08-06 15:07:58 -0700 Comment on attachment 236139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236139&action=review > Source/WebCore/platform/ios/wak/WKGraphics.mm:116 > + NSData *imageData = nullptr; > + for (unsigned scaleFactor = wkGetScreenScaleFactor(); scaleFactor > 0; --scaleFactor) { > + imageData = [NSData dataWithContentsOfFile:imageResourcePath(image_file, scaleFactor)]; > + ASSERT(scaleFactor != wkGetScreenScaleFactor() || imageData); Now you're just fetching the 1x image. 1027323 8 236143 mmaxfield 2014-08-06 15:27:43 -0700 Created attachment 236143 Patch 1027373 9 236143 simon.fraser 2014-08-06 17:42:39 -0700 Comment on attachment 236143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236143&action=review > Source/WebCore/ChangeLog:9 > + No new tests, because on iOS I can only test whether or not document > + markers should be rendered, rather than whether or not they were rendered I don't think you need to justify the lack of tests. > Source/WebCore/platform/ios/wak/WKGraphics.mm:116 > + ASSERT(scaleFactor != wkGetScreenScaleFactor() || imageData); I think an if (imageData) break; would be a little easier to read. 1027377 10 236143 mmaxfield 2014-08-06 17:59:56 -0700 Comment on attachment 236143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236143&action=review >> Source/WebCore/ChangeLog:9 >> + markers should be rendered, rather than whether or not they were rendered > > I don't think you need to justify the lack of tests. Done. >> Source/WebCore/platform/ios/wak/WKGraphics.mm:116 >> + ASSERT(scaleFactor != wkGetScreenScaleFactor() || imageData); > > I think an if (imageData) break; would be a little easier to read. Done. 1027378 11 mmaxfield 2014-08-06 18:00:04 -0700 https://trac.webkit.org/r172197 236138 2014-08-06 14:51:07 -0700 2014-08-06 15:05:23 -0700 Patch bug-135671-20140806145055.patch text/plain 7344 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk4ZWM1NTI5OGFlYjIz Y2Q3NWIyNjI1MWUyNzEyMWJjMDhiYTdkNy4uYmI2NDFkNGQ5OTE0YmE2NTBiMzA5MjFhN2Y3ODg0 MTc1NTE0Mzk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTA2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFr ZSBkb2N1bWVudCBtYXJrZXIgYXNzZXRzIG5vdCBzcGVjaWZpYyB0byBwYXJ0aWN1bGFyIHNjYWxl IGZhY3RvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgYmVjYXVzZSBvbiBpT1MgSSBjYW4gb25seSB0ZXN0IHdoZXRoZXIgb3Ig bm90IGRvY3VtZW50CisgICAgICAgIG1hcmtlcnMgc2hvdWxkIGJlIHJlbmRlcmVkLCByYXRoZXIg dGhhbiB3aGV0aGVyIG9yIG5vdCB0aGV5IHdlcmUgcmVuZGVyZWQKKworICAgICAgICAqIFdlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW06CisgICAgICAgIChpbWFnZVJlc291cmNlUGF0aCk6CisgICAgICAgIChX S0dyYXBoaWNzQ3JlYXRlSW1hZ2VGcm9tQnVuZGxlV2l0aE5hbWUpOgorCiAyMDE0LTA4LTA2ICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2Vk IFJlbmRlckJveDo6cmVmbGVjdGlvbkJveCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv UmVzb3VyY2VzL1NwZWxsaW5nRG90QDN4LnBuZyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9T cGVsbGluZ0RvdEAzeC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjFiN2Y3YWZlNzg4OTUzMGNhN2M4NzM3ODU0 N2MzNGUwYWEwYjAyZgpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMjcwCnpjbVYrcDByQ0VjUCk8 aDszS3xMazAwMGUxTkpMVHEwMDBhQzAwMFJIMV5AczYyRHJeczAwMDBQYlZYUW5RKlVOOwp6Y1ZU ajYwNn1ETFZyM3ZuWkRENitRZXxPZWQyentRSk9CVXl1dGBLZ1JDd0JTaytCVmZGYzN4V3F6c1pl cjh7UXUKejI0TjcyKVI5O09IdC1yUXNvNE1sbEgxR0FhZ09hR1U7ZFZMe19sVztXZiV5JCEjKFVf MlMrJS02VEgkbVFyNkFGCnpafT4/P28lc1IzNiM0LXZefjgqQD1wdGdXIX1vfGZGVkBoMl5ZQjs1 Qm5VSEtqRiFjPnpfdlRQen5hSXhwcXJ+Kwp6Nn5Na2xUeX58elMxPjw4SUpVclgyS35VJnYyKyhE TEpPb2MqKS19WVd6OUMpV357ND9adSRFa0R0IWJQMEd6QmsKVTFNPSt4Qj4oXmIwNypxb002Tjwk ZzAlbHtPI2xEQAoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDA5YTc4OWQyMmVmOGM5ODdh Y2IxZjU5ZDY2YjM4MjhiYzVkNWFjOTkuLjFkODY1N2YwZDA2YzRhZmQ5MWUzOWY3NzhkZjFiNzE3 MWU0YWExNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTkzMyw2ICs5MzMsNyBAQAogCQkxQzE4REE1OTE4MUFGNkE1MDBDNEVG MjIgLyogVGV4dFBhaW50ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFDMThEQTU3MTgxQUY2QTUwMEM0RUYyMiAvKiBUZXh0UGFpbnRlci5oICovOyB9 OwogCQkxQzIxRTU3QzE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QTE4M0VEMUZG MDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgKi87IH07CiAJCTFDMjFFNTdEMTgzRUQxRkYw MDFDMjg5RCAvKiBJT1N1cmZhY2VQb29sLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QjE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9v bC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTFD MjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4gUmVzb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDMjQxN0I5MTk5MkMwNDEwMEVG OTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi87IH07CiAJCTFDMjY0OTdBMEQ3RTI0OEEwMEJE MTBGMiAvKiBEb2N1bWVudExvYWRlck1hYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2NDk3OTBEN0UyNDhBMDBCRDEwRjIgLyogRG9jdW1lbnRM b2FkZXJNYWMuY3BwICovOyB9OwogCQkxQzI2NDk3QzBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1h Yy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2 NDk3QjBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1hYy5jcHAgKi87IH07CiAJCTFDNEM4RjAyMEFE ODVEODcwMDk0NzVDRSAvKiBEZWxldGVCdXR0b25Db250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzRDOEYwMDBBRDg1RDg3MDA5NDc1Q0Ug LyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CkBAIC03OTA4LDYgKzc5MDksNyBAQAogCQkxQzE4REE1NzE4MUFG NkE1MDBDNEVGMjIgLyogVGV4dFBhaW50ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gVGV4dFBhaW50ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1 N0ExODNFRDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBuYW1lID0gSU9TdXJmYWNlUG9vbC5jcHA7IHBhdGggPSAuLi9jZy9JT1N1 cmZhY2VQb29sLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1N0IxODNF RDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBuYW1lID0gSU9TdXJmYWNlUG9vbC5oOyBwYXRoID0gLi4vY2cvSU9TdXJmYWNlUG9vbC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzI0MTdCOTE5OTJDMDQxMDBFRjk5MzggLyog U3BlbGxpbmdEb3RAM3gucG5nICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gaW1hZ2UucG5nOyBwYXRoID0gIlNwZWxsaW5nRG90QDN4LnBuZyI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0OTc5MEQ3RTI0OEEwMEJEMTBGMiAvKiBEb2N1 bWVudExvYWRlck1hYy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBE b2N1bWVudExvYWRlck1hYy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0 OTdCMEQ3RTI0RUMwMEJEMTBGMiAvKiBQYWdlTWFjLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IFBhZ2VNYWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkxQzRDOEVGRjBBRDg1RDg3MDA5NDc1Q0UgLyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEZWxldGVCdXR0b25Db250cm9s bGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9 IDA7IH07CkBAIC0xNjUxOCw2ICsxNjUyMCw3IEBACiAJCTY1OTk4QTY1MEU1RjVGRDMwMDRFMDk3 QSAvKiBpbWFnZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAor CQkJCTFDMjQxN0I5MTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi8sCiAJ CQkJRDAyQjY0QjAxNDA4OUU1NjAwNkVGQTIxIC8qIERpY3RhdGlvblBocmFzZVdpdGhBbHRlcm5h dGl2ZXNEb3QucG5nICovLAogCQkJCUQwMkI2NEIxMTQwODlFNTYwMDZFRkEyMSAvKiBEaWN0YXRp b25QaHJhc2VXaXRoQWx0ZXJuYXRpdmVzRG90QDJ4LnBuZyAqLywKIAkJCQlCRThDNzUzMDEwNjgx MzI0MDAxRTkzRjUgLyogU3BlbGxpbmdEb3QucG5nICovLApAQCAtMjY4NzUsNiArMjY4NzgsNyBA QAogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKIAkJCWZpbGVzID0gKAogCQkJCTQ2 RjlENUREMEIwRDYwMTcwMDI4RUUzNiAvKiBhbGlhc0N1cnNvci5wbmcgaW4gUmVzb3VyY2VzICov LAorCQkJCTFDMjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4g UmVzb3VyY2VzICovLAogCQkJCTQ2RDRGMjQ5MEFGOTdFODEwMDM1Mzg1QSAvKiBjZWxsQ3Vyc29y LnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJOTMxNTNCREUxNDE5NTlGNDAwRkNGNUJFIC8qIGRl bGV0ZUJ1dHRvbi5wbmcgaW4gUmVzb3VyY2VzICovLAogCQkJCTkzMTUzQkNEMTQxN0ZCQkYwMEZD RjVCRSAvKiBkZWxldGVCdXR0b25AMngucG5nIGluIFJlc291cmNlcyAqLywKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbQppbmRleCAzZTdlNjhhMzU5NjQx MDVjNjE0ODBhYWYxODVkN2Q0OTQyZDJhMWI5Li5lNzRiZjhiZTU0N2ZjMWIxYzI0ODBkMzg1OGJk YTM3MjM0MmNmNjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0dy YXBoaWNzLm1tCkBAIC05MSw5ICs5MSw5IEBAIENHQ29udGV4dFJlZiBXS0dldEN1cnJlbnRHcmFw aGljc0NvbnRleHQodm9pZCkKICAgICByZXR1cm4gdGhyZWFkQ29udGV4dC0+Y3VycmVudENHQ29u dGV4dDsKIH0KIAotc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFy KiBpbWFnZUZpbGUsIGJvb2wgaXMyeCkKK3N0YXRpYyBOU1N0cmluZyAqaW1hZ2VSZXNvdXJjZVBh dGgoY29uc3QgY2hhciogaW1hZ2VGaWxlLCB1bnNpZ25lZCBzY2FsZUZhY3RvcikKIHsKLSAgICBO U1N0cmluZyAqZmlsZU5hbWUgPSBpczJ4ID8gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIl c0AyeCIsIGltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6aW1hZ2VG aWxlXTsKKyAgICBOU1N0cmluZyAqZmlsZU5hbWUgPSBzY2FsZUZhY3RvciA9PSAxID8gW05TU3Ry aW5nIHN0cmluZ1dpdGhVVEY4U3RyaW5nOmltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIiVzQCVkeCIsIGltYWdlRmlsZSwgc2NhbGVGYWN0b3JdOwogI2lmIFBMQVRGT1JN KElPU19TSU1VTEFUT1IpCiAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVX aXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl07CiAgICAgcmV0dXJuIFtidW5kbGUg cGF0aEZvclJlc291cmNlOmZpbGVOYW1lIG9mVHlwZTpAInBuZyJdOwpAQCAtMTA0LDIzICsxMDQs MTMgQEAgc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFyKiBpbWFn ZUZpbGUsIGJvb2wgaXMyeCkKICNlbmRpZgogfQogCi1DR0ltYWdlUmVmIFdLR3JhcGhpY3NDcmVh dGVJbWFnZUZyb21CdW5kbGVXaXRoTmFtZSAoY29uc3QgY2hhciAqaW1hZ2VfZmlsZSkKK0NHSW1h Z2VSZWYgV0tHcmFwaGljc0NyZWF0ZUltYWdlRnJvbUJ1bmRsZVdpdGhOYW1lKGNvbnN0IGNoYXIg KmltYWdlX2ZpbGUpCiB7CiAgICAgaWYgKCFpbWFnZV9maWxlKQogICAgICAgICByZXR1cm4gTlVM TDsKIAogICAgIENHSW1hZ2VSZWYgaW1hZ2UgPSBudWxscHRyOwotICAgIE5TRGF0YSAqaW1hZ2VE YXRhID0gbmlsOwotCi0gICAgaWYgKHdrR2V0U2NyZWVuU2NhbGVGYWN0b3IoKSA9PSAyKSB7Ci0g ICAgICAgIE5TU3RyaW5nKiBmdWxsMnhQYXRoID0gaW1hZ2VSZXNvdXJjZVBhdGgoaW1hZ2VfZmls ZSwgdHJ1ZSk7Ci0gICAgICAgIGltYWdlRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09m RmlsZTpmdWxsMnhQYXRoXTsKLSAgICB9Ci0gICAgaWYgKCFpbWFnZURhdGEpIHsKLSAgICAgICAg Ly8gV2UgZ290IGhlcmUgZWl0aGVyIGJlY2F1c2Ugd2UgZGlkbid0IHJlcXVlc3QgaGktZHBpIG9y IHRoZSBAMnggZmlsZSBkb2Vzbid0IGV4aXN0LgotICAgICAgICBOU1N0cmluZyogZnVsbDF4UGF0 aCA9IGltYWdlUmVzb3VyY2VQYXRoKGltYWdlX2ZpbGUsIGZhbHNlKTsKLSAgICAgICAgaW1hZ2VE YXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZGaWxlOmZ1bGwxeFBhdGhdOwotICAgIH0K KyAgICBOU0RhdGEgKmltYWdlRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09mRmlsZTpp bWFnZVJlc291cmNlUGF0aChpbWFnZV9maWxlLCB3a0dldFNjcmVlblNjYWxlRmFjdG9yKCkpXTsK ICAgICAKICAgICBpZiAoaW1hZ2VEYXRhKSB7CiAgICAgICAgIFJldGFpblB0cjxDR0RhdGFQcm92 aWRlclJlZj4gZGF0YVByb3ZpZGVyID0gYWRvcHRDRihDR0RhdGFQcm92aWRlckNyZWF0ZVdpdGhD RkRhdGEocmVpbnRlcnByZXRfY2FzdDxDRkRhdGFSZWY+KGltYWdlRGF0YSkpKTsK 236139 2014-08-06 15:05:26 -0700 2014-08-06 15:27:40 -0700 Patch bug-135671-20140806150514.patch text/plain 7391 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk4ZWM1NTI5OGFlYjIz Y2Q3NWIyNjI1MWUyNzEyMWJjMDhiYTdkNy4uYmI2NDFkNGQ5OTE0YmE2NTBiMzA5MjFhN2Y3ODg0 MTc1NTE0Mzk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTA2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFr ZSBkb2N1bWVudCBtYXJrZXIgYXNzZXRzIG5vdCBzcGVjaWZpYyB0byBwYXJ0aWN1bGFyIHNjYWxl IGZhY3RvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgYmVjYXVzZSBvbiBpT1MgSSBjYW4gb25seSB0ZXN0IHdoZXRoZXIgb3Ig bm90IGRvY3VtZW50CisgICAgICAgIG1hcmtlcnMgc2hvdWxkIGJlIHJlbmRlcmVkLCByYXRoZXIg dGhhbiB3aGV0aGVyIG9yIG5vdCB0aGV5IHdlcmUgcmVuZGVyZWQKKworICAgICAgICAqIFdlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW06CisgICAgICAgIChpbWFnZVJlc291cmNlUGF0aCk6CisgICAgICAgIChX S0dyYXBoaWNzQ3JlYXRlSW1hZ2VGcm9tQnVuZGxlV2l0aE5hbWUpOgorCiAyMDE0LTA4LTA2ICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2Vk IFJlbmRlckJveDo6cmVmbGVjdGlvbkJveCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv UmVzb3VyY2VzL1NwZWxsaW5nRG90QDN4LnBuZyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9T cGVsbGluZ0RvdEAzeC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjFiN2Y3YWZlNzg4OTUzMGNhN2M4NzM3ODU0 N2MzNGUwYWEwYjAyZgpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMjcwCnpjbVYrcDByQ0VjUCk8 aDszS3xMazAwMGUxTkpMVHEwMDBhQzAwMFJIMV5AczYyRHJeczAwMDBQYlZYUW5RKlVOOwp6Y1ZU ajYwNn1ETFZyM3ZuWkRENitRZXxPZWQyentRSk9CVXl1dGBLZ1JDd0JTaytCVmZGYzN4V3F6c1pl cjh7UXUKejI0TjcyKVI5O09IdC1yUXNvNE1sbEgxR0FhZ09hR1U7ZFZMe19sVztXZiV5JCEjKFVf MlMrJS02VEgkbVFyNkFGCnpafT4/P28lc1IzNiM0LXZefjgqQD1wdGdXIX1vfGZGVkBoMl5ZQjs1 Qm5VSEtqRiFjPnpfdlRQen5hSXhwcXJ+Kwp6Nn5Na2xUeX58elMxPjw4SUpVclgyS35VJnYyKyhE TEpPb2MqKS19WVd6OUMpV357ND9adSRFa0R0IWJQMEd6QmsKVTFNPSt4Qj4oXmIwNypxb002Tjwk ZzAlbHtPI2xEQAoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDA5YTc4OWQyMmVmOGM5ODdh Y2IxZjU5ZDY2YjM4MjhiYzVkNWFjOTkuLjFkODY1N2YwZDA2YzRhZmQ5MWUzOWY3NzhkZjFiNzE3 MWU0YWExNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTkzMyw2ICs5MzMsNyBAQAogCQkxQzE4REE1OTE4MUFGNkE1MDBDNEVG MjIgLyogVGV4dFBhaW50ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFDMThEQTU3MTgxQUY2QTUwMEM0RUYyMiAvKiBUZXh0UGFpbnRlci5oICovOyB9 OwogCQkxQzIxRTU3QzE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QTE4M0VEMUZG MDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgKi87IH07CiAJCTFDMjFFNTdEMTgzRUQxRkYw MDFDMjg5RCAvKiBJT1N1cmZhY2VQb29sLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QjE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9v bC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTFD MjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4gUmVzb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDMjQxN0I5MTk5MkMwNDEwMEVG OTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi87IH07CiAJCTFDMjY0OTdBMEQ3RTI0OEEwMEJE MTBGMiAvKiBEb2N1bWVudExvYWRlck1hYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2NDk3OTBEN0UyNDhBMDBCRDEwRjIgLyogRG9jdW1lbnRM b2FkZXJNYWMuY3BwICovOyB9OwogCQkxQzI2NDk3QzBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1h Yy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2 NDk3QjBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1hYy5jcHAgKi87IH07CiAJCTFDNEM4RjAyMEFE ODVEODcwMDk0NzVDRSAvKiBEZWxldGVCdXR0b25Db250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzRDOEYwMDBBRDg1RDg3MDA5NDc1Q0Ug LyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CkBAIC03OTA4LDYgKzc5MDksNyBAQAogCQkxQzE4REE1NzE4MUFG NkE1MDBDNEVGMjIgLyogVGV4dFBhaW50ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gVGV4dFBhaW50ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1 N0ExODNFRDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBuYW1lID0gSU9TdXJmYWNlUG9vbC5jcHA7IHBhdGggPSAuLi9jZy9JT1N1 cmZhY2VQb29sLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1N0IxODNF RDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBuYW1lID0gSU9TdXJmYWNlUG9vbC5oOyBwYXRoID0gLi4vY2cvSU9TdXJmYWNlUG9vbC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzI0MTdCOTE5OTJDMDQxMDBFRjk5MzggLyog U3BlbGxpbmdEb3RAM3gucG5nICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gaW1hZ2UucG5nOyBwYXRoID0gIlNwZWxsaW5nRG90QDN4LnBuZyI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0OTc5MEQ3RTI0OEEwMEJEMTBGMiAvKiBEb2N1 bWVudExvYWRlck1hYy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBE b2N1bWVudExvYWRlck1hYy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0 OTdCMEQ3RTI0RUMwMEJEMTBGMiAvKiBQYWdlTWFjLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IFBhZ2VNYWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkxQzRDOEVGRjBBRDg1RDg3MDA5NDc1Q0UgLyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEZWxldGVCdXR0b25Db250cm9s bGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9 IDA7IH07CkBAIC0xNjUxOCw2ICsxNjUyMCw3IEBACiAJCTY1OTk4QTY1MEU1RjVGRDMwMDRFMDk3 QSAvKiBpbWFnZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAor CQkJCTFDMjQxN0I5MTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi8sCiAJ CQkJRDAyQjY0QjAxNDA4OUU1NjAwNkVGQTIxIC8qIERpY3RhdGlvblBocmFzZVdpdGhBbHRlcm5h dGl2ZXNEb3QucG5nICovLAogCQkJCUQwMkI2NEIxMTQwODlFNTYwMDZFRkEyMSAvKiBEaWN0YXRp b25QaHJhc2VXaXRoQWx0ZXJuYXRpdmVzRG90QDJ4LnBuZyAqLywKIAkJCQlCRThDNzUzMDEwNjgx MzI0MDAxRTkzRjUgLyogU3BlbGxpbmdEb3QucG5nICovLApAQCAtMjY4NzUsNiArMjY4NzgsNyBA QAogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKIAkJCWZpbGVzID0gKAogCQkJCTQ2 RjlENUREMEIwRDYwMTcwMDI4RUUzNiAvKiBhbGlhc0N1cnNvci5wbmcgaW4gUmVzb3VyY2VzICov LAorCQkJCTFDMjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4g UmVzb3VyY2VzICovLAogCQkJCTQ2RDRGMjQ5MEFGOTdFODEwMDM1Mzg1QSAvKiBjZWxsQ3Vyc29y LnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJOTMxNTNCREUxNDE5NTlGNDAwRkNGNUJFIC8qIGRl bGV0ZUJ1dHRvbi5wbmcgaW4gUmVzb3VyY2VzICovLAogCQkJCTkzMTUzQkNEMTQxN0ZCQkYwMEZD RjVCRSAvKiBkZWxldGVCdXR0b25AMngucG5nIGluIFJlc291cmNlcyAqLywKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbQppbmRleCAzZTdlNjhhMzU5NjQx MDVjNjE0ODBhYWYxODVkN2Q0OTQyZDJhMWI5Li5iYjJmMTQwNDJlOTEyMzEzNzk0NGYzNTk2ZWFm OWI3NGQ1NjdjMDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0dy YXBoaWNzLm1tCkBAIC05MSw5ICs5MSw5IEBAIENHQ29udGV4dFJlZiBXS0dldEN1cnJlbnRHcmFw aGljc0NvbnRleHQodm9pZCkKICAgICByZXR1cm4gdGhyZWFkQ29udGV4dC0+Y3VycmVudENHQ29u dGV4dDsKIH0KIAotc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFy KiBpbWFnZUZpbGUsIGJvb2wgaXMyeCkKK3N0YXRpYyBOU1N0cmluZyAqaW1hZ2VSZXNvdXJjZVBh dGgoY29uc3QgY2hhciogaW1hZ2VGaWxlLCB1bnNpZ25lZCBzY2FsZUZhY3RvcikKIHsKLSAgICBO U1N0cmluZyAqZmlsZU5hbWUgPSBpczJ4ID8gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIl c0AyeCIsIGltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6aW1hZ2VG aWxlXTsKKyAgICBOU1N0cmluZyAqZmlsZU5hbWUgPSBzY2FsZUZhY3RvciA9PSAxID8gW05TU3Ry aW5nIHN0cmluZ1dpdGhVVEY4U3RyaW5nOmltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIiVzQCVkeCIsIGltYWdlRmlsZSwgc2NhbGVGYWN0b3JdOwogI2lmIFBMQVRGT1JN KElPU19TSU1VTEFUT1IpCiAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVX aXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl07CiAgICAgcmV0dXJuIFtidW5kbGUg cGF0aEZvclJlc291cmNlOmZpbGVOYW1lIG9mVHlwZTpAInBuZyJdOwpAQCAtMTA0LDIyICsxMDQs MTYgQEAgc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFyKiBpbWFn ZUZpbGUsIGJvb2wgaXMyeCkKICNlbmRpZgogfQogCi1DR0ltYWdlUmVmIFdLR3JhcGhpY3NDcmVh dGVJbWFnZUZyb21CdW5kbGVXaXRoTmFtZSAoY29uc3QgY2hhciAqaW1hZ2VfZmlsZSkKK0NHSW1h Z2VSZWYgV0tHcmFwaGljc0NyZWF0ZUltYWdlRnJvbUJ1bmRsZVdpdGhOYW1lKGNvbnN0IGNoYXIg KmltYWdlX2ZpbGUpCiB7CiAgICAgaWYgKCFpbWFnZV9maWxlKQogICAgICAgICByZXR1cm4gTlVM TDsKIAogICAgIENHSW1hZ2VSZWYgaW1hZ2UgPSBudWxscHRyOwotICAgIE5TRGF0YSAqaW1hZ2VE YXRhID0gbmlsOwotCi0gICAgaWYgKHdrR2V0U2NyZWVuU2NhbGVGYWN0b3IoKSA9PSAyKSB7Ci0g ICAgICAgIE5TU3RyaW5nKiBmdWxsMnhQYXRoID0gaW1hZ2VSZXNvdXJjZVBhdGgoaW1hZ2VfZmls ZSwgdHJ1ZSk7Ci0gICAgICAgIGltYWdlRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09m RmlsZTpmdWxsMnhQYXRoXTsKLSAgICB9Ci0gICAgaWYgKCFpbWFnZURhdGEpIHsKLSAgICAgICAg Ly8gV2UgZ290IGhlcmUgZWl0aGVyIGJlY2F1c2Ugd2UgZGlkbid0IHJlcXVlc3QgaGktZHBpIG9y IHRoZSBAMnggZmlsZSBkb2Vzbid0IGV4aXN0LgotICAgICAgICBOU1N0cmluZyogZnVsbDF4UGF0 aCA9IGltYWdlUmVzb3VyY2VQYXRoKGltYWdlX2ZpbGUsIGZhbHNlKTsKLSAgICAgICAgaW1hZ2VE YXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZGaWxlOmZ1bGwxeFBhdGhdOworICAgIE5T RGF0YSAqaW1hZ2VEYXRhID0gbnVsbHB0cjsKKyAgICBmb3IgKHVuc2lnbmVkIHNjYWxlRmFjdG9y ID0gd2tHZXRTY3JlZW5TY2FsZUZhY3RvcigpOyBzY2FsZUZhY3RvciA+IDA7IC0tc2NhbGVGYWN0 b3IpIHsKKyAgICAgICAgaW1hZ2VEYXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZGaWxl OmltYWdlUmVzb3VyY2VQYXRoKGltYWdlX2ZpbGUsIHNjYWxlRmFjdG9yKV07CisgICAgICAgIEFT U0VSVChzY2FsZUZhY3RvciAhPSB3a0dldFNjcmVlblNjYWxlRmFjdG9yKCkgfHwgaW1hZ2VEYXRh KTsKICAgICB9CiAgICAgCiAgICAgaWYgKGltYWdlRGF0YSkgewo= 236143 2014-08-06 15:27:43 -0700 2014-08-06 17:59:56 -0700 Patch bug-135671-20140806152732.patch text/plain 7405 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk4ZWM1NTI5OGFlYjIz Y2Q3NWIyNjI1MWUyNzEyMWJjMDhiYTdkNy4uYmI2NDFkNGQ5OTE0YmE2NTBiMzA5MjFhN2Y3ODg0 MTc1NTE0Mzk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA4LTA2ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFr ZSBkb2N1bWVudCBtYXJrZXIgYXNzZXRzIG5vdCBzcGVjaWZpYyB0byBwYXJ0aWN1bGFyIHNjYWxl IGZhY3RvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNTY3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgYmVjYXVzZSBvbiBpT1MgSSBjYW4gb25seSB0ZXN0IHdoZXRoZXIgb3Ig bm90IGRvY3VtZW50CisgICAgICAgIG1hcmtlcnMgc2hvdWxkIGJlIHJlbmRlcmVkLCByYXRoZXIg dGhhbiB3aGV0aGVyIG9yIG5vdCB0aGV5IHdlcmUgcmVuZGVyZWQKKworICAgICAgICAqIFdlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW06CisgICAgICAgIChpbWFnZVJlc291cmNlUGF0aCk6CisgICAgICAgIChX S0dyYXBoaWNzQ3JlYXRlSW1hZ2VGcm9tQnVuZGxlV2l0aE5hbWUpOgorCiAyMDE0LTA4LTA2ICBB bmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2Vk IFJlbmRlckJveDo6cmVmbGVjdGlvbkJveCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv UmVzb3VyY2VzL1NwZWxsaW5nRG90QDN4LnBuZyBiL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9T cGVsbGluZ0RvdEAzeC5wbmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjFiN2Y3YWZlNzg4OTUzMGNhN2M4NzM3ODU0 N2MzNGUwYWEwYjAyZgpHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgMjcwCnpjbVYrcDByQ0VjUCk8 aDszS3xMazAwMGUxTkpMVHEwMDBhQzAwMFJIMV5AczYyRHJeczAwMDBQYlZYUW5RKlVOOwp6Y1ZU ajYwNn1ETFZyM3ZuWkRENitRZXxPZWQyentRSk9CVXl1dGBLZ1JDd0JTaytCVmZGYzN4V3F6c1pl cjh7UXUKejI0TjcyKVI5O09IdC1yUXNvNE1sbEgxR0FhZ09hR1U7ZFZMe19sVztXZiV5JCEjKFVf MlMrJS02VEgkbVFyNkFGCnpafT4/P28lc1IzNiM0LXZefjgqQD1wdGdXIX1vfGZGVkBoMl5ZQjs1 Qm5VSEtqRiFjPnpfdlRQen5hSXhwcXJ+Kwp6Nn5Na2xUeX58elMxPjw4SUpVclgyS35VJnYyKyhE TEpPb2MqKS19WVd6OUMpV357ND9adSRFa0R0IWJQMEd6QmsKVTFNPSt4Qj4oXmIwNypxb002Tjwk ZzAlbHtPI2xEQAoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDA5YTc4OWQyMmVmOGM5ODdh Y2IxZjU5ZDY2YjM4MjhiYzVkNWFjOTkuLjFkODY1N2YwZDA2YzRhZmQ5MWUzOWY3NzhkZjFiNzE3 MWU0YWExNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTkzMyw2ICs5MzMsNyBAQAogCQkxQzE4REE1OTE4MUFGNkE1MDBDNEVG MjIgLyogVGV4dFBhaW50ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDFDMThEQTU3MTgxQUY2QTUwMEM0RUYyMiAvKiBUZXh0UGFpbnRlci5oICovOyB9 OwogCQkxQzIxRTU3QzE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QTE4M0VEMUZG MDAxQzI4OUQgLyogSU9TdXJmYWNlUG9vbC5jcHAgKi87IH07CiAJCTFDMjFFNTdEMTgzRUQxRkYw MDFDMjg5RCAvKiBJT1N1cmZhY2VQb29sLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQzIxRTU3QjE4M0VEMUZGMDAxQzI4OUQgLyogSU9TdXJmYWNlUG9v bC5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTFD MjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4gUmVzb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFDMjQxN0I5MTk5MkMwNDEwMEVG OTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi87IH07CiAJCTFDMjY0OTdBMEQ3RTI0OEEwMEJE MTBGMiAvKiBEb2N1bWVudExvYWRlck1hYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2NDk3OTBEN0UyNDhBMDBCRDEwRjIgLyogRG9jdW1lbnRM b2FkZXJNYWMuY3BwICovOyB9OwogCQkxQzI2NDk3QzBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1h Yy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzI2 NDk3QjBEN0UyNEVDMDBCRDEwRjIgLyogUGFnZU1hYy5jcHAgKi87IH07CiAJCTFDNEM4RjAyMEFE ODVEODcwMDk0NzVDRSAvKiBEZWxldGVCdXR0b25Db250cm9sbGVyLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzRDOEYwMDBBRDg1RDg3MDA5NDc1Q0Ug LyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07CkBAIC03OTA4LDYgKzc5MDksNyBAQAogCQkxQzE4REE1NzE4MUFG NkE1MDBDNEVGMjIgLyogVGV4dFBhaW50ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gVGV4dFBhaW50ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1 N0ExODNFRDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuY3BwICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBuYW1lID0gSU9TdXJmYWNlUG9vbC5jcHA7IHBhdGggPSAuLi9jZy9JT1N1 cmZhY2VQb29sLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUMyMUU1N0IxODNF RDFGRjAwMUMyODlEIC8qIElPU3VyZmFjZVBvb2wuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBuYW1lID0gSU9TdXJmYWNlUG9vbC5oOyBwYXRoID0gLi4vY2cvSU9TdXJmYWNlUG9vbC5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQzI0MTdCOTE5OTJDMDQxMDBFRjk5MzggLyog U3BlbGxpbmdEb3RAM3gucG5nICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93 bkZpbGVUeXBlID0gaW1hZ2UucG5nOyBwYXRoID0gIlNwZWxsaW5nRG90QDN4LnBuZyI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0OTc5MEQ3RTI0OEEwMEJEMTBGMiAvKiBEb2N1 bWVudExvYWRlck1hYy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBE b2N1bWVudExvYWRlck1hYy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFDMjY0 OTdCMEQ3RTI0RUMwMEJEMTBGMiAvKiBQYWdlTWFjLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IFBhZ2VNYWMuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkxQzRDOEVGRjBBRDg1RDg3MDA5NDc1Q0UgLyogRGVsZXRlQnV0dG9uQ29udHJvbGxlci5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBEZWxldGVCdXR0b25Db250cm9s bGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgdGFiV2lkdGggPSA4OyB1c2VzVGFicyA9 IDA7IH07CkBAIC0xNjUxOCw2ICsxNjUyMCw3IEBACiAJCTY1OTk4QTY1MEU1RjVGRDMwMDRFMDk3 QSAvKiBpbWFnZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAor CQkJCTFDMjQxN0I5MTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgKi8sCiAJ CQkJRDAyQjY0QjAxNDA4OUU1NjAwNkVGQTIxIC8qIERpY3RhdGlvblBocmFzZVdpdGhBbHRlcm5h dGl2ZXNEb3QucG5nICovLAogCQkJCUQwMkI2NEIxMTQwODlFNTYwMDZFRkEyMSAvKiBEaWN0YXRp b25QaHJhc2VXaXRoQWx0ZXJuYXRpdmVzRG90QDJ4LnBuZyAqLywKIAkJCQlCRThDNzUzMDEwNjgx MzI0MDAxRTkzRjUgLyogU3BlbGxpbmdEb3QucG5nICovLApAQCAtMjY4NzUsNiArMjY4NzgsNyBA QAogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKIAkJCWZpbGVzID0gKAogCQkJCTQ2 RjlENUREMEIwRDYwMTcwMDI4RUUzNiAvKiBhbGlhc0N1cnNvci5wbmcgaW4gUmVzb3VyY2VzICov LAorCQkJCTFDMjQxN0JBMTk5MkMwNDEwMEVGOTkzOCAvKiBTcGVsbGluZ0RvdEAzeC5wbmcgaW4g UmVzb3VyY2VzICovLAogCQkJCTQ2RDRGMjQ5MEFGOTdFODEwMDM1Mzg1QSAvKiBjZWxsQ3Vyc29y LnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJOTMxNTNCREUxNDE5NTlGNDAwRkNGNUJFIC8qIGRl bGV0ZUJ1dHRvbi5wbmcgaW4gUmVzb3VyY2VzICovLAogCQkJCTkzMTUzQkNEMTQxN0ZCQkYwMEZD RjVCRSAvKiBkZWxldGVCdXR0b25AMngucG5nIGluIFJlc291cmNlcyAqLywKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbSBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tHcmFwaGljcy5tbQppbmRleCAzZTdlNjhhMzU5NjQx MDVjNjE0ODBhYWYxODVkN2Q0OTQyZDJhMWI5Li5mM2JkMWU0NzgxZDZmZDhmMDhkZWIzNjg0YjQx M2UyMDMyYTllYmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mvd2Fr L1dLR3JhcGhpY3MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0dy YXBoaWNzLm1tCkBAIC05MSw5ICs5MSw5IEBAIENHQ29udGV4dFJlZiBXS0dldEN1cnJlbnRHcmFw aGljc0NvbnRleHQodm9pZCkKICAgICByZXR1cm4gdGhyZWFkQ29udGV4dC0+Y3VycmVudENHQ29u dGV4dDsKIH0KIAotc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFy KiBpbWFnZUZpbGUsIGJvb2wgaXMyeCkKK3N0YXRpYyBOU1N0cmluZyAqaW1hZ2VSZXNvdXJjZVBh dGgoY29uc3QgY2hhciogaW1hZ2VGaWxlLCB1bnNpZ25lZCBzY2FsZUZhY3RvcikKIHsKLSAgICBO U1N0cmluZyAqZmlsZU5hbWUgPSBpczJ4ID8gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIl c0AyeCIsIGltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0aFVURjhTdHJpbmc6aW1hZ2VG aWxlXTsKKyAgICBOU1N0cmluZyAqZmlsZU5hbWUgPSBzY2FsZUZhY3RvciA9PSAxID8gW05TU3Ry aW5nIHN0cmluZ1dpdGhVVEY4U3RyaW5nOmltYWdlRmlsZV0gOiBbTlNTdHJpbmcgc3RyaW5nV2l0 aEZvcm1hdDpAIiVzQCVkeCIsIGltYWdlRmlsZSwgc2NhbGVGYWN0b3JdOwogI2lmIFBMQVRGT1JN KElPU19TSU1VTEFUT1IpCiAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVX aXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl07CiAgICAgcmV0dXJuIFtidW5kbGUg cGF0aEZvclJlc291cmNlOmZpbGVOYW1lIG9mVHlwZTpAInBuZyJdOwpAQCAtMTA0LDIyICsxMDQs MTYgQEAgc3RhdGljIE5TU3RyaW5nICppbWFnZVJlc291cmNlUGF0aChjb25zdCBjaGFyKiBpbWFn ZUZpbGUsIGJvb2wgaXMyeCkKICNlbmRpZgogfQogCi1DR0ltYWdlUmVmIFdLR3JhcGhpY3NDcmVh dGVJbWFnZUZyb21CdW5kbGVXaXRoTmFtZSAoY29uc3QgY2hhciAqaW1hZ2VfZmlsZSkKK0NHSW1h Z2VSZWYgV0tHcmFwaGljc0NyZWF0ZUltYWdlRnJvbUJ1bmRsZVdpdGhOYW1lKGNvbnN0IGNoYXIg KmltYWdlX2ZpbGUpCiB7CiAgICAgaWYgKCFpbWFnZV9maWxlKQogICAgICAgICByZXR1cm4gTlVM TDsKIAogICAgIENHSW1hZ2VSZWYgaW1hZ2UgPSBudWxscHRyOwotICAgIE5TRGF0YSAqaW1hZ2VE YXRhID0gbmlsOwotCi0gICAgaWYgKHdrR2V0U2NyZWVuU2NhbGVGYWN0b3IoKSA9PSAyKSB7Ci0g ICAgICAgIE5TU3RyaW5nKiBmdWxsMnhQYXRoID0gaW1hZ2VSZXNvdXJjZVBhdGgoaW1hZ2VfZmls ZSwgdHJ1ZSk7Ci0gICAgICAgIGltYWdlRGF0YSA9IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09m RmlsZTpmdWxsMnhQYXRoXTsKLSAgICB9Ci0gICAgaWYgKCFpbWFnZURhdGEpIHsKLSAgICAgICAg Ly8gV2UgZ290IGhlcmUgZWl0aGVyIGJlY2F1c2Ugd2UgZGlkbid0IHJlcXVlc3QgaGktZHBpIG9y IHRoZSBAMnggZmlsZSBkb2Vzbid0IGV4aXN0LgotICAgICAgICBOU1N0cmluZyogZnVsbDF4UGF0 aCA9IGltYWdlUmVzb3VyY2VQYXRoKGltYWdlX2ZpbGUsIGZhbHNlKTsKLSAgICAgICAgaW1hZ2VE YXRhID0gW05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZGaWxlOmZ1bGwxeFBhdGhdOworICAgIE5T RGF0YSAqaW1hZ2VEYXRhID0gbnVsbHB0cjsKKyAgICBmb3IgKHVuc2lnbmVkIHNjYWxlRmFjdG9y ID0gd2tHZXRTY3JlZW5TY2FsZUZhY3RvcigpOyAhaW1hZ2VEYXRhICYmIHNjYWxlRmFjdG9yID4g MDsgLS1zY2FsZUZhY3RvcikgeworICAgICAgICBpbWFnZURhdGEgPSBbTlNEYXRhIGRhdGFXaXRo Q29udGVudHNPZkZpbGU6aW1hZ2VSZXNvdXJjZVBhdGgoaW1hZ2VfZmlsZSwgc2NhbGVGYWN0b3Ip XTsKKyAgICAgICAgQVNTRVJUKHNjYWxlRmFjdG9yICE9IHdrR2V0U2NyZWVuU2NhbGVGYWN0b3Io KSB8fCBpbWFnZURhdGEpOwogICAgIH0KICAgICAKICAgICBpZiAoaW1hZ2VEYXRhKSB7Cg==