53472 2011-01-31 21:05:58 -0800 Clean up ShadowBlur 2011-01-31 21:33:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser sam simon.fraser oldest_to_newest 343007 0 simon.fraser 2011-01-31 21:05:58 -0800 Clean up ShadowBlur 343008 1 80714 simon.fraser 2011-01-31 21:10:39 -0800 Created attachment 80714 Patch 343011 2 80714 sam 2011-01-31 21:18:01 -0800 Comment on attachment 80714 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=80714&action=review > Source/WebCore/platform/graphics/ShadowBlur.cpp:427 > + shadowContext->setFillColor(Color(.0f, .0f, .0f, 1.f), ColorSpaceDeviceRGB); This doesn't need to use the float Color constructor anymore. > Source/WebCore/platform/graphics/ShadowBlur.cpp:487 > + shadowContext->setFillColor(Color(.0f, .0f, .0f, 1.f), ColorSpaceDeviceRGB); Nor here. 343013 3 simon.fraser 2011-01-31 21:20:17 -0800 http://trac.webkit.org/changeset/77213 343016 4 simon.fraser 2011-01-31 21:33:37 -0800 And http://trac.webkit.org/changeset/77215 80714 2011-01-31 21:10:39 -0800 2011-01-31 21:18:01 -0800 Patch bug-53472-20110131211037.patch text/plain 14538 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YmY3NDU4YmFjMzU0ZDRmMzIxNjQ5MjY2MDBkNjdiZmZkOTY5NTcxLi40 YWU0ZDFlMDhkMTZhOGRjNzQ4NTE4Y2ZlNjE0OTAyZDNhMGQ1Y2U2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzMgQEAKKzIwMTEtMDEtMzEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBs ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2xlYW4gdXAgU2hhZG93Qmx1cgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTM0NzIKKworICAgICAgICBTb21lIG1pbm9yIFNoYWRvd0JsdXIgY2xlYW51 cC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1NoYWRvd0JsdXIuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9TaGFkb3dCbHVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNo YWRvd0JsdXI6OlNoYWRvd0JsdXIpOiBVc2UgbV9ibHVyUmFkaXVzIHJhdGhlciB0aGFuIHRoZSBy YWRpdXMKKyAgICAgICAgcGFyYW10ZXIuCisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dCbHVyOjph ZGp1c3RCbHVyUmFkaXVzKTogUmVuYW1lZCBmcm9tIGFkanVzdEJsdXJEaXN0YW5jZS4KKyAgICAg ICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmNhbGN1bGF0ZUxheWVyQm91bmRpbmdSZWN0KTogUmVu YW1lIGxheWVyRmxvYXRSZWN0IHRvCisgICAgICAgIGxheWVyUmVjdC4gTWFrZSBmcmFtZVNpemUg YSBmbG9hdC4KKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmJlZ2luU2hhZG93TGF5ZXIp OiBUaGlzIG5vdyB0YWtlcyBhIHByZWNvbXB1dGVkCisgICAgICAgIGxheWVyUmVjdCByYXRoZXIg dGhhbiBjYWxsaW5nIGNhbGN1bGF0ZUxheWVyQm91bmRpbmdSZWN0KCkgdG8gY29tcHV0ZQorICAg ICAgICBpdCBpdHNlbGYsIHNpbmNlIHdlIHdlcmUgY2FsbGluZyBjYWxjdWxhdGVMYXllckJvdW5k aW5nUmVjdCgpIHR3aWNlLgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Qmx1cjo6ZHJhd1JlY3RT aGFkb3cpOiBPcHRpbWl6ZSB0byBjYWxsIGNhbGN1bGF0ZUxheWVyQm91bmRpbmdSZWN0KCkKKyAg ICAgICAgb25seSBvbmNlLiBUaGUgc2hhZG93UmVjdCB2YXJpYWJsZSB3YXMgdW51c2VkLCBzbyB0 d28gcmV0dXJuIHBhdGhzIGNvdWxkIGJlCisgICAgICAgIGNvbGxhcHNlZCBpbnRvIG9uZS4KKyAg ICAgICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmRyYXdJbnNldFNoYWRvdyk6IENhbGwgY2FsY3Vs YXRlTGF5ZXJCb3VuZGluZ1JlY3QoKSBiZWZvcmUKKyAgICAgICAgYmVnaW5TaGFkb3dMYXllcigp IG5vdy4KKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93V2l0aG91 dFRpbGluZyk6IFRoZSBsYXllclJlY3QgZ2V0cyBwYXNzZWQgaW4uCisgICAgICAgIFdlIGFsd2F5 cyB1c2VkIGFscGhhPTEsIHNvIG5vIG5lZWQgdG8gcGFzcyB0aGF0IGluLgorICAgICAgICAoV2Vi Q29yZTo6U2hhZG93Qmx1cjo6ZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nKTogV2UgYWx3YXlzIHVz ZWQgYWxwaGE9MSwgc28gbm8gbmVlZCB0bworICAgICAgICBwYXNzIHRoYXQgaW4uIE1vdmUgc2hh ZG93UmVjdCBkb3duIHRvIGZpcnN0IHVzZS4KKyAgICAgICAgU2hhZG93Qmx1cjo6Y2xpcEJvdW5k cygpIHdhcyB1bnVzZWQuCisKIDIwMTEtMDEtMzEgIEthbGxlIFZhaGxtYW4gIDxrYWxsZS52YWhs bWFuQG1vdmlhbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NoYWRvd0JsdXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5jcHAKaW5kZXgg ZTU5ZGJmOWY5NDEyOGY3YjRmY2M5NTBiZmE0ZWNlMzRlMTRhMjQ0NS4uMTg2MzU4Nzc5NzY2MDM4 MGVlZDBiMGM1YTA0MGU4MDM3N2Y4MDdjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5jcHAKQEAgLTExNSw3ICsxMTUsNyBAQCBTaGFkb3dCbHVy OjpTaGFkb3dCbHVyKGZsb2F0IHJhZGl1cywgY29uc3QgRmxvYXRTaXplJiBvZmZzZXQsIGNvbnN0 IENvbG9yJiBjb2xvcgogICAgIGlmICghbV9jb2xvci5pc1ZhbGlkKCkgfHwgIWNvbG9yLmFscGhh KCkpIHsKICAgICAgICAgLy8gQ2FuJ3QgcGFpbnQgdGhlIHNoYWRvdyB3aXRoIGludmFsaWQgb3Ig aW52aXNpYmxlIGNvbG9yLgogICAgICAgICBtX3R5cGUgPSBOb1NoYWRvdzsKLSAgICB9IGVsc2Ug aWYgKHJhZGl1cyA+IDApIHsKKyAgICB9IGVsc2UgaWYgKG1fYmx1clJhZGl1cyA+IDApIHsKICAg ICAgICAgLy8gU2hhZG93IGlzIGFsd2F5cyBibHVycmVkLCBldmVuIHRoZSBvZmZzZXQgaXMgemVy by4KICAgICAgICAgbV90eXBlID0gQmx1clNoYWRvdzsKICAgICB9IGVsc2UgaWYgKCFtX29mZnNl dC53aWR0aCgpICYmICFtX29mZnNldC5oZWlnaHQoKSkgewpAQCAtMjIxLDcgKzIyMSw3IEBAIHZv aWQgU2hhZG93Qmx1cjo6Ymx1ckxheWVySW1hZ2UodW5zaWduZWQgY2hhciogaW1hZ2VEYXRhLCBj b25zdCBJbnRTaXplJiBzaXplLCBpCiAgICAgfQogfQogCi12b2lkIFNoYWRvd0JsdXI6OmFkanVz dEJsdXJEaXN0YW5jZShHcmFwaGljc0NvbnRleHQqIGNvbnRleHQpCit2b2lkIFNoYWRvd0JsdXI6 OmFkanVzdEJsdXJSYWRpdXMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0KQogewogICAgIGlmICgh bV9zaGFkb3dzSWdub3JlVHJhbnNmb3JtcykKICAgICAgICAgcmV0dXJuOwpAQCAtMjU5LDMwICsy NTksMzAgQEAgSW50UmVjdCBTaGFkb3dCbHVyOjpjYWxjdWxhdGVMYXllckJvdW5kaW5nUmVjdChH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEYKICAgICBjb25zdCBmbG9hdCByb3VuZGVk UmFkaXVzID0gY2VpbGYobV9ibHVyUmFkaXVzKTsKIAogICAgIC8vIENhbGN1bGF0ZSB0aGUgZGVz dGluYXRpb24gb2YgdGhlIGJsdXJyZWQgYW5kL29yIHRyYW5zZm9ybWVkIGxheWVyLgotICAgIEZs b2F0UmVjdCBsYXllckZsb2F0UmVjdDsKKyAgICBGbG9hdFJlY3QgbGF5ZXJSZWN0OwogICAgIGZs b2F0IGluZmxhdGlvbiA9IDA7CiAKICAgICBjb25zdCBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3Jt ID0gY29udGV4dC0+Z2V0Q1RNKCk7CiAgICAgaWYgKG1fc2hhZG93c0lnbm9yZVRyYW5zZm9ybXMg JiYgIXRyYW5zZm9ybS5pc0lkZW50aXR5KCkpIHsKICAgICAgICAgRmxvYXRRdWFkIHRyYW5zZm9y bWVkUG9seWdvbiA9IHRyYW5zZm9ybS5tYXBRdWFkKEZsb2F0UXVhZChzaGFkb3dlZFJlY3QpKTsK ICAgICAgICAgdHJhbnNmb3JtZWRQb2x5Z29uLm1vdmUobV9vZmZzZXQpOwotICAgICAgICBsYXll ckZsb2F0UmVjdCA9IHRyYW5zZm9ybS5pbnZlcnNlKCkubWFwUXVhZCh0cmFuc2Zvcm1lZFBvbHln b24pLmJvdW5kaW5nQm94KCk7CisgICAgICAgIGxheWVyUmVjdCA9IHRyYW5zZm9ybS5pbnZlcnNl KCkubWFwUXVhZCh0cmFuc2Zvcm1lZFBvbHlnb24pLmJvdW5kaW5nQm94KCk7CiAgICAgfSBlbHNl IHsKLSAgICAgICAgbGF5ZXJGbG9hdFJlY3QgPSBzaGFkb3dlZFJlY3Q7Ci0gICAgICAgIGxheWVy RmxvYXRSZWN0Lm1vdmUobV9vZmZzZXQpOworICAgICAgICBsYXllclJlY3QgPSBzaGFkb3dlZFJl Y3Q7CisgICAgICAgIGxheWVyUmVjdC5tb3ZlKG1fb2Zmc2V0KTsKICAgICB9CiAKICAgICAvLyBX ZSBleHBhbmQgdGhlIGFyZWEgYnkgdGhlIGJsdXIgcmFkaXVzIHRvIGdpdmUgZXh0cmEgc3BhY2Ug Zm9yIHRoZSBibHVyIHRyYW5zaXRpb24uCiAgICAgaWYgKG1fdHlwZSA9PSBCbHVyU2hhZG93KSB7 Ci0gICAgICAgIGxheWVyRmxvYXRSZWN0LmluZmxhdGUocm91bmRlZFJhZGl1cyk7Ci0gICAgICAg IGluZmxhdGlvbiArPSByb3VuZGVkUmFkaXVzOworICAgICAgICBsYXllclJlY3QuaW5mbGF0ZShy b3VuZGVkUmFkaXVzKTsKKyAgICAgICAgaW5mbGF0aW9uID0gcm91bmRlZFJhZGl1czsKICAgICB9 CiAKLSAgICBGbG9hdFJlY3QgdW5jbGlwcGVkTGF5ZXJSZWN0ID0gbGF5ZXJGbG9hdFJlY3Q7Cisg ICAgRmxvYXRSZWN0IHVuY2xpcHBlZExheWVyUmVjdCA9IGxheWVyUmVjdDsKIAotICAgIGlmICgh Y2xpcFJlY3QuY29udGFpbnMoZW5jbG9zaW5nSW50UmVjdChsYXllckZsb2F0UmVjdCkpKSB7Cisg ICAgaWYgKCFjbGlwUmVjdC5jb250YWlucyhlbmNsb3NpbmdJbnRSZWN0KGxheWVyUmVjdCkpKSB7 CiAgICAgICAgIC8vIElmIHdlIGFyZSB0b3RhbGx5IG91dHNpZGUgdGhlIGNsaXAgcmVnaW9uLCB3 ZSBhcmVuJ3QgcGFpbnRpbmcgYXQgYWxsLgotICAgICAgICBpZiAoaW50ZXJzZWN0aW9uKGxheWVy RmxvYXRSZWN0LCBjbGlwUmVjdCkuaXNFbXB0eSgpKQorICAgICAgICBpZiAoaW50ZXJzZWN0aW9u KGxheWVyUmVjdCwgY2xpcFJlY3QpLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiBJbnRS ZWN0KCk7CiAKICAgICAgICAgSW50UmVjdCBpbmZsYXRlZENsaXAgPSBjbGlwUmVjdDsKQEAgLTI5 MSwxMyArMjkxLDEzIEBAIEludFJlY3QgU2hhZG93Qmx1cjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZGlu Z1JlY3QoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGCiAgICAgICAgIGlmIChtX3R5 cGUgPT0gQmx1clNoYWRvdykKICAgICAgICAgICAgIGluZmxhdGVkQ2xpcC5pbmZsYXRlKHJvdW5k ZWRSYWRpdXMpOwogICAgICAgICAKLSAgICAgICAgbGF5ZXJGbG9hdFJlY3QuaW50ZXJzZWN0KGlu ZmxhdGVkQ2xpcCk7CisgICAgICAgIGxheWVyUmVjdC5pbnRlcnNlY3QoaW5mbGF0ZWRDbGlwKTsK ICAgICB9CiAKLSAgICBjb25zdCBpbnQgZnJhbWVTaXplID0gaW5mbGF0aW9uICogMjsKKyAgICBj b25zdCBmbG9hdCBmcmFtZVNpemUgPSBpbmZsYXRpb24gKiAyOwogICAgIG1fc291cmNlUmVjdCA9 IEZsb2F0UmVjdCgwLCAwLCBzaGFkb3dlZFJlY3Qud2lkdGgoKSArIGZyYW1lU2l6ZSwgc2hhZG93 ZWRSZWN0LmhlaWdodCgpICsgZnJhbWVTaXplKTsKLSAgICBtX2xheWVyT3JpZ2luID0gRmxvYXRQ b2ludChsYXllckZsb2F0UmVjdC54KCksIGxheWVyRmxvYXRSZWN0LnkoKSk7Ci0gICAgbV9sYXll clNpemUgPSBsYXllckZsb2F0UmVjdC5zaXplKCk7CisgICAgbV9sYXllck9yaWdpbiA9IEZsb2F0 UG9pbnQobGF5ZXJSZWN0LngoKSwgbGF5ZXJSZWN0LnkoKSk7CisgICAgbV9sYXllclNpemUgPSBs YXllclJlY3Quc2l6ZSgpOwogCiAgICAgY29uc3QgRmxvYXRQb2ludCB1bmNsaXBwZWRMYXllck9y aWdpbiA9IEZsb2F0UG9pbnQodW5jbGlwcGVkTGF5ZXJSZWN0LngoKSwgdW5jbGlwcGVkTGF5ZXJS ZWN0LnkoKSk7CiAgICAgY29uc3QgRmxvYXRTaXplIGNsaXBwZWRPdXQgPSB1bmNsaXBwZWRMYXll ck9yaWdpbiAtIG1fbGF5ZXJPcmlnaW47CkBAIC0zMDgsMTQgKzMwOCwxMyBAQCBJbnRSZWN0IFNo YWRvd0JsdXI6OmNhbGN1bGF0ZUxheWVyQm91bmRpbmdSZWN0KEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgRgogICAgIGZsb2F0IHRyYW5zbGF0aW9uWSA9IC1zaGFkb3dlZFJlY3QueSgp ICsgaW5mbGF0aW9uIC0gZmFic2YoY2xpcHBlZE91dC5oZWlnaHQoKSk7CiAgICAgbV9sYXllckNv bnRleHRUcmFuc2xhdGlvbiA9IEZsb2F0U2l6ZSh0cmFuc2xhdGlvblgsIHRyYW5zbGF0aW9uWSk7 CiAKLSAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChsYXllckZsb2F0UmVjdCk7CisgICAgcmV0 dXJuIGVuY2xvc2luZ0ludFJlY3QobGF5ZXJSZWN0KTsKIH0KIAotR3JhcGhpY3NDb250ZXh0KiBT aGFkb3dCbHVyOjpiZWdpblNoYWRvd0xheWVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250 ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHNoYWRvd2VkUmVjdCkKK0dyYXBoaWNzQ29udGV4dCogU2hh ZG93Qmx1cjo6YmVnaW5TaGFkb3dMYXllcihHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4 dCwgY29uc3QgSW50UmVjdCYgbGF5ZXJSZWN0KQogewotICAgIGFkanVzdEJsdXJEaXN0YW5jZShn cmFwaGljc0NvbnRleHQpOworICAgIGFkanVzdEJsdXJSYWRpdXMoZ3JhcGhpY3NDb250ZXh0KTsK IAotICAgIEludFJlY3QgbGF5ZXJSZWN0ID0gY2FsY3VsYXRlTGF5ZXJCb3VuZGluZ1JlY3QoZ3Jh cGhpY3NDb250ZXh0LCBzaGFkb3dlZFJlY3QsIGdyYXBoaWNzQ29udGV4dC0+Y2xpcEJvdW5kcygp KTsKICAgICAvLyBEb24ndCBwYWludCBpZiB3ZSBhcmUgdG90YWxseSBvdXRzaWRlIHRoZSBjbGlw IHJlZ2lvbi4KICAgICBpZiAobGF5ZXJSZWN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIDA7 CkBAIC0zNjUsMTAgKzM2NCwxMiBAQCB2b2lkIFNoYWRvd0JsdXI6OmVuZFNoYWRvd0xheWVyKEdy YXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0KQogCiB2b2lkIFNoYWRvd0JsdXI6OmRyYXdS ZWN0U2hhZG93KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBGbG9hdFJl Y3QmIHNoYWRvd2VkUmVjdCwgY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiByYWRpaSkKIHsK KyAgICBJbnRSZWN0IGxheWVyUmVjdCA9IGNhbGN1bGF0ZUxheWVyQm91bmRpbmdSZWN0KGdyYXBo aWNzQ29udGV4dCwgc2hhZG93ZWRSZWN0LCBncmFwaGljc0NvbnRleHQtPmNsaXBCb3VuZHMoKSk7 CisKICAgICAvLyBkcmF3U2hhZG93ZWRSZWN0IGRvZXMgbm90IHdvcmsgd2l0aCByb3RhdGlvbnMu CiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MDQyCiAg ICAgaWYgKCFncmFwaGljc0NvbnRleHQtPmdldENUTSgpLmlzSWRlbnRpdHlPclRyYW5zbGF0aW9u T3JGbGlwcGVkKCkgfHwgbV90eXBlICE9IEJsdXJTaGFkb3cpIHsKLSAgICAgICAgZHJhd1JlY3RT aGFkb3dXaXRob3V0VGlsaW5nKGdyYXBoaWNzQ29udGV4dCwgc2hhZG93ZWRSZWN0LCByYWRpaSwg MSk7CisgICAgICAgIGRyYXdSZWN0U2hhZG93V2l0aG91dFRpbGluZyhncmFwaGljc0NvbnRleHQs IHNoYWRvd2VkUmVjdCwgcmFkaWksIGxheWVyUmVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTM4NSwzMiArMzg2LDIxIEBAIHZvaWQgU2hhZG93Qmx1cjo6ZHJhd1JlY3RTaGFkb3co R3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UmVjCiAgICAgLy8g dGhlIHJhZGlpIG9mIHRoZSBjb3JuZXJzLCBhbmQgdGhlbiAxIHBpeGVsIHRvIGRyYXcgdGhlIHNp ZGUgdGlsZXMuCiAgICAgSW50U2l6ZSBzaGFkb3dUZW1wbGF0ZVNpemUgPSBJbnRTaXplKHRlbXBs YXRlU2lkZUxlbmd0aCArIGV4dHJhV2lkdGhGcm9tQ29ybmVyUmFkaWksIHRlbXBsYXRlU2lkZUxl bmd0aCArIGV4dHJhSGVpZ2h0RnJvbUNvcm5lclJhZGlpKTsKIAotICAgIGlmIChzaGFkb3dUZW1w bGF0ZVNpemUud2lkdGgoKSA+IHNoYWRvd2VkUmVjdC53aWR0aCgpIHx8IHNoYWRvd1RlbXBsYXRl U2l6ZS5oZWlnaHQoKSA+IHNoYWRvd2VkUmVjdC5oZWlnaHQoKSkgewotICAgICAgICBkcmF3UmVj dFNoYWRvd1dpdGhvdXRUaWxpbmcoZ3JhcGhpY3NDb250ZXh0LCBzaGFkb3dlZFJlY3QsIHJhZGlp LCAxKTsKKyAgICBpZiAoc2hhZG93VGVtcGxhdGVTaXplLndpZHRoKCkgPiBzaGFkb3dlZFJlY3Qu d2lkdGgoKSB8fCBzaGFkb3dUZW1wbGF0ZVNpemUuaGVpZ2h0KCkgPiBzaGFkb3dlZFJlY3QuaGVp Z2h0KCkKKyAgICAgICAgfHwgKHNoYWRvd1RlbXBsYXRlU2l6ZS53aWR0aCgpICogc2hhZG93VGVt cGxhdGVTaXplLmhlaWdodCgpID4gbV9zb3VyY2VSZWN0LndpZHRoKCkgKiBtX3NvdXJjZVJlY3Qu aGVpZ2h0KCkpKSB7CisgICAgICAgIGRyYXdSZWN0U2hhZG93V2l0aG91dFRpbGluZyhncmFwaGlj c0NvbnRleHQsIHNoYWRvd2VkUmVjdCwgcmFkaWksIGxheWVyUmVjdCk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICAvLyBEZXRlcm1pbmUgZGltZW5zaW9ucyBvZiBzaGFkb3cgcmVjdC4K LSAgICBGbG9hdFJlY3Qgc2hhZG93UmVjdCA9IHNoYWRvd2VkUmVjdDsKLSAgICBzaGFkb3dSZWN0 LmluZmxhdGUocm91bmRlZFJhZGl1cyk7IC8vIEZJWE1FOiBkdXBsaWNhdGluZyBjb2RlIHdpdGgg Y2FsY3VsYXRlTGF5ZXJCb3VuZGluZ1JlY3QuCi0KLSAgICAvLyBSZWR1Y2UgdGhlIHNpemUgb2Yg d2hhdCB3ZSBoYXZlIHRvIGRyYXcgd2l0aCB0aGUgY2xpcCBhcmVhLgotICAgIGNhbGN1bGF0ZUxh eWVyQm91bmRpbmdSZWN0KGdyYXBoaWNzQ29udGV4dCwgc2hhZG93ZWRSZWN0LCBncmFwaGljc0Nv bnRleHQtPmNsaXBCb3VuZHMoKSk7Ci0KLSAgICAvLyBJZiB0aGUgdGVtcGxhdGUgYXJlYSBlbmRz IHVwIGJlaW5nIGxhcmdlciB0aGFuIHRoZSBhcmVhIHRvIGJlIGJsdXJyZWQsIHVzZSB0aGUgc2lt cGxlIGNhc2UuCi0gICAgLy8gRklYTUU6IHdoZW4gZG9lcyB0aGlzIGhhcHBlbj8KLSAgICBpZiAo KHNoYWRvd1RlbXBsYXRlU2l6ZS53aWR0aCgpICogc2hhZG93VGVtcGxhdGVTaXplLmhlaWdodCgp ID4gbV9zb3VyY2VSZWN0LndpZHRoKCkgKiBtX3NvdXJjZVJlY3QuaGVpZ2h0KCkpKSB7Ci0gICAg ICAgIGRyYXdSZWN0U2hhZG93V2l0aG91dFRpbGluZyhncmFwaGljc0NvbnRleHQsIHNoYWRvd2Vk UmVjdCwgcmFkaWksIDEpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIAotICAgIGRyYXdS ZWN0U2hhZG93V2l0aFRpbGluZyhncmFwaGljc0NvbnRleHQsIHNoYWRvd2VkUmVjdCwgcmFkaWks IDEsIHNoYWRvd1RlbXBsYXRlU2l6ZSk7CisgICAgZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nKGdy YXBoaWNzQ29udGV4dCwgc2hhZG93ZWRSZWN0LCByYWRpaSwgc2hhZG93VGVtcGxhdGVTaXplKTsK IH0KIAogdm9pZCBTaGFkb3dCbHVyOjpkcmF3SW5zZXRTaGFkb3coR3JhcGhpY3NDb250ZXh0KiBn cmFwaGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCwgY29uc3QgRmxvYXRSZWN0JiBo b2xlUmVjdCwgY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiBob2xlUmFkaWkpCiB7CiAgICAg Ly8gRklYTUU6IGFkZCBhIHRpbGluZyBjb2RlIHBhdGggaGVyZS4KLSAgICBHcmFwaGljc0NvbnRl eHQqIHNoYWRvd0NvbnRleHQgPSBiZWdpblNoYWRvd0xheWVyKGdyYXBoaWNzQ29udGV4dCwgcmVj dCk7CisgICAgSW50UmVjdCBsYXllclJlY3QgPSBjYWxjdWxhdGVMYXllckJvdW5kaW5nUmVjdChn cmFwaGljc0NvbnRleHQsIHJlY3QsIGdyYXBoaWNzQ29udGV4dC0+Y2xpcEJvdW5kcygpKTsKKwor ICAgIEdyYXBoaWNzQ29udGV4dCogc2hhZG93Q29udGV4dCA9IGJlZ2luU2hhZG93TGF5ZXIoZ3Jh cGhpY3NDb250ZXh0LCBsYXllclJlY3QpOwogICAgIGlmICghc2hhZG93Q29udGV4dCkKICAgICAg ICAgcmV0dXJuOwogCkBAIC00MjUsMTYgKzQxNSwxNiBAQCB2b2lkIFNoYWRvd0JsdXI6OmRyYXdJ bnNldFNoYWRvdyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgRmxvYXRS ZQogICAgIGVuZFNoYWRvd0xheWVyKGdyYXBoaWNzQ29udGV4dCk7CiB9CiAKLXZvaWQgU2hhZG93 Qmx1cjo6ZHJhd1JlY3RTaGFkb3dXaXRob3V0VGlsaW5nKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhp Y3NDb250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHNoYWRvd2VkUmVjdCwgY29uc3QgUm91bmRlZElu dFJlY3Q6OlJhZGlpJiByYWRpaSwgZmxvYXQgYWxwaGEpCit2b2lkIFNoYWRvd0JsdXI6OmRyYXdS ZWN0U2hhZG93V2l0aG91dFRpbGluZyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwg Y29uc3QgRmxvYXRSZWN0JiBzaGFkb3dlZFJlY3QsIGNvbnN0IFJvdW5kZWRJbnRSZWN0OjpSYWRp aSYgcmFkaWksIGNvbnN0IEludFJlY3QmIGxheWVyUmVjdCkKIHsKLSAgICBHcmFwaGljc0NvbnRl eHQqIHNoYWRvd0NvbnRleHQgPSBiZWdpblNoYWRvd0xheWVyKGdyYXBoaWNzQ29udGV4dCwgc2hh ZG93ZWRSZWN0KTsKKyAgICBHcmFwaGljc0NvbnRleHQqIHNoYWRvd0NvbnRleHQgPSBiZWdpblNo YWRvd0xheWVyKGdyYXBoaWNzQ29udGV4dCwgbGF5ZXJSZWN0KTsKICAgICBpZiAoIXNoYWRvd0Nv bnRleHQpCiAgICAgICAgIHJldHVybjsKIAogICAgIFBhdGggcGF0aDsKICAgICBwYXRoLmFkZFJv dW5kZWRSZWN0KHNoYWRvd2VkUmVjdCwgcmFkaWkudG9wTGVmdCgpLCByYWRpaS50b3BSaWdodCgp LCByYWRpaS5ib3R0b21MZWZ0KCksIHJhZGlpLmJvdHRvbVJpZ2h0KCkpOwogCi0gICAgc2hhZG93 Q29udGV4dC0+c2V0RmlsbENvbG9yKENvbG9yKC4wZiwgLjBmLCAuMGYsIGFscGhhKSwgQ29sb3JT cGFjZURldmljZVJHQik7CisgICAgc2hhZG93Q29udGV4dC0+c2V0RmlsbENvbG9yKENvbG9yKC4w ZiwgLjBmLCAuMGYsIDEuZiksIENvbG9yU3BhY2VEZXZpY2VSR0IpOwogICAgIHNoYWRvd0NvbnRl eHQtPmZpbGxQYXRoKHBhdGgpOwogCiAgICAgZW5kU2hhZG93TGF5ZXIoZ3JhcGhpY3NDb250ZXh0 KTsKQEAgLTQ3Myw3ICs0NjMsNyBAQCB2b2lkIFNoYWRvd0JsdXI6OmRyYXdSZWN0U2hhZG93V2l0 aG91dFRpbGluZyhHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgYwogICAgICBzaGFk b3cuCiAgKi8KIAotdm9pZCBTaGFkb3dCbHVyOjpkcmF3UmVjdFNoYWRvd1dpdGhUaWxpbmcoR3Jh cGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgc2hhZG93ZWRS ZWN0LCBjb25zdCBSb3VuZGVkSW50UmVjdDo6UmFkaWkmIHJhZGlpLCBmbG9hdCBhbHBoYSwgY29u c3QgSW50U2l6ZSYgc2hhZG93VGVtcGxhdGVTaXplKQordm9pZCBTaGFkb3dCbHVyOjpkcmF3UmVj dFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0 IEZsb2F0UmVjdCYgc2hhZG93ZWRSZWN0LCBjb25zdCBSb3VuZGVkSW50UmVjdDo6UmFkaWkmIHJh ZGlpLCBjb25zdCBJbnRTaXplJiBzaGFkb3dUZW1wbGF0ZVNpemUpCiB7CiAgICAgY29uc3QgZmxv YXQgcm91bmRlZFJhZGl1cyA9IGNlaWxmKG1fYmx1clJhZGl1cyk7CiAgICAgY29uc3QgZmxvYXQg dHdpY2VSYWRpdXMgPSByb3VuZGVkUmFkaXVzICogMjsKQEAgLTQ4MSwxMSArNDcxLDYgQEAgdm9p ZCBTaGFkb3dCbHVyOjpkcmF3UmVjdFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3NDb250ZXh0KiBn cmFwaGljc0NvbnRleHQsIGNvbnMKICAgICAvLyBTaXplIG9mIHRoZSB0aWxpbmcgc2lkZS4KICAg ICBjb25zdCBpbnQgdGVtcGxhdGVTaWRlTGVuZ3RoID0gMTsKIAotICAgIEZsb2F0UmVjdCBzaGFk b3dSZWN0ID0gc2hhZG93ZWRSZWN0OwotICAgIHNoYWRvd1JlY3QuaW5mbGF0ZShyb3VuZGVkUmFk aXVzKTsgLy8gRklYTUU6IGR1cGxpY2F0aW5nIGNvZGUgd2l0aCBjYWxjdWxhdGVMYXllckJvdW5k aW5nUmVjdC4KLQotICAgIHNoYWRvd1JlY3QubW92ZShtX29mZnNldC53aWR0aCgpLCBtX29mZnNl dC5oZWlnaHQoKSk7Ci0KICAgICBtX2xheWVySW1hZ2UgPSBTY3JhdGNoQnVmZmVyOjpzaGFyZWQo KS5nZXRTY3JhdGNoQnVmZmVyKHNoYWRvd1RlbXBsYXRlU2l6ZSk7CiAKICAgICAvLyBEcmF3IHNo YWRvdyBpbnRvIGEgbmV3IEltYWdlQnVmZmVyLgpAQCAtNDk5LDcgKzQ4NCw3IEBAIHZvaWQgU2hh ZG93Qmx1cjo6ZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhp Y3NDb250ZXh0LCBjb25zCiAgICAgUGF0aCBwYXRoOwogICAgIHBhdGguYWRkUm91bmRlZFJlY3Qo dGVtcGxhdGVSZWN0LCByYWRpaS50b3BMZWZ0KCksIHJhZGlpLnRvcFJpZ2h0KCksIHJhZGlpLmJv dHRvbUxlZnQoKSwgcmFkaWkuYm90dG9tUmlnaHQoKSk7CiAKLSAgICBzaGFkb3dDb250ZXh0LT5z ZXRGaWxsQ29sb3IoQ29sb3IoLjBmLCAuMGYsIC4wZiwgYWxwaGEpLCBDb2xvclNwYWNlRGV2aWNl UkdCKTsKKyAgICBzaGFkb3dDb250ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3IoLjBmLCAuMGYsIC4w ZiwgMS5mKSwgQ29sb3JTcGFjZURldmljZVJHQik7CiAgICAgc2hhZG93Q29udGV4dC0+ZmlsbFBh dGgocGF0aCk7CiAKICAgICAvLyBCbHVyIHRoZSBpbWFnZS4KQEAgLTUxNyw2ICs1MDIsMTAgQEAg dm9pZCBTaGFkb3dCbHVyOjpkcmF3UmVjdFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3NDb250ZXh0 KiBncmFwaGljc0NvbnRleHQsIGNvbnMKICAgICAKICAgICBzaGFkb3dDb250ZXh0LT5yZXN0b3Jl KCk7CiAKKyAgICBGbG9hdFJlY3Qgc2hhZG93UmVjdCA9IHNoYWRvd2VkUmVjdDsKKyAgICBzaGFk b3dSZWN0LmluZmxhdGUocm91bmRlZFJhZGl1cyk7IC8vIEZJWE1FOiBkdXBsaWNhdGluZyBjb2Rl IHdpdGggY2FsY3VsYXRlTGF5ZXJCb3VuZGluZ1JlY3QuCisgICAgc2hhZG93UmVjdC5tb3ZlKG1f b2Zmc2V0LndpZHRoKCksIG1fb2Zmc2V0LmhlaWdodCgpKTsKKwogICAgIC8vIEZpbGwgdGhlIGlu dGVybmFsIHBhcnQgb2YgdGhlIHNoYWRvdy4KICAgICBzaGFkb3dSZWN0LmluZmxhdGUoLXR3aWNl UmFkaXVzKTsKICAgICBpZiAoIXNoYWRvd1JlY3QuaXNFbXB0eSgpKSB7CkBAIC01OTcsMTMgKzU4 Niw0IEBAIHZvaWQgU2hhZG93Qmx1cjo6ZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nKEdyYXBoaWNz Q29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zCiAgICAgU2NyYXRjaEJ1ZmZlcjo6c2hhcmVk KCkuc2NoZWR1bGVTY3JhdGNoQnVmZmVyUHVyZ2UoKTsKIH0KIAotI2lmICFQTEFURk9STShDRykg JiYgIVBMQVRGT1JNKENIUk9NSVVNKQotSW50UmVjdCBTaGFkb3dCbHVyOjpjbGlwQm91bmRzKEdy YXBoaWNzQ29udGV4dCopCi17Ci0gICAgLy8gRklYTUU6IGFkZCBjbGlwQm91bmRzKCkgdG8gR3Jh cGhpY3NDb250ZXh0LgotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBJbnRS ZWN0KCk7Ci19Ci0jZW5kaWYKLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2hhZG93Qmx1ci5oCmluZGV4IDdjODNkNTIxN2RlYjkz ODI2MzZlZTE2N2JjY2E1ZDkyY2IxMDJjYTQuLjQzMzhiMzE2MjJlYTRjY2JjYzRiMDAyN2M4OWFh MmZlMTgxNzJmMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1NoYWRvd0JsdXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaGFk b3dCbHVyLmgKQEAgLTUzLDE1ICs1MywxNSBAQCBwdWJsaWM6CiAgICAgdm9pZCBkcmF3SW5zZXRT aGFkb3coR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgRmxvYXRSZWN0 JiBob2xlUmVjdCwgY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiBob2xlUmFkaWkpOwogCiBw cml2YXRlOgotICAgIEdyYXBoaWNzQ29udGV4dCogYmVnaW5TaGFkb3dMYXllcihHcmFwaGljc0Nv bnRleHQqLCBjb25zdCBGbG9hdFJlY3QmIGxheWVyQXJlYSk7CisgICAgR3JhcGhpY3NDb250ZXh0 KiBiZWdpblNoYWRvd0xheWVyKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIGxheWVy UmVjdCk7CiAgICAgdm9pZCBlbmRTaGFkb3dMYXllcihHcmFwaGljc0NvbnRleHQqKTsKIAotICAg IHZvaWQgYWRqdXN0Qmx1ckRpc3RhbmNlKEdyYXBoaWNzQ29udGV4dCopOworICAgIHZvaWQgYWRq dXN0Qmx1clJhZGl1cyhHcmFwaGljc0NvbnRleHQqKTsKICAgICB2b2lkIGJsdXJMYXllckltYWdl KHVuc2lnbmVkIGNoYXIqLCBjb25zdCBJbnRTaXplJiwgaW50IHN0cmlkZSk7CiAgICAgSW50UmVj dCBjYWxjdWxhdGVMYXllckJvdW5kaW5nUmVjdChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBGbG9h dFJlY3QmIGxheWVyQXJlYSwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwogCi0gICAgdm9pZCBk cmF3UmVjdFNoYWRvd1dpdGhvdXRUaWxpbmcoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRS ZWN0JiwgY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiwgZmxvYXQgYWxwaGEpOwotICAgIHZv aWQgZHJhd1JlY3RTaGFkb3dXaXRoVGlsaW5nKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0 UmVjdCYsIGNvbnN0IFJvdW5kZWRJbnRSZWN0OjpSYWRpaSYsIGZsb2F0IGFscGhhLCBjb25zdCBJ bnRTaXplJiBzaGFkb3dUZW1wbGF0ZVNpemUpOworICAgIHZvaWQgZHJhd1JlY3RTaGFkb3dXaXRo b3V0VGlsaW5nKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IFJvdW5k ZWRJbnRSZWN0OjpSYWRpaSYsIGNvbnN0IEludFJlY3QmIGxheWVyUmVjdCk7CisgICAgdm9pZCBk cmF3UmVjdFNoYWRvd1dpdGhUaWxpbmcoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRSZWN0 JiwgY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiwgY29uc3QgSW50U2l6ZSYgc2hhZG93VGVt cGxhdGVTaXplKTsKICAgICAKICAgICBlbnVtIFNoYWRvd1R5cGUgewogICAgICAgICBOb1NoYWRv dywK