26075 2009-05-29 02:36:46 -0700 [GTK] Refactor key scrolling code 2009-05-29 08:57:01 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned oldest_to_newest 123531 0 xan.lopez 2009-05-29 02:36:46 -0700 Patch attached with explanation. 123532 1 30770 xan.lopez 2009-05-29 02:38:04 -0700 Created attachment 30770 scroll.patch 123540 2 xan.lopez 2009-05-29 04:34:04 -0700 This seems to break scrolling in the Acid2 test :/ I thought we were always guaranteed to have a scrollbar, even if it would be a dummy one, but apparently in that case WebCore thinks we don't have one and scrolling fails when using ScrollView::scroll. Guess I'm missing something here? 123541 3 30774 xan.lopez 2009-05-29 04:38:34 -0700 Created attachment 30774 scrollv2.patch Be more consistent with our previous implementation, always return true and do not scroll parent views (not sure if that's correct or not). My previous comment still applies though. 123553 4 30774 gustavo 2009-05-29 08:50:57 -0700 Comment on attachment 30774 scrollv2.patch Looks good to me. Testing in Chromium/Linux and asking people to test on Safari indicates that not scrolling in acid2 is actually the right thing, so this fixes a bug =). 123554 5 xan.lopez 2009-05-29 08:57:01 -0700 Landed as r44264, thanks! 30770 2009-05-29 02:38:04 -0700 2009-05-29 04:38:34 -0700 scroll.patch scroll.patch text/plain 4156 xan.lopez RnJvbSA3MzAwYjJkMDg2OWUwMjEzNjcxYjc1MDFkZTllOGJiNDkzYzM4YzVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDI5IE1heSAyMDA5IDEyOjMwOjQxICswMzAwClN1YmplY3Q6IFtQQVRDSF0gMjAwOS0wNS0y OSAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBBZnRlciB0aGUgc2Nyb2xsaW5nIGNoYW5nZXMgaW4gcjQ0 MTc3IHdlIGNhbiBub3cgdXNlIHRoZQogICAgICAgIEZyYW1lVmlldzo6c2Nyb2xsIG1ldGhvZCBs aWtlIHRoZSBvdGhlciBwb3J0cywga2VlcGluZyB0aGUgbWFnaWMKICAgICAgICBjb25zdGFudHMg Zm9yIHRoZSBzY3JvbGxpbmcgYW1vdW50cyBpbnNpZGUgV2ViQ29yZSBwcm9wZXIuCgogICAgICAg ICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgogICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfcmVh bF9tb3ZlX2N1cnNvcik6Ci0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg fCAgIDExICsrKysrKysrKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgfCAg IDQxICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg NDAgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBkMDA4ZGEwLi4wMGI5NDkz IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA1LTI5ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdh bGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZnRlciB0aGUgc2Nyb2xsaW5nIGNoYW5nZXMgaW4gcjQ0MTc3IHdlIGNhbiBub3cgdXNlIHRo ZQorICAgICAgICBGcmFtZVZpZXc6OnNjcm9sbCBtZXRob2QgbGlrZSB0aGUgb3RoZXIgcG9ydHMs IGtlZXBpbmcgdGhlIG1hZ2ljCisgICAgICAgIGNvbnN0YW50cyBmb3IgdGhlIHNjcm9sbGluZyBh bW91bnRzIGluc2lkZSBXZWJDb3JlIHByb3Blci4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19yZWFsX21vdmVfY3Vyc29yKToK KwogMjAwOS0wNS0yOCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNv bGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRpZmYgLS1n aXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGM2ODAxZDAuLjExYWM5MWQgMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC04MzMsMzkgKzgzMyw1NiBAQCBzdGF0aWMgZ2Jvb2xl YW4gd2Via2l0X3dlYl92aWV3X3JlYWxfbW92ZV9jdXJzb3IgKFdlYktpdFdlYlZpZXcqIHdlYlZp ZXcsIEd0a01vdgogICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZXAgPT0gR1RLX01PVkVNRU5U X0JVRkZFUl9FTkRTLCBGQUxTRSk7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoY291bnQgPT0g MSB8fCBjb3VudCA9PSAtMSwgRkFMU0UpOwogCi0gICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJW aWV3KS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOwotICAgIEZyYW1l VmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7CisgICAgU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlv bjsKKyAgICBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eTsKIAogICAgIHN3aXRjaCAoc3Rl cCkgewogICAgIGNhc2UgR1RLX01PVkVNRU5UX0RJU1BMQVlfTElORVM6CisgICAgICAgIGdyYW51 bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOwogICAgICAgICBpZiAoY291bnQgPT0gMSkKLSAgICAgICAg ICAgIHZpZXctPnNjcm9sbEJ5KEludFNpemUoMCwgY1Njcm9sbGJhclBpeGVsc1BlckxpbmVTdGVw KSk7CisgICAgICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxEb3duOwogICAgICAgICBlbHNlIGlm IChjb3VudCA9PSAtMSkKLSAgICAgICAgICAgIHZpZXctPnNjcm9sbEJ5KEludFNpemUoMCwgLWNT Y3JvbGxiYXJQaXhlbHNQZXJMaW5lU3RlcCkpOworICAgICAgICAgICAgZGlyZWN0aW9uID0gU2Ny b2xsVXA7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgR1RLX01PVkVNRU5UX1ZJU1VBTF9QT1NJ VElPTlM6CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOwogICAgICAgICBpZiAo Y291bnQgPT0gMSkKLSAgICAgICAgICAgIHZpZXctPnNjcm9sbEJ5KEludFNpemUoY1Njcm9sbGJh clBpeGVsc1BlckxpbmVTdGVwLCAwKSk7CisgICAgICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxS aWdodDsKICAgICAgICAgZWxzZSBpZiAoY291bnQgPT0gLTEpCi0gICAgICAgICAgICB2aWV3LT5z Y3JvbGxCeShJbnRTaXplKC1jU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0ZXAsIDApKTsKKyAgICAg ICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbExlZnQ7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug R1RLX01PVkVNRU5UX1BBR0VTOgorICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5UGFnZTsK ICAgICAgICAgaWYgKGNvdW50ID09IDEpCi0gICAgICAgICAgICB2aWV3LT5zY3JvbGxCeShJbnRT aXplKDAsIHZpZXctPnZpc2libGVIZWlnaHQoKSAtIGNBbW91bnRUb0tlZXBXaGVuUGFnaW5nKSk7 CisgICAgICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxEb3duOwogICAgICAgICBlbHNlIGlmIChj b3VudCA9PSAtMSkKLSAgICAgICAgICAgIHZpZXctPnNjcm9sbEJ5KEludFNpemUoMCwgLXZpZXct PnZpc2libGVIZWlnaHQoKSArIGNBbW91bnRUb0tlZXBXaGVuUGFnaW5nKSk7CisgICAgICAgICAg ICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBHVEtfTU9W RU1FTlRfQlVGRkVSX0VORFM6CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVu dDsKICAgICAgICAgaWYgKGNvdW50ID09IDEpCi0gICAgICAgICAgICB2aWV3LT5zY3JvbGxCeShJ bnRTaXplKDAsIHZpZXctPmNvbnRlbnRzSGVpZ2h0KCkpKTsKKyAgICAgICAgICAgIGRpcmVjdGlv biA9IFNjcm9sbERvd247CiAgICAgICAgIGVsc2UgaWYgKGNvdW50ID09IC0xKQotICAgICAgICAg ICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCAtdmlldy0+Y29udGVudHNIZWlnaHQoKSkpOwor ICAgICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsVXA7CiAgICAgICAgIGJyZWFrOwogICAgIGRl ZmF1bHQ6CiAgICAgICAgIGdfYXNzZXJ0X25vdF9yZWFjaGVkKCk7CisgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9Ci0gIAotICAgIHJldHVybiBUUlVFOworCisgICAgYm9vbCBoYW5kbGVkID0g ZmFsc2U7CisgICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+Zm9jdXNDb250cm9sbGVy KCktPmZvY3VzZWRPck1haW5GcmFtZSgpOworCisgICAgaWYgKCFmcmFtZS0+ZXZlbnRIYW5kbGVy KCktPnNjcm9sbE92ZXJmbG93KGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpKSB7CisgICAgICAgIGhh bmRsZWQgPSBmcmFtZS0+dmlldygpLT5zY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSk7Cisg ICAgICAgIEZyYW1lKiBwYXJlbnQgPSBmcmFtZS0+dHJlZSgpLT5wYXJlbnQoKTsKKyAgICAgICAg d2hpbGUoIWhhbmRsZWQgJiYgcGFyZW50KSB7CisgICAgICAgICAgICBoYW5kbGVkID0gcGFyZW50 LT52aWV3KCktPnNjcm9sbChkaXJlY3Rpb24sIGdyYW51bGFyaXR5KTsKKyAgICAgICAgICAgIHBh cmVudCA9IHBhcmVudC0+dHJlZSgpLT5wYXJlbnQoKTsKKyAgICAgICAgfQorICAgIH0KKworICAg IHJldHVybiBoYW5kbGVkOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9w YXN0ZV9jbGlwYm9hcmQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKLS0gCjEuNi4zLjEKCg== 30774 2009-05-29 04:38:34 -0700 2009-05-29 08:50:57 -0700 scrollv2.patch scrollv2.patch text/plain 3899 xan.lopez RnJvbSA5NWIwZGNkOGQyNWZiYWIwZDU1YzczNGEwODgxOGMxZTcwNjAzMGExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDI5IE1heSAyMDA5IDEyOjMwOjQxICswMzAwClN1YmplY3Q6IFtQQVRDSF0gMjAwOS0wNS0y OSAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBBZnRlciB0aGUgc2Nyb2xsaW5nIGNoYW5nZXMgaW4gcjQ0 MTc3IHdlIGNhbiBub3cgdXNlIHRoZQogICAgICAgIEZyYW1lVmlldzo6c2Nyb2xsIG1ldGhvZCBs aWtlIHRoZSBvdGhlciBwb3J0cywga2VlcGluZyB0aGUgbWFnaWMKICAgICAgICBjb25zdGFudHMg Zm9yIHRoZSBzY3JvbGxpbmcgYW1vdW50cyBpbnNpZGUgV2ViQ29yZSBwcm9wZXIuCgogICAgICAg ICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgogICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfcmVh bF9tb3ZlX2N1cnNvcik6Ci0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg fCAgIDExICsrKysrKysrKysrCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCB8 ICAgMzQgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCAzMyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGQwMDhkYTAuLjAwYjk0 OTMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDUtMjkgIFhhbiBMb3BleiAgPHhsb3BlekBp Z2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFmdGVyIHRoZSBzY3JvbGxpbmcgY2hhbmdlcyBpbiByNDQxNzcgd2UgY2FuIG5vdyB1c2Ug dGhlCisgICAgICAgIEZyYW1lVmlldzo6c2Nyb2xsIG1ldGhvZCBsaWtlIHRoZSBvdGhlciBwb3J0 cywga2VlcGluZyB0aGUgbWFnaWMKKyAgICAgICAgY29uc3RhbnRzIGZvciB0aGUgc2Nyb2xsaW5n IGFtb3VudHMgaW5zaWRlIFdlYkNvcmUgcHJvcGVyLgorCisgICAgICAgICogd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3JlYWxfbW92ZV9jdXJzb3Ip OgorCiAyMDA5LTA1LTI4ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFA Y29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAt LWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggYzY4MDFkMC4uZDQ1M2E5MiAxMDA2NDQKLS0t IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTgzMywzOSArODMzLDQ5IEBAIHN0YXRpYyBnYm9v bGVhbiB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9tb3ZlX2N1cnNvciAoV2ViS2l0V2ViVmlldyogd2Vi VmlldywgR3RrTW92CiAgICAgICAgICAgICAgICAgICAgICAgICAgc3RlcCA9PSBHVEtfTU9WRU1F TlRfQlVGRkVSX0VORFMsIEZBTFNFKTsKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChjb3VudCA9 PSAxIHx8IGNvdW50ID09IC0xLCBGQUxTRSk7CiAKLSAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdl YlZpZXcpLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7Ci0gICAgRnJh bWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXcoKTsKKyAgICBTY3JvbGxEaXJlY3Rpb24gZGlyZWN0 aW9uOworICAgIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5OwogCiAgICAgc3dpdGNoIChz dGVwKSB7CiAgICAgY2FzZSBHVEtfTU9WRU1FTlRfRElTUExBWV9MSU5FUzoKKyAgICAgICAgZ3Jh bnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7CiAgICAgICAgIGlmIChjb3VudCA9PSAxKQotICAgICAg ICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCBjU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0 ZXApKTsKKyAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CiAgICAgICAgIGVsc2Ug aWYgKGNvdW50ID09IC0xKQotICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCAt Y1Njcm9sbGJhclBpeGVsc1BlckxpbmVTdGVwKSk7CisgICAgICAgICAgICBkaXJlY3Rpb24gPSBT Y3JvbGxVcDsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBHVEtfTU9WRU1FTlRfVklTVUFMX1BP U0lUSU9OUzoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7CiAgICAgICAgIGlm IChjb3VudCA9PSAxKQotICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZShjU2Nyb2xs YmFyUGl4ZWxzUGVyTGluZVN0ZXAsIDApKTsKKyAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9s bFJpZ2h0OwogICAgICAgICBlbHNlIGlmIChjb3VudCA9PSAtMSkKLSAgICAgICAgICAgIHZpZXct PnNjcm9sbEJ5KEludFNpemUoLWNTY3JvbGxiYXJQaXhlbHNQZXJMaW5lU3RlcCwgMCkpOworICAg ICAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsTGVmdDsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBHVEtfTU9WRU1FTlRfUEFHRVM6CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlQYWdl OwogICAgICAgICBpZiAoY291bnQgPT0gMSkKLSAgICAgICAgICAgIHZpZXctPnNjcm9sbEJ5KElu dFNpemUoMCwgdmlldy0+dmlzaWJsZUhlaWdodCgpIC0gY0Ftb3VudFRvS2VlcFdoZW5QYWdpbmcp KTsKKyAgICAgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CiAgICAgICAgIGVsc2UgaWYg KGNvdW50ID09IC0xKQotICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCAtdmll dy0+dmlzaWJsZUhlaWdodCgpICsgY0Ftb3VudFRvS2VlcFdoZW5QYWdpbmcpKTsKKyAgICAgICAg ICAgIGRpcmVjdGlvbiA9IFNjcm9sbFVwOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEdUS19N T1ZFTUVOVF9CVUZGRVJfRU5EUzoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeURvY3Vt ZW50OwogICAgICAgICBpZiAoY291bnQgPT0gMSkKLSAgICAgICAgICAgIHZpZXctPnNjcm9sbEJ5 KEludFNpemUoMCwgdmlldy0+Y29udGVudHNIZWlnaHQoKSkpOworICAgICAgICAgICAgZGlyZWN0 aW9uID0gU2Nyb2xsRG93bjsKICAgICAgICAgZWxzZSBpZiAoY291bnQgPT0gLTEpCi0gICAgICAg ICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKDAsIC12aWV3LT5jb250ZW50c0hlaWdodCgpKSk7 CisgICAgICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKICAgICAgICAgYnJlYWs7CiAgICAg ZGVmYXVsdDoKICAgICAgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQoKTsKKyAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0KLSAgCi0gICAgcmV0dXJuIFRSVUU7CisKKyAgICBGcmFtZSogZnJhbWUg PSBjb3JlKHdlYlZpZXcpLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCk7 CisgICAgaWYgKCFmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNjcm9sbE92ZXJmbG93KGRpcmVjdGlv biwgZ3JhbnVsYXJpdHkpKSB7CisgICAgICAgIGZyYW1lLT52aWV3KCktPnNjcm9sbChkaXJlY3Rp b24sIGdyYW51bGFyaXR5KTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxfcGFzdGVfY2xpcGJvYXJkKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCi0tIAoxLjYuMy4xCgo=