15254 2007-09-21 18:39:46 -0700 [gtk] implement theme-aware drawing of text field or text area 2007-09-29 08:53:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 523.x (Safari 3) PC Linux RESOLVED FIXED P2 Enhancement --- 0 jmalonzo webkit-unassigned oldest_to_newest 176 0 jmalonzo 2007-09-21 18:39:46 -0700 Hi! Attached is a patch that makes the text field or text area conform to the current gtk theme. 177 1 16344 jmalonzo 2007-09-21 18:42:01 -0700 Created attachment 16344 implement theme-aware drawing of text fields and text area 149 2 16344 aroben 2007-09-22 13:24:51 -0700 Comment on attachment 16344 implement theme-aware drawing of text fields and text area + else if (isChecked(o)) + result = GTK_STATE_SELECTED; Is this really needed for drawing text fields? Or is this just something that was missing and you added it while you were touching the code? + gtk_paint_shadow(entry->style, i.context->gdkDrawable(), + determineState(o), determineShadow(o), + NULL, entry, "entry", + pos.x(), pos.y(), rect.width(), rect.height()); Since this is C++ code, please use 0 instead of NULL. + if (GTK_WIDGET_HAS_FOCUS(entry)) + { As per <http://webkit.org/coding/coding-style.html>, please pur the brace on the same line as the if. r- so the above can be fixed. Once that's done I'll r+ it. 140 3 16351 jmalonzo 2007-09-22 14:50:28 -0700 Created attachment 16351 theme drawing of text entries This patch incorporates aroben's coding style suggestions. I left the isChecked in determineState but added a separate line in the ChangeLog for the change, not really required to fix this bug but nevertheless missing from the checks. Thanks. 139 4 16351 aroben 2007-09-22 14:53:03 -0700 Comment on attachment 16351 theme drawing of text entries r=me. Thanks for fixing it up! 57244 5 zecke 2007-09-28 08:21:32 -0700 (In reply to comment #4) > (From update of attachment 16351 [edit]) > r=me. Thanks for fixing it up! > I'm not going to say r=- but I think if (GTK_WIDGET_HAS_FOCUS(entry)) {} is a dead code path and something like if (isFocused(renderObject)) should be used. 57278 6 16435 jmalonzo 2007-09-28 15:25:25 -0700 Created attachment 16435 gtk theme-based drawing of text entries Update the patch based on zecke and bdash's comments 57279 7 16435 mrowe 2007-09-28 15:29:45 -0700 Comment on attachment 16435 gtk theme-based drawing of text entries Two comments: You have tabs in your ChangeLog entry, and you don't need the "else"s when you have a series of if's with early returns. 57280 8 16435 mrowe 2007-09-28 15:30:35 -0700 Comment on attachment 16435 gtk theme-based drawing of text entries Those two issues can be fixed by whomever lands the change. No need to jump through the hoops of uploading a new patch to get those minor points addressed. 57346 9 zecke 2007-09-29 08:53:43 -0700 Landed in r25807. The comments by Mark were taken into account. 16344 2007-09-21 18:42:01 -0700 2007-09-22 14:50:28 -0700 implement theme-aware drawing of text fields and text area render-theme-gdk-entry.patch text/plain 3080 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjdmNmE3ZS4uMTZmMjZkMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwNy0wOS0yMSAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9AdW5wbHVnZ2FibGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQg T1IgQ0hBTkdFRAorCisgICAgICAgICogcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpkZXRlcm1pbmVTdGF0ZSk6CisJICAt IEFwcGx5IHN0YXRlIGlmIGNvbnRyb2wgaXMgcmVhZG9ubHkgb3IgaWYgb2JqZWN0IGlzIGNoZWNr ZWQKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpwYWludFRleHRGaWVsZCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUdkazo6Z3RrRW50cnkpOgorICAgICAgICAgIC0g SW1wbGVtZW50ZWQgdGhlbWUtYXdhcmUgdGV4dCBmaWVsZCBiYXNlZCBvbiBndGsvZ3RrZW50cnku YyBpbXBsZW1lbnRhdGlvbgorCiAyMDA3LTA5LTE5ICBKb2huIFN1bGxpdmFuICA8c3VsbGl2YW5A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9nZGsvUmVuZGVyVGhlbWVHZGsuY3BwCmluZGV4IDY5NTZhMTYuLjUxODQzNTUgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dkay9SZW5kZXJUaGVtZUdkay5jcHAKQEAgLTEyOCwxMiArMTI4LDE0IEBA IGJvb2wgUmVuZGVyVGhlbWVHZGs6OnN1cHBvcnRzRm9jdXMoRUFwcGVhcmFuY2UgYXBwZWFyYW5j ZSkKIEd0a1N0YXRlVHlwZSBSZW5kZXJUaGVtZUdkazo6ZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2Jq ZWN0KiBvKQogewogICAgIEd0a1N0YXRlVHlwZSByZXN1bHQgPSBHVEtfU1RBVEVfTk9STUFMOwot ICAgIGlmICghaXNFbmFibGVkKG8pKQorICAgIGlmICghaXNFbmFibGVkKG8pIHx8IGlzUmVhZE9u bHlDb250cm9sKG8pKQogICAgICAgICByZXN1bHQgPSBHVEtfU1RBVEVfSU5TRU5TSVRJVkU7CiAg ICAgZWxzZSBpZiAoaXNQcmVzc2VkKG8pKQogICAgICAgICByZXN1bHQgPSBHVEtfU1RBVEVfQUNU SVZFOwogICAgIGVsc2UgaWYgKGlzSG92ZXJlZChvKSkKICAgICAgICAgcmVzdWx0ID0gR1RLX1NU QVRFX1BSRUxJR0hUOworICAgIGVsc2UgaWYgKGlzQ2hlY2tlZChvKSkKKyAgICAgICAgcmVzdWx0 ID0gR1RLX1NUQVRFX1NFTEVDVEVEOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTIzOSwx MCArMjQxLDI1IEBAIHZvaWQgUmVuZGVyVGhlbWVHZGs6OmFkanVzdFRleHRGaWVsZFN0eWxlKENT U1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZW1lCiAgICAgbm90SW1wbGVtZW50ZWQo KTsgCiB9CiAKLWJvb2wgUmVuZGVyVGhlbWVHZGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVj dCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHIp Citib29sIFJlbmRlclRoZW1lR2RrOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNv bnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewog ICAgIC8vIEZJWE1FOiBzaG91bGQgdXNlIHRoZW1lLWF3YXJlIGRyYXdpbmcKLSAgICByZXR1cm4g dHJ1ZTsKKyAgICBHdGtXaWRnZXQqIGVudHJ5ID0gZ3RrRW50cnkoKTsKKyAgICBJbnRQb2ludCBw b3MgPSBpLmNvbnRleHQtPnRyYW5zbGF0ZVBvaW50KHJlY3QubG9jYXRpb24oKSk7CisKKyAgICBn dGtfcGFpbnRfc2hhZG93KGVudHJ5LT5zdHlsZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAor ICAgICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUobyksIGRldGVybWluZVNoYWRvdyhv KSwKKyAgICAgICAgICAgICAgICAgICAgIE5VTEwsIGVudHJ5LCAiZW50cnkiLAorICAgICAgICAg ICAgICAgICAgICAgcG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp KTsKKyAgICAKKyAgICBpZiAoR1RLX1dJREdFVF9IQVNfRk9DVVMoZW50cnkpKQorICAgIHsKKyAg ICAgICAgZ3RrX3BhaW50X2ZvY3VzKGVudHJ5LT5zdHlsZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJs ZSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUobyksIE5VTEwsCisg ICAgICAgICAgICAgICAgICAgICAgICBlbnRyeSwgImVudHJ5IiwKKyAgICAgICAgICAgICAgICAg ICAgICAgIHBvcy54KCksIHBvcy55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7Cisg ICAgfQorICAgIHJldHVybiBmYWxzZTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZUdkazo6cGFpbnRU ZXh0QXJlYShSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBp LCBjb25zdCBJbnRSZWN0JiByKQpAQCAtMjkyLDYgKzMwOSwxNyBAQCBHdGtXaWRnZXQqIFJlbmRl clRoZW1lR2RrOjpndGtSYWRpb0J1dHRvbigpIGNvbnN0CiAgICAgcmV0dXJuIG1fZ3RrUmFkaW9C dXR0b247CiB9CiAKK0d0a1dpZGdldCogUmVuZGVyVGhlbWVHZGs6Omd0a0VudHJ5KCkgY29uc3QK K3sKKyAgaWYgKCFtX2d0a0VudHJ5KSB7CisgICAgbV9ndGtFbnRyeSA9IGd0a19lbnRyeV9uZXco KTsKKyAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKGd0a1dpbmRvd0NvbnRhaW5l cigpKSwgbV9ndGtFbnRyeSk7CisgICAgZ3RrX3dpZGdldF9yZWFsaXplKG1fZ3RrRW50cnkpOwor ICB9CisgIHJldHVybiBtX2d0a0VudHJ5OworCit9CisKIEd0a1dpZGdldCogUmVuZGVyVGhlbWVH ZGs6Omd0a1dpbmRvd0NvbnRhaW5lcigpIGNvbnN0CiB7CiAgICAgaWYgKCFtX2NvbnRhaW5lcikg ewo= 16351 2007-09-22 14:50:28 -0700 2007-09-28 15:25:25 -0700 theme drawing of text entries render-theme-gdk-entry.2.patch text/plain 3121 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjdmNmE3ZS4uNDI3ZjMzZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwNy0wOS0yMiAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9AdW5wbHVnZ2FibGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQg T1IgQ0hBTkdFRAorCisgICAgICAgICogcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR2RrOjpkZXRlcm1pbmVTdGF0ZSk6CisJICAt IEFwcGx5IHN0YXRlIGlmIGNvbnRyb2wgaXMgcmVhZG9ubHkKKwkgIC0gQWRkZWQgc3RhdGUgR1RL X1NUQVRFX1NFTEVDVEVEIG9mIG9iamVjdCBpcyBjaGVja2VkCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZUdkazo6cGFpbnRUZXh0RmllbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVHZGs6Omd0a0VudHJ5KToKKyAgICAgICAgICAtIEltcGxlbWVudGVkIHRoZW1lLWF3YXJl IHRleHQgZmllbGQgYmFzZWQgb24gZ3RrL2d0a2VudHJ5LmMgaW1wbGVtZW50YXRpb24KKwogMjAw Ny0wOS0xOSAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFuQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ2Rr L1JlbmRlclRoZW1lR2RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL1JlbmRlclRoZW1lR2Rr LmNwcAppbmRleCA2OTU2YTE2Li4zMGRmNTcxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L2dkay9SZW5kZXJUaGVtZUdkay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvUmVuZGVy VGhlbWVHZGsuY3BwCkBAIC0xMjgsMTIgKzEyOCwxNCBAQCBib29sIFJlbmRlclRoZW1lR2RrOjpz dXBwb3J0c0ZvY3VzKEVBcHBlYXJhbmNlIGFwcGVhcmFuY2UpCiBHdGtTdGF0ZVR5cGUgUmVuZGVy VGhlbWVHZGs6OmRldGVybWluZVN0YXRlKFJlbmRlck9iamVjdCogbykKIHsKICAgICBHdGtTdGF0 ZVR5cGUgcmVzdWx0ID0gR1RLX1NUQVRFX05PUk1BTDsKLSAgICBpZiAoIWlzRW5hYmxlZChvKSkK KyAgICBpZiAoIWlzRW5hYmxlZChvKSB8fCBpc1JlYWRPbmx5Q29udHJvbChvKSkKICAgICAgICAg cmVzdWx0ID0gR1RLX1NUQVRFX0lOU0VOU0lUSVZFOwogICAgIGVsc2UgaWYgKGlzUHJlc3NlZChv KSkKICAgICAgICAgcmVzdWx0ID0gR1RLX1NUQVRFX0FDVElWRTsKICAgICBlbHNlIGlmIChpc0hv dmVyZWQobykpCiAgICAgICAgIHJlc3VsdCA9IEdUS19TVEFURV9QUkVMSUdIVDsKKyAgICBlbHNl IGlmIChpc0NoZWNrZWQobykpCisgICAgICAgIHJlc3VsdCA9IEdUS19TVEFURV9TRUxFQ1RFRDsK ICAgICByZXR1cm4gcmVzdWx0OwogfQogCkBAIC0yMzksMTAgKzI0MSwyNCBAQCB2b2lkIFJlbmRl clRoZW1lR2RrOjphZGp1c3RUZXh0RmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVy U3R5bGUqLCBFbGVtZQogICAgIG5vdEltcGxlbWVudGVkKCk7IAogfQogCi1ib29sIFJlbmRlclRo ZW1lR2RrOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVj dDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKQorYm9vbCBSZW5kZXJUaGVtZUdkazo6 cGFpbnRUZXh0RmllbGQoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50 SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICAvLyBGSVhNRTogc2hvdWxkIHVz ZSB0aGVtZS1hd2FyZSBkcmF3aW5nCi0gICAgcmV0dXJuIHRydWU7CisgICAgR3RrV2lkZ2V0KiBl bnRyeSA9IGd0a0VudHJ5KCk7CisgICAgSW50UG9pbnQgcG9zID0gaS5jb250ZXh0LT50cmFuc2xh dGVQb2ludChyZWN0LmxvY2F0aW9uKCkpOworCisgICAgZ3RrX3BhaW50X3NoYWRvdyhlbnRyeS0+ c3R5bGUsIGkuY29udGV4dC0+Z2RrRHJhd2FibGUoKSwKKyAgICAgICAgICAgICAgICAgICAgIGRl dGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVTaGFkb3cobyksCisgICAgICAgICAgICAgICAgICAg ICAwLCBlbnRyeSwgImVudHJ5IiwKKyAgICAgICAgICAgICAgICAgICAgIHBvcy54KCksIHBvcy55 KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisgICAgCisgICAgaWYgKEdUS19XSURH RVRfSEFTX0ZPQ1VTKGVudHJ5KSkgeworICAgICAgICBndGtfcGFpbnRfZm9jdXMoZW50cnktPnN0 eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCisgICAgICAgICAgICAgICAgICAgICAgICBk ZXRlcm1pbmVTdGF0ZShvKSwgMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5LCAiZW50 cnkiLAorICAgICAgICAgICAgICAgICAgICAgICAgcG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiBib29s IFJlbmRlclRoZW1lR2RrOjpwYWludFRleHRBcmVhKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVu ZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHIpCkBAIC0yOTIsNiArMzA4 LDE3IEBAIEd0a1dpZGdldCogUmVuZGVyVGhlbWVHZGs6Omd0a1JhZGlvQnV0dG9uKCkgY29uc3QK ICAgICByZXR1cm4gbV9ndGtSYWRpb0J1dHRvbjsKIH0KIAorR3RrV2lkZ2V0KiBSZW5kZXJUaGVt ZUdkazo6Z3RrRW50cnkoKSBjb25zdAoreworICAgIGlmICghbV9ndGtFbnRyeSkgeworICAgICAg ICBtX2d0a0VudHJ5ID0gZ3RrX2VudHJ5X25ldygpOworICAgICAgICBndGtfY29udGFpbmVyX2Fk ZChHVEtfQ09OVEFJTkVSKGd0a1dpbmRvd0NvbnRhaW5lcigpKSwgbV9ndGtFbnRyeSk7CisgICAg ICAgIGd0a193aWRnZXRfcmVhbGl6ZShtX2d0a0VudHJ5KTsKKyAgICB9CisKKyAgICByZXR1cm4g bV9ndGtFbnRyeTsKK30KKwogR3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUdkazo6Z3RrV2luZG93Q29u dGFpbmVyKCkgY29uc3QKIHsKICAgICBpZiAoIW1fY29udGFpbmVyKSB7Cg== 16435 2007-09-28 15:25:25 -0700 2007-09-28 15:29:45 -0700 gtk theme-based drawing of text entries textentry-gtk-theme.patch text/plain 3171 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzM4OGQ1OS4uNjkzNDhkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwNy0wOS0yOCAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9AdW5wbHVnZ2FibGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQg T1IgQ0hBTkdFRAorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpkZXRlcm1pbmVTdGF0ZSk6CisJICAt IEFwcGx5IHN0YXRlIGlmIGNvbnRyb2wgaXMgcmVhZG9ubHkKKwkgIC0gQWRkZWQgc3RhdGUgR1RL X1NUQVRFX1NFTEVDVEVEIG9mIG9iamVjdCBpcyBjaGVja2VkCisJICAtIEFwcGx5IEdUS19TVEFU RV9BQ1RJVkUgaWYgUmVuZGVyT2JqZWN0IGlzRm9jdXNlZCgpCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZUd0azo6cGFpbnRUZXh0RmllbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVHdGs6Omd0a0VudHJ5KToKKyAgICAgICAgICAtIEltcGxlbWVudGVkIHRoZW1lLWF3YXJl IHRleHQgZmllbGQgYmFzZWQgb24gZ3RrL2d0a2VudHJ5LmMgaW1wbGVtZW50YXRpb24KKwogMjAw Ny0wOS0yMCAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4K IAogICAgICAgICBSdWJiZXIgc3RhbXBlZCBieSBBZGFtLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGsuY3BwCmluZGV4IGFhNjdiZmQuLmRlNjNkZmYgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKQEAgLTEyNywxNCArMTI3LDE2IEBAIGJvb2wgUmVuZGVy VGhlbWVHdGs6OnN1cHBvcnRzRm9jdXMoRUFwcGVhcmFuY2UgYXBwZWFyYW5jZSkKIAogR3RrU3Rh dGVUeXBlIFJlbmRlclRoZW1lR3RrOjpkZXRlcm1pbmVTdGF0ZShSZW5kZXJPYmplY3QqIG8pCiB7 Ci0gICAgR3RrU3RhdGVUeXBlIHJlc3VsdCA9IEdUS19TVEFURV9OT1JNQUw7Ci0gICAgaWYgKCFp c0VuYWJsZWQobykpCi0gICAgICAgIHJlc3VsdCA9IEdUS19TVEFURV9JTlNFTlNJVElWRTsKLSAg ICBlbHNlIGlmIChpc1ByZXNzZWQobykpCi0gICAgICAgIHJlc3VsdCA9IEdUS19TVEFURV9BQ1RJ VkU7CisgICAgaWYgKCFpc0VuYWJsZWQobykgfHwgaXNSZWFkT25seUNvbnRyb2wobykpCisgICAg ICAgIHJldHVybiBHVEtfU1RBVEVfSU5TRU5TSVRJVkU7CisgICAgZWxzZSBpZiAoaXNQcmVzc2Vk KG8pIHx8IGlzRm9jdXNlZChvKSkKKyAgICAgICAgcmV0dXJuIEdUS19TVEFURV9BQ1RJVkU7CiAg ICAgZWxzZSBpZiAoaXNIb3ZlcmVkKG8pKQotICAgICAgICByZXN1bHQgPSBHVEtfU1RBVEVfUFJF TElHSFQ7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICAgICAgcmV0dXJuIEdUS19TVEFURV9QUkVM SUdIVDsKKyAgICBlbHNlIGlmIChpc0NoZWNrZWQobykpCisgICAgICAgIHJldHVybiBHVEtfU1RB VEVfU0VMRUNURUQ7CisgICAgZWxzZQorICAgICAgICByZXR1cm4gR1RLX1NUQVRFX05PUk1BTDsK IH0KIAogR3RrU2hhZG93VHlwZSBSZW5kZXJUaGVtZUd0azo6ZGV0ZXJtaW5lU2hhZG93KFJlbmRl ck9iamVjdCogbykKQEAgLTIzOSwxMCArMjQxLDE3IEBAIHZvaWQgUmVuZGVyVGhlbWVHdGs6OmFk anVzdFRleHRGaWVsZFN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSosIEVsZW1l CiAgICAgbm90SW1wbGVtZW50ZWQoKTsgCiB9CiAKLWJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50 VGV4dEZpZWxkKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8m IGksIGNvbnN0IEludFJlY3QmIHIpCitib29sIFJlbmRlclRoZW1lR3RrOjpwYWludFRleHRGaWVs ZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25z dCBJbnRSZWN0JiByZWN0KQogewogICAgIC8vIEZJWE1FOiBzaG91bGQgdXNlIHRoZW1lLWF3YXJl IGRyYXdpbmcKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICBHdGtXaWRnZXQqIGVudHJ5ID0gZ3RrRW50 cnkoKTsKKyAgICBJbnRQb2ludCBwb3MgPSBpLmNvbnRleHQtPnRyYW5zbGF0ZVBvaW50KHJlY3Qu bG9jYXRpb24oKSk7CisKKyAgICBndGtfcGFpbnRfc2hhZG93KGVudHJ5LT5zdHlsZSwgaS5jb250 ZXh0LT5nZGtEcmF3YWJsZSgpLAorICAgICAgICAgICAgICAgICAgICAgZGV0ZXJtaW5lU3RhdGUo byksIGRldGVybWluZVNoYWRvdyhvKSwKKyAgICAgICAgICAgICAgICAgICAgIDAsIGVudHJ5LCAi ZW50cnkiLAorICAgICAgICAgICAgICAgICAgICAgcG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGJvb2wgUmVuZGVy VGhlbWVHdGs6OnBhaW50VGV4dEFyZWEoUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmpl Y3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcikKQEAgLTI5Miw2ICszMDEsMTcgQEAg R3RrV2lkZ2V0KiBSZW5kZXJUaGVtZUd0azo6Z3RrUmFkaW9CdXR0b24oKSBjb25zdAogICAgIHJl dHVybiBtX2d0a1JhZGlvQnV0dG9uOwogfQogCitHdGtXaWRnZXQqIFJlbmRlclRoZW1lR3RrOjpn dGtFbnRyeSgpIGNvbnN0Cit7CisgICAgaWYgKCFtX2d0a0VudHJ5KSB7CisgICAgICAgIG1fZ3Rr RW50cnkgPSBndGtfZW50cnlfbmV3KCk7CisgICAgICAgIGd0a19jb250YWluZXJfYWRkKEdUS19D T05UQUlORVIoZ3RrV2luZG93Q29udGFpbmVyKCkpLCBtX2d0a0VudHJ5KTsKKyAgICAgICAgZ3Rr X3dpZGdldF9yZWFsaXplKG1fZ3RrRW50cnkpOworICAgIH0KKworICAgIHJldHVybiBtX2d0a0Vu dHJ5OworfQorCiBHdGtXaWRnZXQqIFJlbmRlclRoZW1lR3RrOjpndGtXaW5kb3dDb250YWluZXIo KSBjb25zdAogewogICAgIGlmICghbV9jb250YWluZXIpIHsK