51870 2011-01-04 03:11:42 -0800 [GTK] Port text input control painting to GtkStyleContext 2011-01-10 09:01:48 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 51764 50820 0 cgarcia webkit-unassigned mrobinson webkit.review.bot oldest_to_newest 328941 0 cgarcia 2011-01-04 03:11:42 -0800 This depends on bug #51764 since the patch for stock icons contains the initial GtkStyleContext port. I'm wondering whether we really need setTextInputBorders() method, other ports don't implement adjustTextFieldStyle() and adjustTextAreaStyle() and I don't see any difference when not using them with gtk. 329506 1 77987 cgarcia 2011-01-05 04:24:16 -0800 Created attachment 77987 Patch to use GtkStyleContext to paint text input controls 329726 2 77987 mrobinson 2011-01-05 12:26:35 -0800 Comment on attachment 77987 Patch to use GtkStyleContext to paint text input controls I think we should use adjustRepaintRect to paint exterior focus outside the actual text box rect. This will ensure that a large exterior focus doesn't shrink the text box greatly. 331552 3 78383 cgarcia 2011-01-10 02:03:50 -0800 Created attachment 78383 Updated patch using adjustRepaintRect() 331553 4 webkit.review.bot 2011-01-10 02:05:51 -0800 Attachment 78383 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/gtk/RenderThemeGtk3.cpp']" exit_code: 1 Source/WebCore/platform/gtk/RenderThemeGtk3.cpp:139: Use 0 instead of NULL. [readability/null] [5] Source/WebCore/platform/gtk/RenderThemeGtk3.cpp:370: Use 0 instead of NULL. [readability/null] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 331635 5 78383 mrobinson 2011-01-10 08:22:44 -0800 Comment on attachment 78383 Updated patch using adjustRepaintRect() Nice. GtkStyleContext really simplifies things. 331648 6 cgarcia 2011-01-10 09:01:13 -0800 Committed r75378: <http://trac.webkit.org/changeset/75378> 77987 2011-01-05 04:24:16 -0800 2011-01-10 02:03:50 -0800 Patch to use GtkStyleContext to paint text input controls style-context-text-field.diff text/plain 3131 cgarcia ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDI3M2Q2Mi4uMjY4Mzg4NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMS0wMS0wNSAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUG9ydCB0ZXh0IGlucHV0IGNvbnRyb2wgcGFp bnRpbmcgdG8gR3RrU3R5bGVDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTg3MAorCisgICAgICAgIFVzZSBHdGtTdHlsZUNvbnRleHQgQVBJ IHRvIHBhaW50IHRleHQgaW5wdXQgY29udHJvbHMgd2hlbiBidWlsZGluZworICAgICAgICB3aXRo IEdUSysgMy54LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBzaG91bGQgbm90IGNoYW5n ZSBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3Rr My5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRUZXh0RmllbGQp OgorCisyMDExLTAxLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KKwogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCiAKICAgICAgICAgW0dU S10gVXNlIEd0a1N0eWxlQ29udGV4dCB0byBnZXQgcGxhdGZvcm0gY29sb3JzCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAppbmRleCBhMzdhYmM3Li4zYjNjY2U1IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAKQEAgLTI2OCw5ICsyNjgsNDEg QEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRNZW51TGlzdChSZW5kZXJPYmplY3QqIG9iamVj dCwgY29uc3QgUGFpbnRJbmZvJiBpbmZvLAogICAgIHJldHVybiBwYWludFJlbmRlck9iamVjdChN T1pfR1RLX0RST1BET1dOLCBvYmplY3QsIGluZm8uY29udGV4dCwgcmVjdCk7CiB9CiAKLWJvb2wg UmVuZGVyVGhlbWVHdGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z dCBQYWludEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCitib29sIFJlbmRlclRoZW1l R3RrOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcmV0dXJuIHBh aW50UmVuZGVyT2JqZWN0KE1PWl9HVEtfRU5UUlksIG9iamVjdCwgaW5mby5jb250ZXh0LCByZWN0 KTsKKyAgICBHdGtTdHlsZUNvbnRleHQqIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQoR1RLX1RZ UEVfRU5UUlkpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUoY29udGV4dCk7CisKKyAgICBn dGtfc3R5bGVfY29udGV4dF9zZXRfZGlyZWN0aW9uKGNvbnRleHQsIHN0YXRpY19jYXN0PEd0a1Rl eHREaXJlY3Rpb24+KGd0a1RleHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0LT5zdHlsZSgpLT5kaXJl Y3Rpb24oKSkpKTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3MoY29udGV4dCwgR1RL X1NUWUxFX0NMQVNTX0VOVFJZKTsKKworICAgIGdib29sZWFuIGludGVyaW9yRm9jdXM7CisgICAg Z2ludCBmb2N1c1dpZHRoOworICAgIGd0a19zdHlsZV9jb250ZXh0X2dldF9zdHlsZShjb250ZXh0 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZm9jdXMtbGluZS13aWR0aCIsICZm b2N1c1dpZHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJpb3ItZm9j dXMiLCAmaW50ZXJpb3JGb2N1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCk7 CisKKyAgICBJbnRSZWN0IHRleHRSZWN0ID0gcmVjdDsKKyAgICBpZiAoIWludGVyaW9yRm9jdXMg JiYgaXNGb2N1c2VkKHJlbmRlck9iamVjdCkpCisgICAgICAgIHRleHRSZWN0LmluZmxhdGUoLWZv Y3VzV2lkdGgpOworCisgICAgZ3VpbnQgZmxhZ3MgPSAwOworICAgIGlmICghaXNFbmFibGVkKHJl bmRlck9iamVjdCkgfHwgaXNSZWFkT25seUNvbnRyb2wocmVuZGVyT2JqZWN0KSkKKyAgICAgICAg ZmxhZ3MgfD0gR1RLX1NUQVRFX0ZMQUdfSU5TRU5TSVRJVkU7CisgICAgZWxzZSBpZiAoaXNGb2N1 c2VkKHJlbmRlck9iamVjdCkpCisgICAgICAgIGZsYWdzIHw9IEdUS19TVEFURV9GTEFHX0ZPQ1VT RUQ7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfc2V0X3N0YXRlKGNvbnRleHQsIHN0YXRpY19jYXN0 PEd0a1N0YXRlRmxhZ3M+KGZsYWdzKSk7CisKKyAgICBndGtfcmVuZGVyX2JhY2tncm91bmQoY29u dGV4dCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCB0ZXh0UmVjdC54KCks IHRleHRSZWN0LnkoKSwgdGV4dFJlY3Qud2lkdGgoKSwgdGV4dFJlY3QuaGVpZ2h0KCkpOworICAg IGd0a19yZW5kZXJfZnJhbWUoY29udGV4dCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29u dGV4dCgpLCB0ZXh0UmVjdC54KCksIHRleHRSZWN0LnkoKSwgdGV4dFJlY3Qud2lkdGgoKSwgdGV4 dFJlY3QuaGVpZ2h0KCkpOworCisgICAgaWYgKCFpbnRlcmlvckZvY3VzICYmIGlzRm9jdXNlZChy ZW5kZXJPYmplY3QpICYmIGlzRW5hYmxlZChyZW5kZXJPYmplY3QpKQorICAgICAgICBndGtfcmVu ZGVyX2ZvY3VzKGNvbnRleHQsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwg cmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworCisgICAg Z3RrX3N0eWxlX2NvbnRleHRfcmVzdG9yZShjb250ZXh0KTsKKworICAgIHJldHVybiBmYWxzZTsK IH0KIAogYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJPYmplY3Qq IG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBpbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQo= 78383 2011-01-10 02:03:50 -0800 2011-01-10 09:01:48 -0800 Updated patch using adjustRepaintRect() style-context-textfields2.diff text/plain 4634 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmOWJhNDQ3Li5lY2FmNmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTEtMDEtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFBvcnQgdGV4dCBpbnB1dCBjb250cm9sIHBhaW50aW5nIHRvIEd0a1N0eWxlQ29udGV4dAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE4NzAKKworICAg ICAgICBVc2UgR3RrU3R5bGVDb250ZXh0IEFQSSB0byBwYWludCB0ZXh0IGlucHV0IGNvbnRyb2xz IHdoZW4gYnVpbGRpbmcKKyAgICAgICAgd2l0aCBHVEsrIDMueC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIFRoaXMgc2hvdWxkIG5vdCBjaGFuZ2UgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyVGhlbWVHdGs6OmFkanVzdFJlcGFpbnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lR3RrOjpwYWludFRleHRGaWVsZCk6CisKKzIwMTEtMDEtMTAgIENhcmxvcyBHYXJjaWEg Q2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRp biBSb2JpbnNvbi4KIAogICAgICAgICBbR1RLXSBQb3J0IHByb2dyZXNzYmFyIHBhaW50aW5nIHRv IEd0a1N0eWxlQ29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1JlbmRlclRoZW1lR3RrMy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVy VGhlbWVHdGszLmNwcAppbmRleCAwZTMwMTFmLi4yNmNlNzJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcApAQCAtMTEzLDYgKzExMyw3IEBA IHN0YXRpYyB2b2lkIGFkanVzdFJlY3RGb3JGb2N1cyhHdGtTdHlsZUNvbnRleHQqIGNvbnRleHQs IEludFJlY3QmIHJlY3QpCiB2b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1c3RSZXBhaW50UmVjdChj b25zdCBSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgSW50UmVjdCYgcmVjdCkKIHsKICAgICBH dGtTdHlsZUNvbnRleHQqIGNvbnRleHQgPSAwOworICAgIGJvb2wgY2hlY2tJbnRlcmlvckZvY3Vz ID0gZmFsc2U7CiAgICAgQ29udHJvbFBhcnQgcGFydCA9IHJlbmRlck9iamVjdC0+c3R5bGUoKS0+ YXBwZWFyYW5jZSgpOwogICAgIHN3aXRjaCAocGFydCkgewogICAgIGNhc2UgU2xpZGVyVmVydGlj YWxQYXJ0OgpAQCAtMTIxLDE4ICsxMjIsMjQgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0 UmVwYWludFJlY3QoY29uc3QgUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIEludFJlY3QKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBCdXR0b25QYXJ0OgogICAgICAgICBjb250ZXh0ID0gZ2V0 U3R5bGVDb250ZXh0KEdUS19UWVBFX0JVVFRPTik7Ci0KLSAgICAgICAgZ2Jvb2xlYW4gaW50ZXJp b3JGb2N1czsKLSAgICAgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0eWxlKGNvbnRleHQsICJp bnRlcmlvci1mb2N1cyIsICZpbnRlcmlvckZvY3VzLCBOVUxMKTsKLSAgICAgICAgaWYgKGludGVy aW9yRm9jdXMpCi0gICAgICAgICAgICByZXR1cm47Ci0KKyAgICAgICAgY2hlY2tJbnRlcmlvckZv Y3VzID0gdHJ1ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBUZXh0RmllbGRQYXJ0OgorICAg IGNhc2UgVGV4dEFyZWFQYXJ0OgorICAgICAgICBjb250ZXh0ID0gZ2V0U3R5bGVDb250ZXh0KEdU S19UWVBFX0VOVFJZKTsKKyAgICAgICAgY2hlY2tJbnRlcmlvckZvY3VzID0gdHJ1ZTsKICAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIEFT U0VSVChjb250ZXh0KTsKKyAgICBpZiAoY2hlY2tJbnRlcmlvckZvY3VzKSB7CisgICAgICAgIGdi b29sZWFuIGludGVyaW9yRm9jdXM7CisgICAgICAgIGd0a19zdHlsZV9jb250ZXh0X2dldF9zdHls ZShjb250ZXh0LCAiaW50ZXJpb3ItZm9jdXMiLCAmaW50ZXJpb3JGb2N1cywgTlVMTCk7CisgICAg ICAgIGlmIChpbnRlcmlvckZvY3VzKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBh ZGp1c3RSZWN0Rm9yRm9jdXMoY29udGV4dCwgcmVjdCk7CiB9CiAKQEAgLTMzNSw5ICszNDIsNDMg QEAgYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRNZW51TGlzdChSZW5kZXJPYmplY3QqIG9iamVj dCwgY29uc3QgUGFpbnRJbmZvJiBpbmZvLAogICAgIHJldHVybiBwYWludFJlbmRlck9iamVjdChN T1pfR1RLX0RST1BET1dOLCBvYmplY3QsIGluZm8uY29udGV4dCwgcmVjdCk7CiB9CiAKLWJvb2wg UmVuZGVyVGhlbWVHdGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z dCBQYWludEluZm8mIGluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCitib29sIFJlbmRlclRoZW1l R3RrOjpwYWludFRleHRGaWVsZChSZW5kZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcmV0dXJuIHBh aW50UmVuZGVyT2JqZWN0KE1PWl9HVEtfRU5UUlksIG9iamVjdCwgaW5mby5jb250ZXh0LCByZWN0 KTsKKyAgICBHdGtTdHlsZUNvbnRleHQqIGNvbnRleHQgPSBnZXRTdHlsZUNvbnRleHQoR1RLX1RZ UEVfRU5UUlkpOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NhdmUoY29udGV4dCk7CisKKyAgICBn dGtfc3R5bGVfY29udGV4dF9zZXRfZGlyZWN0aW9uKGNvbnRleHQsIHN0YXRpY19jYXN0PEd0a1Rl eHREaXJlY3Rpb24+KGd0a1RleHREaXJlY3Rpb24ocmVuZGVyT2JqZWN0LT5zdHlsZSgpLT5kaXJl Y3Rpb24oKSkpKTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3MoY29udGV4dCwgR1RL X1NUWUxFX0NMQVNTX0VOVFJZKTsKKworICAgIGd1aW50IGZsYWdzID0gMDsKKyAgICBpZiAoIWlz RW5hYmxlZChyZW5kZXJPYmplY3QpIHx8IGlzUmVhZE9ubHlDb250cm9sKHJlbmRlck9iamVjdCkp CisgICAgICAgIGZsYWdzIHw9IEdUS19TVEFURV9GTEFHX0lOU0VOU0lUSVZFOworICAgIGVsc2Ug aWYgKGlzRm9jdXNlZChyZW5kZXJPYmplY3QpKQorICAgICAgICBmbGFncyB8PSBHVEtfU1RBVEVf RkxBR19GT0NVU0VEOworICAgIGd0a19zdHlsZV9jb250ZXh0X3NldF9zdGF0ZShjb250ZXh0LCBz dGF0aWNfY2FzdDxHdGtTdGF0ZUZsYWdzPihmbGFncykpOworCisgICAgZ3RrX3JlbmRlcl9iYWNr Z3JvdW5kKGNvbnRleHQsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgcmVj dC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19y ZW5kZXJfZnJhbWUoY29udGV4dCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgp LCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisKKyAg ICBpZiAoaXNGb2N1c2VkKHJlbmRlck9iamVjdCkgJiYgaXNFbmFibGVkKHJlbmRlck9iamVjdCkp IHsKKyAgICAgICAgZ2Jvb2xlYW4gaW50ZXJpb3JGb2N1czsKKyAgICAgICAgZ2ludCBmb2N1c1dp ZHRoLCBmb2N1c1BhZDsKKyAgICAgICAgZ3RrX3N0eWxlX2NvbnRleHRfZ2V0X3N0eWxlKGNvbnRl eHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJpb3ItZm9jdXMi LCAmaW50ZXJpb3JGb2N1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJm b2N1cy1saW5lLXdpZHRoIiwgJmZvY3VzV2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiZm9jdXMtcGFkZGluZyIsICZmb2N1c1BhZCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE5VTEwpOworICAgICAgICBpZiAoIWludGVyaW9yRm9jdXMpIHsK KyAgICAgICAgICAgIEludFJlY3QgZm9jdXNSZWN0KHJlY3QpOworICAgICAgICAgICAgZm9jdXNS ZWN0LmluZmxhdGUoZm9jdXNXaWR0aCArIGZvY3VzUGFkKTsKKyAgICAgICAgICAgIGd0a19yZW5k ZXJfZm9jdXMoY29udGV4dCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb2N1c1JlY3QueCgpLCBmb2N1c1JlY3QueSgp LCBmb2N1c1JlY3Qud2lkdGgoKSwgZm9jdXNSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgfQorICAg IH0KKworICAgIGd0a19zdHlsZV9jb250ZXh0X3Jlc3RvcmUoY29udGV4dCk7CisKKyAgICByZXR1 cm4gZmFsc2U7CiB9CiAKIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50U2xpZGVyVHJhY2soUmVu ZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25z dCBJbnRSZWN0JiByZWN0KQo=