62626 2011-06-14 02:13:57 -0700 [GTK] Rename convertWidgetRectToScreenRect() to convertWidgetPointToScreenPoint() 2011-06-14 07:58:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 62627 1 cgarcia webkit-unassigned gustavo xan.lopez oldest_to_newest 420285 0 cgarcia 2011-06-14 02:13:57 -0700 This method actually translates coordinates, the rect size is never modified, so it should be renamed to convertWidgetPointToScreenPoint() and modified to return a point instead of a rectangle. I've also noticed that this functionality is duplicated in several places, so this method should be used instead. There's also a bug in the implementation, it translates the rectangle coordinates with gtk_widget_translate_coordinates(), and it moves the original rectangle using the translated coordinates as an offset instead of as final location, so the method is returning the wrong coordinates when the given rectangle is not at 0,0 (in ChromeClient::screenToWindow() the rect is always at 0,0 so I guess that's why we haven't noticed the bug before) 420287 1 97089 cgarcia 2011-06-14 02:24:15 -0700 Created attachment 97089 Patch 420411 2 97089 mrobinson 2011-06-14 07:53:34 -0700 Comment on attachment 97089 Patch Nice! 420414 3 cgarcia 2011-06-14 07:58:47 -0700 Committed r88802: <http://trac.webkit.org/changeset/88802> 97089 2011-06-14 02:24:15 -0700 2011-06-14 07:53:34 -0700 Patch wk-translate-coords.diff text/plain 14756 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ODVjZmQyLi42OGVjNGIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDYtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFJlbmFtZSBjb252ZXJ0V2lkZ2V0UmVjdFRvU2NyZWVuUmVjdCgpIHRvIGNvbnZlcnRXaWRnZXRQ b2ludFRvU2NyZWVuUG9pbnQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjI2MjYKKworICAgICAgICBUaGUgbWV0aG9kIGFjdHVhbGx5IGNvbnZlcnRz IGNvb3JkaW5hdGVzLCB0aGUgcmVjdGFuZ2xlIHNpemUgaXMKKyAgICAgICAgbm90IGFmZmVjdGVk LCBzbyBpdCBjYW4gYmUgbW9kaWZpZWQgdG8gcmV0dXJuIGEgcG9pbnQKKyAgICAgICAgaW5zdGVh ZC4gRml4IGFsc28gYSBidWcgaW4gdGhlIGltcGxlbWVudGF0aW9uLCBpdCB3YXMgdHJhbnNsYXRp bmcKKyAgICAgICAgdGhlIGNvb3JkaW5hdGVzIHR3aWNlIHJldHVybmluZyB0aGUgd3JvbmcgcG9z aXRpb24gd2hlbiB0aGUgZ2l2ZW4KKyAgICAgICAgcmVjdGFuZ2xlIHdhcyBub3QgYXQgMCwwLgor CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpjb252ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvR3RrVXRpbGl0aWVzLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1BvcHVwTWVudUd0 ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVHdGs6OnNob3cpOiBVc2UKKyAgICAg ICAgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludCgpLgorCiAyMDExLTA2LTEzICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbRUZMXSBUaGUgc2Vjb25k IHRyeSB0byBmaXggYSBidWlsZCBicmVhay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA4MDczMTk5Li4y MzgxZDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMTQgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFJlbmFtZSBjb252ZXJ0V2lk Z2V0UmVjdFRvU2NyZWVuUmVjdCgpIHRvIGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MjYK KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkNocm9tZUNsaWVudDo6d2luZG93VG9TY3JlZW4pOiBVcGRhdGUgdG8gdXNlCisg ICAgICAgIGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoKQorICAgICAgICAoV2ViS2l0 OjpDaHJvbWVDbGllbnQ6OnNjcmVlblRvV2luZG93KTogRGl0dG8uCisgICAgICAgICogd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwOiBSZW1vdmUgZ2xvYmFsUG9pbnRGb3JDbGllbnRQb2ludCgpCisg ICAgICAgIHNpbmNlIGl0IGRvZXMgdGhlIHNhbWUgdGhhbiBjb252ZXJ0V2lkZ2V0UG9pbnRUb1Nj cmVlblBvaW50KCkuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfcG9wdXBfbWVudV9oYW5kbGVy KTogVXNlCisgICAgICAgIGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoKSBpbnN0ZWFk IG9mIGdsb2JhbFBvaW50Rm9yQ2xpZW50UG9pbnQoKS4KKyAgICAgICAgKGRvRHJhZ0xlYXZlTGF0 ZXIpOiBEaXR0by4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19kcmFnX21vdGlvbik6IERpdHRv LgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2RyYWdfZGF0YV9yZWNlaXZlZCk6IERpdHRvLgor ICAgICAgICAod2Via2l0X3dlYl92aWV3X2RyYWdfZHJvcCk6IERpdHRvLgorCiAyMDExLTA2LTEz ICBKb29uZSBIdXIgIDxqb29uZS5odXJAY29sbGFib3JhLmNvLnVrPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlZjczZDBlLi4yYjQ4NWU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMTQgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIFJlbmFtZSBjb252ZXJ0V2lkZ2V0UmVjdFRvU2NyZWVu UmVjdCgpIHRvIGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MjYKKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFn ZUNsaWVudEltcGw6OnNjcmVlblRvV2luZG93KTogSW1wbGVtZW50IHRoaXMgbWV0aG9kCisgICAg ICAgIHVzaW5nIGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoKS4KKyAgICAgICAgKFdl YktpdDo6UGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKTogVXBkYXRlIHRvIHVzZQorICAg ICAgICBjb252ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KCkuCisgICAgICAgICogVUlQcm9j ZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBv cHVwTWVudVByb3h5R3RrOjpzaG93UG9wdXBNZW51KTogVXNlCisgICAgICAgIGNvbnZlcnRXaWRn ZXRQb2ludFRvU2NyZWVuUG9pbnQoKS4KKwogMjAxMS0wNi0xMyAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwCmluZGV4IGI1MjVk ODMuLjJjZjY5YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtV dGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRp ZXMuY3BwCkBAIC0xOSwxMiArMTksMTIgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRl ICJHdGtVdGlsaXRpZXMuaCIKIAotI2luY2x1ZGUgIkludFJlY3QuaCIKKyNpbmNsdWRlICJJbnRQ b2ludC5oIgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1J bnRSZWN0IGNvbnZlcnRXaWRnZXRSZWN0VG9TY3JlZW5SZWN0KEd0a1dpZGdldCogd2lkZ2V0LCBj b25zdCBJbnRSZWN0JiByZWN0KQorSW50UG9pbnQgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Q b2ludChHdGtXaWRnZXQqIHdpZGdldCwgY29uc3QgSW50UG9pbnQmIHBvaW50KQogewogICAgIC8v IEZJWE1FOiBUaGlzIGlzIGFjdHVhbGx5IGEgdmVyeSB0cmlja3kgb3BlcmF0aW9uIGFuZCB0aGUg cmVzdWx0cyBvZiB0aGlzIGZ1bmN0aW9uIHNob3VsZAogICAgIC8vIG9ubHkgYmUgdGhvdWdodCBv ZiBhcyBhIGd1ZXNzLiBGb3IgaW5zdGFuY2UsIHNvbWV0aW1lcyBpdCBtYXkgbm90IGNvcnJlY3Rs eSB0YWtlIGludG8KQEAgLTMyLDE2ICszMiwxNCBAQCBJbnRSZWN0IGNvbnZlcnRXaWRnZXRSZWN0 VG9TY3JlZW5SZWN0KEd0a1dpZGdldCogd2lkZ2V0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogCiAg ICAgR3RrV2lkZ2V0KiB0b3BsZXZlbFdpZGdldCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKHdp ZGdldCk7CiAgICAgaWYgKCF0b3BsZXZlbFdpZGdldCB8fCAhZ3RrX3dpZGdldF9pc190b3BsZXZl bCh0b3BsZXZlbFdpZGdldCkgfHwgIUdUS19JU19XSU5ET1codG9wbGV2ZWxXaWRnZXQpKQotICAg ICAgICByZXR1cm4gcmVjdDsKKyAgICAgICAgcmV0dXJuIHBvaW50OwogCiAgICAgaW50IHhJbldp bmRvdywgeUluV2luZG93OwotICAgIGd0a193aWRnZXRfdHJhbnNsYXRlX2Nvb3JkaW5hdGVzKHdp ZGdldCwgdG9wbGV2ZWxXaWRnZXQsIHJlY3QueCgpLCByZWN0LnkoKSwgJnhJbldpbmRvdywgJnlJ bldpbmRvdyk7CisgICAgZ3RrX3dpZGdldF90cmFuc2xhdGVfY29vcmRpbmF0ZXMod2lkZ2V0LCB0 b3BsZXZlbFdpZGdldCwgcG9pbnQueCgpLCBwb2ludC55KCksICZ4SW5XaW5kb3csICZ5SW5XaW5k b3cpOwogICAgIGludCB3aW5kb3dPcmlnaW5YLCB3aW5kb3dPcmlnaW5ZOwogICAgIGdka193aW5k b3dfZ2V0X29yaWdpbihndGtfd2lkZ2V0X2dldF93aW5kb3codG9wbGV2ZWxXaWRnZXQpLCAmd2lu ZG93T3JpZ2luWCwgJndpbmRvd09yaWdpblkpOwogCi0gICAgSW50UmVjdCByZWN0SW5TY3JlZW5D b29yZGluYXRlcyhyZWN0KTsKLSAgICByZWN0SW5TY3JlZW5Db29yZGluYXRlcy5tb3ZlKHdpbmRv d09yaWdpblggKyB4SW5XaW5kb3csIHdpbmRvd09yaWdpblkgKyB5SW5XaW5kb3cpOwotICAgIHJl dHVybiByZWN0SW5TY3JlZW5Db29yZGluYXRlczsKKyAgICByZXR1cm4gSW50UG9pbnQod2luZG93 T3JpZ2luWCArIHhJbldpbmRvdywgd2luZG93T3JpZ2luWSArIHlJbldpbmRvdyk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9HdGtVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGls aXRpZXMuaAppbmRleCAxMjhkZDgxLi5hMzM4NThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0d0a1V0aWxpdGllcy5oCkBAIC0yMSw5ICsyMSw5IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotY2xhc3MgSW50UmVjdDsKK2NsYXNzIEludFBvaW50OwogCi1JbnRSZWN0IGNvbnZl cnRXaWRnZXRSZWN0VG9TY3JlZW5SZWN0KEd0a1dpZGdldCosIGNvbnN0IEludFJlY3QmKTsKK0lu dFBvaW50IGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoR3RrV2lkZ2V0KiwgY29uc3Qg SW50UG9pbnQmKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUG9wdXBNZW51R3RrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9Qb3B1cE1lbnVHdGsuY3BwCmluZGV4IDAzZGZmYjUuLmE1NTNkYWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Qb3B1cE1lbnVHdGsuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Qb3B1cE1lbnVHdGsuY3BwCkBAIC0yOSw2 ICsyOSw3IEBACiAKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJHT3duUHRyLmgi CisjaW5jbHVkZSAiR3RrVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiSG9zdFdpbmRvdy5oIgogI2lu Y2x1ZGUgPGd0ay9ndGsuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC04Miwx MyArODMsOCBAQCB2b2lkIFBvcHVwTWVudUd0azo6c2hvdyhjb25zdCBJbnRSZWN0JiByZWN0LCBG cmFtZVZpZXcqIHZpZXcsIGludCBpbmRleCkKICAgICAgICAgfQogICAgIH0KIAotICAgIGludCB4 ID0gMDsKLSAgICBpbnQgeSA9IDA7Ci0gICAgR2RrV2luZG93KiB3aW5kb3cgPSBndGtfd2lkZ2V0 X2dldF93aW5kb3coR1RLX1dJREdFVCh2aWV3LT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNs aWVudCgpKSk7Ci0gICAgaWYgKHdpbmRvdykKLSAgICAgICAgZ2RrX3dpbmRvd19nZXRfb3JpZ2lu KHdpbmRvdywgJngsICZ5KTsKLSAgICBJbnRQb2ludCBtZW51UG9zaXRpb24odmlldy0+Y29udGVu dHNUb1dpbmRvdyhyZWN0LmxvY2F0aW9uKCkpKTsKLSAgICBtZW51UG9zaXRpb24ubW92ZSh4LCB5 ICsgcmVjdC5oZWlnaHQoKSk7CisgICAgSW50UG9pbnQgbWVudVBvc2l0aW9uID0gY29udmVydFdp ZGdldFBvaW50VG9TY3JlZW5Qb2ludChHVEtfV0lER0VUKHZpZXctPmhvc3RXaW5kb3coKS0+cGxh dGZvcm1QYWdlQ2xpZW50KCkpLCB2aWV3LT5jb250ZW50c1RvV2luZG93KHJlY3QubG9jYXRpb24o KSkpOworICAgIG1lbnVQb3NpdGlvbi5tb3ZlKDAsIHJlY3QuaGVpZ2h0KCkpOwogCiAgICAgbV9w b3B1cC0+cG9wVXAocmVjdC5zaXplKCksIG1lbnVQb3NpdGlvbiwgc2l6ZSwgaW5kZXgsIGd0a19n ZXRfY3VycmVudF9ldmVudCgpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCmluZGV4IDlkMDAwNjUuLjc5Yjk1OGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0 ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 R3RrLmNwcApAQCAtNDY0LDEzICs0NjQsMTIgQEAgdm9pZCBDaHJvbWVDbGllbnQ6OnNjcm9sbChj b25zdCBJbnRTaXplJiBkZWx0YSwgY29uc3QgSW50UmVjdCYgcmVjdFRvU2Nyb2xsLCBjb24KIAog SW50UmVjdCBDaHJvbWVDbGllbnQ6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3Qp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbnZlcnRXaWRnZXRSZWN0VG9TY3JlZW5SZWN0KEdUS19X SURHRVQobV93ZWJWaWV3KSwgcmVjdCk7CisgICAgcmV0dXJuIEludFJlY3QoY29udmVydFdpZGdl dFBvaW50VG9TY3JlZW5Qb2ludChHVEtfV0lER0VUKG1fd2ViVmlldyksIHJlY3QubG9jYXRpb24o KSksIHJlY3Quc2l6ZSgpKTsKIH0KIAogSW50UG9pbnQgQ2hyb21lQ2xpZW50OjpzY3JlZW5Ub1dp bmRvdyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7Ci0gICAgSW50UG9pbnQgd2lkZ2V0 UG9zaXRpb25PblNjcmVlbiA9IGNvbnZlcnRXaWRnZXRSZWN0VG9TY3JlZW5SZWN0KEdUS19XSURH RVQobV93ZWJWaWV3KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50UmVjdChJbnRQb2ludCgpLCBJbnRTaXplKCkp KS5sb2NhdGlvbigpOworICAgIEludFBvaW50IHdpZGdldFBvc2l0aW9uT25TY3JlZW4gPSBjb252 ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KEdUS19XSURHRVQobV93ZWJWaWV3KSwgSW50UG9p bnQoKSk7CiAgICAgSW50UG9pbnQgcmVzdWx0KHBvaW50KTsKICAgICByZXN1bHQubW92ZSgtd2lk Z2V0UG9zaXRpb25PblNjcmVlbi54KCksIC13aWRnZXRQb3NpdGlvbk9uU2NyZWVuLnkoKSk7CiAg ICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93 ZWJraXR3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAppbmRleCA3YzJiY2Y3Li4yYjFkYmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC01Nyw2ICs1Nyw3IEBACiAjaW5jbHVkZSAiRnJhbWVWaWV3 LmgiCiAjaW5jbHVkZSAiR093blB0ckd0ay5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5o IgorI2luY2x1ZGUgIkd0a1V0aWxpdGllcy5oIgogI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIK ICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVxdWVzdC5oIgpAQCAt MTQ0LDcgKzE0NSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAogc3RhdGljIGNvbnN0IGRvdWJsZSBkZWZhdWx0RFBJID0gOTYuMDsKLXN0YXRp YyBJbnRQb2ludCBnbG9iYWxQb2ludEZvckNsaWVudFBvaW50KEdka1dpbmRvdyogd2luZG93LCBj b25zdCBJbnRQb2ludCYgY2xpZW50UG9pbnQpOwogCiBlbnVtIHsKICAgICAvKiBub3JtYWwgc2ln bmFscyAqLwpAQCAtNDE1LDcgKzQxNSw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3Zp ZXdfcG9wdXBfbWVudV9oYW5kbGVyKEd0a1dpZGdldCogd2lkZ2V0KQogICAgIGxvY2F0aW9uLmV4 cGFuZGVkVG8oSW50UG9pbnQoZ0NvbnRleHRNZW51TWFyZ2luLCBnQ29udGV4dE1lbnVNYXJnaW4p KTsKICAgICBsb2NhdGlvbi5zaHJ1bmtUbyhJbnRQb2ludCh2aWV3LT53aWR0aCgpIC0gZ0NvbnRl eHRNZW51TWFyZ2luLCB2aWV3LT5oZWlnaHQoKSAtIGdDb250ZXh0TWVudU1hcmdpbikpOwogCi0g ICAgSW50UG9pbnQgZ2xvYmFsUG9pbnQoZ2xvYmFsUG9pbnRGb3JDbGllbnRQb2ludChndGtfd2lk Z2V0X2dldF93aW5kb3cod2lkZ2V0KSwgbG9jYXRpb24pKTsKKyAgICBJbnRQb2ludCBnbG9iYWxQ b2ludChjb252ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KHdpZGdldCwgbG9jYXRpb24pKTsK ICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgZXZlbnQobG9jYXRpb24sIGdsb2JhbFBvaW50LCBSaWdo dEJ1dHRvbiwgTW91c2VFdmVudFByZXNzZWQsIDAsIGZhbHNlLCBmYWxzZSwgZmFsc2UsIGZhbHNl LCBndGtfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZSgpKTsKICAgICByZXR1cm4gd2Via2l0X3dlYl92 aWV3X2ZvcndhcmRfY29udGV4dF9tZW51X2V2ZW50KFdFQktJVF9XRUJfVklFVyh3aWRnZXQpLCBl dmVudCk7CiB9CkBAIC0xNDQxLDE0ICsxNDQxLDYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92 aWV3X3NjcmVlbl9jaGFuZ2VkKEd0a1dpZGdldCogd2lkZ2V0LCBHZGtTY3JlZW4qIHByZXZpb3UK ICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUxvZ2ljYWxGb250U2l6ZShtaW5pbXVtTG9naWNhbEZv bnRTaXplIC8gNzIuMCAqIERQSSk7CiB9CiAKLXN0YXRpYyBJbnRQb2ludCBnbG9iYWxQb2ludEZv ckNsaWVudFBvaW50KEdka1dpbmRvdyogd2luZG93LCBjb25zdCBJbnRQb2ludCYgY2xpZW50UG9p bnQpCi17Ci0gICAgaW50IHgsIHk7Ci0gICAgZ2RrX3dpbmRvd19nZXRfb3JpZ2luKHdpbmRvdywg JngsICZ5KTsKLSAgICByZXR1cm4gY2xpZW50UG9pbnQgKyBJbnRTaXplKHgsIHkpOwotfQotCi0K IHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19kcmFnX2VuZChHdGtXaWRnZXQqIHdpZGdldCwg R2RrRHJhZ0NvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9 IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwpAQCAtMTUxOSw3ICsxNTExLDcgQEAgc3RhdGljIGdi b29sZWFuIGRvRHJhZ0xlYXZlTGF0ZXIoRHJvcHBpbmdDb250ZXh0KiBjb250ZXh0KQogICAgIC8v IGhhcHBlbnMgaW4gdGhlIGNhc2Ugb2YgYSBzdWNjZXNzZnVsIGRyb3Agb250byB0aGUgdmlldy4K ICAgICBpZiAoIWNvbnRleHQtPmRyb3BIYXBwZW5lZCkgewogICAgICAgICBjb25zdCBJbnRQb2lu dCYgcG9zaXRpb24gPSBjb250ZXh0LT5sYXN0TW90aW9uUG9zaXRpb247Ci0gICAgICAgIERyYWdE YXRhIGRyYWdEYXRhKGNvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCksIHBvc2l0aW9uLCBnbG9iYWxQ b2ludEZvckNsaWVudFBvaW50KGd0a193aWRnZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKHdlYlZp ZXcpKSwgcG9zaXRpb24pLCBEcmFnT3BlcmF0aW9uTm9uZSk7CisgICAgICAgIERyYWdEYXRhIGRy YWdEYXRhKGNvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCksIHBvc2l0aW9uLCBjb252ZXJ0V2lkZ2V0 UG9pbnRUb1NjcmVlblBvaW50KEdUS19XSURHRVQod2ViVmlldyksIHBvc2l0aW9uKSwgRHJhZ09w ZXJhdGlvbk5vbmUpOwogICAgICAgICBjb3JlKHdlYlZpZXcpLT5kcmFnQ29udHJvbGxlcigpLT5k cmFnRXhpdGVkKCZkcmFnRGF0YSk7CiAgICAgfQogCkBAIC0xNTc1LDcgKzE1NjcsNyBAQCBzdGF0 aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2RyYWdfbW90aW9uKEd0a1dpZGdldCogd2lkZ2V0 LCBHZGtEcmFnQ29udGV4dCogYwogICAgIGlmIChkcm9wcGluZ0NvbnRleHQtPnBlbmRpbmdEYXRh UmVxdWVzdHMgPiAwKQogICAgICAgICByZXR1cm4gVFJVRTsKIAotICAgIERyYWdEYXRhIGRyYWdE YXRhKGRyb3BwaW5nQ29udGV4dC0+ZGF0YU9iamVjdC5nZXQoKSwgcG9zaXRpb24sIGdsb2JhbFBv aW50Rm9yQ2xpZW50UG9pbnQoZ3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIHBvc2l0aW9u KSwgZ2RrRHJhZ0FjdGlvblRvRHJhZ09wZXJhdGlvbihnZGtfZHJhZ19jb250ZXh0X2dldF9hY3Rp b25zKGNvbnRleHQpKSk7CisgICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZHJvcHBpbmdDb250ZXh0LT5k YXRhT2JqZWN0LmdldCgpLCBwb3NpdGlvbiwgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2lu dCh3aWRnZXQsIHBvc2l0aW9uKSwgZ2RrRHJhZ0FjdGlvblRvRHJhZ09wZXJhdGlvbihnZGtfZHJh Z19jb250ZXh0X2dldF9hY3Rpb25zKGNvbnRleHQpKSk7CiAgICAgRHJhZ09wZXJhdGlvbiBvcGVy YXRpb24gPSBjb3JlKHdlYlZpZXcpLT5kcmFnQ29udHJvbGxlcigpLT5kcmFnVXBkYXRlZCgmZHJh Z0RhdGEpOwogICAgIGdka19kcmFnX3N0YXR1cyhjb250ZXh0LCBkcmFnT3BlcmF0aW9uVG9TaW5n bGVHZGtEcmFnQWN0aW9uKG9wZXJhdGlvbiksIHRpbWUpOwogCkBAIC0xNjAyLDcgKzE1OTQsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfZHJhZ19kYXRhX3JlY2VpdmVkKEd0a1dpZGdl dCogd2lkZ2V0LCBHZGtEcmFnQ29udGV4dAogICAgIGNvbnN0IEludFBvaW50JiBwb3NpdGlvbiA9 IGRyb3BwaW5nQ29udGV4dC0+bGFzdE1vdGlvblBvc2l0aW9uOwogCiAgICAgLy8gSWYgdGhlcmUg YXJlIG5vIG1vcmUgcGVuZGluZyByZXF1ZXN0cywgc3RhcnQgc2VuZGluZyBkcmFnZ2luZyBkYXRh IHRvIFdlYkNvcmUuCi0gICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZHJvcHBpbmdDb250ZXh0LT5kYXRh T2JqZWN0LmdldCgpLCBwb3NpdGlvbiwgZ2xvYmFsUG9pbnRGb3JDbGllbnRQb2ludChndGtfd2lk Z2V0X2dldF93aW5kb3cod2lkZ2V0KSwgcG9zaXRpb24pLCBnZGtEcmFnQWN0aW9uVG9EcmFnT3Bl cmF0aW9uKGdka19kcmFnX2NvbnRleHRfZ2V0X2FjdGlvbnMoY29udGV4dCkpKTsKKyAgICBEcmFn RGF0YSBkcmFnRGF0YShkcm9wcGluZ0NvbnRleHQtPmRhdGFPYmplY3QuZ2V0KCksIHBvc2l0aW9u LCBjb252ZXJ0V2lkZ2V0UG9pbnRUb1NjcmVlblBvaW50KHdpZGdldCwgcG9zaXRpb24pLCBnZGtE cmFnQWN0aW9uVG9EcmFnT3BlcmF0aW9uKGdka19kcmFnX2NvbnRleHRfZ2V0X2FjdGlvbnMoY29u dGV4dCkpKTsKICAgICBEcmFnT3BlcmF0aW9uIG9wZXJhdGlvbiA9IGNvcmUod2ViVmlldyktPmRy YWdDb250cm9sbGVyKCktPmRyYWdFbnRlcmVkKCZkcmFnRGF0YSk7CiAgICAgZ2RrX2RyYWdfc3Rh dHVzKGNvbnRleHQsIGRyYWdPcGVyYXRpb25Ub1NpbmdsZUdka0RyYWdBY3Rpb24ob3BlcmF0aW9u KSwgdGltZSk7CiB9CkBAIC0xNjE5LDcgKzE2MTEsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0 X3dlYl92aWV3X2RyYWdfZHJvcChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRHJhZ0NvbnRleHQqIGNv bgogICAgIGRyb3BwaW5nQ29udGV4dC0+ZHJvcEhhcHBlbmVkID0gdHJ1ZTsKIAogICAgIEludFBv aW50IHBvc2l0aW9uKHgsIHkpOwotICAgIERyYWdEYXRhIGRyYWdEYXRhKGRyb3BwaW5nQ29udGV4 dC0+ZGF0YU9iamVjdC5nZXQoKSwgcG9zaXRpb24sIGdsb2JhbFBvaW50Rm9yQ2xpZW50UG9pbnQo Z3RrX3dpZGdldF9nZXRfd2luZG93KHdpZGdldCksIHBvc2l0aW9uKSwgZ2RrRHJhZ0FjdGlvblRv RHJhZ09wZXJhdGlvbihnZGtfZHJhZ19jb250ZXh0X2dldF9hY3Rpb25zKGNvbnRleHQpKSk7Cisg ICAgRHJhZ0RhdGEgZHJhZ0RhdGEoZHJvcHBpbmdDb250ZXh0LT5kYXRhT2JqZWN0LmdldCgpLCBw b3NpdGlvbiwgY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludCh3aWRnZXQsIHBvc2l0aW9u KSwgZ2RrRHJhZ0FjdGlvblRvRHJhZ09wZXJhdGlvbihnZGtfZHJhZ19jb250ZXh0X2dldF9hY3Rp b25zKGNvbnRleHQpKSk7CiAgICAgY29yZSh3ZWJWaWV3KS0+ZHJhZ0NvbnRyb2xsZXIoKS0+cGVy Zm9ybURyYWcoJmRyYWdEYXRhKTsKIAogICAgIGd0a19kcmFnX2ZpbmlzaChjb250ZXh0LCBUUlVF LCBGQUxTRSwgdGltZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggNTVlOTRjNi4uN2EyNGZmMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAt MTg3LDEzICsxODcsMTUgQEAgRmxvYXRSZWN0IFBhZ2VDbGllbnRJbXBsOjpjb252ZXJ0VG9Vc2Vy U3BhY2UoY29uc3QgRmxvYXRSZWN0JiB2aWV3UmVjdCkKIAogSW50UG9pbnQgUGFnZUNsaWVudElt cGw6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBvaW50JiBwb2ludCkKIHsKLSAgICBub3RJbXBs ZW1lbnRlZCgpOwotICAgIHJldHVybiBwb2ludDsKKyAgICBJbnRQb2ludCB3aWRnZXRQb3NpdGlv bk9uU2NyZWVuID0gY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludChtX3ZpZXdXaWRnZXQs IEludFBvaW50KCkpOworICAgIEludFBvaW50IHJlc3VsdChwb2ludCk7CisgICAgcmVzdWx0Lm1v dmUoLXdpZGdldFBvc2l0aW9uT25TY3JlZW4ueCgpLCAtd2lkZ2V0UG9zaXRpb25PblNjcmVlbi55 KCkpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIEludFJlY3QgUGFnZUNsaWVudEltcGw6Ondp bmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgcmV0dXJuIGNvbnZlcnRX aWRnZXRSZWN0VG9TY3JlZW5SZWN0KG1fdmlld1dpZGdldCwgcmVjdCk7CisgICAgcmV0dXJuIElu dFJlY3QoY29udmVydFdpZGdldFBvaW50VG9TY3JlZW5Qb2ludChtX3ZpZXdXaWRnZXQsIHJlY3Qu bG9jYXRpb24oKSksIHJlY3Quc2l6ZSgpKTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZG9u ZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiwgYm9vbCB3YXNFdmVu dEhhbmRsZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlBv cHVwTWVudVByb3h5R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUG9w dXBNZW51UHJveHlHdGsuY3BwCmluZGV4IDI5N2JmOTMuLjczZTQ5ZTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUG9wdXBNZW51UHJveHlHdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUG9wdXBNZW51UHJveHlHdGsuY3BwCkBA IC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJOYXRpdmVXZWJNb3VzZUV2ZW50LmgiCiAjaW5j bHVkZSAiV2ViUG9wdXBJdGVtLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9HdGtVdGlsaXRpZXMuaD4K ICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR093blB0ci5oPgog I2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTgwLDExICs4MSw4IEBAIHZvaWQgV2Vi UG9wdXBNZW51UHJveHlHdGs6OnNob3dQb3B1cE1lbnUoY29uc3QgSW50UmVjdCYgcmVjdCwgVGV4 dERpcmVjdGlvbiB0ZXh0CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpbnQgeCA9IDA7Ci0gICAg aW50IHkgPSAwOwotICAgIGlmIChHZGtXaW5kb3cqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3dp bmRvdyhtX3dlYlZpZXcpKQotICAgICAgICBnZGtfd2luZG93X2dldF9vcmlnaW4od2luZG93LCAm eCwgJnkpOwotICAgIEludFBvaW50IG1lbnVQb3NpdGlvbihyZWN0LngoKSArIHgsIHJlY3QueSgp ICsgeSArIHJlY3QuaGVpZ2h0KCkpOworICAgIEludFBvaW50IG1lbnVQb3NpdGlvbiA9IGNvbnZl cnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQobV93ZWJWaWV3LCByZWN0LmxvY2F0aW9uKCkpOwor ICAgIG1lbnVQb3NpdGlvbi5tb3ZlKDAsIHJlY3QuaGVpZ2h0KCkpOwogCiAgICAgZ3Vsb25nIHVu bWFwSGFuZGxlciA9IGdfc2lnbmFsX2Nvbm5lY3QobV9wb3B1cC0+cGxhdGZvcm1NZW51KCksICJ1 bm1hcCIsIEdfQ0FMTEJBQ0sobWVudVVubWFwcGVkKSwgdGhpcyk7CiAgICAgbV9wb3B1cC0+cG9w VXAocmVjdC5zaXplKCksIG1lbnVQb3NpdGlvbiwgc2l6ZSwgc2VsZWN0ZWRJbmRleCwgbV9jbGll bnQtPmN1cnJlbnRseVByb2Nlc3NlZE1vdXNlRG93bkV2ZW50KCkgPyBtX2NsaWVudC0+Y3VycmVu dGx5UHJvY2Vzc2VkTW91c2VEb3duRXZlbnQoKS0+bmF0aXZlRXZlbnQoKSA6IDApOwo=