71327 2011-11-01 14:54:32 -0700 Use IntPoint for screen coordinates in MouseEvent 2011-11-01 17:08:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae leviw webkit.review.bot oldest_to_newest 494177 0 eae 2011-11-01 14:54:32 -0700 Change mouse events to use IntPoint for screen coordinates and LayoutPoint for zoom adjusted coordinates. 494188 1 113231 eae 2011-11-01 15:03:35 -0700 Created attachment 113231 Patch 494321 2 113231 webkit.review.bot 2011-11-01 17:08:21 -0700 Comment on attachment 113231 Patch Clearing flags on attachment: 113231 Committed r99014: <http://trac.webkit.org/changeset/99014> 494322 3 webkit.review.bot 2011-11-01 17:08:25 -0700 All reviewed patches have been landed. Closing bug. 113231 2011-11-01 15:03:35 -0700 2011-11-01 17:08:21 -0700 Patch bug-71327-20111101150334.patch text/plain 13208 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4OTk4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDkgQEAKKzIwMTEtMTEtMDEgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBJbnRQb2ludCBmb3Igc2Ny ZWVuIGNvb3JkaW5hdGVzIGluIE1vdXNlRXZlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcxMzI3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIG1vdXNlIGV2ZW50cyB0byB1c2UgaW50L0ludFBv aW50IGZvciBzY3JlZW4vd2luZG93IGNvb3JkaW5hdGVzIGFuZAorICAgICAgICBMYXlvdXRVbml0 L0xheW91dFBvaW50IGZvciBjb29yZGluYXRlcyBhZGp1c3RlZCBmb3Igem9vbWluZy4KKworICAg ICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBkb20vTW91c2VSZWxhdGVkRXZlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TW91c2VSZWxhdGVkRXZlbnQ6Ok1vdXNlUmVsYXRlZEV2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6Ok1vdXNlUmVsYXRlZEV2ZW50Ojpjb21wdXRlUmVsYXRpdmVQ b3NpdGlvbik6CisgICAgICAgICogZG9tL01vdXNlUmVsYXRlZEV2ZW50Lmg6CisgICAgICAgIChX ZWJDb3JlOjpNb3VzZVJlbGF0ZWRFdmVudDo6c2NyZWVuTG9jYXRpb24pOgorICAgICAgICBSZXZl cnQgc2NyZWVuTG9jYXRpb24gYW5kIHdpbmRvd0xvY2F0aW9uIGJhY2sgdG8gaW50LgorCisgICAg ICAgICogcGFnZS9EcmFnQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjplbGVtZW50 VW5kZXJNb3VzZSk6CisgICAgICAgIENoYW5nZSBlbGVtZW50VW5kZXJNb3VzZSB0byB1c2UgYSBM YXlvdXRQb2ludCBmb3IgaGl0IHRlc3RpbmcuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmNsZWFyKToKKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6Y3VycmVudE1vdXNlUG9zaXRpb24pOgorICAgICAgICAo V2ViQ29yZTo6ZG9jdW1lbnRQb2ludEZvcldpbmRvd1BvaW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6ZmFrZU1vdXNlTW92ZUV2ZW50VGltZXJGaXJlZCk6CisgICAgICAgICog cGFnZS9FdmVudEhhbmRsZXIuaDoKKyAgICAgICAgUmV2ZXJ0IG1fY3VycmVudE1vdXNlUG9zaXRp b24gdG8gSW50UG9pbnQgYXMgaXQgcmVwcmVzZW50cyBhCisgICAgICAgIHNjcmVlbiBjb29yZGlu YXRlLgorCisgICAgICAgICogcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50Lmg6CisgICAgICAg IChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudCk6CisgICAg ICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OnBvcyk6CisgICAgICAgIChXZWJDb3Jl OjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OngpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Nb3Vz ZUV2ZW50Ojp5KToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTW91c2VFdmVudDo6Z2xvYmFs WCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6Omdsb2JhbFkpOgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9QbGF0Zm9ybU1vdXNlRXZlbnRNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpnbG9iYWxQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpwb2ludEZvckV2ZW50KToK KyAgICAgICAgKFdlYkNvcmU6Omdsb2JhbFBvaW50Rm9yRXZlbnQpOgorICAgICAgICBSZXZlcnQg UGxhdGZvcm1Nb3VzZUV2ZW50IHRvIGludC9JbnRQb2ludCBhcyBpdCByZXByZXNlbnRzIGEgc2Ny ZWVuCisgICAgICAgIGNvb3JkaW5hdGUuCisKIDIwMTEtMTEtMDEgIERvbWluaWMgQ29vbmV5ICA8 ZG9taW5pY2NAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIGRpc3BsYXk6IHRhYmxlLWNlbGwgYW5k IGJveC1zaXppbmc6IGJvcmRlci1ib3ggY2FsY3VsYXRlcyBjb250ZW50LWJveCBoZWlnaHQKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Nb3VzZVJlbGF0ZWRFdmVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL01vdXNlUmVsYXRlZEV2ZW50LmNwcAkocmV2aXNpb24gOTg4 NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vTW91c2VSZWxhdGVkRXZlbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01Myw3ICs1Myw3IEBAIHN0YXRpYyBMYXlvdXRTaXplIGNvbnRlbnRzU2Nyb2xs T2Zmc2V0KEEKIH0KIAogTW91c2VSZWxhdGVkRXZlbnQ6Ok1vdXNlUmVsYXRlZEV2ZW50KGNvbnN0 IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBib29sIGNhbkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxl LCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4gYWJzdHJhY3RWaWV3LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludCBkZXRhaWwsIGNvbnN0IExheW91dFBvaW50JiBzY3Jl ZW5Mb2NhdGlvbiwgY29uc3QgTGF5b3V0UG9pbnQmIHdpbmRvd0xvY2F0aW9uLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBkZXRhaWwsIGNvbnN0IEludFBvaW50JiBz Y3JlZW5Mb2NhdGlvbiwgY29uc3QgSW50UG9pbnQmIHdpbmRvd0xvY2F0aW9uLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJv b2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwgYm9vbCBpc1NpbXVsYXRlZCkKICAgICA6IFVJRXZl bnRXaXRoS2V5U3RhdGUoZXZlbnRUeXBlLCBjYW5CdWJibGUsIGNhbmNlbGFibGUsIGFic3RyYWN0 VmlldywgZGV0YWlsLCBjdHJsS2V5LCBhbHRLZXksIHNoaWZ0S2V5LCBtZXRhS2V5KQogICAgICwg bV9zY3JlZW5Mb2NhdGlvbihzY3JlZW5Mb2NhdGlvbikKQEAgLTgwLDcgKzgwLDcgQEAgTW91c2VS ZWxhdGVkRXZlbnQ6Ok1vdXNlUmVsYXRlZEV2ZW50KGNvbgogICAgICAgICB9CiAgICAgfQogCi0g ICAgbV9jbGllbnRMb2NhdGlvbiA9IGFkanVzdGVkUGFnZUxvY2F0aW9uIC0gdG9TaXplKHNjcm9s bFBvc2l0aW9uKTsKKyAgICBtX2NsaWVudExvY2F0aW9uID0gYWRqdXN0ZWRQYWdlTG9jYXRpb24g LSB0b0xheW91dFNpemUoc2Nyb2xsUG9zaXRpb24pOwogICAgIG1fcGFnZUxvY2F0aW9uID0gYWRq dXN0ZWRQYWdlTG9jYXRpb247CiAKICAgICBpbml0Q29vcmRpbmF0ZXMoKTsKQEAgLTE4MSw3ICsx ODEsNyBAQCB2b2lkIE1vdXNlUmVsYXRlZEV2ZW50Ojpjb21wdXRlUmVsYXRpdmVQCiAgICAgaWYg KG4gJiYgKGxheWVyID0gbi0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKSkpIHsKICAgICAg ICAgbGF5ZXItPnVwZGF0ZUxheWVyUG9zaXRpb24oKTsKICAgICAgICAgZm9yICg7IGxheWVyOyBs YXllciA9IGxheWVyLT5wYXJlbnQoKSkgewotICAgICAgICAgICAgbV9sYXllckxvY2F0aW9uIC09 IHRvU2l6ZShsYXllci0+bG9jYXRpb24oKSk7CisgICAgICAgICAgICBtX2xheWVyTG9jYXRpb24g LT0gdG9MYXlvdXRTaXplKGxheWVyLT5sb2NhdGlvbigpKTsKICAgICAgICAgfQogICAgIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL01vdXNlUmVsYXRlZEV2ZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL01vdXNlUmVsYXRlZEV2ZW50LmgJKHJldmlzaW9uIDk4ODYx KQorKysgU291cmNlL1dlYkNvcmUvZG9tL01vdXNlUmVsYXRlZEV2ZW50LmgJKHdvcmtpbmcgY29w eSkKQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBleHBv c2VkIHZpYSBET00gQVBJcyBhcmUgaW52YXJpYW50IHVuZGVyIHpvb21pbmcuCiAgICAgICAgIGlu dCBzY3JlZW5YKCkgY29uc3QgeyByZXR1cm4gbV9zY3JlZW5Mb2NhdGlvbi54KCk7IH0KICAgICAg ICAgaW50IHNjcmVlblkoKSBjb25zdCB7IHJldHVybiBtX3NjcmVlbkxvY2F0aW9uLnkoKTsgfQot ICAgICAgICBjb25zdCBMYXlvdXRQb2ludCYgc2NyZWVuTG9jYXRpb24oKSBjb25zdCB7IHJldHVy biBtX3NjcmVlbkxvY2F0aW9uOyB9CisgICAgICAgIGNvbnN0IEludFBvaW50JiBzY3JlZW5Mb2Nh dGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2NyZWVuTG9jYXRpb247IH0KICAgICAgICAgaW50IGNs aWVudFgoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudExvY2F0aW9uLngoKTsgfQogICAgICAgICBp bnQgY2xpZW50WSgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50TG9jYXRpb24ueSgpOyB9CiAgICAg ICAgIGNvbnN0IExheW91dFBvaW50JiBjbGllbnRMb2NhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f Y2xpZW50TG9jYXRpb247IH0KQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgIHByb3RlY3RlZDoKICAgICAgICAgTW91c2VSZWxhdGVkRXZlbnQoKTsKICAgICAgICAgTW91 c2VSZWxhdGVkRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlLCBib29sIGNhbkJ1YmJsZSwg Ym9vbCBjYW5jZWxhYmxlLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgIGludCBkZXRhaWwsIGNvbnN0IExheW91dFBvaW50JiBzY3JlZW5Mb2NhdGlv biwgY29uc3QgTGF5b3V0UG9pbnQmIHdpbmRvd0xvY2F0aW9uLAorICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnQgZGV0YWlsLCBjb25zdCBJbnRQb2ludCYgc2NyZWVuTG9jYXRpb24sIGNvbnN0 IEludFBvaW50JiB3aW5kb3dMb2NhdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9v bCBjdHJsS2V5LCBib29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LCBib29s IGlzU2ltdWxhdGVkID0gZmFsc2UpOwogCiAgICAgICAgIHZvaWQgaW5pdENvb3JkaW5hdGVzKCk7 CkBAIC03MCw3ICs3MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBjb21w dXRlUmVsYXRpdmVQb3NpdGlvbigpOwogICAgICAgICAKICAgICAgICAgLy8gRXhwb3NlIHRoZXNl IHNvIE1vdXNlRXZlbnQ6OmluaXRNb3VzZUV2ZW50IGNhbiBzZXQgdGhlbS4KLSAgICAgICAgTGF5 b3V0UG9pbnQgbV9zY3JlZW5Mb2NhdGlvbjsKKyAgICAgICAgSW50UG9pbnQgbV9zY3JlZW5Mb2Nh dGlvbjsKICAgICAgICAgTGF5b3V0UG9pbnQgbV9jbGllbnRMb2NhdGlvbjsKIAogICAgIHByaXZh dGU6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAkocmV2aXNpb24g OTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjY5LDcgKzI2OSw3IEBAIHN0YXRpYyBFbGVtZW50KiBlbGVtZW50VW5kZXJN b3VzZShEb2N1bWUKIHsKICAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudFVuZGVyTW91c2UtPmZy YW1lKCk7CiAgICAgZmxvYXQgem9vbUZhY3RvciA9IGZyYW1lID8gZnJhbWUtPnBhZ2Vab29tRmFj dG9yKCkgOiAxOwotICAgIEludFBvaW50IHBvaW50ID0gcm91bmRlZEludFBvaW50KEZsb2F0UG9p bnQocC54KCkgKiB6b29tRmFjdG9yLCBwLnkoKSAqIHpvb21GYWN0b3IpKTsKKyAgICBMYXlvdXRQ b2ludCBwb2ludCA9IHJvdW5kZWRMYXlvdXRQb2ludChGbG9hdFBvaW50KHAueCgpICogem9vbUZh Y3RvciwgcC55KCkgKiB6b29tRmFjdG9yKSk7CiAKICAgICBIaXRUZXN0UmVxdWVzdCByZXF1ZXN0 KEhpdFRlc3RSZXF1ZXN0OjpSZWFkT25seSB8IEhpdFRlc3RSZXF1ZXN0OjpBY3RpdmUpOwogICAg IEhpdFRlc3RSZXN1bHQgcmVzdWx0KHBvaW50KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5jcHAJKHJldmlzaW9uIDk4ODYxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9FdmVu dEhhbmRsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTcsNyArMjU3LDcgQEAgdm9pZCBFdmVu dEhhbmRsZXI6OmNsZWFyKCkKICAgICBtX2RyYWdUYXJnZXQgPSAwOwogICAgIG1fc2hvdWxkT25s eUZpcmVEcmFnT3ZlckV2ZW50ID0gZmFsc2U7CiAjZW5kaWYKLSAgICBtX2N1cnJlbnRNb3VzZVBv c2l0aW9uID0gTGF5b3V0UG9pbnQoKTsKKyAgICBtX2N1cnJlbnRNb3VzZVBvc2l0aW9uID0gSW50 UG9pbnQoKTsKICAgICBtX21vdXNlUHJlc3NOb2RlID0gMDsKICAgICBtX21vdXNlUHJlc3NlZCA9 IGZhbHNlOwogICAgIG1fY2FwdHVyZXNEcmFnZ2luZyA9IGZhbHNlOwpAQCAtMTEyNiw3ICsxMTI2 LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmxvZ2ljYWxTY3JvbGxSZWN1cnNpdgogICAgIHJldHVy biBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmxvZ2ljYWxTY3JvbGxSZWN1cnNpdmVseShkaXJlY3Rp b24sIGdyYW51bGFyaXR5LCBtX2ZyYW1lLT5vd25lckVsZW1lbnQoKSk7CiB9CiAKLUxheW91dFBv aW50IEV2ZW50SGFuZGxlcjo6Y3VycmVudE1vdXNlUG9zaXRpb24oKSBjb25zdAorSW50UG9pbnQg RXZlbnRIYW5kbGVyOjpjdXJyZW50TW91c2VQb3NpdGlvbigpIGNvbnN0CiB7CiAgICAgcmV0dXJu IG1fY3VycmVudE1vdXNlUG9zaXRpb247CiB9CkBAIC0xMzM0LDcgKzEzMzQsNyBAQCBPcHRpb25h bEN1cnNvciBFdmVudEhhbmRsZXI6OnNlbGVjdEN1cnNvCiAgICAgcmV0dXJuIHBvaW50ZXJDdXJz b3IoKTsKIH0KICAgICAKLXN0YXRpYyBMYXlvdXRQb2ludCBkb2N1bWVudFBvaW50Rm9yV2luZG93 UG9pbnQoRnJhbWUqIGZyYW1lLCBjb25zdCBMYXlvdXRQb2ludCYgd2luZG93UG9pbnQpCitzdGF0 aWMgTGF5b3V0UG9pbnQgZG9jdW1lbnRQb2ludEZvcldpbmRvd1BvaW50KEZyYW1lKiBmcmFtZSwg Y29uc3QgSW50UG9pbnQmIHdpbmRvd1BvaW50KQogewogICAgIEZyYW1lVmlldyogdmlldyA9IGZy YW1lLT52aWV3KCk7CiAgICAgLy8gRklYTUU6IElzIGl0IHJlYWxseSBPSyB0byB1c2UgdGhlIHdy b25nIGNvb3JkaW5hdGVzIGhlcmUgd2hlbiB2aWV3IGlzIDA/CkBAIC0yNDA2LDcgKzI0MDYsNyBA QCB2b2lkIEV2ZW50SGFuZGxlcjo6ZmFrZU1vdXNlTW92ZUV2ZW50VGltCiAgICAgYm9vbCBhbHRL ZXk7CiAgICAgYm9vbCBtZXRhS2V5OwogICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudDo6Z2V0Q3Vy cmVudE1vZGlmaWVyU3RhdGUoc2hpZnRLZXksIGN0cmxLZXksIGFsdEtleSwgbWV0YUtleSk7Ci0g ICAgTGF5b3V0UG9pbnQgZ2xvYmFsUG9pbnQgPSB2aWV3LT5jb250ZW50c1RvU2NyZWVuKExheW91 dFJlY3Qodmlldy0+d2luZG93VG9Db250ZW50cyhtX2N1cnJlbnRNb3VzZVBvc2l0aW9uKSwgTGF5 b3V0U2l6ZSgpKSkubG9jYXRpb24oKTsKKyAgICBJbnRQb2ludCBnbG9iYWxQb2ludCA9IHZpZXct PmNvbnRlbnRzVG9TY3JlZW4oSW50UmVjdCh2aWV3LT53aW5kb3dUb0NvbnRlbnRzKG1fY3VycmVu dE1vdXNlUG9zaXRpb24pLCBJbnRTaXplKCkpKS5sb2NhdGlvbigpOwogICAgIFBsYXRmb3JtTW91 c2VFdmVudCBmYWtlTW91c2VNb3ZlRXZlbnQobV9jdXJyZW50TW91c2VQb3NpdGlvbiwgZ2xvYmFs UG9pbnQsIE5vQnV0dG9uLCBNb3VzZUV2ZW50TW92ZWQsIDAsIHNoaWZ0S2V5LCBjdHJsS2V5LCBh bHRLZXksIG1ldGFLZXksIGN1cnJlbnRUaW1lKCkpOwogICAgIG1vdXNlTW92ZWQoZmFrZU1vdXNl TW92ZUV2ZW50KTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAkocmV2aXNp b24gOTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMzYsNyArMTM2LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCByZXNpemVMYXll ckRlc3Ryb3llZCgpOwogCi0gICAgTGF5b3V0UG9pbnQgY3VycmVudE1vdXNlUG9zaXRpb24oKSBj b25zdDsKKyAgICBJbnRQb2ludCBjdXJyZW50TW91c2VQb3NpdGlvbigpIGNvbnN0OwogCiAgICAg c3RhdGljIEZyYW1lKiBzdWJmcmFtZUZvclRhcmdldE5vZGUoTm9kZSopOwogICAgIHN0YXRpYyBG cmFtZSogc3ViZnJhbWVGb3JIaXRUZXN0UmVzdWx0KGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0VGVz dFJlc3VsdHMmKTsKQEAgLTQwMCw3ICs0MDAsNyBAQCBwcml2YXRlOgogCiAgICAgTGF5b3V0U2l6 ZSBtX29mZnNldEZyb21SZXNpemVDb3JuZXI7IC8vIEluIHRoZSBjb29yZHMgb2YgbV9yZXNpemVM YXllci4KICAgICAKLSAgICBMYXlvdXRQb2ludCBtX2N1cnJlbnRNb3VzZVBvc2l0aW9uOworICAg IEludFBvaW50IG1fY3VycmVudE1vdXNlUG9zaXRpb247CiAgICAgTGF5b3V0UG9pbnQgbV9tb3Vz ZURvd25Qb3M7IC8vIEluIG91ciB2aWV3J3MgY29vcmRzLgogICAgIGRvdWJsZSBtX21vdXNlRG93 blRpbWVzdGFtcDsKICAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgbV9tb3VzZURvd247CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAkocmV2aXNpb24g OTg4NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAko d29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogI2lmbmRlZiBQbGF0Zm9ybU1vdXNlRXZl bnRfaAogI2RlZmluZSBQbGF0Zm9ybU1vdXNlRXZlbnRfaAogCi0jaW5jbHVkZSAiTGF5b3V0VHlw ZXMuaCIKKyNpbmNsdWRlICJJbnRQb2ludC5oIgogCiAjaWYgUExBVEZPUk0oR1RLKQogdHlwZWRl ZiBzdHJ1Y3QgX0dka0V2ZW50QnV0dG9uIEdka0V2ZW50QnV0dG9uOwpAQCAtODMsNyArODMsNyBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHsKICAgICAgICAgfQogCi0gICAgICAgIFBs YXRmb3JtTW91c2VFdmVudChjb25zdCBMYXlvdXRQb2ludCYgcG9zaXRpb24sIGNvbnN0IExheW91 dFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgTW91c2VCdXR0b24gYnV0dG9uLCBNb3VzZUV2ZW50VHlw ZSBldmVudFR5cGUsCisgICAgICAgIFBsYXRmb3JtTW91c2VFdmVudChjb25zdCBJbnRQb2ludCYg cG9zaXRpb24sIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgTW91c2VCdXR0b24gYnV0 dG9uLCBNb3VzZUV2ZW50VHlwZSBldmVudFR5cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnQgY2xpY2tDb3VudCwgYm9vbCBzaGlmdCwgYm9vbCBjdHJsLCBib29sIGFsdCwgYm9vbCBt ZXRhLCBkb3VibGUgdGltZXN0YW1wKQogICAgICAgICAgICAgOiBtX3Bvc2l0aW9uKHBvc2l0aW9u KQogICAgICAgICAgICAgLCBtX2dsb2JhbFBvc2l0aW9uKGdsb2JhbFBvc2l0aW9uKQpAQCAtMTA0 LDExICsxMDQsMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB7CiAgICAgICAgIH0K IAotICAgICAgICBjb25zdCBMYXlvdXRQb2ludCYgcG9zKCkgY29uc3QgeyByZXR1cm4gbV9wb3Np dGlvbjsgfQotICAgICAgICBMYXlvdXRVbml0IHgoKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9u LngoKTsgfQotICAgICAgICBMYXlvdXRVbml0IHkoKSBjb25zdCB7IHJldHVybiBtX3Bvc2l0aW9u LnkoKTsgfQotICAgICAgICBMYXlvdXRVbml0IGdsb2JhbFgoKSBjb25zdCB7IHJldHVybiBtX2ds b2JhbFBvc2l0aW9uLngoKTsgfQotICAgICAgICBMYXlvdXRVbml0IGdsb2JhbFkoKSBjb25zdCB7 IHJldHVybiBtX2dsb2JhbFBvc2l0aW9uLnkoKTsgfQorICAgICAgICBjb25zdCBJbnRQb2ludCYg cG9zKCkgY29uc3QgeyByZXR1cm4gbV9wb3NpdGlvbjsgfQorICAgICAgICBpbnQgeCgpIGNvbnN0 IHsgcmV0dXJuIG1fcG9zaXRpb24ueCgpOyB9CisgICAgICAgIGludCB5KCkgY29uc3QgeyByZXR1 cm4gbV9wb3NpdGlvbi55KCk7IH0KKyAgICAgICAgaW50IGdsb2JhbFgoKSBjb25zdCB7IHJldHVy biBtX2dsb2JhbFBvc2l0aW9uLngoKTsgfQorICAgICAgICBpbnQgZ2xvYmFsWSgpIGNvbnN0IHsg cmV0dXJuIG1fZ2xvYmFsUG9zaXRpb24ueSgpOyB9CiAgICAgICAgIE1vdXNlQnV0dG9uIGJ1dHRv bigpIGNvbnN0IHsgcmV0dXJuIG1fYnV0dG9uOyB9CiAgICAgICAgIE1vdXNlRXZlbnRUeXBlIGV2 ZW50VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnRUeXBlOyB9CiAgICAgICAgIGludCBjbGlj a0NvdW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGlja0NvdW50OyB9CkBAIC0xNjAsOCArMTYwLDgg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogI2VuZGlmCiAKICAgICBwcm90ZWN0ZWQ6Ci0gICAgICAg IExheW91dFBvaW50IG1fcG9zaXRpb247Ci0gICAgICAgIExheW91dFBvaW50IG1fZ2xvYmFsUG9z aXRpb247CisgICAgICAgIEludFBvaW50IG1fcG9zaXRpb247CisgICAgICAgIEludFBvaW50IG1f Z2xvYmFsUG9zaXRpb247CiAgICAgICAgIE1vdXNlQnV0dG9uIG1fYnV0dG9uOwogICAgICAgICBN b3VzZUV2ZW50VHlwZSBtX2V2ZW50VHlwZTsKICAgICAgICAgaW50IG1fY2xpY2tDb3VudDsKQEAg LTE4MCw5ICsxODAsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgfTsKIAogI2lmIFBMQVRG T1JNKE1BQykgJiYgZGVmaW5lZChfX09CSkNfXykKLSAgICBMYXlvdXRQb2ludCBnbG9iYWxQb2lu dChjb25zdCBOU1BvaW50JiB3aW5kb3dQb2ludCwgTlNXaW5kb3cgKik7Ci0gICAgTGF5b3V0UG9p bnQgcG9pbnRGb3JFdmVudChOU0V2ZW50ICosIE5TVmlldyAqd2luZG93Vmlldyk7Ci0gICAgTGF5 b3V0UG9pbnQgZ2xvYmFsUG9pbnRGb3JFdmVudChOU0V2ZW50ICopOworICAgIEludFBvaW50IGds b2JhbFBvaW50KGNvbnN0IE5TUG9pbnQmIHdpbmRvd1BvaW50LCBOU1dpbmRvdyAqKTsKKyAgICBJ bnRQb2ludCBwb2ludEZvckV2ZW50KE5TRXZlbnQgKiwgTlNWaWV3ICp3aW5kb3dWaWV3KTsKKyAg ICBJbnRQb2ludCBnbG9iYWxQb2ludEZvckV2ZW50KE5TRXZlbnQgKik7CiAjZW5kaWYKIAogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bs YXRmb3JtTW91c2VFdmVudE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvUGxhdGZvcm1Nb3VzZUV2ZW50TWFjLm1tCShyZXZpc2lvbiA5ODg2MSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QbGF0Zm9ybU1vdXNlRXZlbnRNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTY4LDEyICs2OCwxMiBAQCBzdGF0aWMgaW50IGNsaWNrQ291bnRGb3JFdmVu dChOU0V2ZW50ICplCiAgICAgfQogfQogCi1MYXlvdXRQb2ludCBnbG9iYWxQb2ludChjb25zdCBO U1BvaW50JiB3aW5kb3dQb2ludCwgTlNXaW5kb3cgKndpbmRvdykKK0ludFBvaW50IGdsb2JhbFBv aW50KGNvbnN0IE5TUG9pbnQmIHdpbmRvd1BvaW50LCBOU1dpbmRvdyAqd2luZG93KQogewotICAg IHJldHVybiBMYXlvdXRQb2ludChmbGlwU2NyZWVuUG9pbnQoW3dpbmRvdyBjb252ZXJ0QmFzZVRv U2NyZWVuOndpbmRvd1BvaW50XSwgc2NyZWVuRm9yV2luZG93KHdpbmRvdykpKTsKKyAgICByZXR1 cm4gSW50UG9pbnQoZmxpcFNjcmVlblBvaW50KFt3aW5kb3cgY29udmVydEJhc2VUb1NjcmVlbjp3 aW5kb3dQb2ludF0sIHNjcmVlbkZvcldpbmRvdyh3aW5kb3cpKSk7CiB9CiAKLUxheW91dFBvaW50 IHBvaW50Rm9yRXZlbnQoTlNFdmVudCAqZXZlbnQsIE5TVmlldyAqd2luZG93VmlldykKK0ludFBv aW50IHBvaW50Rm9yRXZlbnQoTlNFdmVudCAqZXZlbnQsIE5TVmlldyAqd2luZG93VmlldykKIHsK ICAgICBzd2l0Y2ggKFtldmVudCB0eXBlXSkgewogICAgICAgICBjYXNlIE5TTGVmdE1vdXNlRG93 bjoKQEAgLTkyLDE0ICs5MiwxNCBAQCBMYXlvdXRQb2ludCBwb2ludEZvckV2ZW50KE5TRXZlbnQg KmV2ZW50CiAgICAgICAgICAgICBOU1BvaW50IGxvY2F0aW9uID0gW2V2ZW50IGxvY2F0aW9uSW5X aW5kb3ddOwogICAgICAgICAgICAgaWYgKHdpbmRvd1ZpZXcpCiAgICAgICAgICAgICAgICAgbG9j YXRpb24gPSBbd2luZG93VmlldyBjb252ZXJ0UG9pbnQ6bG9jYXRpb24gZnJvbVZpZXc6bmlsXTsK LSAgICAgICAgICAgIHJldHVybiBMYXlvdXRQb2ludChsb2NhdGlvbik7CisgICAgICAgICAgICBy ZXR1cm4gSW50UG9pbnQobG9jYXRpb24pOwogICAgICAgICB9CiAgICAgICAgIGRlZmF1bHQ6Ci0g ICAgICAgICAgICByZXR1cm4gTGF5b3V0UG9pbnQoKTsKKyAgICAgICAgICAgIHJldHVybiBJbnRQ b2ludCgpOwogICAgIH0KIH0KIAotTGF5b3V0UG9pbnQgZ2xvYmFsUG9pbnRGb3JFdmVudChOU0V2 ZW50ICpldmVudCkKK0ludFBvaW50IGdsb2JhbFBvaW50Rm9yRXZlbnQoTlNFdmVudCAqZXZlbnQp CiB7CiAgICAgc3dpdGNoIChbZXZlbnQgdHlwZV0pIHsKICAgICAgICAgY2FzZSBOU0xlZnRNb3Vz ZURvd246CkBAIC0xMTUsNyArMTE1LDcgQEAgTGF5b3V0UG9pbnQgZ2xvYmFsUG9pbnRGb3JFdmVu dChOU0V2ZW50IAogICAgICAgICBjYXNlIE5TU2Nyb2xsV2hlZWw6CiAgICAgICAgICAgICByZXR1 cm4gZ2xvYmFsUG9pbnQoW2V2ZW50IGxvY2F0aW9uSW5XaW5kb3ddLCBbZXZlbnQgd2luZG93XSk7 CiAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gTGF5b3V0UG9pbnQoKTsKKyAg ICAgICAgICAgIHJldHVybiBJbnRQb2ludCgpOwogICAgIH0KIH0KIAo=