81180 2012-03-14 19:03:07 -0700 RenderStyle: Return opaque Color objects rather than const-references. 2012-03-15 14:24:38 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69521 1 kling kling koivisto macpherson menard webkit.review.bot oldest_to_newest 579028 0 kling 2012-03-14 19:03:07 -0700 Prep work for storing colors as RGBA32/bool buddies. 579054 1 131978 kling 2012-03-14 19:21:08 -0700 Created attachment 131978 Proposed patch 579737 2 kling 2012-03-15 14:24:38 -0700 Committed r110886: <http://trac.webkit.org/changeset/110886> 131978 2012-03-14 19:21:08 -0700 2012-03-15 09:05:47 -0700 Proposed patch bug-81180.diff text/plain 14778 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZmFmYzNiLi4zYzVkODZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMDMtMTQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJlbmRlclN0eWxlOiBSZXR1cm4gb3BhcXVlIENvbG9yIG9iamVjdHMgcmF0aGVyIHRoYW4g Y29uc3QtcmVmZXJlbmNlcy4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvODExODA+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBSZW5k ZXJTdHlsZSBnZXR0ZXJzIHJldHVybiAiQ29sb3IiIHJhdGhlciB0aGFuICJjb25zdCBDb2xvciYi LiBUaGlzIGlzIHByZXBhcmF0aW9uCisgICAgICAgIGZvciBzdG9yaW5nIHNvbWUgY29sb3IgdmFs dWVzIGluIGEgbW9yZSBzcGFjZS1lZmZpY2llbnQgZmFzaGlvbi4KKworICAgICAgICAqIGNzcy9D U1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0 eUNvbG9yOjphcHBseUluaGVyaXRWYWx1ZSk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQmFzZS5jcHA6CisgICAgICAgIChQcm9wZXJ0eVdyYXBwZXJDb2xvcik6CisgICAgICAg IChXZWJDb3JlOjpQcm9wZXJ0eVdyYXBwZXJDb2xvcjo6UHJvcGVydHlXcmFwcGVyQ29sb3IpOgor ICAgICAgICAoV2ViQ29yZTo6UHJvcGVydHlXcmFwcGVyQ29sb3I6OmJsZW5kKToKKyAgICAgICAg KFdlYkNvcmU6OlByb3BlcnR5V3JhcHBlck1heWJlSW52YWxpZENvbG9yOjpQcm9wZXJ0eVdyYXBw ZXJNYXliZUludmFsaWRDb2xvcik6CisgICAgICAgIChQcm9wZXJ0eVdyYXBwZXJNYXliZUludmFs aWRDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpQcm9wZXJ0eVdyYXBwZXJWaXNpdGVkQWZmZWN0 ZWRDb2xvcjo6UHJvcGVydHlXcmFwcGVyVmlzaXRlZEFmZmVjdGVkQ29sb3IpOgorICAgICAgICAo V2ViQ29yZTo6UHJvcGVydHlXcmFwcGVyU1ZHUGFpbnQ6OlByb3BlcnR5V3JhcHBlclNWR1BhaW50 KToKKyAgICAgICAgKFByb3BlcnR5V3JhcHBlclNWR1BhaW50KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9Db2xvci5oOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OkNvbG9yKToKKyAg ICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKwogMjAxMi0wMy0xMiAgQWRh bSBLbGVpbiAgPGFkYW1rQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbTXV0YXRpb25PYnNlcnZl cnNdIEVuZm9yY2UgYSBjb25zaXN0ZW50IG9yZGVyIG9mIE11dGF0aW9uUmVjb3JkIGRlbGl2ZXJ5 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCmluZGV4IDM3 YmM0ODUuLjA0NzkyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFw cGx5UHJvcGVydHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJv cGVydHkuY3BwCkBAIC0yNjYsMTcgKzI2NiwxNyBAQCBlbnVtIENvbG9ySW5oZXJpdCB7Tm9Jbmhl cml0RnJvbVBhcmVudCA9IDAsIEluaGVyaXRGcm9tUGFyZW50fTsKIENvbG9yIGRlZmF1bHRJbml0 aWFsQ29sb3IoKTsKIENvbG9yIGRlZmF1bHRJbml0aWFsQ29sb3IoKSB7IHJldHVybiBDb2xvcigp OyB9CiB0ZW1wbGF0ZSA8Q29sb3JJbmhlcml0IGluaGVyaXRDb2xvckZyb21QYXJlbnQsCi0gICAg ICAgICAgY29uc3QgQ29sb3ImIChSZW5kZXJTdHlsZTo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0 LAorICAgICAgICAgIENvbG9yIChSZW5kZXJTdHlsZTo6KmdldHRlckZ1bmN0aW9uKSgpIGNvbnN0 LAogICAgICAgICAgIHZvaWQgKFJlbmRlclN0eWxlOjoqc2V0dGVyRnVuY3Rpb24pKGNvbnN0IENv bG9yJiksCiAgICAgICAgICAgdm9pZCAoUmVuZGVyU3R5bGU6Oip2aXNpdGVkTGlua1NldHRlckZ1 bmN0aW9uKShjb25zdCBDb2xvciYpLAotICAgICAgICAgIGNvbnN0IENvbG9yJiAoUmVuZGVyU3R5 bGU6OipkZWZhdWx0RnVuY3Rpb24pKCkgY29uc3QsCisgICAgICAgICAgQ29sb3IgKFJlbmRlclN0 eWxlOjoqZGVmYXVsdEZ1bmN0aW9uKSgpIGNvbnN0LAogICAgICAgICAgIENvbG9yICgqaW5pdGlh bEZ1bmN0aW9uKSgpID0gJmRlZmF1bHRJbml0aWFsQ29sb3I+CiBjbGFzcyBBcHBseVByb3BlcnR5 Q29sb3IgewogcHVibGljOgogICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0 eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQogICAgIHsKICAgICAgICAgLy8gVmlzaXRlZCBsaW5rIHN0 eWxlIGNhbiBuZXZlciBleHBsaWNpdGx5IGluaGVyaXQgZnJvbSBwYXJlbnQgdmlzaXRlZCBsaW5r IHN0eWxlIHNvIG5vIHNlcGFyYXRlIGdldHRlcnMgYXJlIG5lZWRlZC4KLSAgICAgICAgY29uc3Qg Q29sb3ImIGNvbG9yID0gKHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT4qZ2V0dGVyRnVuY3Rpb24p KCk7CisgICAgICAgIENvbG9yIGNvbG9yID0gKHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT4qZ2V0 dGVyRnVuY3Rpb24pKCk7CiAgICAgICAgIGFwcGx5Q29sb3JWYWx1ZShzZWxlY3RvciwgY29sb3Iu aXNWYWxpZCgpID8gY29sb3IgOiAoc2VsZWN0b3ItPnBhcmVudFN0eWxlKCktPipkZWZhdWx0RnVu Y3Rpb24pKCkpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmlt YXRpb24vQW5pbWF0aW9uQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9B bmltYXRpb25CYXNlLmNwcAppbmRleCAxZTY2NWVjLi4yOGM1OTBiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcApAQCAtNDE4LDYgKzQxOCwy MyBAQCBwdWJsaWM6CiAgICAgfQogfTsKIAorY2xhc3MgUHJvcGVydHlXcmFwcGVyQ29sb3IgOiBw dWJsaWMgUHJvcGVydHlXcmFwcGVyR2V0dGVyPENvbG9yPiB7CitwdWJsaWM6CisgICAgUHJvcGVy dHlXcmFwcGVyQ29sb3IoaW50IHByb3AsIENvbG9yIChSZW5kZXJTdHlsZTo6KmdldHRlcikoKSBj b25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXIpKGNvbnN0IENvbG9yJikpCisgICAgICAg IDogUHJvcGVydHlXcmFwcGVyR2V0dGVyPENvbG9yPihwcm9wLCBnZXR0ZXIpCisgICAgICAgICwg bV9zZXR0ZXIoc2V0dGVyKQorICAgIHsKKyAgICB9CisKKyAgICB2aXJ0dWFsIHZvaWQgYmxlbmQo Y29uc3QgQW5pbWF0aW9uQmFzZSogYW5pbSwgUmVuZGVyU3R5bGUqIGRzdCwgY29uc3QgUmVuZGVy U3R5bGUqIGEsIGNvbnN0IFJlbmRlclN0eWxlKiBiLCBkb3VibGUgcHJvZ3Jlc3MpIGNvbnN0Cisg ICAgeworICAgICAgICAoZHN0LT4qbV9zZXR0ZXIpKGJsZW5kRnVuYyhhbmltLCAoYS0+KlByb3Bl cnR5V3JhcHBlckdldHRlcjxDb2xvcj46Om1fZ2V0dGVyKSgpLCAoYi0+KlByb3BlcnR5V3JhcHBl ckdldHRlcjxDb2xvcj46Om1fZ2V0dGVyKSgpLCBwcm9ncmVzcykpOworICAgIH0KKworcHJvdGVj dGVkOgorICAgIHZvaWQgKFJlbmRlclN0eWxlOjoqbV9zZXR0ZXIpKGNvbnN0IENvbG9yJik7Cit9 OworCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogY2xhc3MgUHJvcGVydHlXcmFw cGVyQWNjZWxlcmF0ZWRPcGFjaXR5IDogcHVibGljIFByb3BlcnR5V3JhcHBlcjxmbG9hdD4gewog cHVibGljOgpAQCAtNjEwLDcgKzYyNyw3IEBAIHByaXZhdGU6CiAKIGNsYXNzIFByb3BlcnR5V3Jh cHBlck1heWJlSW52YWxpZENvbG9yIDogcHVibGljIFByb3BlcnR5V3JhcHBlckJhc2UgewogcHVi bGljOgotICAgIFByb3BlcnR5V3JhcHBlck1heWJlSW52YWxpZENvbG9yKGludCBwcm9wLCBjb25z dCBDb2xvciYgKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lkIChSZW5kZXJTdHls ZTo6KnNldHRlcikoY29uc3QgQ29sb3ImKSkKKyAgICBQcm9wZXJ0eVdyYXBwZXJNYXliZUludmFs aWRDb2xvcihpbnQgcHJvcCwgQ29sb3IgKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2 b2lkIChSZW5kZXJTdHlsZTo6KnNldHRlcikoY29uc3QgQ29sb3ImKSkKICAgICAgICAgOiBQcm9w ZXJ0eVdyYXBwZXJCYXNlKHByb3ApCiAgICAgICAgICwgbV9nZXR0ZXIoZ2V0dGVyKQogICAgICAg ICAsIG1fc2V0dGVyKHNldHRlcikKQEAgLTY0OSwyMiArNjY2LDIyIEBAIHB1YmxpYzoKICAgICB9 CiAKIHByaXZhdGU6Ci0gICAgY29uc3QgQ29sb3ImIChSZW5kZXJTdHlsZTo6Km1fZ2V0dGVyKSgp IGNvbnN0OworICAgIENvbG9yIChSZW5kZXJTdHlsZTo6Km1fZ2V0dGVyKSgpIGNvbnN0OwogICAg IHZvaWQgKFJlbmRlclN0eWxlOjoqbV9zZXR0ZXIpKGNvbnN0IENvbG9yJik7CiB9OwogCiBlbnVt IE1heWJlSW52YWxpZENvbG9yVGFnIHsgTWF5YmVJbnZhbGlkQ29sb3IgfTsKIGNsYXNzIFByb3Bl cnR5V3JhcHBlclZpc2l0ZWRBZmZlY3RlZENvbG9yIDogcHVibGljIFByb3BlcnR5V3JhcHBlckJh c2UgewogcHVibGljOgotICAgIFByb3BlcnR5V3JhcHBlclZpc2l0ZWRBZmZlY3RlZENvbG9yKGlu dCBwcm9wLCBjb25zdCBDb2xvciYgKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lk IChSZW5kZXJTdHlsZTo6KnNldHRlcikoY29uc3QgQ29sb3ImKSwgCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgQ29sb3ImIChSZW5kZXJTdHlsZTo6KnZpc2l0 ZWRHZXR0ZXIpKCkgY29uc3QsIHZvaWQgKFJlbmRlclN0eWxlOjoqdmlzaXRlZFNldHRlcikoY29u c3QgQ29sb3ImKSkKKyAgICBQcm9wZXJ0eVdyYXBwZXJWaXNpdGVkQWZmZWN0ZWRDb2xvcihpbnQg cHJvcCwgQ29sb3IgKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lkIChSZW5kZXJT dHlsZTo6KnNldHRlcikoY29uc3QgQ29sb3ImKSwgCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQ29sb3IgKFJlbmRlclN0eWxlOjoqdmlzaXRlZEdldHRlcikoKSBjb25z dCwgdm9pZCAoUmVuZGVyU3R5bGU6Oip2aXNpdGVkU2V0dGVyKShjb25zdCBDb2xvciYpKQogICAg ICAgICA6IFByb3BlcnR5V3JhcHBlckJhc2UocHJvcCkKLSAgICAgICAgLCBtX3dyYXBwZXIoYWRv cHRQdHIobmV3IFByb3BlcnR5V3JhcHBlcjxjb25zdCBDb2xvciY+KHByb3AsIGdldHRlciwgc2V0 dGVyKSkpCi0gICAgICAgICwgbV92aXNpdGVkV3JhcHBlcihhZG9wdFB0cihuZXcgUHJvcGVydHlX cmFwcGVyPGNvbnN0IENvbG9yJj4ocHJvcCwgdmlzaXRlZEdldHRlciwgdmlzaXRlZFNldHRlcikp KQorICAgICAgICAsIG1fd3JhcHBlcihhZG9wdFB0cihuZXcgUHJvcGVydHlXcmFwcGVyQ29sb3Io cHJvcCwgZ2V0dGVyLCBzZXR0ZXIpKSkKKyAgICAgICAgLCBtX3Zpc2l0ZWRXcmFwcGVyKGFkb3B0 UHRyKG5ldyBQcm9wZXJ0eVdyYXBwZXJDb2xvcihwcm9wLCB2aXNpdGVkR2V0dGVyLCB2aXNpdGVk U2V0dGVyKSkpCiAgICAgewogICAgIH0KLSAgICBQcm9wZXJ0eVdyYXBwZXJWaXNpdGVkQWZmZWN0 ZWRDb2xvcihpbnQgcHJvcCwgTWF5YmVJbnZhbGlkQ29sb3JUYWcsIGNvbnN0IENvbG9yJiAoUmVu ZGVyU3R5bGU6OipnZXR0ZXIpKCkgY29uc3QsIHZvaWQgKFJlbmRlclN0eWxlOjoqc2V0dGVyKShj b25zdCBDb2xvciYpLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBDb2xvciYgKFJlbmRlclN0eWxlOjoqdmlzaXRlZEdldHRlcikoKSBjb25zdCwgdm9pZCAo UmVuZGVyU3R5bGU6Oip2aXNpdGVkU2V0dGVyKShjb25zdCBDb2xvciYpKQorICAgIFByb3BlcnR5 V3JhcHBlclZpc2l0ZWRBZmZlY3RlZENvbG9yKGludCBwcm9wLCBNYXliZUludmFsaWRDb2xvclRh ZywgQ29sb3IgKFJlbmRlclN0eWxlOjoqZ2V0dGVyKSgpIGNvbnN0LCB2b2lkIChSZW5kZXJTdHls ZTo6KnNldHRlcikoY29uc3QgQ29sb3ImKSwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgQ29sb3IgKFJlbmRlclN0eWxlOjoqdmlzaXRlZEdldHRlcikoKSBjb25zdCwg dm9pZCAoUmVuZGVyU3R5bGU6Oip2aXNpdGVkU2V0dGVyKShjb25zdCBDb2xvciYpKQogICAgICAg ICA6IFByb3BlcnR5V3JhcHBlckJhc2UocHJvcCkKICAgICAgICAgLCBtX3dyYXBwZXIoYWRvcHRQ dHIobmV3IFByb3BlcnR5V3JhcHBlck1heWJlSW52YWxpZENvbG9yKHByb3AsIGdldHRlciwgc2V0 dGVyKSkpCiAgICAgICAgICwgbV92aXNpdGVkV3JhcHBlcihhZG9wdFB0cihuZXcgUHJvcGVydHlX cmFwcGVyTWF5YmVJbnZhbGlkQ29sb3IocHJvcCwgdmlzaXRlZEdldHRlciwgdmlzaXRlZFNldHRl cikpKQpAQCAtODg3LDcgKzkwNCw3IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFNWRykKIGNsYXNz IFByb3BlcnR5V3JhcHBlclNWR1BhaW50IDogcHVibGljIFByb3BlcnR5V3JhcHBlckJhc2Ugewog cHVibGljOgotICAgIFByb3BlcnR5V3JhcHBlclNWR1BhaW50KGludCBwcm9wLCBjb25zdCBTVkdQ YWludDo6U1ZHUGFpbnRUeXBlJiAoUmVuZGVyU3R5bGU6OipwYWludFR5cGVHZXR0ZXIpKCkgY29u c3QsIGNvbnN0IENvbG9yJiAoUmVuZGVyU3R5bGU6OipnZXR0ZXIpKCkgY29uc3QsIHZvaWQgKFJl bmRlclN0eWxlOjoqc2V0dGVyKShjb25zdCBDb2xvciYpKQorICAgIFByb3BlcnR5V3JhcHBlclNW R1BhaW50KGludCBwcm9wLCBjb25zdCBTVkdQYWludDo6U1ZHUGFpbnRUeXBlJiAoUmVuZGVyU3R5 bGU6OipwYWludFR5cGVHZXR0ZXIpKCkgY29uc3QsIENvbG9yIChSZW5kZXJTdHlsZTo6KmdldHRl cikoKSBjb25zdCwgdm9pZCAoUmVuZGVyU3R5bGU6OipzZXR0ZXIpKGNvbnN0IENvbG9yJikpCiAg ICAgICAgIDogUHJvcGVydHlXcmFwcGVyQmFzZShwcm9wKQogICAgICAgICAsIG1fcGFpbnRUeXBl R2V0dGVyKHBhaW50VHlwZUdldHRlcikKICAgICAgICAgLCBtX2dldHRlcihnZXR0ZXIpCkBAIC05 NDEsNyArOTU4LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIGNvbnN0IFNWR1BhaW50OjpT VkdQYWludFR5cGUmIChSZW5kZXJTdHlsZTo6Km1fcGFpbnRUeXBlR2V0dGVyKSgpIGNvbnN0Owot ICAgIGNvbnN0IENvbG9yJiAoUmVuZGVyU3R5bGU6OiptX2dldHRlcikoKSBjb25zdDsKKyAgICBD b2xvciAoUmVuZGVyU3R5bGU6OiptX2dldHRlcikoKSBjb25zdDsKICAgICB2b2lkIChSZW5kZXJT dHlsZTo6Km1fc2V0dGVyKShjb25zdCBDb2xvciYpOwogfTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKaW5kZXggMjM1ZjY3MS4uZGRmZTIwZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Db2xvci5oCkBAIC03OSw3ICs3OSw3IEBAIGNs YXNzIENvbG9yIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBD b2xvcigpIDogbV9jb2xvcigwKSwgbV92YWxpZChmYWxzZSkgeyB9Ci0gICAgQ29sb3IoUkdCQTMy IGNvbCkgOiBtX2NvbG9yKGNvbCksIG1fdmFsaWQodHJ1ZSkgeyB9CisgICAgQ29sb3IoUkdCQTMy IGNvbG9yLCBib29sIHZhbGlkID0gdHJ1ZSkgOiBtX2NvbG9yKGNvbG9yKSwgbV92YWxpZCh2YWxp ZCkgeyBBU1NFUlQoIW1fY29sb3IgfHwgbV92YWxpZCk7IH0KICAgICBDb2xvcihpbnQgciwgaW50 IGcsIGludCBiKSA6IG1fY29sb3IobWFrZVJHQihyLCBnLCBiKSksIG1fdmFsaWQodHJ1ZSkgeyB9 CiAgICAgQ29sb3IoaW50IHIsIGludCBnLCBpbnQgYiwgaW50IGEpIDogbV9jb2xvcihtYWtlUkdC QShyLCBnLCBiLCBhKSksIG1fdmFsaWQodHJ1ZSkgeyB9CiAgICAgLy8gQ29sb3IgaXMgY3VycmVu dGx5IGxpbWl0ZWQgdG8gMzJiaXQgUkdCQSwgcGVyaGFwcyBzb21lIGRheSB3ZSdsbCBzdXBwb3J0 IGJldHRlciBjb2xvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmgKaW5kZXggNTUxNTFkMy4uNDY2Zjg1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKQEAgLTEzNzYsMTMgKzEzNzYsMTMgQEAgcHVibGljOgog ICAgIFNWR1JlbmRlclN0eWxlKiBhY2Nlc3NTVkdTdHlsZSgpIHsgcmV0dXJuIG1fc3ZnU3R5bGUu YWNjZXNzKCk7IH0KIAogICAgIGNvbnN0IFNWR1BhaW50OjpTVkdQYWludFR5cGUmIGZpbGxQYWlu dFR5cGUoKSBjb25zdCB7IHJldHVybiBzdmdTdHlsZSgpLT5maWxsUGFpbnRUeXBlKCk7IH0KLSAg ICBjb25zdCBDb2xvciYgZmlsbFBhaW50Q29sb3IoKSBjb25zdCB7IHJldHVybiBzdmdTdHlsZSgp LT5maWxsUGFpbnRDb2xvcigpOyB9CisgICAgQ29sb3IgZmlsbFBhaW50Q29sb3IoKSBjb25zdCB7 IHJldHVybiBzdmdTdHlsZSgpLT5maWxsUGFpbnRDb2xvcigpOyB9CiAgICAgdm9pZCBzZXRGaWxs UGFpbnRDb2xvcihjb25zdCBDb2xvciYgYykgeyBhY2Nlc3NTVkdTdHlsZSgpLT5zZXRGaWxsUGFp bnQoU1ZHUGFpbnQ6OlNWR19QQUlOVFRZUEVfUkdCQ09MT1IsIGMsICIiKTsgfQogICAgIGZsb2F0 IGZpbGxPcGFjaXR5KCkgY29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS0+ZmlsbE9wYWNpdHkoKTsg fQogICAgIHZvaWQgc2V0RmlsbE9wYWNpdHkoZmxvYXQgZikgeyBhY2Nlc3NTVkdTdHlsZSgpLT5z ZXRGaWxsT3BhY2l0eShmKTsgfQogCiAgICAgY29uc3QgU1ZHUGFpbnQ6OlNWR1BhaW50VHlwZSYg c3Ryb2tlUGFpbnRUeXBlKCkgY29uc3QgeyByZXR1cm4gc3ZnU3R5bGUoKS0+c3Ryb2tlUGFpbnRU eXBlKCk7IH0KLSAgICBjb25zdCBDb2xvciYgc3Ryb2tlUGFpbnRDb2xvcigpIGNvbnN0IHsgcmV0 dXJuIHN2Z1N0eWxlKCktPnN0cm9rZVBhaW50Q29sb3IoKTsgfQorICAgIENvbG9yIHN0cm9rZVBh aW50Q29sb3IoKSBjb25zdCB7IHJldHVybiBzdmdTdHlsZSgpLT5zdHJva2VQYWludENvbG9yKCk7 IH0KICAgICB2b2lkIHNldFN0cm9rZVBhaW50Q29sb3IoY29uc3QgQ29sb3ImIGMpIHsgYWNjZXNz U1ZHU3R5bGUoKS0+c2V0U3Ryb2tlUGFpbnQoU1ZHUGFpbnQ6OlNWR19QQUlOVFRZUEVfUkdCQ09M T1IsIGMsICIiKTsgfQogICAgIGZsb2F0IHN0cm9rZU9wYWNpdHkoKSBjb25zdCB7IHJldHVybiBz dmdTdHlsZSgpLT5zdHJva2VPcGFjaXR5KCk7IH0KICAgICB2b2lkIHNldFN0cm9rZU9wYWNpdHko ZmxvYXQgZikgeyBhY2Nlc3NTVkdTdHlsZSgpLT5zZXRTdHJva2VPcGFjaXR5KGYpOyB9CkBAIC0x NzE2LDM2ICsxNzE2LDM2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc0Rpc3BsYXlJbmxpbmVUeXBl KEVEaXNwbGF5IGRpc3BsYXkpIGNvbnN0IHsgcmV0dXJuIGRpc3BsYXkgPT0gSU5MSU5FIHx8IGlz RGlzcGxheVJlcGxhY2VkVHlwZShkaXNwbGF5KTsgfQogCiAgICAgLy8gQ29sb3IgYWNjZXNzb3Jz IGFyZSBhbGwgcHJpdmF0ZSB0byBtYWtlIHN1cmUgY2FsbGVycyB1c2UgdmlzaXRlZERlcGVuZGVu dENvbG9yIGluc3RlYWQgdG8gYWNjZXNzIHRoZW0uCi0gICAgY29uc3QgQ29sb3ImIGludmFsaWRD b2xvcigpIGNvbnN0IHsgc3RhdGljIENvbG9yIGludmFsaWQ7IHJldHVybiBpbnZhbGlkOyB9Ci0g ICAgY29uc3QgQ29sb3ImIGJvcmRlckxlZnRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHN1cnJvdW5k LT5ib3JkZXIubGVmdCgpLmNvbG9yKCk7IH0KLSAgICBjb25zdCBDb2xvciYgYm9yZGVyUmlnaHRD b2xvcigpIGNvbnN0IHsgcmV0dXJuIHN1cnJvdW5kLT5ib3JkZXIucmlnaHQoKS5jb2xvcigpOyB9 Ci0gICAgY29uc3QgQ29sb3ImIGJvcmRlclRvcENvbG9yKCkgY29uc3QgeyByZXR1cm4gc3Vycm91 bmQtPmJvcmRlci50b3AoKS5jb2xvcigpOyB9Ci0gICAgY29uc3QgQ29sb3ImIGJvcmRlckJvdHRv bUNvbG9yKCkgY29uc3QgeyByZXR1cm4gc3Vycm91bmQtPmJvcmRlci5ib3R0b20oKS5jb2xvcigp OyB9Ci0gICAgY29uc3QgQ29sb3ImIGJhY2tncm91bmRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIG1f YmFja2dyb3VuZC0+Y29sb3IoKTsgfQotICAgIGNvbnN0IENvbG9yJiBjb2xvcigpIGNvbnN0IHsg cmV0dXJuIGluaGVyaXRlZC0+Y29sb3I7IH0KLSAgICBjb25zdCBDb2xvciYgY29sdW1uUnVsZUNv bG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbXVsdGlDb2wtPm1f cnVsZS5jb2xvcigpOyB9Ci0gICAgY29uc3QgQ29sb3ImIG91dGxpbmVDb2xvcigpIGNvbnN0IHsg cmV0dXJuIG1fYmFja2dyb3VuZC0+b3V0bGluZSgpLmNvbG9yKCk7IH0KLSAgICBjb25zdCBDb2xv ciYgdGV4dEVtcGhhc2lzQ29sb3IoKSBjb25zdCB7IHJldHVybiByYXJlSW5oZXJpdGVkRGF0YS0+ dGV4dEVtcGhhc2lzQ29sb3I7IH0KLSAgICBjb25zdCBDb2xvciYgdGV4dEZpbGxDb2xvcigpIGNv bnN0IHsgcmV0dXJuIHJhcmVJbmhlcml0ZWREYXRhLT50ZXh0RmlsbENvbG9yOyB9Ci0gICAgY29u c3QgQ29sb3ImIHRleHRTdHJva2VDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVJbmhlcml0ZWRE YXRhLT50ZXh0U3Ryb2tlQ29sb3I7IH0KLSAgICBjb25zdCBDb2xvciYgdmlzaXRlZExpbmtDb2xv cigpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRlZC0+dmlzaXRlZExpbmtDb2xvcjsgfQotICAgIGNv bnN0IENvbG9yJiB2aXNpdGVkTGlua0JhY2tncm91bmRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHJh cmVOb25Jbmhlcml0ZWREYXRhLT5tX3Zpc2l0ZWRMaW5rQmFja2dyb3VuZENvbG9yOyB9Ci0gICAg Y29uc3QgQ29sb3ImIHZpc2l0ZWRMaW5rQm9yZGVyTGVmdENvbG9yKCkgY29uc3QgeyByZXR1cm4g cmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdmlzaXRlZExpbmtCb3JkZXJMZWZ0Q29sb3I7IH0KLSAg ICBjb25zdCBDb2xvciYgdmlzaXRlZExpbmtCb3JkZXJSaWdodENvbG9yKCkgY29uc3QgeyByZXR1 cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdmlzaXRlZExpbmtCb3JkZXJSaWdodENvbG9yOyB9 Ci0gICAgY29uc3QgQ29sb3ImIHZpc2l0ZWRMaW5rQm9yZGVyQm90dG9tQ29sb3IoKSBjb25zdCB7 IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV92aXNpdGVkTGlua0JvcmRlckJvdHRvbUNv bG9yOyB9Ci0gICAgY29uc3QgQ29sb3ImIHZpc2l0ZWRMaW5rQm9yZGVyVG9wQ29sb3IoKSBjb25z dCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV92aXNpdGVkTGlua0JvcmRlclRvcENv bG9yOyB9Ci0gICAgY29uc3QgQ29sb3ImIHZpc2l0ZWRMaW5rT3V0bGluZUNvbG9yKCkgY29uc3Qg eyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdmlzaXRlZExpbmtPdXRsaW5lQ29sb3I7 IH0KLSAgICBjb25zdCBDb2xvciYgdmlzaXRlZExpbmtDb2x1bW5SdWxlQ29sb3IoKSBjb25zdCB7 IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9tdWx0aUNvbC0+bV92aXNpdGVkTGlua0Nv bHVtblJ1bGVDb2xvcjsgfQotICAgIGNvbnN0IENvbG9yJiB2aXNpdGVkTGlua1RleHRFbXBoYXNp c0NvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPnZpc2l0ZWRMaW5rVGV4 dEVtcGhhc2lzQ29sb3I7IH0KLSAgICBjb25zdCBDb2xvciYgdmlzaXRlZExpbmtUZXh0RmlsbENv bG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPnZpc2l0ZWRMaW5rVGV4dEZp bGxDb2xvcjsgfQotICAgIGNvbnN0IENvbG9yJiB2aXNpdGVkTGlua1RleHRTdHJva2VDb2xvcigp IGNvbnN0IHsgcmV0dXJuIHJhcmVJbmhlcml0ZWREYXRhLT52aXNpdGVkTGlua1RleHRTdHJva2VD b2xvcjsgfQorICAgIENvbG9yIGludmFsaWRDb2xvcigpIGNvbnN0IHsgc3RhdGljIENvbG9yIGlu dmFsaWQ7IHJldHVybiBpbnZhbGlkOyB9CisgICAgQ29sb3IgYm9yZGVyTGVmdENvbG9yKCkgY29u c3QgeyByZXR1cm4gc3Vycm91bmQtPmJvcmRlci5sZWZ0KCkuY29sb3IoKTsgfQorICAgIENvbG9y IGJvcmRlclJpZ2h0Q29sb3IoKSBjb25zdCB7IHJldHVybiBzdXJyb3VuZC0+Ym9yZGVyLnJpZ2h0 KCkuY29sb3IoKTsgfQorICAgIENvbG9yIGJvcmRlclRvcENvbG9yKCkgY29uc3QgeyByZXR1cm4g c3Vycm91bmQtPmJvcmRlci50b3AoKS5jb2xvcigpOyB9CisgICAgQ29sb3IgYm9yZGVyQm90dG9t Q29sb3IoKSBjb25zdCB7IHJldHVybiBzdXJyb3VuZC0+Ym9yZGVyLmJvdHRvbSgpLmNvbG9yKCk7 IH0KKyAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3IoKSBjb25zdCB7IHJldHVybiBtX2JhY2tncm91 bmQtPmNvbG9yKCk7IH0KKyAgICBDb2xvciBjb2xvcigpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRl ZC0+Y29sb3I7IH0KKyAgICBDb2xvciBjb2x1bW5SdWxlQ29sb3IoKSBjb25zdCB7IHJldHVybiBy YXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9tdWx0aUNvbC0+bV9ydWxlLmNvbG9yKCk7IH0KKyAgICBD b2xvciBvdXRsaW5lQ29sb3IoKSBjb25zdCB7IHJldHVybiBtX2JhY2tncm91bmQtPm91dGxpbmUo KS5jb2xvcigpOyB9CisgICAgQ29sb3IgdGV4dEVtcGhhc2lzQ29sb3IoKSBjb25zdCB7IHJldHVy biByYXJlSW5oZXJpdGVkRGF0YS0+dGV4dEVtcGhhc2lzQ29sb3I7IH0KKyAgICBDb2xvciB0ZXh0 RmlsbENvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPnRleHRGaWxsQ29s b3I7IH0KKyAgICBDb2xvciB0ZXh0U3Ryb2tlQ29sb3IoKSBjb25zdCB7IHJldHVybiByYXJlSW5o ZXJpdGVkRGF0YS0+dGV4dFN0cm9rZUNvbG9yOyB9CisgICAgQ29sb3IgdmlzaXRlZExpbmtDb2xv cigpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRlZC0+dmlzaXRlZExpbmtDb2xvcjsgfQorICAgIENv bG9yIHZpc2l0ZWRMaW5rQmFja2dyb3VuZENvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbklu aGVyaXRlZERhdGEtPm1fdmlzaXRlZExpbmtCYWNrZ3JvdW5kQ29sb3I7IH0KKyAgICBDb2xvciB2 aXNpdGVkTGlua0JvcmRlckxlZnRDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0 ZWREYXRhLT5tX3Zpc2l0ZWRMaW5rQm9yZGVyTGVmdENvbG9yOyB9CisgICAgQ29sb3IgdmlzaXRl ZExpbmtCb3JkZXJSaWdodENvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERh dGEtPm1fdmlzaXRlZExpbmtCb3JkZXJSaWdodENvbG9yOyB9CisgICAgQ29sb3IgdmlzaXRlZExp bmtCb3JkZXJCb3R0b21Db2xvcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRh LT5tX3Zpc2l0ZWRMaW5rQm9yZGVyQm90dG9tQ29sb3I7IH0KKyAgICBDb2xvciB2aXNpdGVkTGlu a0JvcmRlclRvcENvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1f dmlzaXRlZExpbmtCb3JkZXJUb3BDb2xvcjsgfQorICAgIENvbG9yIHZpc2l0ZWRMaW5rT3V0bGlu ZUNvbG9yKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fdmlzaXRlZExp bmtPdXRsaW5lQ29sb3I7IH0KKyAgICBDb2xvciB2aXNpdGVkTGlua0NvbHVtblJ1bGVDb2xvcigp IGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29sLT5tX3Zpc2l0 ZWRMaW5rQ29sdW1uUnVsZUNvbG9yOyB9CisgICAgQ29sb3IgdmlzaXRlZExpbmtUZXh0RW1waGFz aXNDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVJbmhlcml0ZWREYXRhLT52aXNpdGVkTGlua1Rl eHRFbXBoYXNpc0NvbG9yOyB9CisgICAgQ29sb3IgdmlzaXRlZExpbmtUZXh0RmlsbENvbG9yKCkg Y29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPnZpc2l0ZWRMaW5rVGV4dEZpbGxDb2xv cjsgfQorICAgIENvbG9yIHZpc2l0ZWRMaW5rVGV4dFN0cm9rZUNvbG9yKCkgY29uc3QgeyByZXR1 cm4gcmFyZUluaGVyaXRlZERhdGEtPnZpc2l0ZWRMaW5rVGV4dFN0cm9rZUNvbG9yOyB9CiAKICAg ICBDb2xvciBjb2xvckluY2x1ZGluZ0ZhbGxiYWNrKGludCBjb2xvclByb3BlcnR5LCBib29sIHZp c2l0ZWRMaW5rKSBjb25zdDsKIAogI2lmIEVOQUJMRShTVkcpCi0gICAgY29uc3QgQ29sb3ImIHN0 b3BDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHN2Z1N0eWxlKCktPnN0b3BDb2xvcigpOyB9Ci0gICAg Y29uc3QgQ29sb3ImIGZsb29kQ29sb3IoKSBjb25zdCB7IHJldHVybiBzdmdTdHlsZSgpLT5mbG9v ZENvbG9yKCk7IH0KLSAgICBjb25zdCBDb2xvciYgbGlnaHRpbmdDb2xvcigpIGNvbnN0IHsgcmV0 dXJuIHN2Z1N0eWxlKCktPmxpZ2h0aW5nQ29sb3IoKTsgfQorICAgIENvbG9yIHN0b3BDb2xvcigp IGNvbnN0IHsgcmV0dXJuIHN2Z1N0eWxlKCktPnN0b3BDb2xvcigpOyB9CisgICAgQ29sb3IgZmxv b2RDb2xvcigpIGNvbnN0IHsgcmV0dXJuIHN2Z1N0eWxlKCktPmZsb29kQ29sb3IoKTsgfQorICAg IENvbG9yIGxpZ2h0aW5nQ29sb3IoKSBjb25zdCB7IHJldHVybiBzdmdTdHlsZSgpLT5saWdodGlu Z0NvbG9yKCk7IH0KICNlbmRpZgogCiAgICAgdm9pZCBhcHBlbmRDb250ZW50KFBhc3NPd25QdHI8 Q29udGVudERhdGE+KTsK