62037 2011-06-03 12:02:21 -0700 Switch paintCaret and paintDragCaret to use IntPoint 2011-06-03 19:36:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw crogers darin eae eric simon.fraser simonjam thakis oldest_to_newest 415068 0 leviw 2011-06-03 12:02:21 -0700 Ongoing tx/ty removal. 415074 1 leviw 2011-06-03 12:05:33 -0700 Two is today's magic number. 415085 2 95944 leviw 2011-06-03 12:25:04 -0700 Created attachment 95944 Patch 415153 3 95944 leviw 2011-06-03 13:57:47 -0700 Comment on attachment 95944 Patch Clearing flags on attachment: 95944 Committed r88050: <http://trac.webkit.org/changeset/88050> 415154 4 leviw 2011-06-03 13:57:51 -0700 All reviewed patches have been landed. Closing bug. 415355 5 simonjam 2011-06-03 18:55:50 -0700 This caused the Mac Clang bot to fail. Can you take a look? http://build.chromium.org/p/chromium/builders/Mac%20Clang%20%28dbg%29/builds/3810/steps/compile/logs/stdio 415363 6 thakis 2011-06-03 19:30:04 -0700 Hi this breaks the clang build thusly: clang:warning: argument unused during compilation: '-fobjc-exceptions' /b/build/slave/Mac_Clang__dbg_/build/src/third_party/WebKit/Source/WebCore/WebCore.gyp/../webaudio/AudioParamTimeline.cpp:231:39:error: operands of ? are integers of different signs: 'unsigned int' and 'int' [-Werror,-Wsign-compare] int nextEventType = nextEvent ? nextEvent->type() : -1 /* unknown */; Can you fix? 415364 7 eric 2011-06-03 19:32:51 -0700 That can't be this change. 415366 8 thakis 2011-06-03 19:36:20 -0700 Sorry, meant to comment on bug 61830 9_9 95944 2011-06-03 12:25:04 -0700 2011-06-03 13:57:46 -0700 Patch bug-62037-20110603122503.patch text/plain 10490 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MDM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDMgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludENhcmV0IGFuZCBwYWludERyYWdDYXJl dCB0byB1c2UgSW50UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTYyMDM3CisKKyAgICAgICAgU3dpdGNoaW5nIHBhaW50Q2FyZXQgYW5kIHBhaW50 RHJhZ0NhcmV0IHRvIHVzZSBhbiBJbnRQb2ludCByZXByZXNlbnRpbmcKKyAgICAgICAgdGhlIHBh aW50IG9mZnNldCBpbnN0ZWFkIG9mIGEgcGFpciBvZiBpbnRzLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBzaW5jZSB0aGlzIGlzIHNpbXBsZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGVkaXRp bmcvRnJhbWVTZWxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246 OnBhaW50Q2FyZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q2FyZXRCYXNlOjpwYWludENhcmV0KToK KyAgICAgICAgKFdlYkNvcmU6OkRyYWdDYXJldENvbnRyb2xsZXI6OnBhaW50RHJhZ0NhcmV0KToK KyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwYWludENh cmV0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpwYWludE9iamVjdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cG9zaXRpb25Gb3JQb2ludCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6b2Zmc2V0Rm9yQ29udGVudHMpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5oOgorCiAyMDExLTA2LTAzICBDaHJpcyBSb2dlcnMgIDxjcm9nZXJz QGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpJbmRl eDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAJKHJldmlzaW9uIDg4 MDMzKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyNTksMTMgKzEyNTksMTMgQEAgdm9pZCBDYXJldEJhc2U6OmludmFsaWRh dGVDYXJldFJlY3QoTm9kZQogICAgIH0KIH0KIAotdm9pZCBGcmFtZVNlbGVjdGlvbjo6cGFpbnRD YXJldChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGludCB0eCwgaW50IHR5LCBjb25zdCBJbnRS ZWN0JiBjbGlwUmVjdCkKK3ZvaWQgRnJhbWVTZWxlY3Rpb246OnBhaW50Q2FyZXQoR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRQb2ludCYgcGFpbnRPZmZzZXQsIGNvbnN0IEludFJl Y3QmIGNsaXBSZWN0KQogewogICAgIGlmIChtX3NlbGVjdGlvbi5pc0NhcmV0KCkgJiYgbV9jYXJl dFBhaW50KQotICAgICAgICBDYXJldEJhc2U6OnBhaW50Q2FyZXQobV9zZWxlY3Rpb24uc3RhcnQo KS5kZXByZWNhdGVkTm9kZSgpLCBjb250ZXh0LCB0eCwgdHksIGNsaXBSZWN0KTsKKyAgICAgICAg Q2FyZXRCYXNlOjpwYWludENhcmV0KG1fc2VsZWN0aW9uLnN0YXJ0KCkuZGVwcmVjYXRlZE5vZGUo KSwgY29udGV4dCwgcGFpbnRPZmZzZXQsIGNsaXBSZWN0KTsKIH0KIAotdm9pZCBDYXJldEJhc2U6 OnBhaW50Q2FyZXQoTm9kZSogbm9kZSwgR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBpbnQgdHgs IGludCB0eSwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpIGNvbnN0Cit2b2lkIENhcmV0QmFzZTo6 cGFpbnRDYXJldChOb2RlKiBub2RlLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IElu dFBvaW50JiBwYWludE9mZnNldCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpIGNvbnN0CiB7CiAj aWYgRU5BQkxFKFRFWFRfQ0FSRVQpCiAgICAgaWYgKG1fY2FyZXRWaXNpYmlsaXR5ID09IEhpZGRl bikKQEAgLTEyNzUsNyArMTI3NSw3IEBAIHZvaWQgQ2FyZXRCYXNlOjpwYWludENhcmV0KE5vZGUq IG5vZGUsIEcKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gY2FyZXRSZW5kZXJlcihub2Rl KTsKICAgICBpZiAocmVuZGVyZXIgJiYgcmVuZGVyZXItPmlzQm94KCkpCiAgICAgICAgIHRvUmVu ZGVyQm94KHJlbmRlcmVyKS0+ZmxpcEZvcldyaXRpbmdNb2RlKGRyYXdpbmdSZWN0KTsKLSAgICBk cmF3aW5nUmVjdC5tb3ZlKHR4LCB0eSk7CisgICAgZHJhd2luZ1JlY3QubW92ZUJ5KHBhaW50T2Zm c2V0KTsKICAgICBJbnRSZWN0IGNhcmV0ID0gaW50ZXJzZWN0aW9uKGRyYXdpbmdSZWN0LCBjbGlw UmVjdCk7CiAgICAgaWYgKGNhcmV0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTI5 Miw4ICsxMjkyLDcgQEAgdm9pZCBDYXJldEJhc2U6OnBhaW50Q2FyZXQoTm9kZSogbm9kZSwgRwog I2Vsc2UKICAgICBVTlVTRURfUEFSQU0obm9kZSk7CiAgICAgVU5VU0VEX1BBUkFNKGNvbnRleHQp OwotICAgIFVOVVNFRF9QQVJBTSh0eCk7Ci0gICAgVU5VU0VEX1BBUkFNKHR5KTsKKyAgICBVTlVT RURfUEFSQU0ocGFpbnRPZmZzZXQpOwogICAgIFVOVVNFRF9QQVJBTShjbGlwUmVjdCk7CiAjZW5k aWYKIH0KQEAgLTE3NjgsMTYgKzE3NjcsMTUgQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6c2V0Rm9j dXNlZE5vZGVJZk5lZQogICAgICAgICBtX2ZyYW1lLT5wYWdlKCktPmZvY3VzQ29udHJvbGxlcigp LT5zZXRGb2N1c2VkTm9kZSgwLCBtX2ZyYW1lKTsKIH0KIAotdm9pZCBEcmFnQ2FyZXRDb250cm9s bGVyOjpwYWludERyYWdDYXJldChGcmFtZSogZnJhbWUsIEdyYXBoaWNzQ29udGV4dCogcCwgaW50 IHR4LCBpbnQgdHksIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KSBjb25zdAordm9pZCBEcmFnQ2Fy ZXRDb250cm9sbGVyOjpwYWludERyYWdDYXJldChGcmFtZSogZnJhbWUsIEdyYXBoaWNzQ29udGV4 dCogcCwgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVj dCkgY29uc3QKIHsKICNpZiBFTkFCTEUoVEVYVF9DQVJFVCkKICAgICBpZiAobV9wb3NpdGlvbi5k ZWVwRXF1aXZhbGVudCgpLmRlcHJlY2F0ZWROb2RlKCktPmRvY3VtZW50KCktPmZyYW1lKCkgPT0g ZnJhbWUpCi0gICAgICAgIHBhaW50Q2FyZXQobV9wb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpLmRl cHJlY2F0ZWROb2RlKCksIHAsIHR4LCB0eSwgY2xpcFJlY3QpOworICAgICAgICBwYWludENhcmV0 KG1fcG9zaXRpb24uZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpLCBwLCBwYWludE9m ZnNldCwgY2xpcFJlY3QpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oZnJhbWUpOwogICAgIFVO VVNFRF9QQVJBTShwKTsKLSAgICBVTlVTRURfUEFSQU0odHgpOwotICAgIFVOVVNFRF9QQVJBTSh0 eSk7CisgICAgVU5VU0VEX1BBUkFNKHBhaW50T2Zmc2V0KTsKICAgICBVTlVTRURfUEFSQU0oY2xp cFJlY3QpOwogI2VuZGlmCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2Vs ZWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVj dGlvbi5oCShyZXZpc2lvbiA4ODAzMykKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVT ZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQCBwcm90ZWN0ZWQ6CiAg ICAgSW50UmVjdCBhYnNvbHV0ZUJvdW5kc0ZvckxvY2FsUmVjdChOb2RlKiwgY29uc3QgSW50UmVj dCYpIGNvbnN0OwogICAgIEludFJlY3QgY2FyZXRSZXBhaW50UmVjdChOb2RlKikgY29uc3Q7CiAg ICAgYm9vbCBzaG91bGRSZXBhaW50Q2FyZXQoY29uc3QgUmVuZGVyVmlldyosIGJvb2wgaXNDb250 ZW50RWRpdGFibGUpIGNvbnN0OwotICAgIHZvaWQgcGFpbnRDYXJldChOb2RlKiwgR3JhcGhpY3ND b250ZXh0KiwgaW50IHR4LCBpbnQgdHksIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KSBjb25zdDsK KyAgICB2b2lkIHBhaW50Q2FyZXQoTm9kZSosIEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFBv aW50JiwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpIGNvbnN0OwogICAgIFJlbmRlck9iamVjdCog Y2FyZXRSZW5kZXJlcihOb2RlKikgY29uc3Q7CiAKICAgICBjb25zdCBJbnRSZWN0JiBsb2NhbENh cmV0UmVjdFdpdGhvdXRVcGRhdGUoKSBjb25zdCB7IHJldHVybiBtX2NhcmV0TG9jYWxSZWN0OyB9 CkBAIC04Niw3ICs4Niw3IEBAIHB1YmxpYzoKICAgICBEcmFnQ2FyZXRDb250cm9sbGVyKCk7CiAK ICAgICBSZW5kZXJPYmplY3QqIGNhcmV0UmVuZGVyZXIoKSBjb25zdDsKLSAgICB2b2lkIHBhaW50 RHJhZ0NhcmV0KEZyYW1lKiwgR3JhcGhpY3NDb250ZXh0KiwgaW50IHR4LCBpbnQgdHksIGNvbnN0 IEludFJlY3QmIGNsaXBSZWN0KSBjb25zdDsKKyAgICB2b2lkIHBhaW50RHJhZ0NhcmV0KEZyYW1l KiwgR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UG9pbnQmLCBjb25zdCBJbnRSZWN0JiBjbGlw UmVjdCkgY29uc3Q7CiAKICAgICBib29sIGlzQ29udGVudEVkaXRhYmxlKCkgY29uc3QgeyByZXR1 cm4gbV9wb3NpdGlvbi5yb290RWRpdGFibGVFbGVtZW50KCk7IH0KICAgICBib29sIGlzQ29udGVu dFJpY2hseUVkaXRhYmxlKCkgY29uc3Q7CkBAIC0xOTMsNyArMTkzLDcgQEAgcHVibGljOgogICAg IHZvaWQgY2xlYXJDYXJldFJlY3RJZk5lZWRlZCgpOwogICAgIGJvb2wgcmVjb21wdXRlQ2FyZXRS ZWN0KCk7CiAgICAgdm9pZCBpbnZhbGlkYXRlQ2FyZXRSZWN0KCk7Ci0gICAgdm9pZCBwYWludENh cmV0KEdyYXBoaWNzQ29udGV4dCosIGludCB0eCwgaW50IHR5LCBjb25zdCBJbnRSZWN0JiBjbGlw UmVjdCk7CisgICAgdm9pZCBwYWludENhcmV0KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFBv aW50JiwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpOwogCiAgICAgLy8gVXNlZCB0byBzdXNwZW5k IGNhcmV0IGJsaW5raW5nIHdoaWxlIHRoZSBtb3VzZSBpcyBkb3duLgogICAgIHZvaWQgc2V0Q2Fy ZXRCbGlua2luZ1N1c3BlbmRlZChib29sIHN1c3BlbmRlZCkgeyBtX2lzQ2FyZXRCbGlua2luZ1N1 c3BlbmRlZCA9IHN1c3BlbmRlZDsgfQpAQCAtMjIwLDcgKzIyMCw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldEZvY3VzZWROb2RlSWZOZWVkZWQoKTsKICAgICB2b2lkIG5vdGlmeVJlbmRlcmVyT2ZT ZWxlY3Rpb25DaGFuZ2UoYm9vbCB1c2VyVHJpZ2dlcmVkKTsKIAotICAgIHZvaWQgcGFpbnREcmFn Q2FyZXQoR3JhcGhpY3NDb250ZXh0KiwgaW50IHR4LCBpbnQgdHksIGNvbnN0IEludFJlY3QmIGNs aXBSZWN0KSBjb25zdDsKKyAgICB2b2lkIHBhaW50RHJhZ0NhcmV0KEdyYXBoaWNzQ29udGV4dCos IGNvbnN0IEludFBvaW50JiwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpIGNvbnN0OwogCiAgICAg RWRpdGluZ1N0eWxlKiB0eXBpbmdTdHlsZSgpIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8Q1NTTXV0 YWJsZVN0eWxlRGVjbGFyYXRpb24+IGNvcHlUeXBpbmdTdHlsZSgpIGNvbnN0OwpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4ODAzMykKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0MzEsNyArMjQzMSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q2hpbGRyZW4oUGFp bnRJbmYKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q2FyZXQoUGFpbnRJbmZv JiBwYWludEluZm8sIGludCB0eCwgaW50IHR5LCBDYXJldFR5cGUgdHlwZSkKK3ZvaWQgUmVuZGVy QmxvY2s6OnBhaW50Q2FyZXQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFBvaW50JiBw YWludE9mZnNldCwgQ2FyZXRUeXBlIHR5cGUpCiB7CiAgICAgLy8gUGFpbnQgdGhlIGNhcmV0IGlm IHRoZSBGcmFtZVNlbGVjdGlvbiBzYXlzIHNvIG9yIGlmIGNhcmV0IGJyb3dzaW5nIGlzIGVuYWJs ZWQKICAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBmcmFtZSgpLT5zZXR0aW5ncygpICYmIGZyYW1l KCktPnNldHRpbmdzKCktPmNhcmV0QnJvd3NpbmdFbmFibGVkKCk7CkBAIC0yNDQ4LDEyICsyNDQ4 LDEzIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnBhaW50Q2FyZXQoUGFpbnRJbmZvJiAKICAgICBpZiAo Y2FyZXRQYWludGVyID09IHRoaXMgJiYgKGlzQ29udGVudEVkaXRhYmxlIHx8IGNhcmV0QnJvd3Np bmcpKSB7CiAgICAgICAgIC8vIENvbnZlcnQgdGhlIHBhaW50aW5nIG9mZnNldCBpbnRvIHRoZSBs b2NhbCBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGlzIHJlbmRlcmVyLAogICAgICAgICAvLyB0byBt YXRjaCB0aGUgbG9jYWxDYXJldFJlY3QgY29tcHV0ZWQgYnkgdGhlIEZyYW1lU2VsZWN0aW9uCi0g ICAgICAgIG9mZnNldEZvckNvbnRlbnRzKHR4LCB0eSk7CisgICAgICAgIEludFBvaW50IGFkanVz dGVkUGFpbnRPZmZzZXQgPSBwYWludE9mZnNldDsKKyAgICAgICAgb2Zmc2V0Rm9yQ29udGVudHMo YWRqdXN0ZWRQYWludE9mZnNldCk7CiAKICAgICAgICAgaWYgKHR5cGUgPT0gQ3Vyc29yQ2FyZXQp Ci0gICAgICAgICAgICBmcmFtZSgpLT5zZWxlY3Rpb24oKS0+cGFpbnRDYXJldChwYWludEluZm8u Y29udGV4dCwgdHgsIHR5LCBwYWludEluZm8ucmVjdCk7CisgICAgICAgICAgICBmcmFtZSgpLT5z ZWxlY3Rpb24oKS0+cGFpbnRDYXJldChwYWludEluZm8uY29udGV4dCwgYWRqdXN0ZWRQYWludE9m ZnNldCwgcGFpbnRJbmZvLnJlY3QpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBmcmFtZSgp LT5wYWdlKCktPmRyYWdDYXJldENvbnRyb2xsZXIoKS0+cGFpbnREcmFnQ2FyZXQoZnJhbWUoKSwg cGFpbnRJbmZvLmNvbnRleHQsIHR4LCB0eSwgcGFpbnRJbmZvLnJlY3QpOworICAgICAgICAgICAg ZnJhbWUoKS0+cGFnZSgpLT5kcmFnQ2FyZXRDb250cm9sbGVyKCktPnBhaW50RHJhZ0NhcmV0KGZy YW1lKCksIHBhaW50SW5mby5jb250ZXh0LCBhZGp1c3RlZFBhaW50T2Zmc2V0LCBwYWludEluZm8u cmVjdCk7CiAgICAgfQogfQogCkBAIC0yNTQxLDggKzI1NDIsOCBAQCB2b2lkIFJlbmRlckJsb2Nr OjpwYWludE9iamVjdChQYWludEluZm8mCiAgICAgLy8gSWYgdGhlIGNhcmV0J3Mgbm9kZSdzIHJl bmRlciBvYmplY3QncyBjb250YWluaW5nIGJsb2NrIGlzIHRoaXMgYmxvY2ssIGFuZCB0aGUgcGFp bnQgYWN0aW9uIGlzIFBhaW50UGhhc2VGb3JlZ3JvdW5kLAogICAgIC8vIHRoZW4gcGFpbnQgdGhl IGNhcmV0LgogICAgIGlmIChwYWludFBoYXNlID09IFBhaW50UGhhc2VGb3JlZ3JvdW5kKSB7ICAg ICAgICAKLSAgICAgICAgcGFpbnRDYXJldChwYWludEluZm8sIHNjcm9sbGVkWCwgc2Nyb2xsZWRZ LCBDdXJzb3JDYXJldCk7Ci0gICAgICAgIHBhaW50Q2FyZXQocGFpbnRJbmZvLCBzY3JvbGxlZFgs IHNjcm9sbGVkWSwgRHJhZ0NhcmV0KTsKKyAgICAgICAgcGFpbnRDYXJldChwYWludEluZm8sIElu dFBvaW50KHNjcm9sbGVkWCwgc2Nyb2xsZWRZKSwgQ3Vyc29yQ2FyZXQpOworICAgICAgICBwYWlu dENhcmV0KHBhaW50SW5mbywgSW50UG9pbnQoc2Nyb2xsZWRYLCBzY3JvbGxlZFkpLCBEcmFnQ2Fy ZXQpOwogICAgIH0KIH0KIApAQCAtNDE4OCwxMCArNDE4OSw4IEBAIFZpc2libGVQb3NpdGlvbiBS ZW5kZXJCbG9jazo6cG9zaXRpb25Gb3IKICAgICAgICAgICAgIHJldHVybiBjcmVhdGVWaXNpYmxl UG9zaXRpb24oY2FyZXRNYXhPZmZzZXQoKSwgRE9XTlNUUkVBTSk7CiAgICAgfSAKIAotICAgIGlu dCBjb250ZW50c1ggPSBwb2ludC54KCk7Ci0gICAgaW50IGNvbnRlbnRzWSA9IHBvaW50LnkoKTsK LSAgICBvZmZzZXRGb3JDb250ZW50cyhjb250ZW50c1gsIGNvbnRlbnRzWSk7Ci0gICAgSW50UG9p bnQgcG9pbnRJbkNvbnRlbnRzKGNvbnRlbnRzWCwgY29udGVudHNZKTsKKyAgICBJbnRQb2ludCBw b2ludEluQ29udGVudHMgPSBwb2ludDsKKyAgICBvZmZzZXRGb3JDb250ZW50cyhwb2ludEluQ29u dGVudHMpOwogICAgIEludFBvaW50IHBvaW50SW5Mb2dpY2FsQ29udGVudHMocG9pbnRJbkNvbnRl bnRzKTsKICAgICBpZiAoIWlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgIHBvaW50 SW5Mb2dpY2FsQ29udGVudHMgPSBwb2ludEluTG9naWNhbENvbnRlbnRzLnRyYW5zcG9zZWRQb2lu dCgpOwpAQCAtNDIxNiwxOCArNDIxNSwxMyBAQCBWaXNpYmxlUG9zaXRpb24gUmVuZGVyQmxvY2s6 OnBvc2l0aW9uRm9yCiAgICAgcmV0dXJuIFJlbmRlckJveDo6cG9zaXRpb25Gb3JQb2ludChwb2lu dCk7CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6Om9mZnNldEZvckNvbnRlbnRzKGludCYgdHgsIGlu dCYgdHkpIGNvbnN0Cit2b2lkIFJlbmRlckJsb2NrOjpvZmZzZXRGb3JDb250ZW50cyhJbnRQb2lu dCYgb2Zmc2V0KSBjb25zdAogewotICAgIEludFBvaW50IGNvbnRlbnRzUG9pbnQodHgsIHR5KTsK LQogICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSkKLSAgICAgICAgY29udGVudHNQb2ludCArPSBs YXllcigpLT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKTsKKyAgICAgICAgb2Zmc2V0ICs9IGxheWVy KCktPnNjcm9sbGVkQ29udGVudE9mZnNldCgpOwogCiAgICAgaWYgKGhhc0NvbHVtbnMoKSkKLSAg ICAgICAgYWRqdXN0UG9pbnRUb0NvbHVtbkNvbnRlbnRzKGNvbnRlbnRzUG9pbnQpOwotCi0gICAg dHggPSBjb250ZW50c1BvaW50LngoKTsKLSAgICB0eSA9IGNvbnRlbnRzUG9pbnQueSgpOworICAg ICAgICBhZGp1c3RQb2ludFRvQ29sdW1uQ29udGVudHMob2Zmc2V0KTsKIH0KIAogaW50IFJlbmRl ckJsb2NrOjphdmFpbGFibGVMb2dpY2FsV2lkdGgoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDg4MDMzKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2Niw3ICs1NjYs NyBAQCBwcml2YXRlOgogICAgIHZvaWQgcGFpbnRDaGlsZHJlbihQYWludEluZm8mLCBpbnQgdHgs IGludCB0eSk7CiAgICAgdm9pZCBwYWludEVsbGlwc2lzQm94ZXMoUGFpbnRJbmZvJiwgaW50IHR4 LCBpbnQgdHkpOwogICAgIHZvaWQgcGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiwgaW50IHR4LCBp bnQgdHkpOwotICAgIHZvaWQgcGFpbnRDYXJldChQYWludEluZm8mLCBpbnQgdHgsIGludCB0eSwg Q2FyZXRUeXBlKTsKKyAgICB2b2lkIHBhaW50Q2FyZXQoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9p bnQmLCBDYXJldFR5cGUpOwogCiAgICAgRmxvYXRpbmdPYmplY3QqIGluc2VydEZsb2F0aW5nT2Jq ZWN0KFJlbmRlckJveCopOwogICAgIHZvaWQgcmVtb3ZlRmxvYXRpbmdPYmplY3QoUmVuZGVyQm94 Kik7CkBAIC02NDYsOCArNjQ2LDggQEAgcHJpdmF0ZToKICAgICBQb3NpdGlvbiBwb3NpdGlvbkZv ckJveChJbmxpbmVCb3gqLCBib29sIHN0YXJ0ID0gdHJ1ZSkgY29uc3Q7CiAgICAgVmlzaWJsZVBv c2l0aW9uIHBvc2l0aW9uRm9yUG9pbnRXaXRoSW5saW5lQ2hpbGRyZW4oY29uc3QgSW50UG9pbnQm KTsKIAotICAgIC8vIEFkanVzdCB0eCBhbmQgdHkgZnJvbSBwYWludGluZyBvZmZzZXRzIHRvIHRo ZSBsb2NhbCBjb29yZHMgb2YgdGhpcyByZW5kZXJlcgotICAgIHZvaWQgb2Zmc2V0Rm9yQ29udGVu dHMoaW50JiB0eCwgaW50JiB0eSkgY29uc3Q7CisgICAgLy8gQWRqdXN0IGZyb20gcGFpbnRpbmcg b2Zmc2V0cyB0byB0aGUgbG9jYWwgY29vcmRzIG9mIHRoaXMgcmVuZGVyZXIKKyAgICB2b2lkIG9m ZnNldEZvckNvbnRlbnRzKEludFBvaW50JikgY29uc3Q7CiAKICAgICB2b2lkIGNhbGNDb2x1bW5X aWR0aCgpOwogICAgIGJvb2wgbGF5b3V0Q29sdW1ucyhib29sIGhhc1NwZWNpZmllZFBhZ2VMb2dp Y2FsSGVpZ2h0LCBpbnQgcGFnZUxvZ2ljYWxIZWlnaHQsIExheW91dFN0YXRlTWFpbnRhaW5lciYp Owo=