62908 2011-06-17 14:08:18 -0700 Optimization: avoid call to clearRect() when bgColor is valid when painting the root background in RenderBoxModelObject::paintFillLayerExtended 2011-06-19 13:48:34 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 una.sabovic webkit-unassigned darin eric simon.fraser webkit.review.bot oldest_to_newest 422876 0 una.sabovic 2011-06-17 14:08:18 -0700 When root layers base color is fully transparent backgroundRect was cleared before bgColor is applied. Instead of clearing the rect we apply CompositeCopy operation when painting the background color. 422895 1 97655 una.sabovic 2011-06-17 14:46:03 -0700 Created attachment 97655 proposed patch Adjustment for https://bugs.webkit.org/show_bug.cgi?id=62593 per Darin's suggestion. 422995 2 97655 darin 2011-06-17 17:50:15 -0700 Comment on attachment 97655 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=97655&action=review > Source/WebCore/rendering/RenderBoxModelObject.cpp:745 > + bool clearRect = false; This local variable name sounds like “a rectangle that is clear” or a verb phrase that means “clear a rectangle”, but it’s actually a boolean flag that indicates whether we need to clear the background. I would name it shouldClearBackground or mustClearBackground. > Source/WebCore/rendering/RenderBoxModelObject.cpp:758 > + CompositeOperator compositeOp = clearRect ? CompositeCopy : context->compositeOperation(); I’d name this “operation” rather than “compositeOp”. 423319 3 97655 eric 2011-06-18 20:05:17 -0700 Comment on attachment 97655 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=97655&action=review > Source/WebCore/ChangeLog:1 > +2011-06-17 una sabovic <una.sabovic@palm.com> Is your name normally written without capitals? 423320 4 eric 2011-06-18 20:05:52 -0700 Una isn't a committer. Should this be marked r- or cq+? 423327 5 97715 una.sabovic 2011-06-18 21:29:29 -0700 Created attachment 97715 proposed patch Fixed variable names patch ready for cq now. 423392 6 97715 webkit.review.bot 2011-06-19 13:48:29 -0700 Comment on attachment 97715 proposed patch Clearing flags on attachment: 97715 Committed r89221: <http://trac.webkit.org/changeset/89221> 423393 7 webkit.review.bot 2011-06-19 13:48:34 -0700 All reviewed patches have been landed. Closing bug. 97655 2011-06-17 14:46:03 -0700 2011-06-18 21:29:29 -0700 proposed patch clearRectPatch.txt text/plain 4954 una.sabovic SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MTcyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMTcgIHVuYSBzYWJv dmljICA8dW5hLnNhYm92aWNAcGFsbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgT3B0aW1pemF0aW9uOiBhdm9pZCBjYWxsIHRvIGNsZWFyUmVj dCgpIHdoZW4gYmdDb2xvciBpcyB2YWxpZCB3aGVuIHBhaW50aW5nIHRoZSByb290IGJhY2tncm91 bmQgaW4gUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTA4CisKKyAgICAg ICAgV2hlbiByb290IGxheWVycyBiYXNlIGNvbG9yIGlzIGZ1bGx5IHRyYW5zcGFyZW50IGJhY2tn cm91bmRSZWN0IHdhcyBjbGVhcmVkIGJlZm9yZSBiZ0NvbG9yIGlzIGFwcGxpZWQuCisgICAgICAg IEluc3RlYWQgb2YgY2xlYXJpbmcgdGhlIHJlY3Qgd2UgYXBwbHkgQ29tcG9zaXRlQ29weSBvcGVy YXRpb24gd2hlbiBwYWludGluZyB0aGUgYmFja2dyb3VuZCBjb2xvci4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIFRoaXMgaXMgYW4gb3B0aW1pemF0aW9uLCBpdCBkb2Vzbid0IGNoYW5nZSBhbnkg ZXhpc3RpbmcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZp bGxSZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQpOgor CiAyMDExLTA2LTE3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYSBDaGFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCShyZXZpc2lvbiA4OTE3MSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTYxMyw2ICs2MTMsMTcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmZp bGxSZWN0KGNvbnN0IEZsbwogICAgIGdlbmVyYXRvci5maWxsKHRoaXMsIHJlY3QpOwogfQogCit2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBjb25z dCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVPcGVy YXRvciBvcCkKK3sKKyAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQorICAgICAgICByZXR1cm47 CisKKyAgICBDb21wb3NpdGVPcGVyYXRvciBwcmV2aW91c09wZXJhdG9yID0gY29tcG9zaXRlT3Bl cmF0aW9uKCk7CisgICAgc2V0Q29tcG9zaXRlT3BlcmF0aW9uKG9wKTsKKyAgICBmaWxsUmVjdChy ZWN0LCBjb2xvciwgc3R5bGVDb2xvclNwYWNlKTsKKyAgICBzZXRDb21wb3NpdGVPcGVyYXRpb24o cHJldmlvdXNPcGVyYXRvcik7Cit9CisKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRl ZFJlY3QoY29uc3QgUm91bmRlZEludFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwgQ29s b3JTcGFjZSBjb2xvclNwYWNlKQogewogICAgIGZpbGxSb3VuZGVkUmVjdChyZWN0LnJlY3QoKSwg cmVjdC5yYWRpaSgpLnRvcExlZnQoKSwgcmVjdC5yYWRpaSgpLnRvcFJpZ2h0KCksIHJlY3QucmFk aWkoKS5ib3R0b21MZWZ0KCksIHJlY3QucmFkaWkoKS5ib3R0b21SaWdodCgpLCBjb2xvciwgY29s b3JTcGFjZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaAkocmV2aXNpb24gODkxNzEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtMjkz LDYgKzI5Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBmaWxsUmVjdChj b25zdCBGbG9hdFJlY3QmKTsKICAgICAgICAgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJlY3Qm LCBjb25zdCBDb2xvciYsIENvbG9yU3BhY2UpOwogICAgICAgICB2b2lkIGZpbGxSZWN0KGNvbnN0 IEZsb2F0UmVjdCYsIEdlbmVyYXRvciYpOworICAgICAgICB2b2lkIGZpbGxSZWN0KGNvbnN0IEZs b2F0UmVjdCYsIGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3IpOwog ICAgICAgICB2b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiwgY29uc3QgSW50U2l6 ZSYgdG9wTGVmdCwgY29uc3QgSW50U2l6ZSYgdG9wUmlnaHQsIGNvbnN0IEludFNpemUmIGJvdHRv bUxlZnQsIGNvbnN0IEludFNpemUmIGJvdHRvbVJpZ2h0LCBjb25zdCBDb2xvciYsIENvbG9yU3Bh Y2UpOwogICAgICAgICB2b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBSb3VuZGVkSW50UmVjdCYs IGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSk7CiAgICAgICAgIHZvaWQgZmlsbFJlY3RXaXRoUm91 bmRlZEhvbGUoY29uc3QgSW50UmVjdCYsIGNvbnN0IFJvdW5kZWRJbnRSZWN0JiByb3VuZGVkSG9s ZVJlY3QsIGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9uIDg5MTcx KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNzQyLDIyICs3NDIsMjMgQEAgdm9pZCBSZW5kZXJCb3hNb2RlbE9i amVjdDo6cGFpbnRGaWxsTGF5ZQogICAgICAgICBiYWNrZ3JvdW5kUmVjdC5pbnRlcnNlY3QocGFp bnRJbmZvLnJlY3QpOwogICAgICAgICAvLyBJZiB3ZSBoYXZlIGFuIGFscGhhIGFuZCB3ZSBhcmUg cGFpbnRpbmcgdGhlIHJvb3QgZWxlbWVudCwgZ28gYWhlYWQgYW5kIGJsZW5kIHdpdGggdGhlIGJh c2UgYmFja2dyb3VuZCBjb2xvci4KICAgICAgICAgQ29sb3IgYmFzZUNvbG9yOworICAgICAgICBi b29sIGNsZWFyUmVjdCA9IGZhbHNlOwogICAgICAgICBpZiAoaXNPcGFxdWVSb290KSB7CiAgICAg ICAgICAgICBiYXNlQ29sb3IgPSB2aWV3KCktPmZyYW1lVmlldygpLT5iYXNlQmFja2dyb3VuZENv bG9yKCk7CiAgICAgICAgICAgICBpZiAoIWJhc2VDb2xvci5hbHBoYSgpKQotICAgICAgICAgICAg ICAgIGNvbnRleHQtPmNsZWFyUmVjdChiYWNrZ3JvdW5kUmVjdCk7CisgICAgICAgICAgICAgICAg Y2xlYXJSZWN0ID0gdHJ1ZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChiYXNlQ29sb3IuYWxw aGEoKSA+IDApIHsKKyAgICAgICAgaWYgKGJhc2VDb2xvci5hbHBoYSgpKSB7CiAgICAgICAgICAg ICBpZiAoYmdDb2xvci5hbHBoYSgpKQogICAgICAgICAgICAgICAgIGJhc2VDb2xvciA9IGJhc2VD b2xvci5ibGVuZChiZ0NvbG9yKTsKIAotICAgICAgICAgICAgQ29tcG9zaXRlT3BlcmF0b3IgcHJl dmlvdXNPcGVyYXRvciA9IGNvbnRleHQtPmNvbXBvc2l0ZU9wZXJhdGlvbigpOwotICAgICAgICAg ICAgY29udGV4dC0+c2V0Q29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZUNvcHkpOwotICAgICAg ICAgICAgY29udGV4dC0+ZmlsbFJlY3QoYmFja2dyb3VuZFJlY3QsIGJhc2VDb2xvciwgc3R5bGUo KS0+Y29sb3JTcGFjZSgpKTsKLSAgICAgICAgICAgIGNvbnRleHQtPnNldENvbXBvc2l0ZU9wZXJh dGlvbihwcmV2aW91c09wZXJhdG9yKTsKLSAgICAgICAgfSBlbHNlIGlmIChiZ0NvbG9yLmFscGhh KCkgPiAwKQotICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QoYmFja2dyb3VuZFJlY3QsIGJn Q29sb3IsIHN0eWxlKCktPmNvbG9yU3BhY2UoKSk7CisgICAgICAgICAgICBjb250ZXh0LT5maWxs UmVjdChiYWNrZ3JvdW5kUmVjdCwgYmFzZUNvbG9yLCBzdHlsZSgpLT5jb2xvclNwYWNlKCksIENv bXBvc2l0ZUNvcHkpOworICAgICAgICB9IGVsc2UgaWYgKGJnQ29sb3IuYWxwaGEoKSkgeworICAg ICAgICAgICAgQ29tcG9zaXRlT3BlcmF0b3IgY29tcG9zaXRlT3AgPSBjbGVhclJlY3QgPyBDb21w b3NpdGVDb3B5IDogY29udGV4dC0+Y29tcG9zaXRlT3BlcmF0aW9uKCk7CisgICAgICAgICAgICBj b250ZXh0LT5maWxsUmVjdChiYWNrZ3JvdW5kUmVjdCwgYmdDb2xvciwgc3R5bGUoKS0+Y29sb3JT cGFjZSgpLCBjb21wb3NpdGVPcCk7CisgICAgICAgIH0gZWxzZSBpZiAoY2xlYXJSZWN0KQorICAg ICAgICAgICAgY29udGV4dC0+Y2xlYXJSZWN0KGJhY2tncm91bmRSZWN0KTsKICAgICB9CiAKICAg ICAvLyBubyBwcm9ncmVzc2l2ZSBsb2FkaW5nIG9mIHRoZSBiYWNrZ3JvdW5kIGltYWdlCg== 97715 2011-06-18 21:29:29 -0700 2011-06-19 13:48:29 -0700 proposed patch clearRectPatch1.txt text/plain 5001 una.sabovic SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MjExKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMTggIFVuYSBTYWJv dmljICA8dW5hLnNhYm92aWNAcGFsbS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgT3B0aW1pemF0aW9uOiBhdm9pZCBjYWxsIHRvIGNsZWFyUmVj dCgpIHdoZW4gYmdDb2xvciBpcyB2YWxpZCB3aGVuIHBhaW50aW5nIHRoZSByb290IGJhY2tncm91 bmQgaW4gUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTA4CisKKyAgICAg ICAgV2hlbiByb290IGxheWVycyBiYXNlIGNvbG9yIGlzIGZ1bGx5IHRyYW5zcGFyZW50IGJhY2tn cm91bmRSZWN0IHdhcyBjbGVhcmVkIGJlZm9yZSBiZ0NvbG9yIGlzIGFwcGxpZWQuCisgICAgICAg IEluc3RlYWQgb2YgY2xlYXJpbmcgdGhlIHJlY3Qgd2UgYXBwbHkgQ29tcG9zaXRlQ29weSBvcGVy YXRpb24gd2hlbiBwYWludGluZyB0aGUgYmFja2dyb3VuZCBjb2xvci4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIFRoaXMgaXMgYW4gb3B0aW1pemF0aW9uLCBpdCBkb2Vzbid0IGNoYW5nZSBhbnkg ZXhpc3RpbmcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZp bGxSZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50RmlsbExheWVyRXh0ZW5kZWQpOgor CiAyMDExLTA2LTE4ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCShyZXZpc2lvbiA4OTIxMSkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTYxMyw2ICs2MTMsMTcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmZpbGxSZWN0KGNvbnN0IEZsbwogICAgIGdlbmVyYXRvci5maWxsKHRoaXMsIHJlY3QpOwogfQog Cit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0LCBj b25zdCBDb2xvciYgY29sb3IsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21wb3NpdGVP cGVyYXRvciBvcCkKK3sKKyAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQorICAgICAgICByZXR1 cm47CisKKyAgICBDb21wb3NpdGVPcGVyYXRvciBwcmV2aW91c09wZXJhdG9yID0gY29tcG9zaXRl T3BlcmF0aW9uKCk7CisgICAgc2V0Q29tcG9zaXRlT3BlcmF0aW9uKG9wKTsKKyAgICBmaWxsUmVj dChyZWN0LCBjb2xvciwgc3R5bGVDb2xvclNwYWNlKTsKKyAgICBzZXRDb21wb3NpdGVPcGVyYXRp b24ocHJldmlvdXNPcGVyYXRvcik7Cit9CisKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUm91 bmRlZFJlY3QoY29uc3QgUm91bmRlZEludFJlY3QmIHJlY3QsIGNvbnN0IENvbG9yJiBjb2xvciwg Q29sb3JTcGFjZSBjb2xvclNwYWNlKQogewogICAgIGZpbGxSb3VuZGVkUmVjdChyZWN0LnJlY3Qo KSwgcmVjdC5yYWRpaSgpLnRvcExlZnQoKSwgcmVjdC5yYWRpaSgpLnRvcFJpZ2h0KCksIHJlY3Qu cmFkaWkoKS5ib3R0b21MZWZ0KCksIHJlY3QucmFkaWkoKS5ib3R0b21SaWdodCgpLCBjb2xvciwg Y29sb3JTcGFjZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAkocmV2aXNpb24gODkyMTEpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAt MjkzLDYgKzI5Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBmaWxsUmVj dChjb25zdCBGbG9hdFJlY3QmKTsKICAgICAgICAgdm9pZCBmaWxsUmVjdChjb25zdCBGbG9hdFJl Y3QmLCBjb25zdCBDb2xvciYsIENvbG9yU3BhY2UpOwogICAgICAgICB2b2lkIGZpbGxSZWN0KGNv bnN0IEZsb2F0UmVjdCYsIEdlbmVyYXRvciYpOworICAgICAgICB2b2lkIGZpbGxSZWN0KGNvbnN0 IEZsb2F0UmVjdCYsIGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSwgQ29tcG9zaXRlT3BlcmF0b3Ip OwogICAgICAgICB2b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBJbnRSZWN0JiwgY29uc3QgSW50 U2l6ZSYgdG9wTGVmdCwgY29uc3QgSW50U2l6ZSYgdG9wUmlnaHQsIGNvbnN0IEludFNpemUmIGJv dHRvbUxlZnQsIGNvbnN0IEludFNpemUmIGJvdHRvbVJpZ2h0LCBjb25zdCBDb2xvciYsIENvbG9y U3BhY2UpOwogICAgICAgICB2b2lkIGZpbGxSb3VuZGVkUmVjdChjb25zdCBSb3VuZGVkSW50UmVj dCYsIGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSk7CiAgICAgICAgIHZvaWQgZmlsbFJlY3RXaXRo Um91bmRlZEhvbGUoY29uc3QgSW50UmVjdCYsIGNvbnN0IFJvdW5kZWRJbnRSZWN0JiByb3VuZGVk SG9sZVJlY3QsIGNvbnN0IENvbG9yJiwgQ29sb3JTcGFjZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9uIDg5 MjExKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNzQyLDIyICs3NDIsMjMgQEAgdm9pZCBSZW5kZXJCb3hNb2Rl bE9iamVjdDo6cGFpbnRGaWxsTGF5ZQogICAgICAgICBiYWNrZ3JvdW5kUmVjdC5pbnRlcnNlY3Qo cGFpbnRJbmZvLnJlY3QpOwogICAgICAgICAvLyBJZiB3ZSBoYXZlIGFuIGFscGhhIGFuZCB3ZSBh cmUgcGFpbnRpbmcgdGhlIHJvb3QgZWxlbWVudCwgZ28gYWhlYWQgYW5kIGJsZW5kIHdpdGggdGhl IGJhc2UgYmFja2dyb3VuZCBjb2xvci4KICAgICAgICAgQ29sb3IgYmFzZUNvbG9yOworICAgICAg ICBib29sIHNob3VsZENsZWFyQmFja2dyb3VuZCA9IGZhbHNlOwogICAgICAgICBpZiAoaXNPcGFx dWVSb290KSB7CiAgICAgICAgICAgICBiYXNlQ29sb3IgPSB2aWV3KCktPmZyYW1lVmlldygpLT5i YXNlQmFja2dyb3VuZENvbG9yKCk7CiAgICAgICAgICAgICBpZiAoIWJhc2VDb2xvci5hbHBoYSgp KQotICAgICAgICAgICAgICAgIGNvbnRleHQtPmNsZWFyUmVjdChiYWNrZ3JvdW5kUmVjdCk7Cisg ICAgICAgICAgICAgICAgc2hvdWxkQ2xlYXJCYWNrZ3JvdW5kID0gdHJ1ZTsKICAgICAgICAgfQog Ci0gICAgICAgIGlmIChiYXNlQ29sb3IuYWxwaGEoKSA+IDApIHsKKyAgICAgICAgaWYgKGJhc2VD b2xvci5hbHBoYSgpKSB7CiAgICAgICAgICAgICBpZiAoYmdDb2xvci5hbHBoYSgpKQogICAgICAg ICAgICAgICAgIGJhc2VDb2xvciA9IGJhc2VDb2xvci5ibGVuZChiZ0NvbG9yKTsKIAotICAgICAg ICAgICAgQ29tcG9zaXRlT3BlcmF0b3IgcHJldmlvdXNPcGVyYXRvciA9IGNvbnRleHQtPmNvbXBv c2l0ZU9wZXJhdGlvbigpOwotICAgICAgICAgICAgY29udGV4dC0+c2V0Q29tcG9zaXRlT3BlcmF0 aW9uKENvbXBvc2l0ZUNvcHkpOwotICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QoYmFja2dy b3VuZFJlY3QsIGJhc2VDb2xvciwgc3R5bGUoKS0+Y29sb3JTcGFjZSgpKTsKLSAgICAgICAgICAg IGNvbnRleHQtPnNldENvbXBvc2l0ZU9wZXJhdGlvbihwcmV2aW91c09wZXJhdG9yKTsKLSAgICAg ICAgfSBlbHNlIGlmIChiZ0NvbG9yLmFscGhhKCkgPiAwKQotICAgICAgICAgICAgY29udGV4dC0+ ZmlsbFJlY3QoYmFja2dyb3VuZFJlY3QsIGJnQ29sb3IsIHN0eWxlKCktPmNvbG9yU3BhY2UoKSk7 CisgICAgICAgICAgICBjb250ZXh0LT5maWxsUmVjdChiYWNrZ3JvdW5kUmVjdCwgYmFzZUNvbG9y LCBzdHlsZSgpLT5jb2xvclNwYWNlKCksIENvbXBvc2l0ZUNvcHkpOworICAgICAgICB9IGVsc2Ug aWYgKGJnQ29sb3IuYWxwaGEoKSkgeworICAgICAgICAgICAgQ29tcG9zaXRlT3BlcmF0b3Igb3Bl cmF0aW9uID0gc2hvdWxkQ2xlYXJCYWNrZ3JvdW5kID8gQ29tcG9zaXRlQ29weSA6IGNvbnRleHQt PmNvbXBvc2l0ZU9wZXJhdGlvbigpOworICAgICAgICAgICAgY29udGV4dC0+ZmlsbFJlY3QoYmFj a2dyb3VuZFJlY3QsIGJnQ29sb3IsIHN0eWxlKCktPmNvbG9yU3BhY2UoKSwgb3BlcmF0aW9uKTsK KyAgICAgICAgfSBlbHNlIGlmIChzaG91bGRDbGVhckJhY2tncm91bmQpCisgICAgICAgICAgICBj b250ZXh0LT5jbGVhclJlY3QoYmFja2dyb3VuZFJlY3QpOwogICAgIH0KIAogICAgIC8vIG5vIHBy b2dyZXNzaXZlIGxvYWRpbmcgb2YgdGhlIGJhY2tncm91bmQgaW1hZ2UK