34348 2010-01-29 14:43:04 -0800 Windows has out of date virtual function in GraphicsLayer (setContentsToVideo is now setContentsToMedia) 2010-02-05 17:13:57 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin bweinstein eric.carlson oldest_to_newest 185969 0 cmarrin 2010-01-29 14:43:04 -0800 Simon recently changed the virtual function name in GraphicsLayer from setContentsToVideo to setContentsToMedia. The name needs to be updated in the Windows build 186028 1 47751 cmarrin 2010-01-29 17:53:55 -0800 Created attachment 47751 Patch 186176 2 bweinstein 2010-01-31 00:42:16 -0800 Chris, I'm worried this patch broke a bunch of tests: http://build.webkit.org/results/Windows%20Release%20(Tests)/r54108%20(8573)/results.html If you look at some of the results in the failing media tests - for example: http://build.webkit.org/results/Windows%20Release%20(Tests)/r54108%20(8573)/media/controls-styling-pretty-diff.html They seem to be failing due to layer issues, and these failures started between r54093 and r54095, so I think this r54095 is the culprit. 186294 3 eric.carlson 2010-01-31 20:57:11 -0800 Reverted the changes for now. 187134 4 47751 eric 2010-02-02 14:08:43 -0800 Comment on attachment 47751 Patch Marking r- since this change was reverted. 188347 5 48270 cmarrin 2010-02-05 15:50:20 -0800 Created attachment 48270 replacement patch fixing LayoutTests 188361 6 48275 cmarrin 2010-02-05 16:31:31 -0800 Created attachment 48275 Replacement patch with more description of what changed in each file 188368 7 cmarrin 2010-02-05 17:13:57 -0800 Landed in http://trac.webkit.org/changeset/54455 47751 2010-01-29 17:53:55 -0800 2010-02-05 15:50:20 -0800 Patch 34348.patch text/plain 6284 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDA5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDEtMjkgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIGNoYW5nZWQgdmlydHVhbCBmdW5jdGlvbiBpbiBHcmFwaGljc0xheWVyQ0FDRiBhbmQgY2Fs bCBvcmRlciBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0MzQ4CisgICAgICAgIAorICAgICAgICBUaGUgY29ycmVjdCB2aXJ0dWFsIGZ1bmN0 aW9uIGluIEdyYXBoaWNzTGF5ZXJDQUNGIGlzIG5vdyBiZWluZworICAgICAgICBjYWxsZWQuIFdl IGFsc28gZml4ZWQgYW4gaXNzdWUgaW4gUVRNb3ZpZVdpbiB3aGVyZSB0aGUgc2l6ZQorICAgICAg ICBvZiB0aGUgbW92aWUgd2FzIG5vdCBiZWluZyBzZXQgY29ycmVjdGx5IGJlY2F1c2UgdGhlIGNh bGwgb3JkZXIKKyAgICAgICAgd2FzIGNoYW5nZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NMYXllckNBQ0Y6OnNldENvbnRlbnRzVG9NZWRpYSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyQ0FDRjo6dXBkYXRlQ29udGVudHNNZWRpYSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJDQUNGLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyQ0FDRjo6KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3Zp ZVdpbi5jcHA6CisgICAgICAgIChRVE1vdmllV2luUHJpdmF0ZTo6dGFzayk6CisgICAgICAgIChR VE1vdmllV2luUHJpdmF0ZTo6c2V0U2l6ZSk6CisgICAgICAgIChRVE1vdmllV2luUHJpdmF0ZTo6 dXBkYXRlTW92aWVTaXplKToKKwogMjAxMC0wMS0yOSAgSmFrb2IgUGV0c292aXRzICA8anBldHNv dml0c0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJDQUNGLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xh eWVyQ0FDRi5jcHAJKHJldmlzaW9uIDU0MDcxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vR3JhcGhpY3NMYXllckNBQ0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjQsMjEgKzM2 NCwxOCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQUNGOjpzZXRDb250ZW50c1RvSW1hCiAgICAgICAg IHVwZGF0ZVN1YmxheWVyTGlzdCgpOwogfQogCi12b2lkIEdyYXBoaWNzTGF5ZXJDQUNGOjpzZXRD b250ZW50c1RvVmlkZW8oUGxhdGZvcm1MYXllciogdmlkZW9MYXllcikKK3ZvaWQgR3JhcGhpY3NM YXllckNBQ0Y6OnNldENvbnRlbnRzVG9NZWRpYShQbGF0Zm9ybUxheWVyKiBtZWRpYUxheWVyKQog ewotICAgIGJvb2wgY2hpbGRyZW5DaGFuZ2VkID0gZmFsc2U7Ci0KLSAgICBpZiAodmlkZW9MYXll ciAhPSBtX2NvbnRlbnRzTGF5ZXIuZ2V0KCkpCi0gICAgICAgIGNoaWxkcmVuQ2hhbmdlZCA9IHRy dWU7CisgICAgaWYgKG1lZGlhTGF5ZXIgPT0gbV9jb250ZW50c0xheWVyKQorICAgICAgICByZXR1 cm47CiAKLSAgICBtX2NvbnRlbnRzTGF5ZXIgPSB2aWRlb0xheWVyOwotICAgIG1fY29udGVudHNM YXllclB1cnBvc2UgPSB2aWRlb0xheWVyID8gQ29udGVudHNMYXllckZvclZpZGVvIDogTm9Db250 ZW50c0xheWVyOworICAgIG1fY29udGVudHNMYXllciA9IG1lZGlhTGF5ZXI7CisgICAgbV9jb250 ZW50c0xheWVyUHVycG9zZSA9IG1lZGlhTGF5ZXIgPyBDb250ZW50c0xheWVyRm9yTWVkaWEgOiBO b0NvbnRlbnRzTGF5ZXI7CiAKLSAgICB1cGRhdGVDb250ZW50c1ZpZGVvKCk7CisgICAgdXBkYXRl Q29udGVudHNNZWRpYSgpOwogCi0gICAgLy8gVGhpcyBoYXMgdG8gaGFwcGVuIGFmdGVyIHVwZGF0 ZUNvbnRlbnRzVmlkZW8KLSAgICBpZiAoY2hpbGRyZW5DaGFuZ2VkKQotICAgICAgICB1cGRhdGVT dWJsYXllckxpc3QoKTsKKyAgICAvLyBUaGlzIGhhcyB0byBoYXBwZW4gYWZ0ZXIgdXBkYXRlQ29u dGVudHNNZWRpYQorICAgIHVwZGF0ZVN1YmxheWVyTGlzdCgpOwogfQogCiB2b2lkIEdyYXBoaWNz TGF5ZXJDQUNGOjpzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKQEAgLTYzMyw5ICs2MzAsOSBAQCB2b2lkIEdyYXBoaWNz TGF5ZXJDQUNGOjp1cGRhdGVDb250ZW50c0ltCiAgICAgfQogfQogCi12b2lkIEdyYXBoaWNzTGF5 ZXJDQUNGOjp1cGRhdGVDb250ZW50c1ZpZGVvKCkKK3ZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnVw ZGF0ZUNvbnRlbnRzTWVkaWEoKQogewotICAgIC8vIFZpZGVvIGxheWVyIHdhcyBzZXQgYXMgbV9j b250ZW50c0xheWVyLCBhbmQgd2lsbCBnZXQgcGFyZW50ZWQgaW4gdXBkYXRlU3VibGF5ZXJMaXN0 KCkuCisgICAgLy8gTWVkaWEgbGF5ZXIgd2FzIHNldCBhcyBtX2NvbnRlbnRzTGF5ZXIsIGFuZCB3 aWxsIGdldCBwYXJlbnRlZCBpbiB1cGRhdGVTdWJsYXllckxpc3QoKS4KICAgICBpZiAobV9jb250 ZW50c0xheWVyKSB7CiAgICAgICAgIHNldHVwQ29udGVudHNMYXllcihtX2NvbnRlbnRzTGF5ZXIu Z2V0KCkpOwogICAgICAgICB1cGRhdGVDb250ZW50c1JlY3QoKTsKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJDQUNGLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuaAkocmV2aXNpb24g NTQwNzEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FD Ri5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw3ICs4Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgc2V0Q29udGVudHNSZWN0KGNvbnN0IEludFJlY3QmKTsKIAogICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c1RvSW1hZ2UoSW1hZ2UqKTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVu dHNUb1ZpZGVvKFBsYXRmb3JtTGF5ZXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNU b01lZGlhKFBsYXRmb3JtTGF5ZXIqKTsKICAgICAKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIq IHBsYXRmb3JtTGF5ZXIoKSBjb25zdDsKIApAQCAtMTE1LDcgKzExNSw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCB1cGRhdGVMYXllckJhY2tncm91bmRDb2xvcigpOwogCiAgICAgdm9pZCB1cGRhdGVD b250ZW50c0ltYWdlKCk7Ci0gICAgdm9pZCB1cGRhdGVDb250ZW50c1ZpZGVvKCk7CisgICAgdm9p ZCB1cGRhdGVDb250ZW50c01lZGlhKCk7CiAgICAgdm9pZCB1cGRhdGVDb250ZW50c1JlY3QoKTsK ICAgICB2b2lkIHVwZGF0ZUdlb21ldHJ5T3JpZW50YXRpb24oKTsKICAgICAKQEAgLTEyOSw3ICsx MjksNyBAQCBwcml2YXRlOgogICAgIGVudW0gQ29udGVudHNMYXllclB1cnBvc2UgewogICAgICAg ICBOb0NvbnRlbnRzTGF5ZXIgPSAwLAogICAgICAgICBDb250ZW50c0xheWVyRm9ySW1hZ2UsCi0g ICAgICAgIENvbnRlbnRzTGF5ZXJGb3JWaWRlbworICAgICAgICBDb250ZW50c0xheWVyRm9yTWVk aWEKICAgICB9OwogICAgIAogICAgIENvbnRlbnRzTGF5ZXJQdXJwb3NlIG1fY29udGVudHNMYXll clB1cnBvc2U7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1vdmllV2lu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1vdmll V2luLmNwcAkocmV2aXNpb24gNTQwNzEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9RVE1vdmllV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTksNiArOTksNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBkZWxldGVHV29ybGQoKTsKICAgICB2b2lkIGNsZWFyR1dvcmxkKCk7CiAgICAg dm9pZCBjYWNoZU1vdmllU2NhbGUoKTsKKyAgICB2b2lkIHVwZGF0ZU1vdmllU2l6ZSgpOwogCiAg ICAgdm9pZCBzZXRTaXplKGludCwgaW50KTsKIApAQCAtMjU5LDE0ICsyNjAsMTYgQEAgdm9pZCBR VE1vdmllV2luUHJpdmF0ZTo6dGFzaygpIAogICAgICAgICAgICAgLy8gd2Ugb25seSBuZWVkIHRv IGVyYXNlIHRoZSBtb3ZpZSBnd29ybGQgd2hlbiB0aGUgbG9hZCBzdGF0ZSBjaGFuZ2VzIHRvIGxv YWRlZCB3aGlsZSBpdAogICAgICAgICAgICAgLy8gIGlzIHZpc2libGUgYXMgdGhlIGd3b3JsZCBp cyBkZXN0cm95ZWQvY3JlYXRlZCB3aGVuIHZpc2liaWxpdHkgY2hhbmdlcwogICAgICAgICAgICAg Ym9vbCBzaG91bGRSZXN0b3JlUGxheWJhY2tTdGF0ZSA9IGZhbHNlOwotICAgICAgICAgICAgaWYg KGxvYWRTdGF0ZSA+PSBRVE1vdmllTG9hZFN0YXRlTG9hZGVkICYmIG1fbG9hZFN0YXRlIDwgUVRN b3ZpZUxvYWRTdGF0ZUxvYWRlZCkgeworICAgICAgICAgICAgYm9vbCBtb3ZpZU5ld2x5UGxheWFi bGUgPSBsb2FkU3RhdGUgPj0gUVRNb3ZpZUxvYWRTdGF0ZUxvYWRlZCAmJiBtX2xvYWRTdGF0ZSA8 IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQ7CisgICAgICAgICAgICBtX2xvYWRTdGF0ZSA9IGxvYWRT dGF0ZTsKKyAgICAgICAgICAgIGlmIChtb3ZpZU5ld2x5UGxheWFibGUpIHsKKyAgICAgICAgICAg ICAgICB1cGRhdGVNb3ZpZVNpemUoKTsKICAgICAgICAgICAgICAgICBpZiAobV92aXNpYmxlKQog ICAgICAgICAgICAgICAgICAgICBjbGVhckdXb3JsZCgpOwogICAgICAgICAgICAgICAgIGNhY2hl TW92aWVTY2FsZSgpOwogICAgICAgICAgICAgICAgIHNob3VsZFJlc3RvcmVQbGF5YmFja1N0YXRl ID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbV9sb2FkU3RhdGUgPSBsb2Fk U3RhdGU7CiAgICAgICAgICAgICBpZiAoIW1fbW92aWVDb250cm9sbGVyICYmIG1fbG9hZFN0YXRl ID49IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQpCiAgICAgICAgICAgICAgICAgY3JlYXRlTW92aWVD b250cm9sbGVyKCk7CiAgICAgICAgICAgICBtX2NsaWVudC0+bW92aWVMb2FkU3RhdGVDaGFuZ2Vk KG1fbW92aWVXaW4pOwpAQCAtNDAzLDcgKzQwNiw2IEBAIHZvaWQgUVRNb3ZpZVdpblByaXZhdGU6 OmNsZWFyR1dvcmxkKCkKICAgICBNYWNTZXRQb3J0KHNhdmVQb3J0KTsKIH0KIAotCiB2b2lkIFFU TW92aWVXaW5Qcml2YXRlOjpzZXRTaXplKGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKICAgICBp ZiAobV93aWR0aCA9PSB3aWR0aCAmJiBtX2hlaWdodCA9PSBoZWlnaHQpCkBAIC00MjEsMTcgKzQy MywyNiBAQCB2b2lkIFFUTW92aWVXaW5Qcml2YXRlOjpzZXRTaXplKGludCB3aWR0CiAgICAgQVNT RVJUKG1fc2NhbGVDYWNoZWQpOwogI2VuZGlmCiAKKyAgICB1cGRhdGVNb3ZpZVNpemUoKTsKK30K Kwordm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6dXBkYXRlTW92aWVTaXplKCkKK3sKKyAgICBpZiAo IW1fbW92aWUgfHwgbV9sb2FkU3RhdGUgPCBRVE1vdmllTG9hZFN0YXRlTG9hZGVkKQorICAgICAg ICByZXR1cm47CisKICAgICBSZWN0IGJvdW5kczsgCiAgICAgYm91bmRzLnRvcCA9IDA7CiAgICAg Ym91bmRzLmxlZnQgPSAwOyAKLSAgICBib3VuZHMucmlnaHQgPSB3aWR0aDsKLSAgICBib3VuZHMu Ym90dG9tID0gaGVpZ2h0OworICAgIGJvdW5kcy5yaWdodCA9IG1fd2lkdGg7CisgICAgYm91bmRz LmJvdHRvbSA9IG1faGVpZ2h0OwogICAgIGlmIChtX21vdmllQ29udHJvbGxlcikKICAgICAgICAg TUNTZXRDb250cm9sbGVyQm91bmRzUmVjdChtX21vdmllQ29udHJvbGxlciwgJmJvdW5kcyk7CiAg ICAgU2V0TW92aWVCb3gobV9tb3ZpZSwgJmJvdW5kcyk7CiAgICAgdXBkYXRlR1dvcmxkKCk7CiB9 CiAKKwogdm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6ZGVsZXRlR1dvcmxkKCkKIHsKICAgICBBU1NF UlQobV9nV29ybGQpOwo= 48270 2010-02-05 15:50:20 -0800 2010-02-05 16:31:31 -0800 replacement patch fixing LayoutTests 34348.patch text/plain 7028 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDQ0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDItMDUgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIGNoYW5nZWQgdmlydHVhbCBmdW5jdGlvbiBpbiBHcmFwaGljc0xheWVyQ0FDRiBhbmQgY2Fs bCBvcmRlciBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0MzQ4CisgICAgICAgIAorICAgICAgICBUaGUgY29ycmVjdCB2aXJ0dWFsIGZ1bmN0 aW9uIGluIEdyYXBoaWNzTGF5ZXJDQUNGIGlzIG5vdyBiZWluZworICAgICAgICBjYWxsZWQuIFdl IGFsc28gZml4ZWQgYW4gaXNzdWUgaW4gUVRNb3ZpZVdpbiB3aGVyZSB0aGUgc2l6ZQorICAgICAg ICBvZiB0aGUgbW92aWUgd2FzIG5vdCBiZWluZyBzZXQgY29ycmVjdGx5IGJlY2F1c2UgdGhlIGNh bGwgb3JkZXIKKyAgICAgICAgd2FzIGNoYW5nZWQuCisgICAgICAgIAorICAgICAgICBJIGFsc28g Y2hhbmdlZCB0aGUgb3JkZXIgb2YgYSBjb3VwbGUgb2YgY2FsbHMgaW4gUVRNb3ZpZVdpbiB0byBh Y2NvdW50CisgICAgICAgIGZvciBjaGFuZ2VkIGNhbGxpbmcgb3JkZXIgZnJvbSB0aGUgbG9naWMg YWJvdmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNB Q0YuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBQ0Y6OnNldENvbnRlbnRz VG9NZWRpYSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0FDRjo6dXBkYXRlQ29u dGVudHNNZWRpYSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5 ZXJDQUNGLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0FDRjo6KToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZVdpbi5jcHA6CisgICAgICAgIChRVE1v dmllV2luUHJpdmF0ZTo6Y2FjaGVNb3ZpZVNjYWxlKToKKyAgICAgICAgKFFUTW92aWVXaW5Qcml2 YXRlOjp0YXNrKToKKyAgICAgICAgKFFUTW92aWVXaW5Qcml2YXRlOjpzZXRTaXplKToKKyAgICAg ICAgKFFUTW92aWVXaW5Qcml2YXRlOjp1cGRhdGVNb3ZpZVNpemUpOgorCiAyMDEwLTAyLTA1ICBF bnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2ltb24gRnJhc2VyLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhp Y3NMYXllckNBQ0YuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0dyYXBoaWNzTGF5ZXJDQUNGLmNwcAkocmV2aXNpb24gNTQzNjgpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM2NCwyMSArMzY0LDE4IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnNldENvbnRlbnRz VG9JbWEKICAgICAgICAgdXBkYXRlU3VibGF5ZXJMaXN0KCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NM YXllckNBQ0Y6OnNldENvbnRlbnRzVG9WaWRlbyhQbGF0Zm9ybUxheWVyKiB2aWRlb0xheWVyKQor dm9pZCBHcmFwaGljc0xheWVyQ0FDRjo6c2V0Q29udGVudHNUb01lZGlhKFBsYXRmb3JtTGF5ZXIq IG1lZGlhTGF5ZXIpCiB7Ci0gICAgYm9vbCBjaGlsZHJlbkNoYW5nZWQgPSBmYWxzZTsKLQotICAg IGlmICh2aWRlb0xheWVyICE9IG1fY29udGVudHNMYXllci5nZXQoKSkKLSAgICAgICAgY2hpbGRy ZW5DaGFuZ2VkID0gdHJ1ZTsKKyAgICBpZiAobWVkaWFMYXllciA9PSBtX2NvbnRlbnRzTGF5ZXIp CisgICAgICAgIHJldHVybjsKIAotICAgIG1fY29udGVudHNMYXllciA9IHZpZGVvTGF5ZXI7Ci0g ICAgbV9jb250ZW50c0xheWVyUHVycG9zZSA9IHZpZGVvTGF5ZXIgPyBDb250ZW50c0xheWVyRm9y VmlkZW8gOiBOb0NvbnRlbnRzTGF5ZXI7CisgICAgbV9jb250ZW50c0xheWVyID0gbWVkaWFMYXll cjsKKyAgICBtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlID0gbWVkaWFMYXllciA/IENvbnRlbnRzTGF5 ZXJGb3JNZWRpYSA6IE5vQ29udGVudHNMYXllcjsKIAotICAgIHVwZGF0ZUNvbnRlbnRzVmlkZW8o KTsKKyAgICB1cGRhdGVDb250ZW50c01lZGlhKCk7CiAKLSAgICAvLyBUaGlzIGhhcyB0byBoYXBw ZW4gYWZ0ZXIgdXBkYXRlQ29udGVudHNWaWRlbwotICAgIGlmIChjaGlsZHJlbkNoYW5nZWQpCi0g ICAgICAgIHVwZGF0ZVN1YmxheWVyTGlzdCgpOworICAgIC8vIFRoaXMgaGFzIHRvIGhhcHBlbiBh ZnRlciB1cGRhdGVDb250ZW50c01lZGlhCisgICAgdXBkYXRlU3VibGF5ZXJMaXN0KCk7CiB9CiAK IHZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnNldEdlb21ldHJ5T3JpZW50YXRpb24oQ29tcG9zaXRp bmdDb29yZGluYXRlc09yaWVudGF0aW9uIG9yaWVudGF0aW9uKQpAQCAtNjMzLDkgKzYzMCw5IEBA IHZvaWQgR3JhcGhpY3NMYXllckNBQ0Y6OnVwZGF0ZUNvbnRlbnRzSW0KICAgICB9CiB9CiAKLXZv aWQgR3JhcGhpY3NMYXllckNBQ0Y6OnVwZGF0ZUNvbnRlbnRzVmlkZW8oKQordm9pZCBHcmFwaGlj c0xheWVyQ0FDRjo6dXBkYXRlQ29udGVudHNNZWRpYSgpCiB7Ci0gICAgLy8gVmlkZW8gbGF5ZXIg d2FzIHNldCBhcyBtX2NvbnRlbnRzTGF5ZXIsIGFuZCB3aWxsIGdldCBwYXJlbnRlZCBpbiB1cGRh dGVTdWJsYXllckxpc3QoKS4KKyAgICAvLyBNZWRpYSBsYXllciB3YXMgc2V0IGFzIG1fY29udGVu dHNMYXllciwgYW5kIHdpbGwgZ2V0IHBhcmVudGVkIGluIHVwZGF0ZVN1YmxheWVyTGlzdCgpLgog ICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIpIHsKICAgICAgICAgc2V0dXBDb250ZW50c0xheWVyKG1f Y29udGVudHNMYXllci5nZXQoKSk7CiAgICAgICAgIHVwZGF0ZUNvbnRlbnRzUmVjdCgpOwpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FD Ri5oCShyZXZpc2lvbiA1NDM2OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dy YXBoaWNzTGF5ZXJDQUNGLmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDcgKzgyLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1JlY3QoY29uc3QgSW50UmVjdCYpOwogCiAg ICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopOwotICAgIHZpcnR1YWwg dm9pZCBzZXRDb250ZW50c1RvVmlkZW8oUGxhdGZvcm1MYXllciopOworICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciopOwogICAgIAogICAgIHZpcnR1YWwg UGxhdGZvcm1MYXllciogcGxhdGZvcm1MYXllcigpIGNvbnN0OwogCkBAIC0xMTUsNyArMTE1LDcg QEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUxheWVyQmFja2dyb3VuZENvbG9yKCk7CiAKICAg ICB2b2lkIHVwZGF0ZUNvbnRlbnRzSW1hZ2UoKTsKLSAgICB2b2lkIHVwZGF0ZUNvbnRlbnRzVmlk ZW8oKTsKKyAgICB2b2lkIHVwZGF0ZUNvbnRlbnRzTWVkaWEoKTsKICAgICB2b2lkIHVwZGF0ZUNv bnRlbnRzUmVjdCgpOwogICAgIHZvaWQgdXBkYXRlR2VvbWV0cnlPcmllbnRhdGlvbigpOwogICAg IApAQCAtMTI5LDcgKzEyOSw3IEBAIHByaXZhdGU6CiAgICAgZW51bSBDb250ZW50c0xheWVyUHVy cG9zZSB7CiAgICAgICAgIE5vQ29udGVudHNMYXllciA9IDAsCiAgICAgICAgIENvbnRlbnRzTGF5 ZXJGb3JJbWFnZSwKLSAgICAgICAgQ29udGVudHNMYXllckZvclZpZGVvCisgICAgICAgIENvbnRl bnRzTGF5ZXJGb3JNZWRpYQogICAgIH07CiAgICAgCiAgICAgQ29udGVudHNMYXllclB1cnBvc2Ug bV9jb250ZW50c0xheWVyUHVycG9zZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL1FUTW92aWVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL1FUTW92aWVXaW4uY3BwCShyZXZpc2lvbiA1NDM2OCkKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd2luL1FUTW92aWVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OSw2ICs5 OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRlbGV0ZUdXb3JsZCgpOwogICAgIHZvaWQgY2xlYXJH V29ybGQoKTsKICAgICB2b2lkIGNhY2hlTW92aWVTY2FsZSgpOworICAgIHZvaWQgdXBkYXRlTW92 aWVTaXplKCk7CiAKICAgICB2b2lkIHNldFNpemUoaW50LCBpbnQpOwogCkBAIC0yMjYsOCArMjI3 LDggQEAgdm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6Y2FjaGVNb3ZpZVNjYWxlKAogICAgIEdldE1v dmllTmF0dXJhbEJvdW5kc1JlY3QobV9tb3ZpZSwgJm5hdHVyYWxSZWN0KTsKICAgICBHZXRNb3Zp ZUJveChtX21vdmllLCAmaW5pdGlhbFJlY3QpOwogCi0gICAgaW50IG5hdHVyYWxXaWR0aCA9IG5h dHVyYWxSZWN0LnJpZ2h0IC0gbmF0dXJhbFJlY3QubGVmdDsKLSAgICBpbnQgbmF0dXJhbEhlaWdo dCA9IG5hdHVyYWxSZWN0LmJvdHRvbSAtIG5hdHVyYWxSZWN0LnRvcDsKKyAgICBmbG9hdCBuYXR1 cmFsV2lkdGggPSBuYXR1cmFsUmVjdC5yaWdodCAtIG5hdHVyYWxSZWN0LmxlZnQ7CisgICAgZmxv YXQgbmF0dXJhbEhlaWdodCA9IG5hdHVyYWxSZWN0LmJvdHRvbSAtIG5hdHVyYWxSZWN0LnRvcDsK IAogICAgIGlmIChuYXR1cmFsV2lkdGgpCiAgICAgICAgIG1fd2lkdGhTY2FsZUZhY3RvciA9IChp bml0aWFsUmVjdC5yaWdodCAtIGluaXRpYWxSZWN0LmxlZnQpIC8gbmF0dXJhbFdpZHRoOwpAQCAt MjU5LDE0ICsyNjAsMTYgQEAgdm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6dGFzaygpIAogICAgICAg ICAgICAgLy8gd2Ugb25seSBuZWVkIHRvIGVyYXNlIHRoZSBtb3ZpZSBnd29ybGQgd2hlbiB0aGUg bG9hZCBzdGF0ZSBjaGFuZ2VzIHRvIGxvYWRlZCB3aGlsZSBpdAogICAgICAgICAgICAgLy8gIGlz IHZpc2libGUgYXMgdGhlIGd3b3JsZCBpcyBkZXN0cm95ZWQvY3JlYXRlZCB3aGVuIHZpc2liaWxp dHkgY2hhbmdlcwogICAgICAgICAgICAgYm9vbCBzaG91bGRSZXN0b3JlUGxheWJhY2tTdGF0ZSA9 IGZhbHNlOwotICAgICAgICAgICAgaWYgKGxvYWRTdGF0ZSA+PSBRVE1vdmllTG9hZFN0YXRlTG9h ZGVkICYmIG1fbG9hZFN0YXRlIDwgUVRNb3ZpZUxvYWRTdGF0ZUxvYWRlZCkgeworICAgICAgICAg ICAgYm9vbCBtb3ZpZU5ld2x5UGxheWFibGUgPSBsb2FkU3RhdGUgPj0gUVRNb3ZpZUxvYWRTdGF0 ZUxvYWRlZCAmJiBtX2xvYWRTdGF0ZSA8IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQ7CisgICAgICAg ICAgICBtX2xvYWRTdGF0ZSA9IGxvYWRTdGF0ZTsKKyAgICAgICAgICAgIGlmIChtb3ZpZU5ld2x5 UGxheWFibGUpIHsKKyAgICAgICAgICAgICAgICBjYWNoZU1vdmllU2NhbGUoKTsKKyAgICAgICAg ICAgICAgICB1cGRhdGVNb3ZpZVNpemUoKTsKICAgICAgICAgICAgICAgICBpZiAobV92aXNpYmxl KQogICAgICAgICAgICAgICAgICAgICBjbGVhckdXb3JsZCgpOwotICAgICAgICAgICAgICAgIGNh Y2hlTW92aWVTY2FsZSgpOwogICAgICAgICAgICAgICAgIHNob3VsZFJlc3RvcmVQbGF5YmFja1N0 YXRlID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbV9sb2FkU3RhdGUgPSBs b2FkU3RhdGU7CiAgICAgICAgICAgICBpZiAoIW1fbW92aWVDb250cm9sbGVyICYmIG1fbG9hZFN0 YXRlID49IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQpCiAgICAgICAgICAgICAgICAgY3JlYXRlTW92 aWVDb250cm9sbGVyKCk7CiAgICAgICAgICAgICBtX2NsaWVudC0+bW92aWVMb2FkU3RhdGVDaGFu Z2VkKG1fbW92aWVXaW4pOwpAQCAtNDAzLDcgKzQwNiw2IEBAIHZvaWQgUVRNb3ZpZVdpblByaXZh dGU6OmNsZWFyR1dvcmxkKCkKICAgICBNYWNTZXRQb3J0KHNhdmVQb3J0KTsKIH0KIAotCiB2b2lk IFFUTW92aWVXaW5Qcml2YXRlOjpzZXRTaXplKGludCB3aWR0aCwgaW50IGhlaWdodCkKIHsKICAg ICBpZiAobV93aWR0aCA9PSB3aWR0aCAmJiBtX2hlaWdodCA9PSBoZWlnaHQpCkBAIC00MjEsMTcg KzQyMywyNiBAQCB2b2lkIFFUTW92aWVXaW5Qcml2YXRlOjpzZXRTaXplKGludCB3aWR0CiAgICAg QVNTRVJUKG1fc2NhbGVDYWNoZWQpOwogI2VuZGlmCiAKKyAgICB1cGRhdGVNb3ZpZVNpemUoKTsK K30KKwordm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6dXBkYXRlTW92aWVTaXplKCkKK3sKKyAgICBp ZiAoIW1fbW92aWUgfHwgbV9sb2FkU3RhdGUgPCBRVE1vdmllTG9hZFN0YXRlTG9hZGVkKQorICAg ICAgICByZXR1cm47CisKICAgICBSZWN0IGJvdW5kczsgCiAgICAgYm91bmRzLnRvcCA9IDA7CiAg ICAgYm91bmRzLmxlZnQgPSAwOyAKLSAgICBib3VuZHMucmlnaHQgPSB3aWR0aDsKLSAgICBib3Vu ZHMuYm90dG9tID0gaGVpZ2h0OworICAgIGJvdW5kcy5yaWdodCA9IG1fd2lkdGg7CisgICAgYm91 bmRzLmJvdHRvbSA9IG1faGVpZ2h0OwogICAgIGlmIChtX21vdmllQ29udHJvbGxlcikKICAgICAg ICAgTUNTZXRDb250cm9sbGVyQm91bmRzUmVjdChtX21vdmllQ29udHJvbGxlciwgJmJvdW5kcyk7 CiAgICAgU2V0TW92aWVCb3gobV9tb3ZpZSwgJmJvdW5kcyk7CiAgICAgdXBkYXRlR1dvcmxkKCk7 CiB9CiAKKwogdm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6ZGVsZXRlR1dvcmxkKCkKIHsKICAgICBB U1NFUlQobV9nV29ybGQpOwo= 48275 2010-02-05 16:31:31 -0800 2010-02-05 16:59:56 -0800 Replacement patch with more description of what changed in each file 34348.patch text/plain 7351 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDQ0OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMTAtMDItMDUgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVkIGNoYW5nZWQgdmlydHVhbCBmdW5jdGlvbiBpbiBHcmFwaGljc0xheWVyQ0FDRiBhbmQgY2Fs bCBvcmRlciBpc3N1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0MzQ4CisgICAgICAgIAorICAgICAgICBUaGUgY29ycmVjdCB2aXJ0dWFsIGZ1bmN0 aW9uIGluIEdyYXBoaWNzTGF5ZXJDQUNGIGlzIG5vdyBiZWluZworICAgICAgICBjYWxsZWQuIFdl IGFsc28gZml4ZWQgYW4gaXNzdWUgaW4gUVRNb3ZpZVdpbiB3aGVyZSB0aGUgc2l6ZQorICAgICAg ICBvZiB0aGUgbW92aWUgd2FzIG5vdCBiZWluZyBzZXQgY29ycmVjdGx5IGJlY2F1c2UgdGhlIGNh bGwgb3JkZXIKKyAgICAgICAgd2FzIGNoYW5nZWQuCisgICAgICAgIAorICAgICAgICBJIGFsc28g Y2hhbmdlZCB0aGUgb3JkZXIgb2YgYSBjb3VwbGUgb2YgY2FsbHMgaW4gUVRNb3ZpZVdpbiB0byBh Y2NvdW50CisgICAgICAgIGZvciBjaGFuZ2VkIGNhbGxpbmcgb3JkZXIgZnJvbSB0aGUgbG9naWMg YWJvdmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNB Q0YuY3BwOlVwZGF0ZSB0byBuZXcgdmlydHVhbCBmdW5jdGlvbiBBUEkKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzTGF5ZXJDQUNGOjpzZXRDb250ZW50c1RvTWVkaWEpOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckNBQ0Y6OnVwZGF0ZUNvbnRlbnRzTWVkaWEpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5oOlVwZGF0ZSB0byBuZXcg dmlydHVhbCBmdW5jdGlvbiBBUEkKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQUNG OjopOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1vdmllV2luLmNwcDoKKyAg ICAgICAgKFFUTW92aWVXaW5Qcml2YXRlOjpjYWNoZU1vdmllU2NhbGUpOkZpeCBhIGJ1ZyB3aGVy ZSByYXRpbyB3YXMgY29tcHV0ZWQgd3JvbmcgYmVjYXVzZSBpdCB3YXMgdXNpbmcgaW50ZWdlciBt YXRoCisgICAgICAgIChRVE1vdmllV2luUHJpdmF0ZTo6dGFzayk6Q29tcHV0ZSBtb3ZpZSBzY2Fs ZSBiZWZvcmUgY29tcHV0aW5nIG1vdmllIHNpemUgc28gdmFsdWVzIGFyZSBjb3JyZWN0CisgICAg ICAgIChRVE1vdmllV2luUHJpdmF0ZTo6c2V0U2l6ZSk6TW92ZSBtb3ZpZSBzaXplIHVwZGF0ZSB0 byB1cGRhdGVNb3ZpZVNpemUoKQorICAgICAgICAoUVRNb3ZpZVdpblByaXZhdGU6OnVwZGF0ZU1v dmllU2l6ZSk6V3JhcCBzaXplIHVwZGF0ZSBpbiBhIG5ldyBjYWxsIHNvIGl0IGNhbiBiZSB1c2Vk IGZyb20gbXVsdGlwbGUgcGxhY2VzCisKIDIwMTAtMDItMDUgIEVucmljYSBDYXN1Y2NpICA8ZW5y aWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNB Q0YuY3BwCShyZXZpc2lvbiA1NDM2OCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L0dyYXBoaWNzTGF5ZXJDQUNGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY0LDIxICszNjQsMTgg QEAgdm9pZCBHcmFwaGljc0xheWVyQ0FDRjo6c2V0Q29udGVudHNUb0ltYQogICAgICAgICB1cGRh dGVTdWJsYXllckxpc3QoKTsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0FDRjo6c2V0Q29udGVu dHNUb1ZpZGVvKFBsYXRmb3JtTGF5ZXIqIHZpZGVvTGF5ZXIpCit2b2lkIEdyYXBoaWNzTGF5ZXJD QUNGOjpzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciogbWVkaWFMYXllcikKIHsKLSAg ICBib29sIGNoaWxkcmVuQ2hhbmdlZCA9IGZhbHNlOwotCi0gICAgaWYgKHZpZGVvTGF5ZXIgIT0g bV9jb250ZW50c0xheWVyLmdldCgpKQotICAgICAgICBjaGlsZHJlbkNoYW5nZWQgPSB0cnVlOwor ICAgIGlmIChtZWRpYUxheWVyID09IG1fY29udGVudHNMYXllcikKKyAgICAgICAgcmV0dXJuOwog Ci0gICAgbV9jb250ZW50c0xheWVyID0gdmlkZW9MYXllcjsKLSAgICBtX2NvbnRlbnRzTGF5ZXJQ dXJwb3NlID0gdmlkZW9MYXllciA/IENvbnRlbnRzTGF5ZXJGb3JWaWRlbyA6IE5vQ29udGVudHNM YXllcjsKKyAgICBtX2NvbnRlbnRzTGF5ZXIgPSBtZWRpYUxheWVyOworICAgIG1fY29udGVudHNM YXllclB1cnBvc2UgPSBtZWRpYUxheWVyID8gQ29udGVudHNMYXllckZvck1lZGlhIDogTm9Db250 ZW50c0xheWVyOwogCi0gICAgdXBkYXRlQ29udGVudHNWaWRlbygpOworICAgIHVwZGF0ZUNvbnRl bnRzTWVkaWEoKTsKIAotICAgIC8vIFRoaXMgaGFzIHRvIGhhcHBlbiBhZnRlciB1cGRhdGVDb250 ZW50c1ZpZGVvCi0gICAgaWYgKGNoaWxkcmVuQ2hhbmdlZCkKLSAgICAgICAgdXBkYXRlU3VibGF5 ZXJMaXN0KCk7CisgICAgLy8gVGhpcyBoYXMgdG8gaGFwcGVuIGFmdGVyIHVwZGF0ZUNvbnRlbnRz TWVkaWEKKyAgICB1cGRhdGVTdWJsYXllckxpc3QoKTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVy Q0FDRjo6c2V0R2VvbWV0cnlPcmllbnRhdGlvbihDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50 YXRpb24gb3JpZW50YXRpb24pCkBAIC02MzMsOSArNjMwLDkgQEAgdm9pZCBHcmFwaGljc0xheWVy Q0FDRjo6dXBkYXRlQ29udGVudHNJbQogICAgIH0KIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0FD Rjo6dXBkYXRlQ29udGVudHNWaWRlbygpCit2b2lkIEdyYXBoaWNzTGF5ZXJDQUNGOjp1cGRhdGVD b250ZW50c01lZGlhKCkKIHsKLSAgICAvLyBWaWRlbyBsYXllciB3YXMgc2V0IGFzIG1fY29udGVu dHNMYXllciwgYW5kIHdpbGwgZ2V0IHBhcmVudGVkIGluIHVwZGF0ZVN1YmxheWVyTGlzdCgpLgor ICAgIC8vIE1lZGlhIGxheWVyIHdhcyBzZXQgYXMgbV9jb250ZW50c0xheWVyLCBhbmQgd2lsbCBn ZXQgcGFyZW50ZWQgaW4gdXBkYXRlU3VibGF5ZXJMaXN0KCkuCiAgICAgaWYgKG1fY29udGVudHNM YXllcikgewogICAgICAgICBzZXR1cENvbnRlbnRzTGF5ZXIobV9jb250ZW50c0xheWVyLmdldCgp KTsKICAgICAgICAgdXBkYXRlQ29udGVudHNSZWN0KCk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3dpbi9HcmFwaGljc0xheWVyQ0FDRi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzTGF5ZXJDQUNGLmgJKHJldmlzaW9uIDU0MzY4 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NMYXllckNBQ0YuaAko d29ya2luZyBjb3B5KQpAQCAtODIsNyArODIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IHNldENvbnRlbnRzUmVjdChjb25zdCBJbnRSZWN0Jik7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0 Q29udGVudHNUb0ltYWdlKEltYWdlKik7Ci0gICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9W aWRlbyhQbGF0Zm9ybUxheWVyKik7CisgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9NZWRp YShQbGF0Zm9ybUxheWVyKik7CiAgICAgCiAgICAgdmlydHVhbCBQbGF0Zm9ybUxheWVyKiBwbGF0 Zm9ybUxheWVyKCkgY29uc3Q7CiAKQEAgLTExNSw3ICsxMTUsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgdXBkYXRlTGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKTsKIAogICAgIHZvaWQgdXBkYXRlQ29udGVu dHNJbWFnZSgpOwotICAgIHZvaWQgdXBkYXRlQ29udGVudHNWaWRlbygpOworICAgIHZvaWQgdXBk YXRlQ29udGVudHNNZWRpYSgpOwogICAgIHZvaWQgdXBkYXRlQ29udGVudHNSZWN0KCk7CiAgICAg dm9pZCB1cGRhdGVHZW9tZXRyeU9yaWVudGF0aW9uKCk7CiAgICAgCkBAIC0xMjksNyArMTI5LDcg QEAgcHJpdmF0ZToKICAgICBlbnVtIENvbnRlbnRzTGF5ZXJQdXJwb3NlIHsKICAgICAgICAgTm9D b250ZW50c0xheWVyID0gMCwKICAgICAgICAgQ29udGVudHNMYXllckZvckltYWdlLAotICAgICAg ICBDb250ZW50c0xheWVyRm9yVmlkZW8KKyAgICAgICAgQ29udGVudHNMYXllckZvck1lZGlhCiAg ICAgfTsKICAgICAKICAgICBDb250ZW50c0xheWVyUHVycG9zZSBtX2NvbnRlbnRzTGF5ZXJQdXJw b3NlOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZVdpbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZVdpbi5j cHAJKHJldmlzaW9uIDU0MzY4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRN b3ZpZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk5LDYgKzk5LDcgQEAgcHVibGljOgogICAg IHZvaWQgZGVsZXRlR1dvcmxkKCk7CiAgICAgdm9pZCBjbGVhckdXb3JsZCgpOwogICAgIHZvaWQg Y2FjaGVNb3ZpZVNjYWxlKCk7CisgICAgdm9pZCB1cGRhdGVNb3ZpZVNpemUoKTsKIAogICAgIHZv aWQgc2V0U2l6ZShpbnQsIGludCk7CiAKQEAgLTIyNiw4ICsyMjcsOCBAQCB2b2lkIFFUTW92aWVX aW5Qcml2YXRlOjpjYWNoZU1vdmllU2NhbGUoCiAgICAgR2V0TW92aWVOYXR1cmFsQm91bmRzUmVj dChtX21vdmllLCAmbmF0dXJhbFJlY3QpOwogICAgIEdldE1vdmllQm94KG1fbW92aWUsICZpbml0 aWFsUmVjdCk7CiAKLSAgICBpbnQgbmF0dXJhbFdpZHRoID0gbmF0dXJhbFJlY3QucmlnaHQgLSBu YXR1cmFsUmVjdC5sZWZ0OwotICAgIGludCBuYXR1cmFsSGVpZ2h0ID0gbmF0dXJhbFJlY3QuYm90 dG9tIC0gbmF0dXJhbFJlY3QudG9wOworICAgIGZsb2F0IG5hdHVyYWxXaWR0aCA9IG5hdHVyYWxS ZWN0LnJpZ2h0IC0gbmF0dXJhbFJlY3QubGVmdDsKKyAgICBmbG9hdCBuYXR1cmFsSGVpZ2h0ID0g bmF0dXJhbFJlY3QuYm90dG9tIC0gbmF0dXJhbFJlY3QudG9wOwogCiAgICAgaWYgKG5hdHVyYWxX aWR0aCkKICAgICAgICAgbV93aWR0aFNjYWxlRmFjdG9yID0gKGluaXRpYWxSZWN0LnJpZ2h0IC0g aW5pdGlhbFJlY3QubGVmdCkgLyBuYXR1cmFsV2lkdGg7CkBAIC0yNTksMTQgKzI2MCwxNiBAQCB2 b2lkIFFUTW92aWVXaW5Qcml2YXRlOjp0YXNrKCkgCiAgICAgICAgICAgICAvLyB3ZSBvbmx5IG5l ZWQgdG8gZXJhc2UgdGhlIG1vdmllIGd3b3JsZCB3aGVuIHRoZSBsb2FkIHN0YXRlIGNoYW5nZXMg dG8gbG9hZGVkIHdoaWxlIGl0CiAgICAgICAgICAgICAvLyAgaXMgdmlzaWJsZSBhcyB0aGUgZ3dv cmxkIGlzIGRlc3Ryb3llZC9jcmVhdGVkIHdoZW4gdmlzaWJpbGl0eSBjaGFuZ2VzCiAgICAgICAg ICAgICBib29sIHNob3VsZFJlc3RvcmVQbGF5YmFja1N0YXRlID0gZmFsc2U7Ci0gICAgICAgICAg ICBpZiAobG9hZFN0YXRlID49IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQgJiYgbV9sb2FkU3RhdGUg PCBRVE1vdmllTG9hZFN0YXRlTG9hZGVkKSB7CisgICAgICAgICAgICBib29sIG1vdmllTmV3bHlQ bGF5YWJsZSA9IGxvYWRTdGF0ZSA+PSBRVE1vdmllTG9hZFN0YXRlTG9hZGVkICYmIG1fbG9hZFN0 YXRlIDwgUVRNb3ZpZUxvYWRTdGF0ZUxvYWRlZDsKKyAgICAgICAgICAgIG1fbG9hZFN0YXRlID0g bG9hZFN0YXRlOworICAgICAgICAgICAgaWYgKG1vdmllTmV3bHlQbGF5YWJsZSkgeworICAgICAg ICAgICAgICAgIGNhY2hlTW92aWVTY2FsZSgpOworICAgICAgICAgICAgICAgIHVwZGF0ZU1vdmll U2l6ZSgpOwogICAgICAgICAgICAgICAgIGlmIChtX3Zpc2libGUpCiAgICAgICAgICAgICAgICAg ICAgIGNsZWFyR1dvcmxkKCk7Ci0gICAgICAgICAgICAgICAgY2FjaGVNb3ZpZVNjYWxlKCk7CiAg ICAgICAgICAgICAgICAgc2hvdWxkUmVzdG9yZVBsYXliYWNrU3RhdGUgPSB0cnVlOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBtX2xvYWRTdGF0ZSA9IGxvYWRTdGF0ZTsKICAgICAgICAg ICAgIGlmICghbV9tb3ZpZUNvbnRyb2xsZXIgJiYgbV9sb2FkU3RhdGUgPj0gUVRNb3ZpZUxvYWRT dGF0ZUxvYWRlZCkKICAgICAgICAgICAgICAgICBjcmVhdGVNb3ZpZUNvbnRyb2xsZXIoKTsKICAg ICAgICAgICAgIG1fY2xpZW50LT5tb3ZpZUxvYWRTdGF0ZUNoYW5nZWQobV9tb3ZpZVdpbik7CkBA IC00MDMsNyArNDA2LDYgQEAgdm9pZCBRVE1vdmllV2luUHJpdmF0ZTo6Y2xlYXJHV29ybGQoKQog ICAgIE1hY1NldFBvcnQoc2F2ZVBvcnQpOwogfQogCi0KIHZvaWQgUVRNb3ZpZVdpblByaXZhdGU6 OnNldFNpemUoaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogewogICAgIGlmIChtX3dpZHRoID09IHdp ZHRoICYmIG1faGVpZ2h0ID09IGhlaWdodCkKQEAgLTQyMSwxNyArNDIzLDI2IEBAIHZvaWQgUVRN b3ZpZVdpblByaXZhdGU6OnNldFNpemUoaW50IHdpZHQKICAgICBBU1NFUlQobV9zY2FsZUNhY2hl ZCk7CiAjZW5kaWYKIAorICAgIHVwZGF0ZU1vdmllU2l6ZSgpOworfQorCit2b2lkIFFUTW92aWVX aW5Qcml2YXRlOjp1cGRhdGVNb3ZpZVNpemUoKQoreworICAgIGlmICghbV9tb3ZpZSB8fCBtX2xv YWRTdGF0ZSA8IFFUTW92aWVMb2FkU3RhdGVMb2FkZWQpCisgICAgICAgIHJldHVybjsKKwogICAg IFJlY3QgYm91bmRzOyAKICAgICBib3VuZHMudG9wID0gMDsKICAgICBib3VuZHMubGVmdCA9IDA7 IAotICAgIGJvdW5kcy5yaWdodCA9IHdpZHRoOwotICAgIGJvdW5kcy5ib3R0b20gPSBoZWlnaHQ7 CisgICAgYm91bmRzLnJpZ2h0ID0gbV93aWR0aDsKKyAgICBib3VuZHMuYm90dG9tID0gbV9oZWln aHQ7CiAgICAgaWYgKG1fbW92aWVDb250cm9sbGVyKQogICAgICAgICBNQ1NldENvbnRyb2xsZXJC b3VuZHNSZWN0KG1fbW92aWVDb250cm9sbGVyLCAmYm91bmRzKTsKICAgICBTZXRNb3ZpZUJveCht X21vdmllLCAmYm91bmRzKTsKICAgICB1cGRhdGVHV29ybGQoKTsKIH0KIAorCiB2b2lkIFFUTW92 aWVXaW5Qcml2YXRlOjpkZWxldGVHV29ybGQoKQogewogICAgIEFTU0VSVChtX2dXb3JsZCk7Cg==