67419 2011-09-01 10:52:53 -0700 [Chromium/Skia] Use GraphicsContext3D::grContext() to create GrContext for accelerated drawing 2011-09-01 12:28:01 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 bsalomon bsalomon alokp jamesr webkit.review.bot oldest_to_newest 460601 0 bsalomon 2011-09-01 10:52:53 -0700 [Chromium/Skia] Use GraphicsContext3D::grContext() to create GrContext for accelerated drawing 460609 1 105992 bsalomon 2011-09-01 10:57:01 -0700 Created attachment 105992 Patch 460615 2 bsalomon 2011-09-01 11:02:37 -0700 The code that creates a GrContext for accelerated drawing relied on removed code that set a default GrGLInterface when a WGC3D subclass was created. So GrContext creation failed. This change uses the existing GrContext creation code in GraphicsContext3D. This change fixes http://crbug.com/95044 460620 3 105992 jamesr 2011-09-01 11:06:54 -0700 Comment on attachment 105992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105992&action=review > Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h:97 > + LayerTextureUpdaterSkPicture(PassOwnPtr<LayerPainterChromium>); need explicit keyword on this c'tor 460629 4 105996 bsalomon 2011-09-01 11:23:37 -0700 Created attachment 105996 Patch 460630 5 bsalomon 2011-09-01 11:25:12 -0700 (In reply to comment #3) > (From update of attachment 105992 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105992&action=review > > > Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.h:97 > > + LayerTextureUpdaterSkPicture(PassOwnPtr<LayerPainterChromium>); > > need explicit keyword on this c'tor Added in latest patch. 460688 6 105996 webkit.review.bot 2011-09-01 12:27:56 -0700 Comment on attachment 105996 Patch Clearing flags on attachment: 105996 Committed r94329: <http://trac.webkit.org/changeset/94329> 460689 7 webkit.review.bot 2011-09-01 12:28:01 -0700 All reviewed patches have been landed. Closing bug. 105992 2011-09-01 10:57:01 -0700 2011-09-01 11:23:32 -0700 Patch bug-67419-20110901135516.patch text/plain 9258 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MzExKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMDEgIEJyaWFuIFNh bG9tb24gIDxic2Fsb21vbkBnb29nbGUuY29tPgorCisgICAgICAgIFtDaHJvbWl1bS9Ta2lhXSBV c2UgR3JhcGhpY3NDb250ZXh0M0Q6OmdyQ29udGV4dCgpIHRvIGNyZWF0ZSBHckNvbnRleHQgZm9y IGFjY2VsZXJhdGVkIGRyYXdpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY3NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWNjZWxlcmF0ZWQgZHJhd2luZyBpcyBub3QgZW5hYmxlZCBpbiBsYXlvdXQg dGVzdHMuIEhvd2V2ZXIsIG9uY2UgaXQgaXMgdGhpcyBjaGFuZ2Ugd2lsbCBiZSB0ZXN0ZWQgYnkg ZXZlcnkgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRl bnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRMYXllckNocm9t aXVtOjpjcmVhdGVUZXh0dXJlVXBkYXRlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNv bnRleHRTdXBwb3J0c0FjY2VsZXJhdGVkUGFpbnRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJSZW5kZXJlckNocm9taXVtOjppbml0aWFsaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpMYXllclRleHR1cmVV cGRhdGVyU2tQaWN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJT a1BpY3R1cmU6OnVwZGF0ZVRleHR1cmVSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4 dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZUZyYW1lQnVmZmVyKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmg6CisKIDIw MTEtMDgtMzEgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogY2xvc2UgZGVkaWNhdGVkIHdvcmtlciBpbnNwZWN0b3JzIHdoZW4g cGFnZSBpbnNwZWN0b3IgaXMgY2xvc2luZwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNo cm9taXVtLmNwcAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lkIENvbnRlbnRMYXllckNocm9taXVtOjpjcmVhdGVUZXh0 dXJlCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElORykKICNpZiBVU0UoU0tJQSkKICAgICBp ZiAoaG9zdC0+c2V0dGluZ3MoKS5hY2NlbGVyYXRlUGFpbnRpbmcpIHsKLSAgICAgICAgbV90ZXh0 dXJlVXBkYXRlciA9IExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZShDb250ZW50 TGF5ZXJQYWludGVyOjpjcmVhdGUobV9vd25lciksIGhvc3QtPmxheWVyUmVuZGVyZXIoKS0+c2tp YUNvbnRleHQoKSk7CisgICAgICAgIG1fdGV4dHVyZVVwZGF0ZXIgPSBMYXllclRleHR1cmVVcGRh dGVyU2tQaWN0dXJlOjpjcmVhdGUoQ29udGVudExheWVyUGFpbnRlcjo6Y3JlYXRlKG1fb3duZXIp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZiAvLyBTS0lBCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDk0MzA1KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVt LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQ1LDYgKzQ0NSw5IEBAIGJvb2wgY29udGV4dFN1cHBv cnRzQWNjZWxlcmF0ZWRQYWludGluZygKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAorICAgIGlmICghY29udGV4dC0+Z3JDb250ZXh0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KwogICAgIHJldHVybiB0cnVlOwogfQogI2VuZGlmCkBAIC00NzUsMTYgKzQ3OCw2IEBAIExheWVy UmVuZGVyZXJDaHJvbWl1bTo6TGF5ZXJSZW5kZXJlckNocm8KIGJvb2wgTGF5ZXJSZW5kZXJlckNo cm9taXVtOjppbml0aWFsaXplKCkKIHsKICAgICBtX2NvbnRleHQtPm1ha2VDb250ZXh0Q3VycmVu dCgpOwotI2lmIFVTRShTS0lBKQotICAgIGlmIChzZXR0aW5ncygpLmFjY2VsZXJhdGVQYWludGlu ZykgewotICAgICAgICBtX3NraWFDb250ZXh0ID0gYWRvcHRQdHIoR3JDb250ZXh0OjpDcmVhdGVH TFNoYWRlckNvbnRleHQoKSk7Ci0gICAgICAgIC8vIExpbWl0IHRoZSBudW1iZXIgb2YgdGV4dHVy ZXMgd2UgaG9sZCBpbiB0aGUgYml0bWFwLT50ZXh0dXJlIGNhY2hlLgotICAgICAgICBzdGF0aWMg Y29uc3QgaW50IG1heFRleHR1cmVDYWNoZUNvdW50ID0gNTEyOwotICAgICAgICAvLyBMaW1pdCB0 aGUgYnl0ZXMgYWxsb2NhdGVkIHRvd2FyZCB0ZXh0dXJlcyBpbiB0aGUgYml0bWFwLT50ZXh0dXJl IGNhY2hlLgotICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IG1heFRleHR1cmVDYWNoZUJ5dGVz ID0gNTAgKiAxMDI0ICogMTAyNDsKLSAgICAgICAgbV9za2lhQ29udGV4dC0+c2V0VGV4dHVyZUNh Y2hlTGltaXRzKG1heFRleHR1cmVDYWNoZUNvdW50LCBtYXhUZXh0dXJlQ2FjaGVCeXRlcyk7Ci0g ICAgfQotI2VuZGlmCiAKICAgICBXZWJDb3JlOjpFeHRlbnNpb25zM0QqIGV4dGVuc2lvbnMgPSBt X2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKTsKICAgICBtX2NvbnRleHRTdXBwb3J0c01hcFN1YiA9 IGV4dGVuc2lvbnMtPnN1cHBvcnRzKCJHTF9DSFJPTUlVTV9tYXBfc3ViIik7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21p dW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u aAkod29ya2luZyBjb3B5KQpAQCAtODcsMTAgKzg3LDYgQEAgcHVibGljOgogICAgIEdyYXBoaWNz Q29udGV4dDNEKiBjb250ZXh0KCk7CiAgICAgYm9vbCBjb250ZXh0U3VwcG9ydHNNYXBTdWIoKSBj b25zdCB7IHJldHVybiBtX2NvbnRleHRTdXBwb3J0c01hcFN1YjsgfQogCi0jaWYgVVNFKFNLSUEp Ci0gICAgR3JDb250ZXh0KiBza2lhQ29udGV4dCgpIHsgcmV0dXJuIG1fc2tpYUNvbnRleHQuZ2V0 KCk7IH0KLSNlbmRpZgotCiAgICAgY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKCkgeyByZXR1 cm4gbV9vd25lci0+dmlld3BvcnRTaXplKCk7IH0KICAgICBpbnQgdmlld3BvcnRXaWR0aCgpIHsg cmV0dXJuIHZpZXdwb3J0U2l6ZSgpLndpZHRoKCk7IH0KICAgICBpbnQgdmlld3BvcnRIZWlnaHQo KSB7IHJldHVybiB2aWV3cG9ydFNpemUoKS5oZWlnaHQoKTsgfQpAQCAtMjMwLDkgKzIyNiw2IEBA IHByaXZhdGU6CiAgICAgT3duUHRyPENDSGVhZHNVcERpc3BsYXk+IG1faGVhZHNVcERpc3BsYXk7 CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDsKLSNpZiBVU0UoU0tJ QSkKLSAgICBPd25QdHI8R3JDb250ZXh0PiBtX3NraWFDb250ZXh0OwotI2VuZGlmCiAKICAgICBi b29sIG1fY29udGV4dFN1cHBvcnRzTWFwU3ViOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDE0ICsxMDMsMTMgQEAgdm9pZCBMYXllclRleHR1 cmVVcGRhdGVyQml0bWFwOjp1cGRhdGVUZQogCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElO RykKICNpZiBVU0UoU0tJQSkKLVBhc3NPd25QdHI8TGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVy ZT4gTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXRlKFBhc3NPd25QdHI8TGF5ZXJQ YWludGVyQ2hyb21pdW0+IHBhaW50ZXIsIEdyQ29udGV4dCogc2tpYUNvbnRleHQpCitQYXNzT3du UHRyPExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU+IExheWVyVGV4dHVyZVVwZGF0ZXJTa1Bp Y3R1cmU6OmNyZWF0ZShQYXNzT3duUHRyPExheWVyUGFpbnRlckNocm9taXVtPiBwYWludGVyKQog ewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZShw YWludGVyLCBza2lhQ29udGV4dCkpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgTGF5ZXJUZXh0 dXJlVXBkYXRlclNrUGljdHVyZShwYWludGVyKSk7CiB9CiAKLUxheWVyVGV4dHVyZVVwZGF0ZXJT a1BpY3R1cmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmUoUGFzc093blB0cjxMYXllclBh aW50ZXJDaHJvbWl1bT4gcGFpbnRlciwgR3JDb250ZXh0KiBza2lhQ29udGV4dCkKK0xheWVyVGV4 dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmUoUGFzc093 blB0cjxMYXllclBhaW50ZXJDaHJvbWl1bT4gcGFpbnRlcikKICAgICA6IExheWVyVGV4dHVyZVVw ZGF0ZXJDYW52YXMocGFpbnRlcikKLSAgICAsIG1fc2tpYUNvbnRleHQoc2tpYUNvbnRleHQpCiAg ICAgLCBtX2NvbnRleHQoMCkKICAgICAsIG1fY3JlYXRlRnJhbWVCdWZmZXIoZmFsc2UpCiAgICAg LCBtX2ZibygwKQpAQCAtMTY3LDggKzE2Niw5IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNr UGljdHVyZTo6dXBkYXQKICAgICAvLyBNYWtlIHN1cmUgU0tJQSB1c2VzIHRoZSBjb3JyZWN0IEdM IGNvbnRleHQuCiAgICAgY29udGV4dCgpLT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKIAorICAgIEdy Q29udGV4dCogc2tpYUNvbnRleHQgPSBtX2NvbnRleHQtPmdyQ29udGV4dCgpOwogICAgIC8vIE5v dGlmeSBTS0lBIHRvIHN5bmMgaXRzIGludGVybmFsIEdMIHN0YXRlLgotICAgIG1fc2tpYUNvbnRl eHQtPnJlc2V0Q29udGV4dCgpOworICAgIHNraWFDb250ZXh0LT5yZXNldENvbnRleHQoKTsKICAg ICBtX2NhbnZhcy0+c2F2ZSgpOwogICAgIG1fY2FudmFzLT5jbGlwUmVjdChTa1JlY3QoZGVzdFJl Y3QpKTsKICAgICAvLyBUcmFuc2xhdGUgdGhlIG9yaWdpbiBvZiBjb250ZW50UmVjdCB0byB0aGF0 IG9mIGRlc3RSZWN0LgpAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRl clNrUGljdHVyZTo6dXBkYXQKICAgICBtX2NhbnZhcy0+ZHJhd1BpY3R1cmUobV9waWN0dXJlKTsK ICAgICBtX2NhbnZhcy0+cmVzdG9yZSgpOwogICAgIC8vIEZsdXNoIFNLSUEgY29udGV4dCBzbyB0 aGF0IGFsbCB0aGUgcmVuZGVyZWQgc3R1ZmYgYXBwZWFycyBvbiB0aGUgdGV4dHVyZS4KLSAgICBt X3NraWFDb250ZXh0LT5mbHVzaCgpOworICAgIHNraWFDb250ZXh0LT5mbHVzaCgpOwogCiAgICAg Ly8gVW5iaW5kIHRleHR1cmUuCiAgICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclRleHR1cmUyRChH cmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9B VFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIDApOwpAQCAtMjM3 LDYgKzIzNyw3IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAg ICBjb250ZXh0KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpG UkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhp Y3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogCiAgICAg Ly8gQ3JlYXRlIGEgc2tpYSBncHUgY2FudmFzLgorICAgIEdyQ29udGV4dCogc2tpYUNvbnRleHQg PSBtX2NvbnRleHQtPmdyQ29udGV4dCgpOwogICAgIEdyUGxhdGZvcm1TdXJmYWNlRGVzYyB0YXJn ZXREZXNjOwogICAgIHRhcmdldERlc2MucmVzZXQoKTsKICAgICB0YXJnZXREZXNjLmZTdXJmYWNl VHlwZSA9IGtSZW5kZXJUYXJnZXRfR3JQbGF0Zm9ybVN1cmZhY2VUeXBlOwpAQCAtMjQ2LDggKzI0 Nyw4IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAgICB0YXJn ZXREZXNjLmZDb25maWcgPSBrUkdCQV84ODg4X0dyUGl4ZWxDb25maWc7CiAgICAgdGFyZ2V0RGVz Yy5mU3RlbmNpbEJpdHMgPSA4OwogICAgIHRhcmdldERlc2MuZlBsYXRmb3JtUmVuZGVyVGFyZ2V0 ID0gbV9mYm87Ci0gICAgU2tBdXRvVFVucmVmPEdyUmVuZGVyVGFyZ2V0PiB0YXJnZXQoc3RhdGlj X2Nhc3Q8R3JSZW5kZXJUYXJnZXQqPihtX3NraWFDb250ZXh0LT5jcmVhdGVQbGF0Zm9ybVN1cmZh Y2UodGFyZ2V0RGVzYykpKTsKLSAgICBTa0F1dG9UVW5yZWY8U2tEZXZpY2U+IGRldmljZShuZXcg U2tHcHVEZXZpY2UobV9za2lhQ29udGV4dCwgdGFyZ2V0LmdldCgpKSk7CisgICAgU2tBdXRvVFVu cmVmPEdyUmVuZGVyVGFyZ2V0PiB0YXJnZXQoc3RhdGljX2Nhc3Q8R3JSZW5kZXJUYXJnZXQqPihz a2lhQ29udGV4dC0+Y3JlYXRlUGxhdGZvcm1TdXJmYWNlKHRhcmdldERlc2MpKSk7CisgICAgU2tB dXRvVFVucmVmPFNrRGV2aWNlPiBkZXZpY2UobmV3IFNrR3B1RGV2aWNlKHNraWFDb250ZXh0LCB0 YXJnZXQuZ2V0KCkpKTsKICAgICBtX2NhbnZhcyA9IGFkb3B0UHRyKG5ldyBTa0NhbnZhcyhkZXZp Y2UuZ2V0KCkpKTsKIAogICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29u dGV4dDNEOjpGUkFNRUJVRkZFUiwgMCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJl VXBkYXRlckNhbnZhcy5oCShyZXZpc2lvbiA5NDMwNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaAkod29ya2lu ZyBjb3B5KQpAQCAtODUsNyArODUsNyBAQCBwcml2YXRlOgogY2xhc3MgTGF5ZXJUZXh0dXJlVXBk YXRlclNrUGljdHVyZSA6IHB1YmxpYyBMYXllclRleHR1cmVVcGRhdGVyQ2FudmFzIHsKICAgICBX VEZfTUFLRV9OT05DT1BZQUJMRShMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlKTsKIHB1Ymxp YzoKLSAgICBzdGF0aWMgUGFzc093blB0cjxMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlPiBj cmVhdGUoUGFzc093blB0cjxMYXllclBhaW50ZXJDaHJvbWl1bT4sIEdyQ29udGV4dCopOworICAg IHN0YXRpYyBQYXNzT3duUHRyPExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU+IGNyZWF0ZShQ YXNzT3duUHRyPExheWVyUGFpbnRlckNocm9taXVtPik7CiAgICAgdmlydHVhbCB+TGF5ZXJUZXh0 dXJlVXBkYXRlclNrUGljdHVyZSgpOwogCiAgICAgdmlydHVhbCBPcmllbnRhdGlvbiBvcmllbnRh dGlvbigpIHsgcmV0dXJuIExheWVyVGV4dHVyZVVwZGF0ZXI6OlRvcERvd25PcmllbnRhdGlvbjsg fQpAQCAtOTQsMTIgKzk0LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGV4 dHVyZVJlY3QoR3JhcGhpY3NDb250ZXh0M0QqLCBNYW5hZ2VkVGV4dHVyZSosIGNvbnN0IEludFJl Y3QmIHNvdXJjZVJlY3QsIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KTsKIAogcHJpdmF0ZToKLSAg ICBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlKFBhc3NPd25QdHI8TGF5ZXJQYWludGVyQ2hy b21pdW0+LCBHckNvbnRleHQqKTsKKyAgICBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlKFBh c3NPd25QdHI8TGF5ZXJQYWludGVyQ2hyb21pdW0+KTsKICAgICB2b2lkIGRlbGV0ZUZyYW1lQnVm ZmVyKCk7CiAgICAgYm9vbCBjcmVhdGVGcmFtZUJ1ZmZlcigpOwogICAgIEdyYXBoaWNzQ29udGV4 dDNEKiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0OyB9CiAKLSAgICBHckNvbnRleHQqIG1f c2tpYUNvbnRleHQ7IC8vIFNLSUEgZ3JhcGhpY3MgY29udGV4dC4KICAgICBHcmFwaGljc0NvbnRl eHQzRCogbV9jb250ZXh0OwogCiAgICAgYm9vbCBtX2NyZWF0ZUZyYW1lQnVmZmVyOyAvLyBOZWVk IHRvIGNyZWF0ZSBGQk8gaWYgdHJ1ZS4K 105996 2011-09-01 11:23:37 -0700 2011-09-01 12:27:56 -0700 Patch bug-67419-20110901142152.patch text/plain 9267 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MzExKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDktMDEgIEJyaWFuIFNh bG9tb24gIDxic2Fsb21vbkBnb29nbGUuY29tPgorCisgICAgICAgIFtDaHJvbWl1bS9Ta2lhXSBV c2UgR3JhcGhpY3NDb250ZXh0M0Q6OmdyQ29udGV4dCgpIHRvIGNyZWF0ZSBHckNvbnRleHQgZm9y IGFjY2VsZXJhdGVkIGRyYXdpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY3NDE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWNjZWxlcmF0ZWQgZHJhd2luZyBpcyBub3QgZW5hYmxlZCBpbiBsYXlvdXQg dGVzdHMuIEhvd2V2ZXIsIG9uY2UgaXQgaXMgdGhpcyBjaGFuZ2Ugd2lsbCBiZSB0ZXN0ZWQgYnkg ZXZlcnkgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRl bnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRMYXllckNocm9t aXVtOjpjcmVhdGVUZXh0dXJlVXBkYXRlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNv bnRleHRTdXBwb3J0c0FjY2VsZXJhdGVkUGFpbnRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJSZW5kZXJlckNocm9taXVtOjppbml0aWFsaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpMYXllclRleHR1cmVV cGRhdGVyU2tQaWN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJT a1BpY3R1cmU6OnVwZGF0ZVRleHR1cmVSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4 dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZUZyYW1lQnVmZmVyKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmg6CisKIDIw MTEtMDgtMzEgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogY2xvc2UgZGVkaWNhdGVkIHdvcmtlciBpbnNwZWN0b3JzIHdoZW4g cGFnZSBpbnNwZWN0b3IgaXMgY2xvc2luZwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNo cm9taXVtLmNwcAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEyMyw3ICsxMjMsNyBAQCB2b2lkIENvbnRlbnRMYXllckNocm9taXVtOjpjcmVhdGVUZXh0 dXJlCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElORykKICNpZiBVU0UoU0tJQSkKICAgICBp ZiAoaG9zdC0+c2V0dGluZ3MoKS5hY2NlbGVyYXRlUGFpbnRpbmcpIHsKLSAgICAgICAgbV90ZXh0 dXJlVXBkYXRlciA9IExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZShDb250ZW50 TGF5ZXJQYWludGVyOjpjcmVhdGUobV9vd25lciksIGhvc3QtPmxheWVyUmVuZGVyZXIoKS0+c2tp YUNvbnRleHQoKSk7CisgICAgICAgIG1fdGV4dHVyZVVwZGF0ZXIgPSBMYXllclRleHR1cmVVcGRh dGVyU2tQaWN0dXJlOjpjcmVhdGUoQ29udGVudExheWVyUGFpbnRlcjo6Y3JlYXRlKG1fb3duZXIp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICNlbmRpZiAvLyBTS0lBCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDk0MzA1KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVt LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQ1LDYgKzQ0NSw5IEBAIGJvb2wgY29udGV4dFN1cHBv cnRzQWNjZWxlcmF0ZWRQYWludGluZygKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAorICAgIGlmICghY29udGV4dC0+Z3JDb250ZXh0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KwogICAgIHJldHVybiB0cnVlOwogfQogI2VuZGlmCkBAIC00NzUsMTYgKzQ3OCw2IEBAIExheWVy UmVuZGVyZXJDaHJvbWl1bTo6TGF5ZXJSZW5kZXJlckNocm8KIGJvb2wgTGF5ZXJSZW5kZXJlckNo cm9taXVtOjppbml0aWFsaXplKCkKIHsKICAgICBtX2NvbnRleHQtPm1ha2VDb250ZXh0Q3VycmVu dCgpOwotI2lmIFVTRShTS0lBKQotICAgIGlmIChzZXR0aW5ncygpLmFjY2VsZXJhdGVQYWludGlu ZykgewotICAgICAgICBtX3NraWFDb250ZXh0ID0gYWRvcHRQdHIoR3JDb250ZXh0OjpDcmVhdGVH TFNoYWRlckNvbnRleHQoKSk7Ci0gICAgICAgIC8vIExpbWl0IHRoZSBudW1iZXIgb2YgdGV4dHVy ZXMgd2UgaG9sZCBpbiB0aGUgYml0bWFwLT50ZXh0dXJlIGNhY2hlLgotICAgICAgICBzdGF0aWMg Y29uc3QgaW50IG1heFRleHR1cmVDYWNoZUNvdW50ID0gNTEyOwotICAgICAgICAvLyBMaW1pdCB0 aGUgYnl0ZXMgYWxsb2NhdGVkIHRvd2FyZCB0ZXh0dXJlcyBpbiB0aGUgYml0bWFwLT50ZXh0dXJl IGNhY2hlLgotICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IG1heFRleHR1cmVDYWNoZUJ5dGVz ID0gNTAgKiAxMDI0ICogMTAyNDsKLSAgICAgICAgbV9za2lhQ29udGV4dC0+c2V0VGV4dHVyZUNh Y2hlTGltaXRzKG1heFRleHR1cmVDYWNoZUNvdW50LCBtYXhUZXh0dXJlQ2FjaGVCeXRlcyk7Ci0g ICAgfQotI2VuZGlmCiAKICAgICBXZWJDb3JlOjpFeHRlbnNpb25zM0QqIGV4dGVuc2lvbnMgPSBt X2NvbnRleHQtPmdldEV4dGVuc2lvbnMoKTsKICAgICBtX2NvbnRleHRTdXBwb3J0c01hcFN1YiA9 IGV4dGVuc2lvbnMtPnN1cHBvcnRzKCJHTF9DSFJPTUlVTV9tYXBfc3ViIik7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21p dW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0u aAkod29ya2luZyBjb3B5KQpAQCAtODcsMTAgKzg3LDYgQEAgcHVibGljOgogICAgIEdyYXBoaWNz Q29udGV4dDNEKiBjb250ZXh0KCk7CiAgICAgYm9vbCBjb250ZXh0U3VwcG9ydHNNYXBTdWIoKSBj b25zdCB7IHJldHVybiBtX2NvbnRleHRTdXBwb3J0c01hcFN1YjsgfQogCi0jaWYgVVNFKFNLSUEp Ci0gICAgR3JDb250ZXh0KiBza2lhQ29udGV4dCgpIHsgcmV0dXJuIG1fc2tpYUNvbnRleHQuZ2V0 KCk7IH0KLSNlbmRpZgotCiAgICAgY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKCkgeyByZXR1 cm4gbV9vd25lci0+dmlld3BvcnRTaXplKCk7IH0KICAgICBpbnQgdmlld3BvcnRXaWR0aCgpIHsg cmV0dXJuIHZpZXdwb3J0U2l6ZSgpLndpZHRoKCk7IH0KICAgICBpbnQgdmlld3BvcnRIZWlnaHQo KSB7IHJldHVybiB2aWV3cG9ydFNpemUoKS5oZWlnaHQoKTsgfQpAQCAtMjMwLDkgKzIyNiw2IEBA IHByaXZhdGU6CiAgICAgT3duUHRyPENDSGVhZHNVcERpc3BsYXk+IG1faGVhZHNVcERpc3BsYXk7 CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29udGV4dDsKLSNpZiBVU0UoU0tJ QSkKLSAgICBPd25QdHI8R3JDb250ZXh0PiBtX3NraWFDb250ZXh0OwotI2VuZGlmCiAKICAgICBi b29sIG1fY29udGV4dFN1cHBvcnRzTWFwU3ViOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAkocmV2aXNpb24gOTQzMDUpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDE0ICsxMDMsMTMgQEAgdm9pZCBMYXllclRleHR1 cmVVcGRhdGVyQml0bWFwOjp1cGRhdGVUZQogCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElO RykKICNpZiBVU0UoU0tJQSkKLVBhc3NPd25QdHI8TGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVy ZT4gTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXRlKFBhc3NPd25QdHI8TGF5ZXJQ YWludGVyQ2hyb21pdW0+IHBhaW50ZXIsIEdyQ29udGV4dCogc2tpYUNvbnRleHQpCitQYXNzT3du UHRyPExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU+IExheWVyVGV4dHVyZVVwZGF0ZXJTa1Bp Y3R1cmU6OmNyZWF0ZShQYXNzT3duUHRyPExheWVyUGFpbnRlckNocm9taXVtPiBwYWludGVyKQog ewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZShw YWludGVyLCBza2lhQ29udGV4dCkpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgTGF5ZXJUZXh0 dXJlVXBkYXRlclNrUGljdHVyZShwYWludGVyKSk7CiB9CiAKLUxheWVyVGV4dHVyZVVwZGF0ZXJT a1BpY3R1cmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmUoUGFzc093blB0cjxMYXllclBh aW50ZXJDaHJvbWl1bT4gcGFpbnRlciwgR3JDb250ZXh0KiBza2lhQ29udGV4dCkKK0xheWVyVGV4 dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmUoUGFzc093 blB0cjxMYXllclBhaW50ZXJDaHJvbWl1bT4gcGFpbnRlcikKICAgICA6IExheWVyVGV4dHVyZVVw ZGF0ZXJDYW52YXMocGFpbnRlcikKLSAgICAsIG1fc2tpYUNvbnRleHQoc2tpYUNvbnRleHQpCiAg ICAgLCBtX2NvbnRleHQoMCkKICAgICAsIG1fY3JlYXRlRnJhbWVCdWZmZXIoZmFsc2UpCiAgICAg LCBtX2ZibygwKQpAQCAtMTY3LDggKzE2Niw5IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNr UGljdHVyZTo6dXBkYXQKICAgICAvLyBNYWtlIHN1cmUgU0tJQSB1c2VzIHRoZSBjb3JyZWN0IEdM IGNvbnRleHQuCiAgICAgY29udGV4dCgpLT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKIAorICAgIEdy Q29udGV4dCogc2tpYUNvbnRleHQgPSBtX2NvbnRleHQtPmdyQ29udGV4dCgpOwogICAgIC8vIE5v dGlmeSBTS0lBIHRvIHN5bmMgaXRzIGludGVybmFsIEdMIHN0YXRlLgotICAgIG1fc2tpYUNvbnRl eHQtPnJlc2V0Q29udGV4dCgpOworICAgIHNraWFDb250ZXh0LT5yZXNldENvbnRleHQoKTsKICAg ICBtX2NhbnZhcy0+c2F2ZSgpOwogICAgIG1fY2FudmFzLT5jbGlwUmVjdChTa1JlY3QoZGVzdFJl Y3QpKTsKICAgICAvLyBUcmFuc2xhdGUgdGhlIG9yaWdpbiBvZiBjb250ZW50UmVjdCB0byB0aGF0 IG9mIGRlc3RSZWN0LgpAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRl clNrUGljdHVyZTo6dXBkYXQKICAgICBtX2NhbnZhcy0+ZHJhd1BpY3R1cmUobV9waWN0dXJlKTsK ICAgICBtX2NhbnZhcy0+cmVzdG9yZSgpOwogICAgIC8vIEZsdXNoIFNLSUEgY29udGV4dCBzbyB0 aGF0IGFsbCB0aGUgcmVuZGVyZWQgc3R1ZmYgYXBwZWFycyBvbiB0aGUgdGV4dHVyZS4KLSAgICBt X3NraWFDb250ZXh0LT5mbHVzaCgpOworICAgIHNraWFDb250ZXh0LT5mbHVzaCgpOwogCiAgICAg Ly8gVW5iaW5kIHRleHR1cmUuCiAgICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclRleHR1cmUyRChH cmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9B VFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIDApOwpAQCAtMjM3 LDYgKzIzNyw3IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAg ICBjb250ZXh0KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpG UkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhp Y3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogCiAgICAg Ly8gQ3JlYXRlIGEgc2tpYSBncHUgY2FudmFzLgorICAgIEdyQ29udGV4dCogc2tpYUNvbnRleHQg PSBtX2NvbnRleHQtPmdyQ29udGV4dCgpOwogICAgIEdyUGxhdGZvcm1TdXJmYWNlRGVzYyB0YXJn ZXREZXNjOwogICAgIHRhcmdldERlc2MucmVzZXQoKTsKICAgICB0YXJnZXREZXNjLmZTdXJmYWNl VHlwZSA9IGtSZW5kZXJUYXJnZXRfR3JQbGF0Zm9ybVN1cmZhY2VUeXBlOwpAQCAtMjQ2LDggKzI0 Nyw4IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAgICB0YXJn ZXREZXNjLmZDb25maWcgPSBrUkdCQV84ODg4X0dyUGl4ZWxDb25maWc7CiAgICAgdGFyZ2V0RGVz Yy5mU3RlbmNpbEJpdHMgPSA4OwogICAgIHRhcmdldERlc2MuZlBsYXRmb3JtUmVuZGVyVGFyZ2V0 ID0gbV9mYm87Ci0gICAgU2tBdXRvVFVucmVmPEdyUmVuZGVyVGFyZ2V0PiB0YXJnZXQoc3RhdGlj X2Nhc3Q8R3JSZW5kZXJUYXJnZXQqPihtX3NraWFDb250ZXh0LT5jcmVhdGVQbGF0Zm9ybVN1cmZh Y2UodGFyZ2V0RGVzYykpKTsKLSAgICBTa0F1dG9UVW5yZWY8U2tEZXZpY2U+IGRldmljZShuZXcg U2tHcHVEZXZpY2UobV9za2lhQ29udGV4dCwgdGFyZ2V0LmdldCgpKSk7CisgICAgU2tBdXRvVFVu cmVmPEdyUmVuZGVyVGFyZ2V0PiB0YXJnZXQoc3RhdGljX2Nhc3Q8R3JSZW5kZXJUYXJnZXQqPihz a2lhQ29udGV4dC0+Y3JlYXRlUGxhdGZvcm1TdXJmYWNlKHRhcmdldERlc2MpKSk7CisgICAgU2tB dXRvVFVucmVmPFNrRGV2aWNlPiBkZXZpY2UobmV3IFNrR3B1RGV2aWNlKHNraWFDb250ZXh0LCB0 YXJnZXQuZ2V0KCkpKTsKICAgICBtX2NhbnZhcyA9IGFkb3B0UHRyKG5ldyBTa0NhbnZhcyhkZXZp Y2UuZ2V0KCkpKTsKIAogICAgIGNvbnRleHQoKS0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29u dGV4dDNEOjpGUkFNRUJVRkZFUiwgMCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJl VXBkYXRlckNhbnZhcy5oCShyZXZpc2lvbiA5NDMwNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaAkod29ya2lu ZyBjb3B5KQpAQCAtODUsNyArODUsNyBAQCBwcml2YXRlOgogY2xhc3MgTGF5ZXJUZXh0dXJlVXBk YXRlclNrUGljdHVyZSA6IHB1YmxpYyBMYXllclRleHR1cmVVcGRhdGVyQ2FudmFzIHsKICAgICBX VEZfTUFLRV9OT05DT1BZQUJMRShMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlKTsKIHB1Ymxp YzoKLSAgICBzdGF0aWMgUGFzc093blB0cjxMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlPiBj cmVhdGUoUGFzc093blB0cjxMYXllclBhaW50ZXJDaHJvbWl1bT4sIEdyQ29udGV4dCopOworICAg IHN0YXRpYyBQYXNzT3duUHRyPExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU+IGNyZWF0ZShQ YXNzT3duUHRyPExheWVyUGFpbnRlckNocm9taXVtPik7CiAgICAgdmlydHVhbCB+TGF5ZXJUZXh0 dXJlVXBkYXRlclNrUGljdHVyZSgpOwogCiAgICAgdmlydHVhbCBPcmllbnRhdGlvbiBvcmllbnRh dGlvbigpIHsgcmV0dXJuIExheWVyVGV4dHVyZVVwZGF0ZXI6OlRvcERvd25PcmllbnRhdGlvbjsg fQpAQCAtOTQsMTIgKzk0LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGV4 dHVyZVJlY3QoR3JhcGhpY3NDb250ZXh0M0QqLCBNYW5hZ2VkVGV4dHVyZSosIGNvbnN0IEludFJl Y3QmIHNvdXJjZVJlY3QsIGNvbnN0IEludFJlY3QmIGRlc3RSZWN0KTsKIAogcHJpdmF0ZToKLSAg ICBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlKFBhc3NPd25QdHI8TGF5ZXJQYWludGVyQ2hy b21pdW0+LCBHckNvbnRleHQqKTsKKyAgICBleHBsaWNpdCBMYXllclRleHR1cmVVcGRhdGVyU2tQ aWN0dXJlKFBhc3NPd25QdHI8TGF5ZXJQYWludGVyQ2hyb21pdW0+KTsKICAgICB2b2lkIGRlbGV0 ZUZyYW1lQnVmZmVyKCk7CiAgICAgYm9vbCBjcmVhdGVGcmFtZUJ1ZmZlcigpOwogICAgIEdyYXBo aWNzQ29udGV4dDNEKiBjb250ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0OyB9CiAKLSAgICBHckNv bnRleHQqIG1fc2tpYUNvbnRleHQ7IC8vIFNLSUEgZ3JhcGhpY3MgY29udGV4dC4KICAgICBHcmFw aGljc0NvbnRleHQzRCogbV9jb250ZXh0OwogCiAgICAgYm9vbCBtX2NyZWF0ZUZyYW1lQnVmZmVy OyAvLyBOZWVkIHRvIGNyZWF0ZSBGQk8gaWYgdHJ1ZS4K