83407 2012-04-06 15:50:39 -0700 [chromium] Clear values in combinedClear path not respected in WebGLRenderingContext::clearIfComposited() 2012-04-06 16:09:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs kbr zmo oldest_to_newest 597761 0 jamesr 2012-04-06 15:50:39 -0700 [chromium] Clear values in combinedClear path not respected in WebGLRenderingContext::clearIfComposited() 597762 1 136081 jamesr 2012-04-06 15:51:21 -0700 Created attachment 136081 Patch 597764 2 jamesr 2012-04-06 15:52:01 -0700 This fixes the regressions in http://code.google.com/p/chromium/issues/detail?id=122463. I need to add some layout test coverage before landing (which is why I left the OOPS! in), but posting the code first so folks can look at it. 597775 3 136083 jamesr 2012-04-06 15:58:37 -0700 Created attachment 136083 Patch 597778 4 jamesr 2012-04-06 16:00:10 -0700 Turns out fast/canvas/webgl/canvas-test.html covers this when run interactively, but since it was running in DRT without any explicit display() calls we didn't hit the same clearIfComposited() calls and the bug didn't manifest. Tweaked the test to do something closer to what a real browser does so it would catch this regression. 597781 5 136083 kbr 2012-04-06 16:05:00 -0700 Comment on attachment 136083 Patch LGTM as long as it's been tested. 597783 6 jamesr 2012-04-06 16:08:53 -0700 Thanks. I've checked this on the layout tests, the failure gpu_tests test, and manually made sure the webgl aquarium shows up so I think we're good. Of course, I thought that last time too so my record isn't that great :) 597785 7 jamesr 2012-04-06 16:09:52 -0700 Committed r113517: <http://trac.webkit.org/changeset/113517> 136081 2012-04-06 15:51:21 -0700 2012-04-06 15:58:35 -0700 Patch bug-83407-20120406155119.patch text/plain 8155 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc0ZmI4MmIyOGYwOTU2 YjE0NjYwODA0ZGRmYjdmNDIzNzRkZDdmZC4uZmQxY2RkYzY0MDVhN2JlNTAwZjRhZmVlNGQ1N2My ZWRjYjUzNDg2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA0LTA2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBD bGVhciB2YWx1ZXMgaW4gY29tYmluZWRDbGVhciBwYXRoIG5vdCByZXNwZWN0ZWQgaW4gV2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpjbGVhcklmQ29tcG9zaXRlZCgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQwNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gZG9pbmcgYSBjb21iaW5lZCBjbGVhciBp biB0aGUgZHJhd2luZyBidWZmZXIgcGF0aCwgd2UgaGF2ZSB0byB1c2UgdGhlIHVzZXIgc3BlY2lm aWVkIHZhbHVlcyBmb3IgdGhlIGNsZWFyCisgICAgICAgIGNvbG9yIC8gbWFzayAvIGRlcHRoIGFu ZCBub3QgYWxsIDBzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAg ICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmUpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpjbGVhcklmQ29t cG9zaXRlZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6Y2xlYXJGcmFtZWJ1ZmZlcnMp OgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6cmVzZXQpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisKIDIwMTItMDQtMDYgIFRvbSBT ZXBleiAgPHRzZXBlekBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQmxvY2sgY3Jvc3Mtb3JpZ2lu IGlmcmFtZSBzY3JvbGwgdG8gZnJhZ21lbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCAwOTA4YTk0YjZmZTI1MTdm MzMxZTk0M2M5YjVkMTIzMmJlNWM5ZjZjLi4zZWEyYTFlZTI3ZTE3OGRkMmI4ODZmYzM3YWFmZTA0 NjM1ZjU2ZjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHAKQEAgLTYyMCwzOSArNjIwLDM1IEBAIGJvb2wgV2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpjbGVhcklmQ29tcG9zaXRlZChHQzNEYml0ZmllbGQgbWFzaykKICAgICAv LyBEZXRlcm1pbmUgaWYgaXQncyBwb3NzaWJsZSB0byBjb21iaW5lIHRoZSBjbGVhciB0aGUgdXNl ciBhc2tlZCBmb3IgYW5kIHRoaXMgY2xlYXIuCiAgICAgYm9vbCBjb21iaW5lZENsZWFyID0gbWFz ayAmJiAhbV9zY2lzc29yRW5hYmxlZDsKIAotICAgIGlmIChtX2ZyYW1lYnVmZmVyQmluZGluZykg ewotICAgICAgICBpZiAobV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgbV9kcmF3aW5nQnVm ZmVyLT5iaW5kKCk7CisgICAgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpT Q0lTU09SX1RFU1QpOworICAgIGlmIChjb21iaW5lZENsZWFyICYmIChtYXNrICYgR3JhcGhpY3ND b250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQpKQorICAgICAgICBtX2NvbnRleHQtPmNsZWFyQ29s b3IobV9jb2xvck1hc2tbMF0gPyBtX2NsZWFyQ29sb3JbMF0gOiAwLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbV9jb2xvck1hc2tbMV0gPyBtX2NsZWFyQ29sb3JbMV0gOiAwLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jb2xvck1hc2tbMl0gPyBtX2NsZWFyQ29sb3Jb Ml0gOiAwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jb2xvck1hc2tbM10gPyBt X2NsZWFyQ29sb3JbM10gOiAwKTsKKyAgICBlbHNlCisgICAgICAgIG1fY29udGV4dC0+Y2xlYXJD b2xvcigwLCAwLCAwLCAwKTsKKyAgICBtX2NvbnRleHQtPmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0 cnVlLCB0cnVlKTsKKyAgICBHQzNEYml0ZmllbGQgY2xlYXJNYXNrID0gR3JhcGhpY3NDb250ZXh0 M0Q6OkNPTE9SX0JVRkZFUl9CSVQ7CisgICAgaWYgKGNvbnRleHRBdHRyaWJ1dGVzLT5kZXB0aCgp KSB7CisgICAgICAgIGlmICghY29tYmluZWRDbGVhciB8fCAhbV9kZXB0aE1hc2sgfHwgIShtYXNr ICYgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0JVRkZFUl9CSVQpKQorICAgICAgICAgICAgbV9j b250ZXh0LT5jbGVhckRlcHRoKDEuMGYpOworICAgICAgICBjbGVhck1hc2sgfD0gR3JhcGhpY3ND b250ZXh0M0Q6OkRFUFRIX0JVRkZFUl9CSVQ7CisgICAgICAgIG1fY29udGV4dC0+ZGVwdGhNYXNr KHRydWUpOworICAgIH0KKyAgICBpZiAoY29udGV4dEF0dHJpYnV0ZXMtPnN0ZW5jaWwoKSkgewor ICAgICAgICBpZiAoY29tYmluZWRDbGVhciAmJiAobWFzayAmIEdyYXBoaWNzQ29udGV4dDNEOjpT VEVOQ0lMX0JVRkZFUl9CSVQpKQorICAgICAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwo bV9jbGVhclN0ZW5jaWwgJiBtX3N0ZW5jaWxNYXNrKTsKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVG RkVSLCAwKTsKKyAgICAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJTdGVuY2lsKDApOworICAgICAg ICBjbGVhck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVSX0JJVDsKKyAg ICAgICAgbV9jb250ZXh0LT5zdGVuY2lsTWFza1NlcGFyYXRlKEdyYXBoaWNzQ29udGV4dDNEOjpG Uk9OVCwgMHhGRkZGRkZGRik7CiAgICAgfQogICAgIGlmIChtX2RyYXdpbmdCdWZmZXIpCi0gICAg ICAgIG1fZHJhd2luZ0J1ZmZlci0+Y2xlYXJGcmFtZWJ1ZmZlcigpOworICAgICAgICBtX2RyYXdp bmdCdWZmZXItPmNsZWFyRnJhbWVidWZmZXJzKGNsZWFyTWFzayk7CiAgICAgZWxzZSB7Ci0gICAg ICAgIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKTsK LSAgICAgICAgaWYgKGNvbWJpbmVkQ2xlYXIgJiYgKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6 Q09MT1JfQlVGRkVSX0JJVCkpCi0gICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyQ29sb3IobV9j b2xvck1hc2tbMF0gPyBtX2NsZWFyQ29sb3JbMF0gOiAwLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1fY29sb3JNYXNrWzFdID8gbV9jbGVhckNvbG9yWzFdIDogMCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2NvbG9yTWFza1syXSA/IG1fY2xlYXJDb2xv clsyXSA6IDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jb2xvck1hc2tb M10gPyBtX2NsZWFyQ29sb3JbM10gOiAwKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9j b250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDAsIDApOwotICAgICAgICBtX2NvbnRleHQtPmNvbG9y TWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKTsKLSAgICAgICAgR0MzRGJpdGZpZWxkIGNsZWFy TWFzayA9IEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUOwotICAgICAgICBpZiAo Y29udGV4dEF0dHJpYnV0ZXMtPmRlcHRoKCkpIHsKLSAgICAgICAgICAgIGlmICghY29tYmluZWRD bGVhciB8fCAhbV9kZXB0aE1hc2sgfHwgIShtYXNrICYgR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRI X0JVRkZFUl9CSVQpKQotICAgICAgICAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJEZXB0aCgxLjBm KTsKLSAgICAgICAgICAgIGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVG RkVSX0JJVDsKLSAgICAgICAgICAgIG1fY29udGV4dC0+ZGVwdGhNYXNrKHRydWUpOwotICAgICAg ICB9Ci0gICAgICAgIGlmIChjb250ZXh0QXR0cmlidXRlcy0+c3RlbmNpbCgpKSB7Ci0gICAgICAg ICAgICBpZiAoY29tYmluZWRDbGVhciAmJiAobWFzayAmIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVO Q0lMX0JVRkZFUl9CSVQpKQotICAgICAgICAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJTdGVuY2ls KG1fY2xlYXJTdGVuY2lsICYgbV9zdGVuY2lsTWFzayk7Ci0gICAgICAgICAgICBlbHNlCi0gICAg ICAgICAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwoMCk7Ci0gICAgICAgICAgICBjbGVh ck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVSX0JJVDsKLSAgICAgICAg ICAgIG1fY29udGV4dC0+c3RlbmNpbE1hc2tTZXBhcmF0ZShHcmFwaGljc0NvbnRleHQzRDo6RlJP TlQsIDB4RkZGRkZGRkYpOwotICAgICAgICB9CisgICAgICAgIGlmIChtX2ZyYW1lYnVmZmVyQmlu ZGluZykKKyAgICAgICAgICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29u dGV4dDNEOjpGUkFNRUJVRkZFUiwgMCk7CiAgICAgICAgIG1fY29udGV4dC0+Y2xlYXIoY2xlYXJN YXNrKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcAppbmRleCA3MjFjNmI1Y2I1ZWQ5MTMxN2I2NjY5ZjVm M2JmYTgyZmIyNmU3ZTZjLi5jOTE1Zjc1NjEyODE4MDQ1Mzk3NzcxNTBhODZmY2Y4MTM4MWJhODBk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2lu Z0J1ZmZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0Ry YXdpbmdCdWZmZXIuY3BwCkBAIC0xNjcsMjUgKzE2NywxMCBAQCB2b2lkIERyYXdpbmdCdWZmZXI6 OnJlc2l6ZURlcHRoU3RlbmNpbChpbnQgc2FtcGxlQ291bnQpCiAgICAgbV9jb250ZXh0LT5iaW5k UmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIDApOwogfQogCi12 b2lkIERyYXdpbmdCdWZmZXI6OmNsZWFyRnJhbWVidWZmZXIoKQordm9pZCBEcmF3aW5nQnVmZmVy OjpjbGVhckZyYW1lYnVmZmVycyhHQzNEYml0ZmllbGQgY2xlYXJNYXNrKQogewogICAgIG1fY29u dGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9t dWx0aXNhbXBsZUZCTyA/IG1fbXVsdGlzYW1wbGVGQk8gOiBtX2Zibyk7Ci0gICAgY29uc3QgR3Jh cGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMgPSBtX2NvbnRleHQtPmdldENv bnRleHRBdHRyaWJ1dGVzKCk7Ci0gICAgdW5zaWduZWQgY2xlYXJNYXNrID0gR3JhcGhpY3NDb250 ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQ7Ci0gICAgaWYgKGF0dHJpYnV0ZXMuZGVwdGgpIHsKLSAg ICAgICAgbV9jb250ZXh0LT5jbGVhckRlcHRoKDEpOwotICAgICAgICBtX2NvbnRleHQtPmRlcHRo TWFzayh0cnVlKTsKLSAgICAgICAgY2xlYXJNYXNrIHw9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBU SF9CVUZGRVJfQklUOwotICAgIH0KLSAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsKSB7Ci0gICAg ICAgIG1fY29udGV4dC0+Y2xlYXJTdGVuY2lsKDApOwotICAgICAgICBtX2NvbnRleHQtPnN0ZW5j aWxNYXNrU2VwYXJhdGUoR3JhcGhpY3NDb250ZXh0M0Q6OkZST05ULCAweGZmZmZmZmZmKTsKLSAg ICAgICAgY2xlYXJNYXNrIHw9IEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0JVRkZFUl9CSVQ7 Ci0gICAgfQotICAgIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NP Ul9URVNUKTsKIAotICAgIG1fY29udGV4dC0+Y29sb3JNYXNrKHRydWUsIHRydWUsIHRydWUsIHRy dWUpOwotICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigwLCAwLCAwLCAwKTsKICAgICBtX2NvbnRl eHQtPmNsZWFyKGNsZWFyTWFzayk7CiAKICAgICAvLyBUaGUgbXVsdGlzYW1wbGUgZmJvIHdhcyBq dXN0IGNsZWFyZWQsIGJ1dCB3ZSBhbHNvIG5lZWQgdG8gY2xlYXIgdGhlIG5vbi1tdWx0aXNhbXBs ZWQgYnVmZmVyIHRvby4KQEAgLTMwMSw3ICsyODYsMjMgQEAgYm9vbCBEcmF3aW5nQnVmZmVyOjpy ZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogICAgICAgICB9CiAgICAgfQogCi0gICAgY2xl YXJGcmFtZWJ1ZmZlcigpOworICAgIG1fY29udGV4dC0+ZGlzYWJsZShHcmFwaGljc0NvbnRleHQz RDo6U0NJU1NPUl9URVNUKTsKKyAgICBtX2NvbnRleHQtPmNsZWFyQ29sb3IoMCwgMCwgMCwgMCk7 CisgICAgbV9jb250ZXh0LT5jb2xvck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7CisKKyAg ICBHQzNEYml0ZmllbGQgY2xlYXJNYXNrID0gR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZF Ul9CSVQ7CisgICAgaWYgKGF0dHJpYnV0ZXMuZGVwdGgpIHsKKyAgICAgICAgbV9jb250ZXh0LT5j bGVhckRlcHRoKDEuMGYpOworICAgICAgICBjbGVhck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6 OkRFUFRIX0JVRkZFUl9CSVQ7CisgICAgICAgIG1fY29udGV4dC0+ZGVwdGhNYXNrKHRydWUpOwor ICAgIH0KKyAgICBpZiAoYXR0cmlidXRlcy5zdGVuY2lsKSB7CisgICAgICAgIG1fY29udGV4dC0+ Y2xlYXJTdGVuY2lsKDApOworICAgICAgICBjbGVhck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6 OlNURU5DSUxfQlVGRkVSX0JJVDsKKyAgICAgICAgbV9jb250ZXh0LT5zdGVuY2lsTWFza1NlcGFy YXRlKEdyYXBoaWNzQ29udGV4dDNEOjpGUk9OVCwgMHhGRkZGRkZGRik7CisgICAgfQorCisgICAg Y2xlYXJGcmFtZWJ1ZmZlcnMoY2xlYXJNYXNrKTsKIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZm ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVy LmgKaW5kZXggMjA0YmRmYTA2MWVlYzdjNjBkYWM2OGVlZTUzNmQxZDdhNmIxZTRhYy4uOTVlYTkw ZjA5YmIyMGZkYWEzYWQ5YzhkZDljZDYyYWJkNmQ3NGZiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCkBAIC03MCwxMyAr NzAsOSBAQCBwdWJsaWM6CiAKICAgICB+RHJhd2luZ0J1ZmZlcigpOwogCi0gICAgLy8gQ2xlYXJz IHRoZSBEcmF3aW5nQnVmZmVyJ3MgZnJhbWVidWZmZXIocykuIElzIGRlc3RydWN0aXZlIG9mIHRo ZSBmb2xsb3dpbmcgc3RhdGU6Ci0gICAgLy8gKikgZnJhbWVidWZmZXIgYmluZGluZwotICAgIC8v ICopIHNjaXNzb3IgdGVzdAotICAgIC8vICopIHN0ZW5jaWwgbWFzawotICAgIC8vICopIGNsZWFy IGNvbG9yLCBkZXB0aCwgYW5kIHN0ZW5jaWwKLSAgICAvLyAqKSBkZXB0aCBhbmQgY29sb3IgbWFz awotICAgIHZvaWQgY2xlYXJGcmFtZWJ1ZmZlcigpOworICAgIC8vIElzc3VlcyBhIGdsQ2xlYXIo KSBvbiBhbGwgZnJhbWVidWZmZXJzIGFzc29jaWF0ZWQgd2l0aCB0aGlzIERyYXdpbmdCdWZmZXIu IFRoZSBjYWxsZXIgaXMgcmVzcG9uc2libGUgZm9yCisgICAgLy8gbWFraW5nIHRoZSBjb250ZXh0 IGN1cnJlbnQgYW5kIHNldHRpbmcgdGhlIGNsZWFyIHZhbHVlcyBhbmQgbWFza3MuIE1vZGlmaWVz IHRoZSBmcmFtZWJ1ZmZlciBiaW5kaW5nLgorICAgIHZvaWQgY2xlYXJGcmFtZWJ1ZmZlcnMoR0Mz RGJpdGZpZWxkIGNsZWFyTWFzayk7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGJ1ZmZl ciB3YXMgc3VjY2Vzc2Z1bGx5IHJlc2l6ZWQuCiAgICAgYm9vbCByZXNldChjb25zdCBJbnRTaXpl Jik7Cg== 136083 2012-04-06 15:58:37 -0700 2012-04-06 16:04:59 -0700 Patch bug-83407-20120406155836.patch text/plain 9558 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc0ZmI4MmIyOGYwOTU2 YjE0NjYwODA0ZGRmYjdmNDIzNzRkZDdmZC4uZDA5NmM1MzZmYmFhMmQ5OWVkZjdjYmJjYjhkMDY1 YzA0YjgxMjAxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA0LTA2ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBD bGVhciB2YWx1ZXMgaW4gY29tYmluZWRDbGVhciBwYXRoIG5vdCByZXNwZWN0ZWQgaW4gV2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpjbGVhcklmQ29tcG9zaXRlZCgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzQwNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gZG9pbmcgYSBjb21iaW5lZCBjbGVhciBp biB0aGUgZHJhd2luZyBidWZmZXIgcGF0aCwgd2UgaGF2ZSB0byB1c2UgdGhlIHVzZXIgc3BlY2lm aWVkIHZhbHVlcyBmb3IgdGhlIGNsZWFyCisgICAgICAgIGNvbG9yIC8gbWFzayAvIGRlcHRoIGFu ZCBub3QgYWxsIDBzLgorCisgICAgICAgIENvdmVyZWQgYnkgc2xpZ2h0IG1vZGlmaWNhdGlvbiB0 byBmYXN0L2NhbnZhcy93ZWJnbC9jYW52YXMtdGVzdC5odG1sCisKKyAgICAgICAgKiBodG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNsZWFySWZDb21wb3NpdGVkKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjbGVhckZyYW1lYnVmZmVycyk6CisgICAgICAg IChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpyZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaDoKKwogMjAxMi0wNC0wNiAgVG9tIFNlcGV6ICA8dHNl cGV6QGNocm9taXVtLm9yZz4KIAogICAgICAgICBCbG9jayBjcm9zcy1vcmlnaW4gaWZyYW1lIHNj cm9sbCB0byBmcmFnbWVudC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9X ZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IDA5MDhhOTRiNmZlMjUxN2YzMzFlOTQzYzli NWQxMjMyYmU1YzlmNmMuLjNlYTJhMWVlMjdlMTc4ZGQyYjg4NmZjMzdhYWZlMDQ2MzVmNTZmM2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdD b250ZXh0LmNwcApAQCAtNjIwLDM5ICs2MjAsMzUgQEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmNsZWFySWZDb21wb3NpdGVkKEdDM0RiaXRmaWVsZCBtYXNrKQogICAgIC8vIERldGVybWlu ZSBpZiBpdCdzIHBvc3NpYmxlIHRvIGNvbWJpbmUgdGhlIGNsZWFyIHRoZSB1c2VyIGFza2VkIGZv ciBhbmQgdGhpcyBjbGVhci4KICAgICBib29sIGNvbWJpbmVkQ2xlYXIgPSBtYXNrICYmICFtX3Nj aXNzb3JFbmFibGVkOwogCi0gICAgaWYgKG1fZnJhbWVidWZmZXJCaW5kaW5nKSB7Ci0gICAgICAg IGlmIChtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQo KTsKKyAgICBtX2NvbnRleHQtPmRpc2FibGUoR3JhcGhpY3NDb250ZXh0M0Q6OlNDSVNTT1JfVEVT VCk7CisgICAgaWYgKGNvbWJpbmVkQ2xlYXIgJiYgKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6 Q09MT1JfQlVGRkVSX0JJVCkpCisgICAgICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcihtX2NvbG9y TWFza1swXSA/IG1fY2xlYXJDb2xvclswXSA6IDAsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX2NvbG9yTWFza1sxXSA/IG1fY2xlYXJDb2xvclsxXSA6IDAsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX2NvbG9yTWFza1syXSA/IG1fY2xlYXJDb2xvclsyXSA6IDAsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2NvbG9yTWFza1szXSA/IG1fY2xlYXJDb2xv clszXSA6IDApOworICAgIGVsc2UKKyAgICAgICAgbV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAs IDAsIDApOworICAgIG1fY29udGV4dC0+Y29sb3JNYXNrKHRydWUsIHRydWUsIHRydWUsIHRydWUp OworICAgIEdDM0RiaXRmaWVsZCBjbGVhck1hc2sgPSBHcmFwaGljc0NvbnRleHQzRDo6Q09MT1Jf QlVGRkVSX0JJVDsKKyAgICBpZiAoY29udGV4dEF0dHJpYnV0ZXMtPmRlcHRoKCkpIHsKKyAgICAg ICAgaWYgKCFjb21iaW5lZENsZWFyIHx8ICFtX2RlcHRoTWFzayB8fCAhKG1hc2sgJiBHcmFwaGlj c0NvbnRleHQzRDo6REVQVEhfQlVGRkVSX0JJVCkpCisgICAgICAgICAgICBtX2NvbnRleHQtPmNs ZWFyRGVwdGgoMS4wZik7CisgICAgICAgIGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRleHQzRDo6 REVQVEhfQlVGRkVSX0JJVDsKKyAgICAgICAgbV9jb250ZXh0LT5kZXB0aE1hc2sodHJ1ZSk7Cisg ICAgfQorICAgIGlmIChjb250ZXh0QXR0cmlidXRlcy0+c3RlbmNpbCgpKSB7CisgICAgICAgIGlm IChjb21iaW5lZENsZWFyICYmIChtYXNrICYgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVG RkVSX0JJVCkpCisgICAgICAgICAgICBtX2NvbnRleHQtPmNsZWFyU3RlbmNpbChtX2NsZWFyU3Rl bmNpbCAmIG1fc3RlbmNpbE1hc2spOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2NvbnRl eHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIDApOwor ICAgICAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwoMCk7CisgICAgICAgIGNsZWFyTWFz ayB8PSBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9CVUZGRVJfQklUOworICAgICAgICBtX2Nv bnRleHQtPnN0ZW5jaWxNYXNrU2VwYXJhdGUoR3JhcGhpY3NDb250ZXh0M0Q6OkZST05ULCAweEZG RkZGRkZGKTsKICAgICB9CiAgICAgaWYgKG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgbV9kcmF3 aW5nQnVmZmVyLT5jbGVhckZyYW1lYnVmZmVyKCk7CisgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+ Y2xlYXJGcmFtZWJ1ZmZlcnMoY2xlYXJNYXNrKTsKICAgICBlbHNlIHsKLSAgICAgICAgbV9jb250 ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpOwotICAgICAgICBp ZiAoY29tYmluZWRDbGVhciAmJiAobWFzayAmIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZG RVJfQklUKSkKLSAgICAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcihtX2NvbG9yTWFza1sw XSA/IG1fY2xlYXJDb2xvclswXSA6IDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbV9jb2xvck1hc2tbMV0gPyBtX2NsZWFyQ29sb3JbMV0gOiAwLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1fY29sb3JNYXNrWzJdID8gbV9jbGVhckNvbG9yWzJdIDogMCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2NvbG9yTWFza1szXSA/IG1fY2xl YXJDb2xvclszXSA6IDApOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2NvbnRleHQtPmNs ZWFyQ29sb3IoMCwgMCwgMCwgMCk7Ci0gICAgICAgIG1fY29udGV4dC0+Y29sb3JNYXNrKHRydWUs IHRydWUsIHRydWUsIHRydWUpOwotICAgICAgICBHQzNEYml0ZmllbGQgY2xlYXJNYXNrID0gR3Jh cGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQ7Ci0gICAgICAgIGlmIChjb250ZXh0QXR0 cmlidXRlcy0+ZGVwdGgoKSkgewotICAgICAgICAgICAgaWYgKCFjb21iaW5lZENsZWFyIHx8ICFt X2RlcHRoTWFzayB8fCAhKG1hc2sgJiBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVGRkVSX0JJ VCkpCi0gICAgICAgICAgICAgICAgbV9jb250ZXh0LT5jbGVhckRlcHRoKDEuMGYpOwotICAgICAg ICAgICAgY2xlYXJNYXNrIHw9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9CVUZGRVJfQklUOwot ICAgICAgICAgICAgbV9jb250ZXh0LT5kZXB0aE1hc2sodHJ1ZSk7Ci0gICAgICAgIH0KLSAgICAg ICAgaWYgKGNvbnRleHRBdHRyaWJ1dGVzLT5zdGVuY2lsKCkpIHsKLSAgICAgICAgICAgIGlmIChj b21iaW5lZENsZWFyICYmIChtYXNrICYgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVS X0JJVCkpCi0gICAgICAgICAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5jaWwobV9jbGVhclN0 ZW5jaWwgJiBtX3N0ZW5jaWxNYXNrKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAg ICBtX2NvbnRleHQtPmNsZWFyU3RlbmNpbCgwKTsKLSAgICAgICAgICAgIGNsZWFyTWFzayB8PSBH cmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9CVUZGRVJfQklUOwotICAgICAgICAgICAgbV9jb250 ZXh0LT5zdGVuY2lsTWFza1NlcGFyYXRlKEdyYXBoaWNzQ29udGV4dDNEOjpGUk9OVCwgMHhGRkZG RkZGRik7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKG1fZnJhbWVidWZmZXJCaW5kaW5nKQorICAg ICAgICAgICAgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZS QU1FQlVGRkVSLCAwKTsKICAgICAgICAgbV9jb250ZXh0LT5jbGVhcihjbGVhck1hc2spOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0Ry YXdpbmdCdWZmZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0Ry YXdpbmdCdWZmZXIuY3BwCmluZGV4IDcyMWM2YjVjYjVlZDkxMzE3YjY2NjlmNWYzYmZhODJmYjI2 ZTdlNmMuLmM5MTVmNzU2MTI4MTgwNDUzOTc3NzE1MGE4NmZjZjgxMzgxYmE4MGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZl ci5jcHAKQEAgLTE2NywyNSArMTY3LDEwIEBAIHZvaWQgRHJhd2luZ0J1ZmZlcjo6cmVzaXplRGVw dGhTdGVuY2lsKGludCBzYW1wbGVDb3VudCkKICAgICBtX2NvbnRleHQtPmJpbmRSZW5kZXJidWZm ZXIoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgMCk7CiB9CiAKLXZvaWQgRHJhd2lu Z0J1ZmZlcjo6Y2xlYXJGcmFtZWJ1ZmZlcigpCit2b2lkIERyYXdpbmdCdWZmZXI6OmNsZWFyRnJh bWVidWZmZXJzKEdDM0RiaXRmaWVsZCBjbGVhck1hc2spCiB7CiAgICAgbV9jb250ZXh0LT5iaW5k RnJhbWVidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBtX211bHRpc2FtcGxl RkJPID8gbV9tdWx0aXNhbXBsZUZCTyA6IG1fZmJvKTsKLSAgICBjb25zdCBHcmFwaGljc0NvbnRl eHQzRDo6QXR0cmlidXRlcyYgYXR0cmlidXRlcyA9IG1fY29udGV4dC0+Z2V0Q29udGV4dEF0dHJp YnV0ZXMoKTsKLSAgICB1bnNpZ25lZCBjbGVhck1hc2sgPSBHcmFwaGljc0NvbnRleHQzRDo6Q09M T1JfQlVGRkVSX0JJVDsKLSAgICBpZiAoYXR0cmlidXRlcy5kZXB0aCkgewotICAgICAgICBtX2Nv bnRleHQtPmNsZWFyRGVwdGgoMSk7Ci0gICAgICAgIG1fY29udGV4dC0+ZGVwdGhNYXNrKHRydWUp OwotICAgICAgICBjbGVhck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0JVRkZFUl9C SVQ7Ci0gICAgfQotICAgIGlmIChhdHRyaWJ1dGVzLnN0ZW5jaWwpIHsKLSAgICAgICAgbV9jb250 ZXh0LT5jbGVhclN0ZW5jaWwoMCk7Ci0gICAgICAgIG1fY29udGV4dC0+c3RlbmNpbE1hc2tTZXBh cmF0ZShHcmFwaGljc0NvbnRleHQzRDo6RlJPTlQsIDB4ZmZmZmZmZmYpOwotICAgICAgICBjbGVh ck1hc2sgfD0gR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQlVGRkVSX0JJVDsKLSAgICB9Ci0g ICAgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpOwog Ci0gICAgbV9jb250ZXh0LT5jb2xvck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7Ci0gICAg bV9jb250ZXh0LT5jbGVhckNvbG9yKDAsIDAsIDAsIDApOwogICAgIG1fY29udGV4dC0+Y2xlYXIo Y2xlYXJNYXNrKTsKIAogICAgIC8vIFRoZSBtdWx0aXNhbXBsZSBmYm8gd2FzIGp1c3QgY2xlYXJl ZCwgYnV0IHdlIGFsc28gbmVlZCB0byBjbGVhciB0aGUgbm9uLW11bHRpc2FtcGxlZCBidWZmZXIg dG9vLgpAQCAtMzAxLDcgKzI4NiwyMyBAQCBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0 IEludFNpemUmIG5ld1NpemUpCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBjbGVhckZyYW1lYnVm ZmVyKCk7CisgICAgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09S X1RFU1QpOworICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigwLCAwLCAwLCAwKTsKKyAgICBtX2Nv bnRleHQtPmNvbG9yTWFzayh0cnVlLCB0cnVlLCB0cnVlLCB0cnVlKTsKKworICAgIEdDM0RiaXRm aWVsZCBjbGVhck1hc2sgPSBHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVSX0JJVDsKKyAg ICBpZiAoYXR0cmlidXRlcy5kZXB0aCkgeworICAgICAgICBtX2NvbnRleHQtPmNsZWFyRGVwdGgo MS4wZik7CisgICAgICAgIGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRleHQzRDo6REVQVEhfQlVG RkVSX0JJVDsKKyAgICAgICAgbV9jb250ZXh0LT5kZXB0aE1hc2sodHJ1ZSk7CisgICAgfQorICAg IGlmIChhdHRyaWJ1dGVzLnN0ZW5jaWwpIHsKKyAgICAgICAgbV9jb250ZXh0LT5jbGVhclN0ZW5j aWwoMCk7CisgICAgICAgIGNsZWFyTWFzayB8PSBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9C VUZGRVJfQklUOworICAgICAgICBtX2NvbnRleHQtPnN0ZW5jaWxNYXNrU2VwYXJhdGUoR3JhcGhp Y3NDb250ZXh0M0Q6OkZST05ULCAweEZGRkZGRkZGKTsKKyAgICB9CisKKyAgICBjbGVhckZyYW1l YnVmZmVycyhjbGVhck1hc2spOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAppbmRleCAy MDRiZGZhMDYxZWVjN2M2MGRhYzY4ZWVlNTM2ZDFkN2E2YjFlNGFjLi45NWVhOTBmMDliYjIwZmRh YTNhZDljOGRkOWNkNjJhYmQ2ZDc0ZmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKQEAgLTcwLDEzICs3MCw5IEBAIHB1 YmxpYzoKIAogICAgIH5EcmF3aW5nQnVmZmVyKCk7CiAKLSAgICAvLyBDbGVhcnMgdGhlIERyYXdp bmdCdWZmZXIncyBmcmFtZWJ1ZmZlcihzKS4gSXMgZGVzdHJ1Y3RpdmUgb2YgdGhlIGZvbGxvd2lu ZyBzdGF0ZToKLSAgICAvLyAqKSBmcmFtZWJ1ZmZlciBiaW5kaW5nCi0gICAgLy8gKikgc2Npc3Nv ciB0ZXN0Ci0gICAgLy8gKikgc3RlbmNpbCBtYXNrCi0gICAgLy8gKikgY2xlYXIgY29sb3IsIGRl cHRoLCBhbmQgc3RlbmNpbAotICAgIC8vICopIGRlcHRoIGFuZCBjb2xvciBtYXNrCi0gICAgdm9p ZCBjbGVhckZyYW1lYnVmZmVyKCk7CisgICAgLy8gSXNzdWVzIGEgZ2xDbGVhcigpIG9uIGFsbCBm cmFtZWJ1ZmZlcnMgYXNzb2NpYXRlZCB3aXRoIHRoaXMgRHJhd2luZ0J1ZmZlci4gVGhlIGNhbGxl ciBpcyByZXNwb25zaWJsZSBmb3IKKyAgICAvLyBtYWtpbmcgdGhlIGNvbnRleHQgY3VycmVudCBh bmQgc2V0dGluZyB0aGUgY2xlYXIgdmFsdWVzIGFuZCBtYXNrcy4gTW9kaWZpZXMgdGhlIGZyYW1l YnVmZmVyIGJpbmRpbmcuCisgICAgdm9pZCBjbGVhckZyYW1lYnVmZmVycyhHQzNEYml0ZmllbGQg Y2xlYXJNYXNrKTsKIAogICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgYnVmZmVyIHdhcyBzdWNj ZXNzZnVsbHkgcmVzaXplZC4KICAgICBib29sIHJlc2V0KGNvbnN0IEludFNpemUmKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA5NTI3NTQzNGY5NzdjZjBkMTRiNTU5NGE5NTVlZTNmNjA0ZjgwZDBlLi5kMzIzNDg1OWRkYmI1 MzYxYzk2NDczYzBiYTcyOGVlZjA2YzQzYjY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTIt MDQtMDYgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBb Y2hyb21pdW1dIENsZWFyIHZhbHVlcyBpbiBjb21iaW5lZENsZWFyIHBhdGggbm90IHJlc3BlY3Rl ZCBpbiBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNsZWFySWZDb21wb3NpdGVkKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNDA3CisKKyAgICAgICAg Rm9yY2UgYSBjb21wb3NpdGUgb24gZWFjaCB0aWNrIHRvIG1vcmUgY2xvc2VseSBtYXRjaCB0aGUg dGVzdCdzIGJlaGF2aW9yIGluIGFuIGFjdHVhbCBicm93c2VyLgorCisgICAgICAgICogZmFzdC9j YW52YXMvd2ViZ2wvY2FudmFzLXRlc3QuaHRtbDoKKwogMjAxMi0wNC0wNiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gVW5yZXZpZXdlZCwgcmVi YXNlbGluZSBhIHRlc3Qgb24gVmlzdGEvV2luNy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY2FudmFzL3dlYmdsL2NhbnZhcy10ZXN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZh cy93ZWJnbC9jYW52YXMtdGVzdC5odG1sCmluZGV4IDVmYjdlNDNlZDE0NThmYTM2M2FiZWMzM2I1 OGUzOGExZWI2NDY4ZTguLjVhYmU2MmQzM2MxOGU1NDYxMzI4MTY4MGU0ODA0ODA4NzlkMTA4Njcg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2NhbnZhcy10ZXN0Lmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvY2FudmFzLXRlc3QuaHRtbApA QCAtMTM1LDYgKzEzNSw4IEBAIGlmICghZ2wpIHsKICAgY2FudmFzLnN0eWxlLmhlaWdodCA9ICIy NXB4IjsKICAgdmFyIGludGVydmFsSWQ7CiAgIGludGVydmFsSWQgPSB3aW5kb3cuc2V0SW50ZXJ2 YWwoZnVuY3Rpb24oKSB7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmRpc3BsYXkoKTsKICAgICBpZiAoY2FudmFzLmNsaWVu dFdpZHRoID09IDEwMCAmJgogICAgICAgICBjYW52YXMuY2xpZW50SGVpZ2h0ID09IDI1KSB7CiAg ICAgICB3aW5kb3cuY2xlYXJJbnRlcnZhbChpbnRlcnZhbElkKTsK