83278 2012-04-05 07:31:04 -0700 Update LayoutUnit usage in Editor and Frame 2012-04-06 11:35:11 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric jchaffraix webkit.review.bot oldest_to_newest 596548 0 leviw 2012-04-05 07:31:04 -0700 Both have functions that are taking LayoutUnit coordinates that represent screen coordinates. These should be Ints. 596554 1 135822 leviw 2012-04-05 07:41:44 -0700 Created attachment 135822 Patch 596570 2 135822 buildbot 2012-04-05 08:08:32 -0700 Comment on attachment 135822 Patch Attachment 135822 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12340349 596582 3 135822 buildbot 2012-04-05 08:21:18 -0700 Comment on attachment 135822 Patch Attachment 135822 did not pass win-ews (win): Output: http://queues.webkit.org/results/12264329 596629 4 135837 leviw 2012-04-05 09:14:27 -0700 Created attachment 135837 Patch 597394 5 leviw 2012-04-06 08:59:30 -0700 Friendly neighborhood "ping" :) 597516 6 135837 webkit.review.bot 2012-04-06 11:35:06 -0700 Comment on attachment 135837 Patch Clearing flags on attachment: 135837 Committed r113466: <http://trac.webkit.org/changeset/113466> 597517 7 webkit.review.bot 2012-04-06 11:35:11 -0700 All reviewed patches have been landed. Closing bug. 135822 2012-04-05 07:41:44 -0700 2012-04-05 09:14:19 -0700 Patch bug-83278-20120405164141.patch text/plain 5459 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzMxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA0LTA1ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgTGF5b3V0VW5p dCB1c2FnZSBpbiBFZGl0b3IgYW5kIEZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MzI3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZyYW1lIGFuZCBFZGl0b3IgYm90aCB0YWtlIGlucHV0IGZyb20g dGhlIGVtYmVkZGVyLCB3aGljaCBwYXNzZXMgYWxvbmcgY29vcmRpbmF0ZXMgaW4gc2NyZWVuCisg ICAgICAgIGNvb3JkaW5hdGVzLCB3aGljaCBhcmVuJ3QgZnJhY3Rpb25hbC4gVXBkYXRpbmcgYSBm ZXcgcmVtYWluaW5nIGZ1bmN0aW9ucyB0byBzaG93IHRoaXMsIGFuZCBjb3JyZWN0aW5nCisgICAg ICAgIHNvbWUgaW5jb25zaXN0ZW5jaWVzIGluIExheW91dFVuaXQgdXNhZ2UuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBlZGl0aW5n L0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnJhbmdlRm9yUG9pbnQpOiB3 aW5kb3dUb0NvbnRlbnRzIHJldHVybnMgYW4gSW50UG9pbnQuCisgICAgICAgIChXZWJDb3JlOjpF ZGl0b3I6OmNvdW50TWF0Y2hlc0ZvclRleHQpOiBVc2luZyBlbmNsb3NpbmdJbnRSZWN0IHNpbmNl IHdlJ3JlIChmYWtlKSByZXBhaW50aW5nIHRoZSBlbnRpcmUKKyAgICAgICAgdmlldyByZWN0Lgor ICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6CisgICAgICAgIChFZGl0b3IpOiBDb3JyZWN0aW5n IG1pc21hdGNoZWQgZnVuY3Rpb24gc2lnbmF0dXJlLgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnZpc2libGVQb3NpdGlvbkZvclBvaW50KTogRnJh bWUgdGFrZXMgcG9pbnRzIGluIHNjcmVlbiBjb29yZGluYXRlcywgdXN1YWxseSBmcm9tIHRoZQor ICAgICAgICBlbWJlZGRlci4gQ2hhbmdpbmcgdGhlc2UgZnVuY3Rpb25zIHRvIGJlIGluIEludFBv aW50cy4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpkb2N1bWVudEF0UG9pbnQpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpyYW5nZUZvclBvaW50KTogRGl0dG8uCisgICAgICAg ICogcGFnZS9GcmFtZS5oOgorICAgICAgICAoRnJhbWUpOgorCiAyMDEyLTA0LTA1ICBXLiBKYW1l cyBNYWNMZWFuICA8d2ptYWNsZWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGp1c3QgbWF4 IGJpc2VjdGlvbiBzZWFyY2ggaXRlcmF0aW9ucyBmb3IgVG91Y2hwYWRGbGluZ0dlc3R1cmVDdXJ2 ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDExMzMxMCkKKysr IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI0 OCw3ICsyMjQ4LDcgQEAgUGFzc1JlZlB0cjxSYW5nZT4gRWRpdG9yOjpyYW5nZUZvclBvaW50KAog ICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUtPnZpZXcoKTsKICAgICBpZiAoIWZyYW1l VmlldykKICAgICAgICAgcmV0dXJuIDA7Ci0gICAgTGF5b3V0UG9pbnQgZnJhbWVQb2ludCA9IGZy YW1lVmlldy0+d2luZG93VG9Db250ZW50cyh3aW5kb3dQb2ludCk7CisgICAgSW50UG9pbnQgZnJh bWVQb2ludCA9IGZyYW1lVmlldy0+d2luZG93VG9Db250ZW50cyh3aW5kb3dQb2ludCk7CiAgICAg VmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rpb24oZnJhbWUtPnZpc2libGVQb3NpdGlvbkZvclBvaW50 KGZyYW1lUG9pbnQpKTsKICAgICByZXR1cm4gYXZvaWRJbnRlcnNlY3Rpb25XaXRoTm9kZShzZWxl Y3Rpb24udG9Ob3JtYWxpemVkUmFuZ2UoKS5nZXQoKSwgbV9kZWxldGVCdXR0b25Db250cm9sbGVy LT5jb250YWluZXJFbGVtZW50KCkpOwogfQpAQCAtMjg2OCw3ICsyODY4LDcgQEAgdW5zaWduZWQg RWRpdG9yOjpjb3VudE1hdGNoZXNGb3JUZXh0KGNvbgogCiAgICAgICAgICAgICAgICAgUGFpbnRC ZWhhdmlvciBvbGRCZWhhdmlvciA9IG1fZnJhbWUtPnZpZXcoKS0+cGFpbnRCZWhhdmlvcigpOwog ICAgICAgICAgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihvbGRCZWhh dmlvciB8IFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpOwotICAgICAgICAg ICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+cGFpbnRDb250ZW50cygmY29udGV4dCwgdmlzaWJsZVJl Y3QpOworICAgICAgICAgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+cGFpbnRDb250ZW50cygmY29u dGV4dCwgZW5jbG9zaW5nSW50UmVjdCh2aXNpYmxlUmVjdCkpOwogICAgICAgICAgICAgICAgIG1f ZnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihvbGRCZWhhdmlvcik7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkocmV2aXNpb24gMTEz MzEwKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkod29ya2luZyBjb3B5KQpA QCAtMzAwLDcgKzMwMCw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0U3RhcnROZXdLaWxsUmlu Z1NlcXVlbmNlKGJvb2wpOwogCi0gICAgUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2VGb3JQb2ludChj b25zdCBMYXlvdXRQb2ludCYgd2luZG93UG9pbnQpOworICAgIFBhc3NSZWZQdHI8UmFuZ2U+IHJh bmdlRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHdpbmRvd1BvaW50KTsKIAogICAgIHZvaWQgY2xl YXIoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9uIDExMzMxMCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MjUsNyArNzI1 LDcgQEAgU3RyaW5nIEZyYW1lOjpkaXNwbGF5U3RyaW5nTW9kaWZpZWRCeUVuYwogICAgIHJldHVy biBkb2N1bWVudCgpID8gZG9jdW1lbnQoKS0+ZGlzcGxheVN0cmluZ01vZGlmaWVkQnlFbmNvZGlu ZyhzdHIpIDogc3RyOwogfQogCi1WaXNpYmxlUG9zaXRpb24gRnJhbWU6OnZpc2libGVQb3NpdGlv bkZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBmcmFtZVBvaW50KQorVmlzaWJsZVBvc2l0aW9u IEZyYW1lOjp2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2lu dCkKIHsKICAgICBIaXRUZXN0UmVzdWx0IHJlc3VsdCA9IGV2ZW50SGFuZGxlcigpLT5oaXRUZXN0 UmVzdWx0QXRQb2ludChmcmFtZVBvaW50LCB0cnVlKTsKICAgICBOb2RlKiBub2RlID0gcmVzdWx0 LmlubmVyTm9uU2hhcmVkTm9kZSgpOwpAQCAtNzQ1LDcgKzc0NSw3IEBAIERvY3VtZW50KiBGcmFt ZTo6ZG9jdW1lbnRBdFBvaW50KGNvbnN0IEkKICAgICBpZiAoIXZpZXcoKSkKICAgICAgICAgcmV0 dXJuIDA7CiAKLSAgICBMYXlvdXRQb2ludCBwdCA9IHZpZXcoKS0+d2luZG93VG9Db250ZW50cyhw b2ludCk7CisgICAgSW50UG9pbnQgcHQgPSB2aWV3KCktPndpbmRvd1RvQ29udGVudHMocG9pbnQp OwogICAgIEhpdFRlc3RSZXN1bHQgcmVzdWx0ID0gSGl0VGVzdFJlc3VsdChwdCk7CiAKICAgICBp ZiAoY29udGVudFJlbmRlcmVyKCkpCkBAIC03NTMsNyArNzUzLDcgQEAgRG9jdW1lbnQqIEZyYW1l Ojpkb2N1bWVudEF0UG9pbnQoY29uc3QgSQogICAgIHJldHVybiByZXN1bHQuaW5uZXJOb2RlKCkg PyByZXN1bHQuaW5uZXJOb2RlKCktPmRvY3VtZW50KCkgOiAwOwogfQogCi1QYXNzUmVmUHRyPFJh bmdlPiBGcmFtZTo6cmFuZ2VGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYgZnJhbWVQb2ludCkK K1Bhc3NSZWZQdHI8UmFuZ2U+IEZyYW1lOjpyYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBm cmFtZVBvaW50KQogewogICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3Np dGlvbkZvclBvaW50KGZyYW1lUG9pbnQpOwogICAgIGlmIChwb3NpdGlvbi5pc051bGwoKSkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lLmgJKHJldmlzaW9uIDExMzMxMCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtMTc5LDkgKzE3OSw5IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgRHJhZ0ltYWdlUmVmIG5vZGVJbWFnZShOb2RlKik7CiAgICAgICAg IERyYWdJbWFnZVJlZiBkcmFnSW1hZ2VGb3JTZWxlY3Rpb24oKTsKIAotICAgICAgICBWaXNpYmxl UG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIGZyYW1l UG9pbnQpOworICAgICAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQo Y29uc3QgSW50UG9pbnQmIGZyYW1lUG9pbnQpOwogICAgICAgICBEb2N1bWVudCogZG9jdW1lbnRB dFBvaW50KGNvbnN0IEludFBvaW50JiB3aW5kb3dQb2ludCk7Ci0gICAgICAgIFBhc3NSZWZQdHI8 UmFuZ2U+IHJhbmdlRm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIGZyYW1lUG9pbnQpOworICAg ICAgICBQYXNzUmVmUHRyPFJhbmdlPiByYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFt ZVBvaW50KTsKIAogICAgICAgICBTdHJpbmcgc2VhcmNoRm9yTGFiZWxzQWJvdmVDZWxsKFJlZ3Vs YXJFeHByZXNzaW9uKiwgSFRNTFRhYmxlQ2VsbEVsZW1lbnQqLCBzaXplX3QqIHJlc3VsdERpc3Rh bmNlRnJvbVN0YXJ0T2ZDZWxsKTsKICAgICAgICAgU3RyaW5nIHNlYXJjaEZvckxhYmVsc0JlZm9y ZUVsZW1lbnQoY29uc3QgVmVjdG9yPFN0cmluZz4mIGxhYmVscywgRWxlbWVudCosIHNpemVfdCog cmVzdWx0RGlzdGFuY2UsIGJvb2wqIHJlc3VsdElzSW5DZWxsQWJvdmUpOwo= 135837 2012-04-05 09:14:27 -0700 2012-04-06 11:35:06 -0700 Patch bug-83278-20120405181425.patch text/plain 6304 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzMxOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTA1ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBVcGRhdGUgTGF5b3V0VW5p dCB1c2FnZSBpbiBFZGl0b3IgYW5kIEZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MzI3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZyYW1lIGFuZCBFZGl0b3IgYm90aCB0YWtlIGlucHV0IGZyb20g dGhlIGVtYmVkZGVyLCB3aGljaCBwYXNzZXMgYWxvbmcgY29vcmRpbmF0ZXMgaW4gc2NyZWVuCisg ICAgICAgIGNvb3JkaW5hdGVzLCB3aGljaCBhcmVuJ3QgZnJhY3Rpb25hbC4gVXBkYXRpbmcgYSBm ZXcgcmVtYWluaW5nIGZ1bmN0aW9ucyB0byBzaG93IHRoaXMsIGFuZCBjb3JyZWN0aW5nCisgICAg ICAgIHNvbWUgaW5jb25zaXN0ZW5jaWVzIGluIExheW91dFVuaXQgdXNhZ2UuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBlZGl0aW5n L0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnJhbmdlRm9yUG9pbnQpOiB3 aW5kb3dUb0NvbnRlbnRzIHJldHVybnMgYW4gSW50UG9pbnQuCisgICAgICAgIChXZWJDb3JlOjpF ZGl0b3I6OmNvdW50TWF0Y2hlc0ZvclRleHQpOiBVc2luZyBlbmNsb3NpbmdJbnRSZWN0IHNpbmNl IHdlJ3JlIChmYWtlKSByZXBhaW50aW5nIHRoZSBlbnRpcmUKKyAgICAgICAgdmlldyByZWN0Lgor ICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6CisgICAgICAgIChFZGl0b3IpOiBDb3JyZWN0aW5n IG1pc21hdGNoZWQgZnVuY3Rpb24gc2lnbmF0dXJlLgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnZpc2libGVQb3NpdGlvbkZvclBvaW50KTogRnJh bWUgdGFrZXMgcG9pbnRzIGluIHNjcmVlbiBjb29yZGluYXRlcywgdXN1YWxseSBmcm9tIHRoZQor ICAgICAgICBlbWJlZGRlci4gQ2hhbmdpbmcgdGhlc2UgZnVuY3Rpb25zIHRvIGJlIGluIEludFBv aW50cy4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpkb2N1bWVudEF0UG9pbnQpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpyYW5nZUZvclBvaW50KTogRGl0dG8uCisgICAgICAg ICogcGFnZS9GcmFtZS5oOgorICAgICAgICAoRnJhbWUpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0ludFJlY3QuaDoKKyAgICAgICAgKGVuY2xvc2luZ0ludFJlY3QpOiBBZGRpbmcgYW4g aW5saW5lIG5vLW9wIGNvcHkgb2YgdGhlIEZyYWN0aW9uYWxMYXlvdXRSZWN0IG1ldGhvZCBlbmNs b3NpbmdJbnRSZWN0LgorCiAyMDEyLTA0LTA1ICBXLiBKYW1lcyBNYWNMZWFuICA8d2ptYWNsZWFu QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGp1c3QgbWF4IGJpc2VjdGlvbiBzZWFyY2ggaXRl cmF0aW9ucyBmb3IgVG91Y2hwYWRGbGluZ0dlc3R1cmVDdXJ2ZS4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDExMzMxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI0OCw3ICsyMjQ4LDcgQEAgUGFzc1Jl ZlB0cjxSYW5nZT4gRWRpdG9yOjpyYW5nZUZvclBvaW50KAogICAgIEZyYW1lVmlldyogZnJhbWVW aWV3ID0gZnJhbWUtPnZpZXcoKTsKICAgICBpZiAoIWZyYW1lVmlldykKICAgICAgICAgcmV0dXJu IDA7Ci0gICAgTGF5b3V0UG9pbnQgZnJhbWVQb2ludCA9IGZyYW1lVmlldy0+d2luZG93VG9Db250 ZW50cyh3aW5kb3dQb2ludCk7CisgICAgSW50UG9pbnQgZnJhbWVQb2ludCA9IGZyYW1lVmlldy0+ d2luZG93VG9Db250ZW50cyh3aW5kb3dQb2ludCk7CiAgICAgVmlzaWJsZVNlbGVjdGlvbiBzZWxl Y3Rpb24oZnJhbWUtPnZpc2libGVQb3NpdGlvbkZvclBvaW50KGZyYW1lUG9pbnQpKTsKICAgICBy ZXR1cm4gYXZvaWRJbnRlcnNlY3Rpb25XaXRoTm9kZShzZWxlY3Rpb24udG9Ob3JtYWxpemVkUmFu Z2UoKS5nZXQoKSwgbV9kZWxldGVCdXR0b25Db250cm9sbGVyLT5jb250YWluZXJFbGVtZW50KCkp OwogfQpAQCAtMjg2OCw3ICsyODY4LDcgQEAgdW5zaWduZWQgRWRpdG9yOjpjb3VudE1hdGNoZXNG b3JUZXh0KGNvbgogCiAgICAgICAgICAgICAgICAgUGFpbnRCZWhhdmlvciBvbGRCZWhhdmlvciA9 IG1fZnJhbWUtPnZpZXcoKS0+cGFpbnRCZWhhdmlvcigpOwogICAgICAgICAgICAgICAgIG1fZnJh bWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihvbGRCZWhhdmlvciB8IFBhaW50QmVoYXZpb3JG bGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpOwotICAgICAgICAgICAgICAgIG1fZnJhbWUtPnZpZXco KS0+cGFpbnRDb250ZW50cygmY29udGV4dCwgdmlzaWJsZVJlY3QpOworICAgICAgICAgICAgICAg IG1fZnJhbWUtPnZpZXcoKS0+cGFpbnRDb250ZW50cygmY29udGV4dCwgZW5jbG9zaW5nSW50UmVj dCh2aXNpYmxlUmVjdCkpOwogICAgICAgICAgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+c2V0UGFp bnRCZWhhdmlvcihvbGRCZWhhdmlvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0b3IuaAkocmV2aXNpb24gMTEzMzEwKQorKysgU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMzAwLDcgKzMwMCw3IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgc2V0U3RhcnROZXdLaWxsUmluZ1NlcXVlbmNlKGJvb2wpOwogCi0g ICAgUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2VGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYgd2lu ZG93UG9pbnQpOworICAgIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdlRm9yUG9pbnQoY29uc3QgSW50 UG9pbnQmIHdpbmRvd1BvaW50KTsKIAogICAgIHZvaWQgY2xlYXIoKTsKIApJbmRleDogU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZS5jcHAJKHJldmlzaW9uIDExMzMxMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MjUsNyArNzI1LDcgQEAgU3RyaW5nIEZyYW1lOjpk aXNwbGF5U3RyaW5nTW9kaWZpZWRCeUVuYwogICAgIHJldHVybiBkb2N1bWVudCgpID8gZG9jdW1l bnQoKS0+ZGlzcGxheVN0cmluZ01vZGlmaWVkQnlFbmNvZGluZyhzdHIpIDogc3RyOwogfQogCi1W aXNpYmxlUG9zaXRpb24gRnJhbWU6OnZpc2libGVQb3NpdGlvbkZvclBvaW50KGNvbnN0IExheW91 dFBvaW50JiBmcmFtZVBvaW50KQorVmlzaWJsZVBvc2l0aW9uIEZyYW1lOjp2aXNpYmxlUG9zaXRp b25Gb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCkKIHsKICAgICBIaXRUZXN0UmVz dWx0IHJlc3VsdCA9IGV2ZW50SGFuZGxlcigpLT5oaXRUZXN0UmVzdWx0QXRQb2ludChmcmFtZVBv aW50LCB0cnVlKTsKICAgICBOb2RlKiBub2RlID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgp OwpAQCAtNzQ1LDcgKzc0NSw3IEBAIERvY3VtZW50KiBGcmFtZTo6ZG9jdW1lbnRBdFBvaW50KGNv bnN0IEkKICAgICBpZiAoIXZpZXcoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBMYXlvdXRQ b2ludCBwdCA9IHZpZXcoKS0+d2luZG93VG9Db250ZW50cyhwb2ludCk7CisgICAgSW50UG9pbnQg cHQgPSB2aWV3KCktPndpbmRvd1RvQ29udGVudHMocG9pbnQpOwogICAgIEhpdFRlc3RSZXN1bHQg cmVzdWx0ID0gSGl0VGVzdFJlc3VsdChwdCk7CiAKICAgICBpZiAoY29udGVudFJlbmRlcmVyKCkp CkBAIC03NTMsNyArNzUzLDcgQEAgRG9jdW1lbnQqIEZyYW1lOjpkb2N1bWVudEF0UG9pbnQoY29u c3QgSQogICAgIHJldHVybiByZXN1bHQuaW5uZXJOb2RlKCkgPyByZXN1bHQuaW5uZXJOb2RlKCkt PmRvY3VtZW50KCkgOiAwOwogfQogCi1QYXNzUmVmUHRyPFJhbmdlPiBGcmFtZTo6cmFuZ2VGb3JQ b2ludChjb25zdCBMYXlvdXRQb2ludCYgZnJhbWVQb2ludCkKK1Bhc3NSZWZQdHI8UmFuZ2U+IEZy YW1lOjpyYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KQogewogICAgIFZp c2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbkZvclBvaW50KGZyYW1lUG9p bnQpOwogICAgIGlmIChwb3NpdGlvbi5pc051bGwoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmgJKHJl dmlzaW9uIDExMzMxMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAkod29ya2luZyBj b3B5KQpAQCAtMTc5LDkgKzE3OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgRHJh Z0ltYWdlUmVmIG5vZGVJbWFnZShOb2RlKik7CiAgICAgICAgIERyYWdJbWFnZVJlZiBkcmFnSW1h Z2VGb3JTZWxlY3Rpb24oKTsKIAotICAgICAgICBWaXNpYmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0 aW9uRm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIGZyYW1lUG9pbnQpOworICAgICAgICBWaXNp YmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIGZyYW1l UG9pbnQpOwogICAgICAgICBEb2N1bWVudCogZG9jdW1lbnRBdFBvaW50KGNvbnN0IEludFBvaW50 JiB3aW5kb3dQb2ludCk7Ci0gICAgICAgIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdlRm9yUG9pbnQo Y29uc3QgTGF5b3V0UG9pbnQmIGZyYW1lUG9pbnQpOworICAgICAgICBQYXNzUmVmUHRyPFJhbmdl PiByYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KTsKIAogICAgICAgICBT dHJpbmcgc2VhcmNoRm9yTGFiZWxzQWJvdmVDZWxsKFJlZ3VsYXJFeHByZXNzaW9uKiwgSFRNTFRh YmxlQ2VsbEVsZW1lbnQqLCBzaXplX3QqIHJlc3VsdERpc3RhbmNlRnJvbVN0YXJ0T2ZDZWxsKTsK ICAgICAgICAgU3RyaW5nIHNlYXJjaEZvckxhYmVsc0JlZm9yZUVsZW1lbnQoY29uc3QgVmVjdG9y PFN0cmluZz4mIGxhYmVscywgRWxlbWVudCosIHNpemVfdCogcmVzdWx0RGlzdGFuY2UsIGJvb2wq IHJlc3VsdElzSW5DZWxsQWJvdmUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW50UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ludFJlY3QuaAkocmV2aXNpb24gMTEzMzEwKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNzIsNiArMjcyLDEz IEBAIGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgSW50UmVjdCYgYSwKICAgICByZXR1cm4g YS5sb2NhdGlvbigpICE9IGIubG9jYXRpb24oKSB8fCBhLnNpemUoKSAhPSBiLnNpemUoKTsKIH0K IAorLy8gRklYTUU6IFRoaXMgbWV0aG9kIGlzIGhlcmUgb25seSB0byBlYXNlIHRoZSB0cmFuc2l0 aW9uIHRvIHN1Yi1waXhlbCBsYXlvdXQuIEl0IHNob3VsZAorLy8gYmUgcmVtb3ZlZCB3aGVuIHdl IGNsb3NlIGh0dHA6Ly93ZWJraXQub3JnL2IvNjAzMTgKK2lubGluZSBJbnRSZWN0IGVuY2xvc2lu Z0ludFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICByZXR1cm4gcmVjdDsKK30KKwog I2lmIFVTRShDRykgfHwgVVNFKFNLSUFfT05fTUFDX0NIUk9NSVVNKQogSW50UmVjdCBlbmNsb3Np bmdJbnRSZWN0KGNvbnN0IENHUmVjdCYpOwogI2VuZGlmCg==