44314 2010-08-19 17:23:23 -0700 Clean up some selection code 2010-08-19 17:41:05 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser oldest_to_newest 267084 0 simon.fraser 2010-08-19 17:23:23 -0700 Gonna do some reanaming and moving methods around. 267086 1 64917 simon.fraser 2010-08-19 17:29:47 -0700 Created attachment 64917 Patch 267090 2 simon.fraser 2010-08-19 17:41:05 -0700 http://trac.webkit.org/changeset/65716 64917 2010-08-19 17:29:47 -0700 2010-08-19 17:33:03 -0700 Patch bug-44314-20100819172945.patch text/plain 10079 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODc3NjI1N2I3MzZlZDA3MmRhYjE5ZDNhYWNiY2E4NzdiYTRjZWZjNy4uYTY3MDZiZTM0NGMwNTk4 NGMyZDAwY2FkYTBlM2FhMzQ5MjkzODEyMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOSBAQAogMjAxMC0wOC0xOSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBzb21lIHNlbGVjdGlvbiBjb2Rl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDMxNAor ICAgICAgICAKKyAgICAgICAgQ2hhbmdlIHRoZSBjb25jZXB0IG9mICJsYXlvdXQiIGluIFNlbGVj dGlvbkNvbnRyb2xsZXIgdG8gInVwZGF0ZUNhcmV0UmVjdCIsIHJlbmFtaW5nCisgICAgICAgIG1l dGhvZHMgYWNjb3JkaW5nbHkuCisgICAgICAgIAorICAgICAgICBNb3ZlIHNlbGVjdGlvbiBhbmQg cHJpbnRpbmcgbWV0aG9kcyBpbiBSZW5kZXJWaWV3LmggaW50byBncm91cHMuCisKKyAgICAgICAg Tm8gYmVoYXZpb3JhbCBjaGFuZ2VzLgorCisgICAgICAgICogZWRpdGluZy9TZWxlY3Rpb25Db250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvbkNvbnRyb2xsZXI6OlNlbGVj dGlvbkNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJvbGxlcjo6 c2V0U2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdGlvbkNvbnRyb2xsZXI6Om1v ZGlmeSk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25Db250cm9sbGVyOjpzZXRDYXJldFJl Y3ROZWVkc1VwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25Db250cm9sbGVyOjp1 cGRhdGVDYXJldFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJvbGxlcjo6 bG9jYWxDYXJldFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJvbGxlcjo6 cmVjb21wdXRlQ2FyZXRSZWN0KTogVGVzdCBtX2NhcmV0UmVjdE5lZWRzVXBkYXRlIGZpcnN0Lgor ICAgICAgICAoV2ViQ29yZTo6U2VsZWN0aW9uQ29udHJvbGxlcjo6aW52YWxpZGF0ZUNhcmV0UmVj dCk6CisgICAgICAgICogZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmg6CisgICAgICAgICog cGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpsYXlvdXQp OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJWaWV3Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzZWxlY3Rpb25TdGFydCk6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJWaWV3OjpzZWxlY3Rpb25FbmQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVmlldzo6cHJpbnRSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clZpZXc6OnNldFByaW50UmVjdCk6CisKKzIwMTAtMDgtMTkgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKICAgICAgICAgRml4IENocm9taXVtIGJ1aWxkLgogICAgICAg ICAKICAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Vk aXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9u Q29udHJvbGxlci5jcHAKaW5kZXggMDYzNzgzZTY1YTNkYjE1MWJmN2NiNjlmYzYxOWRhMWNlOWEw YTlmMy4uMzY3MmUzZTc1N2JmZGQ4N2Y0MDM5NWU0NjAwNGU0ZGFiMTdlMjIwZCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUv ZWRpdGluZy9TZWxlY3Rpb25Db250cm9sbGVyLmNwcApAQCAtNzAsNyArNzAsNyBAQCBTZWxlY3Rp b25Db250cm9sbGVyOjpTZWxlY3Rpb25Db250cm9sbGVyKEZyYW1lKiBmcmFtZSwgYm9vbCBpc0Ry YWdDYXJldENvbnRyb2xsZQogICAgICwgbV94UG9zRm9yVmVydGljYWxBcnJvd05hdmlnYXRpb24o Tm9YUG9zRm9yVmVydGljYWxBcnJvd05hdmlnYXRpb24pCiAgICAgLCBtX2dyYW51bGFyaXR5KENo YXJhY3RlckdyYW51bGFyaXR5KQogICAgICwgbV9jYXJldEJsaW5rVGltZXIodGhpcywgJlNlbGVj dGlvbkNvbnRyb2xsZXI6OmNhcmV0QmxpbmtUaW1lckZpcmVkKQotICAgICwgbV9uZWVkc0xheW91 dCh0cnVlKQorICAgICwgbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSh0cnVlKQogICAgICwgbV9hYnND YXJldEJvdW5kc0RpcnR5KHRydWUpCiAgICAgLCBtX2lzRHJhZ0NhcmV0Q29udHJvbGxlcihpc0Ry YWdDYXJldENvbnRyb2xsZXIpCiAgICAgLCBtX2lzQ2FyZXRCbGlua2luZ1N1c3BlbmRlZChmYWxz ZSkKQEAgLTExNiw3ICsxMTYsNyBAQCB2b2lkIFNlbGVjdGlvbkNvbnRyb2xsZXI6OnNldFNlbGVj dGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzLCBib29sIGNsb3NlVHlwaQogICAgIGlmICht X2lzRHJhZ0NhcmV0Q29udHJvbGxlcikgewogICAgICAgICBpbnZhbGlkYXRlQ2FyZXRSZWN0KCk7 CiAgICAgICAgIG1fc2VsZWN0aW9uID0gczsKLSAgICAgICAgbV9uZWVkc0xheW91dCA9IHRydWU7 CisgICAgICAgIG1fY2FyZXRSZWN0TmVlZHNVcGRhdGUgPSB0cnVlOwogICAgICAgICBpbnZhbGlk YXRlQ2FyZXRSZWN0KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xNTAsNyArMTUwLDcg QEAgdm9pZCBTZWxlY3Rpb25Db250cm9sbGVyOjpzZXRTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYgcywgYm9vbCBjbG9zZVR5cGkKIAogICAgIG1fc2VsZWN0aW9uID0gczsKICAgICAK LSAgICBtX25lZWRzTGF5b3V0ID0gdHJ1ZTsKKyAgICBtX2NhcmV0UmVjdE5lZWRzVXBkYXRlID0g dHJ1ZTsKICAgICAKICAgICBpZiAoIXMuaXNOb25lKCkpCiAgICAgICAgIG1fZnJhbWUtPnNldEZv Y3VzZWROb2RlSWZOZWVkZWQoKTsKQEAgLTcwNSw3ICs3MDUsNyBAQCBib29sIFNlbGVjdGlvbkNv bnRyb2xsZXI6Om1vZGlmeShFQWx0ZXJhdGlvbiBhbHRlciwgRURpcmVjdGlvbiBkaXJlY3Rpb24s IFRleHRHcgogICAgICAgICBtX2dyYW51bGFyaXR5ID0gQ2hhcmFjdGVyR3JhbnVsYXJpdHk7CiAK IAotICAgIHNldE5lZWRzTGF5b3V0KCk7CisgICAgc2V0Q2FyZXRSZWN0TmVlZHNVcGRhdGUoKTsK IAogICAgIHNldElzRGlyZWN0aW9uYWwoYWx0ZXIgPT0gQWx0ZXJhdGlvbkV4dGVuZCk7CiAKQEAg LTg4NiwxMiArODg2LDEyIEBAIHZvaWQgU2VsZWN0aW9uQ29udHJvbGxlcjo6c2V0RXh0ZW50KGNv bnN0IFBvc2l0aW9uICZwb3MsIEVBZmZpbml0eSBhZmZpbml0eSwgYm9vCiAgICAgc2V0U2VsZWN0 aW9uKFZpc2libGVTZWxlY3Rpb24obV9zZWxlY3Rpb24uYmFzZSgpLCBwb3MsIGFmZmluaXR5KSwg dHJ1ZSwgdHJ1ZSwgdXNlclRyaWdnZXJlZCk7CiB9CiAKLXZvaWQgU2VsZWN0aW9uQ29udHJvbGxl cjo6c2V0TmVlZHNMYXlvdXQoYm9vbCBmbGFnKQordm9pZCBTZWxlY3Rpb25Db250cm9sbGVyOjpz ZXRDYXJldFJlY3ROZWVkc1VwZGF0ZShib29sIGZsYWcpCiB7Ci0gICAgbV9uZWVkc0xheW91dCA9 IGZsYWc7CisgICAgbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSA9IGZsYWc7CiB9CiAKLXZvaWQgU2Vs ZWN0aW9uQ29udHJvbGxlcjo6bGF5b3V0KCkKK3ZvaWQgU2VsZWN0aW9uQ29udHJvbGxlcjo6dXBk YXRlQ2FyZXRSZWN0KCkKIHsKICAgICBpZiAoaXNOb25lKCkgfHwgIW1fc2VsZWN0aW9uLnN0YXJ0 KCkubm9kZSgpLT5pbkRvY3VtZW50KCkgfHwgIW1fc2VsZWN0aW9uLmVuZCgpLm5vZGUoKS0+aW5E b2N1bWVudCgpKSB7CiAgICAgICAgIG1fY2FyZXRSZWN0ID0gSW50UmVjdCgpOwpAQCAtOTM0LDcg KzkzNCw3IEBAIHZvaWQgU2VsZWN0aW9uQ29udHJvbGxlcjo6bGF5b3V0KCkKICAgICAgICAgfQog ICAgIH0KIAotICAgIG1fbmVlZHNMYXlvdXQgPSBmYWxzZTsKKyAgICBtX2NhcmV0UmVjdE5lZWRz VXBkYXRlID0gZmFsc2U7CiB9CiAKIFJlbmRlck9iamVjdCogU2VsZWN0aW9uQ29udHJvbGxlcjo6 Y2FyZXRSZW5kZXJlcigpIGNvbnN0CkBAIC05NTQsOCArOTU0LDggQEAgUmVuZGVyT2JqZWN0KiBT ZWxlY3Rpb25Db250cm9sbGVyOjpjYXJldFJlbmRlcmVyKCkgY29uc3QKIAogSW50UmVjdCBTZWxl Y3Rpb25Db250cm9sbGVyOjpsb2NhbENhcmV0UmVjdCgpCiB7Ci0gICAgaWYgKG1fbmVlZHNMYXlv dXQpCi0gICAgICAgIGxheW91dCgpOworICAgIGlmIChtX2NhcmV0UmVjdE5lZWRzVXBkYXRlKQor ICAgICAgICB1cGRhdGVDYXJldFJlY3QoKTsKICAgICAKICAgICByZXR1cm4gbV9jYXJldFJlY3Q7 CiB9CkBAIC05OTIsNiArOTkyLDkgQEAgSW50UmVjdCBTZWxlY3Rpb25Db250cm9sbGVyOjpjYXJl dFJlcGFpbnRSZWN0KCkgY29uc3QKIAogYm9vbCBTZWxlY3Rpb25Db250cm9sbGVyOjpyZWNvbXB1 dGVDYXJldFJlY3QoKQogeworICAgIGlmICghbV9jYXJldFJlY3ROZWVkc1VwZGF0ZSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgICAgIApAQCAtOTk5LDkgKzEwMDIsNiBAQCBib29sIFNlbGVjdGlvbkNvbnRyb2xs ZXI6OnJlY29tcHV0ZUNhcmV0UmVjdCgpCiAgICAgaWYgKCF2KQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBpZiAoIW1fbmVlZHNMYXlvdXQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQog ICAgIEludFJlY3Qgb2xkUmVjdCA9IG1fY2FyZXRSZWN0OwogICAgIEludFJlY3QgbmV3UmVjdCA9 IGxvY2FsQ2FyZXRSZWN0KCk7CiAgICAgaWYgKG9sZFJlY3QgPT0gbmV3UmVjdCAmJiAhbV9hYnND YXJldEJvdW5kc0RpcnR5KQpAQCAtMTA2MCw3ICsxMDYwLDcgQEAgdm9pZCBTZWxlY3Rpb25Db250 cm9sbGVyOjppbnZhbGlkYXRlQ2FyZXRSZWN0KCkKICAgICAvLyBjaGFuZ2VzIHdoaWNoIG1heSBo YXZlIGJlZW4gZG9uZS4KICAgICAvLyBBbmQsIHdlIG5lZWQgdG8gbGVhdmUgdGhpcyBsYXlvdXQg aGVyZSBzbyB0aGUgY2FyZXQgbW92ZXMgcmlnaHQgCiAgICAgLy8gYXdheSBhZnRlciBjbGlja2lu Zy4KLSAgICBtX25lZWRzTGF5b3V0ID0gdHJ1ZTsKKyAgICBtX2NhcmV0UmVjdE5lZWRzVXBkYXRl ID0gdHJ1ZTsKIAogICAgIGlmICghY2FyZXRSZWN0Q2hhbmdlZCkgewogICAgICAgICBSZW5kZXJW aWV3KiB2aWV3ID0gdG9SZW5kZXJWaWV3KGQtPnJlbmRlcmVyKCkpOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvZWRpdGluZy9TZWxl Y3Rpb25Db250cm9sbGVyLmgKaW5kZXggZDVkNjg0OTNhZGM5ZWExN2QwZjQ0ZDk3NzhhZTdiNjgx Zjg0OTkyMS4uNWZhMjc2OWM4NjkxYmMyYjA4NmQ5NjhmNjUwZThjOGYyODc5YWFiMyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvbkNvbnRyb2xsZXIuaAorKysgYi9XZWJDb3Jl L2VkaXRpbmcvU2VsZWN0aW9uQ29udHJvbGxlci5oCkBAIC0xMDUsNyArMTA1LDcgQEAgcHVibGlj OgogCiAgICAgLy8gQm91bmRzIG9mIChwb3NzaWJseSB0cmFuc2Zvcm1lZCkgY2FyZXQgaW4gYWJz b2x1dGUgY29vcmRzCiAgICAgSW50UmVjdCBhYnNvbHV0ZUNhcmV0Qm91bmRzKCk7Ci0gICAgdm9p ZCBzZXROZWVkc0xheW91dChib29sIGZsYWcgPSB0cnVlKTsKKyAgICB2b2lkIHNldENhcmV0UmVj dE5lZWRzVXBkYXRlKGJvb2wgZmxhZyA9IHRydWUpOwogCiAgICAgdm9pZCBzZXRJc0RpcmVjdGlv bmFsKGJvb2wpOwogICAgIHZvaWQgd2lsbEJlTW9kaWZpZWQoRUFsdGVyYXRpb24sIEVEaXJlY3Rp b24pOwpAQCAtMTY5LDcgKzE2OSw3IEBAIHByaXZhdGU6CiAgICAgVmlzaWJsZVBvc2l0aW9uIG1v ZGlmeU1vdmluZ0xlZnQoVGV4dEdyYW51bGFyaXR5KTsKICAgICBWaXNpYmxlUG9zaXRpb24gbW9k aWZ5TW92aW5nQmFja3dhcmQoVGV4dEdyYW51bGFyaXR5KTsKIAotICAgIHZvaWQgbGF5b3V0KCk7 CisgICAgdm9pZCB1cGRhdGVDYXJldFJlY3QoKTsKICAgICBJbnRSZWN0IGNhcmV0UmVwYWludFJl Y3QoKSBjb25zdDsKICAgICBib29sIHNob3VsZFJlcGFpbnRDYXJldChjb25zdCBSZW5kZXJWaWV3 KiB2aWV3KSBjb25zdDsKIApAQCAtMTk5LDcgKzE5OSw3IEBAIHByaXZhdGU6CiAgICAgSW50UmVj dCBtX2Fic0NhcmV0Qm91bmRzOyAvLyBhYnNvbHV0ZSBib3VuZGluZyByZWN0IGZvciB0aGUgY2Fy ZXQKICAgICBJbnRSZWN0IG1fYWJzb2x1dGVDYXJldFJlcGFpbnRCb3VuZHM7CiAgICAgCi0gICAg Ym9vbCBtX25lZWRzTGF5b3V0OyAvLyB0cnVlIGlmIG1fY2FyZXRSZWN0IGFuZCBtX2Fic0NhcmV0 Qm91bmRzIG5lZWQgdG8gYmUgY2FsY3VsYXRlZAorICAgIGJvb2wgbV9jYXJldFJlY3ROZWVkc1Vw ZGF0ZTsgLy8gdHJ1ZSBpZiBtX2NhcmV0UmVjdCBhbmQgbV9hYnNDYXJldEJvdW5kcyBuZWVkIHRv IGJlIGNhbGN1bGF0ZWQKICAgICBib29sIG1fYWJzQ2FyZXRCb3VuZHNEaXJ0eTsKICAgICBib29s IG1faXNEaXJlY3Rpb25hbDsKICAgICBib29sIG1faXNEcmFnQ2FyZXRDb250cm9sbGVyOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAppbmRleCA1OGE3YmE3YTNmZGVlYzI1MjIyNzljMjMzN2IzODMxYTYyMjRiNjQ3Li45 MTI3MzMzNWM1NWQ2NjY4NGFmMTYwMmQ2MmFjNDMxMDQ4M2E1MDBkIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtNzg2LDcgKzc4Niw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRy ZWUpCiAgICAgfQogICAgIG1fbGF5b3V0Um9vdCA9IDA7CiAKLSAgICBtX2ZyYW1lLT5zZWxlY3Rp b24oKS0+c2V0TmVlZHNMYXlvdXQoKTsKKyAgICBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0Q2Fy ZXRSZWN0TmVlZHNVcGRhdGUoKTsKICAgICBtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+dXBkYXRlQXBw ZWFyYW5jZSgpOwogICAgCiAgICAgbV9sYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCA9IHRydWU7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMGUxN2VhYjM3YWQxODE0YzE5NDM5MzY0M2Yx YTM0MmY4NzBlYjhlMS4uZTA3YjE1ZGM1ZTZlYTRhY2RhM2IxY2UxYjNkZTM1ODAxODUwNzkwZCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTM0OSw3ICsxMzQ5LDcgQEAgdm9pZCBS ZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQoaW50IHgsIGludCB5LCBib29sIHVwZGF0ZVNjcm9s bGJhcnMsIGJvb2wgcmVwYWkKICAgICBGcmFtZSogZnJhbWUgPSByZW5kZXJlcigpLT5mcmFtZSgp OwogICAgIGlmIChmcmFtZSkgewogICAgICAgICAvLyBUaGUgY2FyZXQgcmVjdCBuZWVkcyB0byBi ZSBpbnZhbGlkYXRlZCBhZnRlciBzY3JvbGxpbmcKLSAgICAgICAgZnJhbWUtPnNlbGVjdGlvbigp LT5zZXROZWVkc0xheW91dCgpOworICAgICAgICBmcmFtZS0+c2VsZWN0aW9uKCktPnNldENhcmV0 UmVjdE5lZWRzVXBkYXRlKCk7CiAKICAgICAgICAgRmxvYXRRdWFkIHF1YWRGb3JGYWtlTW91c2VN b3ZlRXZlbnQgPSBGbG9hdFF1YWQocmVjdEZvclJlcGFpbnQpOwogICAgICAgICBpZiAocmVwYWlu dENvbnRhaW5lcikKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBi L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAppbmRleCBjZjJjNWU5OTliYmQ5OWQ5NDk5 ZmExOGVlN2M4MjBlZDBmODQ0NzU1Li4wYTQxMWZkOGZkN2IyOWM4M2FiYjk4MmM0NTE1NmVkOGRl MjJhYTc3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKKysrIGIv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC03MSwxMiArNzEsMTggQEAgcHVibGlj OgogICAgIGVudW0gU2VsZWN0aW9uUmVwYWludE1vZGUgeyBSZXBhaW50TmV3WE9ST2xkLCBSZXBh aW50TmV3TWludXNPbGQgfTsKICAgICB2b2lkIHNldFNlbGVjdGlvbihSZW5kZXJPYmplY3QqIHN0 YXJ0LCBpbnQgc3RhcnRQb3MsIFJlbmRlck9iamVjdCogZW5kLCBpbnQgZW5kUG9zLCBTZWxlY3Rp b25SZXBhaW50TW9kZSA9IFJlcGFpbnROZXdYT1JPbGQpOwogICAgIHZvaWQgY2xlYXJTZWxlY3Rp b24oKTsKLSAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogc2VsZWN0aW9uU3RhcnQoKSBjb25zdCB7 IHJldHVybiBtX3NlbGVjdGlvblN0YXJ0OyB9Ci0gICAgdmlydHVhbCBSZW5kZXJPYmplY3QqIHNl bGVjdGlvbkVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fc2VsZWN0aW9uRW5kOyB9CisgICAgUmVuZGVy T2JqZWN0KiBzZWxlY3Rpb25TdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1fc2VsZWN0aW9uU3RhcnQ7 IH0KKyAgICBSZW5kZXJPYmplY3QqIHNlbGVjdGlvbkVuZCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vs ZWN0aW9uRW5kOyB9CisgICAgSW50UmVjdCBzZWxlY3Rpb25Cb3VuZHMoYm9vbCBjbGlwVG9WaXNp YmxlQ29udGVudCA9IHRydWUpIGNvbnN0OworICAgIHZvaWQgc2VsZWN0aW9uU3RhcnRFbmQoaW50 JiBzdGFydFBvcywgaW50JiBlbmRQb3MpIGNvbnN0OwogCiAgICAgYm9vbCBwcmludGluZygpIGNv bnN0OwogICAgIHZvaWQgc2V0UHJpbnRJbWFnZXMoYm9vbCBlbmFibGUpIHsgbV9wcmludEltYWdl cyA9IGVuYWJsZTsgfQogICAgIGJvb2wgcHJpbnRJbWFnZXMoKSBjb25zdCB7IHJldHVybiBtX3By aW50SW1hZ2VzOyB9CisKKyAgICBJbnRSZWN0IHByaW50UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1f cHJpbnRSZWN0OyB9CisgICAgdm9pZCBzZXRQcmludFJlY3QoY29uc3QgSW50UmVjdCYgcikgeyBt X3ByaW50UmVjdCA9IHI7IH0KKwogICAgIHZvaWQgc2V0VHJ1bmNhdGVkQXQoaW50IHkpIHsgbV90 cnVuY2F0ZWRBdCA9IHk7IG1fYmVzdFRydW5jYXRlZEF0ID0gbV90cnVuY2F0b3JXaWR0aCA9IDA7 IG1fbWluaW11bUNvbHVtbkhlaWdodCA9IDA7IG1fZm9yY2VkUGFnZUJyZWFrID0gZmFsc2U7IH0K ICAgICB2b2lkIHNldEJlc3RUcnVuY2F0ZWRBdChpbnQgeSwgUmVuZGVyQm94TW9kZWxPYmplY3Qq IGZvclJlbmRlcmVyLCBib29sIGZvcmNlZEJyZWFrID0gZmFsc2UpOwogICAgIHZvaWQgc2V0TWlu aW11bUNvbHVtbkhlaWdodChpbnQgaGVpZ2h0KSB7IG1fbWluaW11bUNvbHVtbkhlaWdodCA9IGhl aWdodDsgfQpAQCAtODgsOCArOTQsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFic29s dXRlUmVjdHMoVmVjdG9yPEludFJlY3Q+JiwgaW50IHR4LCBpbnQgdHkpOwogICAgIHZpcnR1YWwg dm9pZCBhYnNvbHV0ZVF1YWRzKFZlY3RvcjxGbG9hdFF1YWQ+Jik7CiAKLSAgICBJbnRSZWN0IHNl bGVjdGlvbkJvdW5kcyhib29sIGNsaXBUb1Zpc2libGVDb250ZW50ID0gdHJ1ZSkgY29uc3Q7Ci0K ICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdm9pZCBzZXRNYXhpbWFsT3V0 bGluZVNpemUoaW50IG8pOwogI2Vsc2UKQEAgLTk5LDExICsxMDMsNiBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIEludFJlY3Qgdmlld1JlY3QoKSBjb25zdDsKIAotICAgIHZvaWQgc2VsZWN0aW9u U3RhcnRFbmQoaW50JiBzdGFydFBvcywgaW50JiBlbmRQb3MpIGNvbnN0OwotCi0gICAgSW50UmVj dCBwcmludFJlY3QoKSBjb25zdCB7IHJldHVybiBtX3ByaW50UmVjdDsgfQotICAgIHZvaWQgc2V0 UHJpbnRSZWN0KGNvbnN0IEludFJlY3QmIHIpIHsgbV9wcmludFJlY3QgPSByOyB9Ci0KICAgICB2 b2lkIHVwZGF0ZVdpZGdldFBvc2l0aW9ucygpOwogICAgIHZvaWQgYWRkV2lkZ2V0KFJlbmRlcldp ZGdldCopOwogICAgIHZvaWQgcmVtb3ZlV2lkZ2V0KFJlbmRlcldpZGdldCopOwo=