58905 2011-04-19 10:46:56 -0700 [Qt][Texmap] Do not create a texture if it will not be used. 2011-05-30 07:29:40 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED INVALID Qt, QtTriaged P2 Normal --- 47068 0 joybro201 webkit-unassigned benjamin cmarrin eric jamesr kbr laszlo.gombos noam skyul oldest_to_newest 388594 0 joybro201 2011-04-19 10:46:56 -0700 [Qt][Texmap] Do not create a texture if it will not be used. 388596 1 90215 joybro201 2011-04-19 10:51:19 -0700 Created attachment 90215 Patch 388602 2 joybro201 2011-04-19 10:53:23 -0700 Currently, all TextureMapperNodes create it's own texture even if the texture will not be used. A lot of memory is being wasted due to this. Whether a TextureMapperNode will be painted or not is determined in the sync-phase, before a texture is created. So, do not create a texture if it is not really needed. 393151 3 90215 laszlo.gombos 2011-04-26 17:13:03 -0700 Comment on attachment 90215 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90215&action=review Overall change looks good, r- to fix the typo and change come up with a better function name. > Source/WebCore/ChangeLog:14 > + No new tests required as no functionaliry changes. Typo. > Source/WebCore/platform/graphics/texmap/TextureMapperNode.h:176 > + inline bool shouldBePainted() const I think we should have a more descriptive name - what about haveContent() ? 393544 4 91281 joybro201 2011-04-27 07:50:24 -0700 Created attachment 91281 Patch haveContent() looks better! thx. 394137 5 91281 tonikitoo 2011-04-27 20:10:41 -0700 Comment on attachment 91281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91281&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperNode.h:176 > + inline bool haveContent() const it should be named hasContent, or something better and more descriptive. 394152 6 91417 joybro201 2011-04-27 20:32:27 -0700 Created attachment 91417 Fixed Fixed. I didn't find a better name. 397522 7 91417 menard 2011-05-03 16:34:17 -0700 Comment on attachment 91417 Fixed View in context: https://bugs.webkit.org/attachment.cgi?id=91417&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:859 > + if (m_state.dirty && hasContent()) I'm wondering if that check should be done before. Why entering here if anyway there is nothing to render? 412217 8 joybro201 2011-05-30 07:28:16 -0700 This problem is resolved by https://bugs.webkit.org/show_bug.cgi?id=60439 90215 2011-04-19 10:51:19 -0700 2011-04-27 07:50:24 -0700 Patch bug-58905-20110420025120.patch text/plain 3279 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODQwODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ODY2MGUzNGZiMTkyMjQz NmI4M2FiNTE2YTZkN2I2YjRmOTIxZDg4Li40MTUwMGQxYjZlMWY5NmJlNGYzZjc3MTU2OGY3MzYw OGFiNTkxM2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMTkgIFlvdW5n IEhhbiBMZWUgIDxqb3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtUZXhtYXBdIERvIG5vdCBjcmVhdGUgYSB0 ZXh0dXJlIGlmIGl0IHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODkwNQorCisgICAgICAgIEN1cnJlbnRseSwgYWxsIFRl eHR1cmVNYXBwZXJOb2RlcyBjcmVhdGUgaXQncyBvd24gdGV4dHVyZSBldmVuIGlmIHRoZSB0ZXh0 dXJlIHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIEEgbG90IG9mIG1lbW9yeSBpcyBiZWluZyB3 YXN0ZWQgZHVlIHRvIHRoaXMuCisKKyAgICAgICAgV2hldGhlciBhIFRleHR1cmVNYXBwZXJOb2Rl IHdpbGwgYmUgcGFpbnRlZCBvciBub3QgaXMgZGV0ZXJtaW5lZCBpbiB0aGUgc3luYy1waGFzZSwK KyAgICAgICAgYmVmb3JlIGEgdGV4dHVyZSBpcyBjcmVhdGVkLiBTbywgZG8gbm90IGNyZWF0ZSBh IHRleHR1cmUgaWYgaXQgaXMgbm90IHJlYWxseSBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIHJlcXVpcmVkIGFzIG5vIGZ1bmN0aW9uYWxpcnkgY2hhbmdlcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToKKyAgICAgICAgKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUludGVybmFsKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpzaG91bGRCZVBhaW50ZWQpOiBBIGNvbmRp dGlvbiB0byBwYWludC4KKwogMjAxMS0wNC0xNiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlck5vZGUuY3BwCmluZGV4IGJmNTNlNjEyMzU1NWYyMTEzOWFjOGNiMzJhMGM1YTk1YjFj MGU5MDkuLmM4Njk3M2JmMDJkZTU3YmMyNmJjM2JkY2JlNjM3Y2FlY2U4NGQwMjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJOb2RlLmNwcApAQCAtNDg4LDcgKzQ4OCw3IEBAIHZvaWQgVGV4dHVyZU1hcHBl ck5vZGU6OnBhaW50KFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIsIGNvbnN0IFRleHR1cmVN YXBwZXJDCiAKIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25zdCBUZXhtYXBQ YWludE9wdGlvbnMmIG9wdGlvbnMpCiB7Ci0gICAgaWYgKG1fc2l6ZS5pc0VtcHR5KCkgfHwgKCFt X3N0YXRlLmRyYXdzQ29udGVudCAmJiBtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IEhU TUxDb250ZW50VHlwZSkpCisgICAgaWYgKCFzaG91bGRCZVBhaW50ZWQoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IHJlcGxpY2FNYXNrVGV4dHVyZTsKQEAg LTg1Niw3ICs4NTYsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdT dGF0ZUludGVybmFsKEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKgogICAgIGlmIChtX3N0YXRl LnJlcGxpY2FMYXllcikKICAgICAgICAgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPnN5bmNDb21wb3Np dGluZ1N0YXRlSW50ZXJuYWwodG9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcihncmFwaGljc0xh eWVyLT5yZXBsaWNhTGF5ZXIoKSksIGZhbHNlLCB0ZXh0dXJlTWFwcGVyKTsKIAotICAgIGlmICht X3N0YXRlLmRpcnR5KQorICAgIGlmIChtX3N0YXRlLmRpcnR5ICYmIHNob3VsZEJlUGFpbnRlZCgp KQogICAgICAgICB1cGxvYWRUZXh0dXJlRnJvbUNvbnRlbnQodGV4dHVyZU1hcHBlciwgbV9zdGF0 ZS52aXNpYmxlUmVjdCwgZ3JhcGhpY3NMYXllcik7CiAKICAgICBtX2N1cnJlbnRDb250ZW50Lm5l ZWRzRGlzcGxheVJlY3QgPSBJbnRSZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCmluZGV4IGM1 ZGVjYzExZTkzYTI4ODg3YjU0MGQ5NTg0MjlkZWVjNjNhOTJlMjQuLmZjNzAyNDkyZDRmNGJiMTBj ZDU1M2I2YTM2YWFkMTI2ZWYyYjY0NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCkBAIC0xNzMs NiArMTczLDExIEBAIHByaXZhdGU6CiAKICAgICBMYXllclR5cGUgbV9sYXllclR5cGU7CiAKKyAg ICBpbmxpbmUgYm9vbCBzaG91bGRCZVBhaW50ZWQoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0 dXJuICFtX3NpemUuaXNFbXB0eSgpICYmIChtX3N0YXRlLmRyYXdzQ29udGVudCB8fCBtX2N1cnJl bnRDb250ZW50LmNvbnRlbnRUeXBlICE9IEhUTUxDb250ZW50VHlwZSk7CisgICAgfQorCiAgICAg aW5saW5lIEludFJlY3QgdGFyZ2V0UmVjdCgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4g bV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBIVE1MQ29udGVudFR5cGUgPyBlbnRpcmVS ZWN0KCkgOiBtX3N0YXRlLmNvbnRlbnRzUmVjdDsK 91281 2011-04-27 07:50:24 -0700 2011-04-27 20:32:27 -0700 Patch patch2.patch text/plain 3241 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODQwODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ODY2MGUzNGZiMTkyMjQz NmI4M2FiNTE2YTZkN2I2YjRmOTIxZDg4Li40MTUwMGQxYjZlMWY5NmJlNGYzZjc3MTU2OGY3MzYw OGFiNTkxM2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMTkgIFlvdW5n IEhhbiBMZWUgIDxqb3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtUZXhtYXBdIERvIG5vdCBjcmVhdGUgYSB0 ZXh0dXJlIGlmIGl0IHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODkwNQorCisgICAgICAgIEN1cnJlbnRseSwgYWxsIFRl eHR1cmVNYXBwZXJOb2RlcyBjcmVhdGUgaXQncyBvd24gdGV4dHVyZSBldmVuIGlmIHRoZSB0ZXh0 dXJlIHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIEEgbG90IG9mIG1lbW9yeSBpcyBiZWluZyB3 YXN0ZWQgZHVlIHRvIHRoaXMuCisKKyAgICAgICAgV2hldGhlciBhIFRleHR1cmVNYXBwZXJOb2Rl IHdpbGwgYmUgcGFpbnRlZCBvciBub3QgaXMgZGV0ZXJtaW5lZCBpbiB0aGUgc3luYy1waGFzZSwK KyAgICAgICAgYmVmb3JlIGEgdGV4dHVyZSBpcyBjcmVhdGVkLiBTbywgZG8gbm90IGNyZWF0ZSBh IHRleHR1cmUgaWYgaXQgaXMgbm90IHJlYWxseSBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIHJlcXVpcmVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToKKyAgICAgICAgKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUludGVybmFsKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpoYXZlQ29udGVudCk6CisKIDIwMTEtMDQt MTYgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAppbmRleCBiZjUz ZTYxMjM1NTVmMjExMzlhYzhjYjMyYTBjNWE5NWIxYzBlOTA5Li5jODY5NzNiZjAyZGU1N2JjMjZi YzNiZGNiZTYzN2NhZWNlODRkMDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKQEAgLTQ4 OCw3ICs0ODgsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpwYWludChUZXh0dXJlTWFwcGVy KiB0ZXh0dXJlTWFwcGVyLCBjb25zdCBUZXh0dXJlTWFwcGVyQwogCiB2b2lkIFRleHR1cmVNYXBw ZXJOb2RlOjpwYWludFNlbGYoY29uc3QgVGV4bWFwUGFpbnRPcHRpb25zJiBvcHRpb25zKQogewot ICAgIGlmIChtX3NpemUuaXNFbXB0eSgpIHx8ICghbV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9j dXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBIVE1MQ29udGVudFR5cGUpKQorICAgIGlmICgh aGF2ZUNvbnRlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVmUHRyPEJpdG1hcFRleHR1 cmU+IHJlcGxpY2FNYXNrVGV4dHVyZTsKQEAgLTg1Niw3ICs4NTYsNyBAQCB2b2lkIFRleHR1cmVN YXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUludGVybmFsKEdyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyKgogICAgIGlmIChtX3N0YXRlLnJlcGxpY2FMYXllcikKICAgICAgICAgbV9zdGF0 ZS5yZXBsaWNhTGF5ZXItPnN5bmNDb21wb3NpdGluZ1N0YXRlSW50ZXJuYWwodG9HcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcihncmFwaGljc0xheWVyLT5yZXBsaWNhTGF5ZXIoKSksIGZhbHNlLCB0 ZXh0dXJlTWFwcGVyKTsKIAotICAgIGlmIChtX3N0YXRlLmRpcnR5KQorICAgIGlmIChtX3N0YXRl LmRpcnR5ICYmIGhhdmVDb250ZW50KCkpCiAgICAgICAgIHVwbG9hZFRleHR1cmVGcm9tQ29udGVu dCh0ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLnZpc2libGVSZWN0LCBncmFwaGljc0xheWVyKTsKIAog ICAgIG1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5UmVjdCA9IEludFJlY3QoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJOb2RlLmgKaW5kZXggYzVkZWNjMTFlOTNhMjg4ODdiNTQwZDk1ODQyOWRlZWM2M2E5 MmUyNC4uZmM3MDI0OTJkNGY0YmIxMGNkNTUzYjZhMzZhYWQxMjZlZjJiNjQ0MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJO b2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJOb2RlLmgKQEAgLTE3Myw2ICsxNzMsMTEgQEAgcHJpdmF0ZToKIAogICAgIExheWVy VHlwZSBtX2xheWVyVHlwZTsKIAorICAgIGlubGluZSBib29sIGhhdmVDb250ZW50KCkgY29uc3QK KyAgICB7CisgICAgICAgIHJldHVybiAhbV9zaXplLmlzRW1wdHkoKSAmJiAobV9zdGF0ZS5kcmF3 c0NvbnRlbnQgfHwgbV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSAhPSBIVE1MQ29udGVudFR5 cGUpOworICAgIH0KKwogICAgIGlubGluZSBJbnRSZWN0IHRhcmdldFJlY3QoKSBjb25zdAogICAg IHsKICAgICAgICAgcmV0dXJuIG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gSFRNTENv bnRlbnRUeXBlID8gZW50aXJlUmVjdCgpIDogbV9zdGF0ZS5jb250ZW50c1JlY3Q7Cg== 91417 2011-04-27 20:32:27 -0700 2011-05-30 07:29:40 -0700 Fixed patch2.patch text/plain 3237 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODQwODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1ODY2MGUzNGZiMTkyMjQz NmI4M2FiNTE2YTZkN2I2YjRmOTIxZDg4Li40MTUwMGQxYjZlMWY5NmJlNGYzZjc3MTU2OGY3MzYw OGFiNTkxM2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMTkgIFlvdW5n IEhhbiBMZWUgIDxqb3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtUZXhtYXBdIERvIG5vdCBjcmVhdGUgYSB0 ZXh0dXJlIGlmIGl0IHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODkwNQorCisgICAgICAgIEN1cnJlbnRseSwgYWxsIFRl eHR1cmVNYXBwZXJOb2RlcyBjcmVhdGUgaXQncyBvd24gdGV4dHVyZSBldmVuIGlmIHRoZSB0ZXh0 dXJlIHdpbGwgbm90IGJlIHVzZWQuCisgICAgICAgIEEgbG90IG9mIG1lbW9yeSBpcyBiZWluZyB3 YXN0ZWQgZHVlIHRvIHRoaXMuCisKKyAgICAgICAgV2hldGhlciBhIFRleHR1cmVNYXBwZXJOb2Rl IHdpbGwgYmUgcGFpbnRlZCBvciBub3QgaXMgZGV0ZXJtaW5lZCBpbiB0aGUgc3luYy1waGFzZSwK KyAgICAgICAgYmVmb3JlIGEgdGV4dHVyZSBpcyBjcmVhdGVkLiBTbywgZG8gbm90IGNyZWF0ZSBh IHRleHR1cmUgaWYgaXQgaXMgbm90IHJlYWxseSBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIHJlcXVpcmVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToKKyAgICAgICAgKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZUludGVybmFsKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpoYXNDb250ZW50KToKKwogMjAxMS0wNC0x NiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCmluZGV4IGJmNTNl NjEyMzU1NWYyMTEzOWFjOGNiMzJhMGM1YTk1YjFjMGU5MDkuLmM4Njk3M2JmMDJkZTU3YmMyNmJj M2JkY2JlNjM3Y2FlY2U4NGQwMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcApAQCAtNDg4 LDcgKzQ4OCw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50KFRleHR1cmVNYXBwZXIq IHRleHR1cmVNYXBwZXIsIGNvbnN0IFRleHR1cmVNYXBwZXJDCiAKIHZvaWQgVGV4dHVyZU1hcHBl ck5vZGU6OnBhaW50U2VsZihjb25zdCBUZXhtYXBQYWludE9wdGlvbnMmIG9wdGlvbnMpCiB7Ci0g ICAgaWYgKG1fc2l6ZS5pc0VtcHR5KCkgfHwgKCFtX3N0YXRlLmRyYXdzQ29udGVudCAmJiBtX2N1 cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IEhUTUxDb250ZW50VHlwZSkpCisgICAgaWYgKCFo YXNDb250ZW50KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJl PiByZXBsaWNhTWFza1RleHR1cmU7CkBAIC04NTYsNyArODU2LDcgQEAgdm9pZCBUZXh0dXJlTWFw cGVyTm9kZTo6c3luY0NvbXBvc2l0aW5nU3RhdGVJbnRlcm5hbChHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlcioKICAgICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIpCiAgICAgICAgIG1fc3RhdGUu cmVwbGljYUxheWVyLT5zeW5jQ29tcG9zaXRpbmdTdGF0ZUludGVybmFsKHRvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIoZ3JhcGhpY3NMYXllci0+cmVwbGljYUxheWVyKCkpLCBmYWxzZSwgdGV4 dHVyZU1hcHBlcik7CiAKLSAgICBpZiAobV9zdGF0ZS5kaXJ0eSkKKyAgICBpZiAobV9zdGF0ZS5k aXJ0eSAmJiBoYXNDb250ZW50KCkpCiAgICAgICAgIHVwbG9hZFRleHR1cmVGcm9tQ29udGVudCh0 ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLnZpc2libGVSZWN0LCBncmFwaGljc0xheWVyKTsKIAogICAg IG1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5UmVjdCA9IEludFJlY3QoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJOb2RlLmgKaW5kZXggYzVkZWNjMTFlOTNhMjg4ODdiNTQwZDk1ODQyOWRlZWM2M2E5MmUy NC4uZmM3MDI0OTJkNGY0YmIxMGNkNTUzYjZhMzZhYWQxMjZlZjJiNjQ0MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2Rl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVN YXBwZXJOb2RlLmgKQEAgLTE3Myw2ICsxNzMsMTEgQEAgcHJpdmF0ZToKIAogICAgIExheWVyVHlw ZSBtX2xheWVyVHlwZTsKIAorICAgIGlubGluZSBib29sIGhhc0NvbnRlbnQoKSBjb25zdAorICAg IHsKKyAgICAgICAgcmV0dXJuICFtX3NpemUuaXNFbXB0eSgpICYmIChtX3N0YXRlLmRyYXdzQ29u dGVudCB8fCBtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlICE9IEhUTUxDb250ZW50VHlwZSk7 CisgICAgfQorCiAgICAgaW5saW5lIEludFJlY3QgdGFyZ2V0UmVjdCgpIGNvbnN0CiAgICAgewog ICAgICAgICByZXR1cm4gbV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBIVE1MQ29udGVu dFR5cGUgPyBlbnRpcmVSZWN0KCkgOiBtX3N0YXRlLmNvbnRlbnRzUmVjdDsK