73476 2011-11-30 11:53:48 -0800 Allow the length of a page along the pagination axis to differ from the length of the view 2011-11-30 17:14:53 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned oldest_to_newest 511979 0 mitz 2011-11-30 11:53:48 -0800 In pagination mode, currently each page (implemented as a column) has the same size as the view. Add API for setting the length of the page independently from the view size. 511987 1 117243 mitz 2011-11-30 12:02:32 -0800 Created attachment 117243 WebCore changes, WebKit2 API and WebKit/mac API 512267 2 mitz 2011-11-30 17:14:53 -0800 Landed as r101574 <http://trac.webkit.org/r101574>. 117243 2011-11-30 12:02:32 -0800 2011-11-30 16:06:08 -0800 WebCore changes, WebKit2 API and WebKit/mac API 73476_r1.diff text/plain 20615 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTU0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDExLTExLTMwICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViQ29yZSBwYXJ0IG9mOiBBbGxv dyB0aGUgbGVuZ3RoIG9mIGEgcGFnZSBhbG9uZyB0aGUgcGFnaW5hdGlvbiBheGlzIHRvIGRpZmZl ciBmcm9tIHRoZSBsZW5ndGggb2YgdGhlIHZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTczNDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZTo6c2V0UGFnaW5hdGlvbik6IENoYW5nZWQgdG8gdXNlIFBhZ2luYXRpb246Om9wZXJhdG9y PT0uCisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdp bmF0aW9uOjpQYWdpbmF0aW9uKTogQWRkZWQgaW5pdGlhbGl6ZXIgZm9yIHRoZSBuZXcgcGFnZUxl bmd0aCBtZW1iZXIgdmFyaWFibGUuCisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQYWdpbmF0aW9u OjpvcGVyYXRvcj09KTogQWRkZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRDb2x1bW5zKTogTmFycm93 ZWQgdGhlIHNjb3BlIG9mIGEgbG9jYWwgdmFyaWFibGUuCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmg6IFByb21vdGVkIHNldERlc2lyZWRDb2x1bW5Db3VudEFuZFdpZHRoKCkgZnJv bSBwcml2YXRlIHRvIHByb3RlY3RlZCwKKyAgICAgICAgYWxsb3dpbmcgaXRzIHVzZSBmcm9tIFJl bmRlclZpZXc6OmNhbGNDb2x1bW5XaWR0aCgpLiBNYWRlIGNhbGNDb2x1bW5XaWR0aCgpIHZpcnR1 YWwuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVmlldzo6Y2FsY0NvbHVtbldpZHRoKTogQWRkZWQuIFVzZXMgdGhlIHBhZ2UgbGVu Z3RoIHNwZWNpZmllZCBpbiB0aGUgcGFnaW5hdGlvbgorICAgICAgICBwYXJhbWV0ZXJzIHRvIHNl dCB0aGUgY29sdW1uIHdpZHRoLCBpZiBwYWdlcyBhcmUgdG8gYmUgbGFpZCBvdXQgb25lIG5leHQg dG8gdGhlIG90aGVyLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6dmlld0xvZ2ljYWxI ZWlnaHQpOiBBZGRlZC4gVXNlcyB0aGUgcGFnZSBsZW5ndGggc3BlY2lmaWVkIGluIHRoZSBwYWdp bmF0aW9uCisgICAgICAgIHBhcmFtZXRlcnMgYXMgdGhlIGhlaWdodCwgaWYgcGFnZXMgYXJlIHRv IGJlIGxhaWQgb3V0IG9uZSBhZnRlciB0aGUgb3RoZXIuCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclZpZXcuaDoKKwogMjAxMS0xMS0zMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBmZUltYWdlIHJlZmVyZW5jaW5nIGEgcHJpbWl0aXZlIGRyYXdz IGluY29ycmVjdGx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDEwMTUyNSkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3Nyw3ICs2 NzcsNyBAQCB2b2lkIFBhZ2U6OnNldERldmljZVNjYWxlRmFjdG9yKGZsb2F0IHNjCiAKIHZvaWQg UGFnZTo6c2V0UGFnaW5hdGlvbihjb25zdCBQYWdpbmF0aW9uJiBwYWdpbmF0aW9uKQogewotICAg IGlmIChtX3BhZ2luYXRpb24ubW9kZSA9PSBwYWdpbmF0aW9uLm1vZGUgJiYgbV9wYWdpbmF0aW9u LmdhcCA9PSBwYWdpbmF0aW9uLmdhcCkKKyAgICBpZiAobV9wYWdpbmF0aW9uID09IHBhZ2luYXRp b24pCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcGFnaW5hdGlvbiA9IHBhZ2luYXRpb247Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuaAkocmV2aXNpb24gMTAxNTI1KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2MSwxMSArMjYxLDE4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogICAgICAgICAgICAgUGFnaW5hdGlvbigpCiAgICAgICAgICAgICAgICAgOiBt b2RlKFVucGFnaW5hdGVkKQorICAgICAgICAgICAgICAgICwgcGFnZUxlbmd0aCgwKQogICAgICAg ICAgICAgICAgICwgZ2FwKDApCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICB9OwogCisgICAg ICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgUGFnaW5hdGlvbiYgb3RoZXIpIGNvbnN0Cisg ICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgcmV0dXJuIG1vZGUgPT0gb3RoZXIubW9kZSAm JiBwYWdlTGVuZ3RoID09IG90aGVyLnBhZ2VMZW5ndGggJiYgZ2FwID09IG90aGVyLmdhcDsKKyAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgTW9kZSBtb2RlOworICAgICAgICAgICAgdW5zaWdu ZWQgcGFnZUxlbmd0aDsKICAgICAgICAgICAgIHVuc2lnbmVkIGdhcDsKICAgICAgICAgfTsKIApJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiAx MDE1MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NjE5LDEwICs0NjE5LDEwIEBAIGJvb2wgUmVuZGVyQmxvY2s6OmxheW91 dENvbHVtbnMoYm9vbCBoYXMKICAgICAvLyBGSVhNRTogV2UgZG9uJ3QgYmFsYW5jZSBwcm9wZXJs eSBhdCBhbGwgaW4gdGhlIHByZXNlbmNlIG9mIGZvcmNlZCBwYWdlIGJyZWFrcy4gIFdlIG5lZWQg dG8gdW5kZXJzdGFuZCB3aGF0CiAgICAgLy8gdGhlIGRpc3RhbmNlIGJldHdlZW4gZm9yY2VkIHBh Z2UgYnJlYWtzIGlzIHNvIHRoYXQgd2UgY2FuIGF2b2lkIG1ha2luZyB0aGUgbWluaW11bSBjb2x1 bW4gaGVpZ2h0IHRvbyB0YWxsLgogICAgIENvbHVtbkluZm8qIGNvbEluZm8gPSBjb2x1bW5JbmZv KCk7Ci0gICAgaW50IGRlc2lyZWRDb2x1bW5Db3VudCA9IGNvbEluZm8tPmRlc2lyZWRDb2x1bW5D b3VudCgpOwogICAgIGlmICghaGFzU3BlY2lmaWVkUGFnZUxvZ2ljYWxIZWlnaHQpIHsKICAgICAg ICAgTGF5b3V0VW5pdCBjb2x1bW5IZWlnaHQgPSBwYWdlTG9naWNhbEhlaWdodDsKICAgICAgICAg aW50IG1pbkNvbHVtbkNvdW50ID0gY29sSW5mby0+Zm9yY2VkQnJlYWtzKCkgKyAxOworICAgICAg ICBpbnQgZGVzaXJlZENvbHVtbkNvdW50ID0gY29sSW5mby0+ZGVzaXJlZENvbHVtbkNvdW50KCk7 CiAgICAgICAgIGlmIChtaW5Db2x1bW5Db3VudCA+PSBkZXNpcmVkQ29sdW1uQ291bnQpIHsKICAg ICAgICAgICAgIC8vIFRoZSBmb3JjZWQgcGFnZSBicmVha3MgYXJlIGluIGNvbnRyb2wgb2YgdGhl IGJhbGFuY2luZy4gIEp1c3Qgc2V0IHRoZSBjb2x1bW4gaGVpZ2h0IHRvIHRoZQogICAgICAgICAg ICAgLy8gbWF4aW11bSBwYWdlIGJyZWFrIGRpc3RhbmNlLgpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDEwMTUyNSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC00MTQsNiArNDE0LDgg QEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2ltcGxpZmllZExheW91dCgpOwogICAgIHZvaWQgc2lt cGxpZmllZE5vcm1hbEZsb3dMYXlvdXQoKTsKIAorICAgIHZvaWQgc2V0RGVzaXJlZENvbHVtbkNv dW50QW5kV2lkdGgoaW50LCBMYXlvdXRVbml0KTsKKwogICAgIHZvaWQgY29tcHV0ZU92ZXJmbG93 KExheW91dFVuaXQgb2xkQ2xpZW50QWZ0ZXJFZGdlLCBib29sIHJlY29tcHV0ZUZsb2F0cyA9IGZh bHNlKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRkT3ZlcmZsb3dGcm9tQ2hpbGRyZW4oKTsKICAgICB2 b2lkIGFkZE92ZXJmbG93RnJvbUZsb2F0cygpOwpAQCAtNzUwLDcgKzc1Miw2IEBAIHByaXZhdGU6 CiAKICAgICBMYXlvdXRVbml0IGRlc2lyZWRDb2x1bW5XaWR0aCgpIGNvbnN0OwogICAgIHVuc2ln bmVkIGRlc2lyZWRDb2x1bW5Db3VudCgpIGNvbnN0OwotICAgIHZvaWQgc2V0RGVzaXJlZENvbHVt bkNvdW50QW5kV2lkdGgoaW50IGNvdW50LCBMYXlvdXRVbml0IHdpZHRoKTsKIAogICAgIHZvaWQg cGFpbnRDb250aW51YXRpb25PdXRsaW5lcyhQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYp OwogCkBAIC03NjksNyArNzcwLDcgQEAgcHJpdmF0ZToKICAgICAvLyBBZGp1c3QgZnJvbSBwYWlu dGluZyBvZmZzZXRzIHRvIHRoZSBsb2NhbCBjb29yZHMgb2YgdGhpcyByZW5kZXJlcgogICAgIHZv aWQgb2Zmc2V0Rm9yQ29udGVudHMoTGF5b3V0UG9pbnQmKSBjb25zdDsKIAotICAgIHZvaWQgY2Fs Y0NvbHVtbldpZHRoKCk7CisgICAgdmlydHVhbCB2b2lkIGNhbGNDb2x1bW5XaWR0aCgpOwogICAg IGJvb2wgbGF5b3V0Q29sdW1ucyhib29sIGhhc1NwZWNpZmllZFBhZ2VMb2dpY2FsSGVpZ2h0LCBM YXlvdXRVbml0IHBhZ2VMb2dpY2FsSGVpZ2h0LCBMYXlvdXRTdGF0ZU1haW50YWluZXImKTsKICAg ICB2b2lkIG1ha2VDaGlsZHJlbkFub255bW91c0NvbHVtbkJsb2NrcyhSZW5kZXJPYmplY3QqIGJl Zm9yZUNoaWxkLCBSZW5kZXJCbG9jayogbmV3QmxvY2tCb3gsIFJlbmRlck9iamVjdCogbmV3Q2hp bGQpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCShyZXZp c2lvbiAxMDE1MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE4NSw2ICsxODUsMjAgQEAgYm9vbCBSZW5kZXJWaWV3OjpyZXF1 aXJlc0NvbHVtbnMoaW50IGRlcwogICAgIHJldHVybiBSZW5kZXJCbG9jazo6cmVxdWlyZXNDb2x1 bW5zKGRlc2lyZWRDb2x1bW5Db3VudCk7CiB9CiAKK3ZvaWQgUmVuZGVyVmlldzo6Y2FsY0NvbHVt bldpZHRoKCkKK3sKKyAgICBpbnQgY29sdW1uV2lkdGggPSBjb250ZW50TG9naWNhbFdpZHRoKCk7 CisgICAgaWYgKG1fZnJhbWVWaWV3ICYmIHN0eWxlKCktPmhhc0lubGluZUNvbHVtbkF4aXMoKSkg eworICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZVZpZXctPmZyYW1lKCkpIHsKKyAg ICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgeworICAgICAgICAgICAg ICAgIGlmIChpbnQgcGFnZUxlbmd0aCA9IHBhZ2UtPnBhZ2luYXRpb24oKS5wYWdlTGVuZ3RoKQor ICAgICAgICAgICAgICAgICAgICBjb2x1bW5XaWR0aCA9IHBhZ2VMZW5ndGg7CisgICAgICAgICAg ICB9CisgICAgICAgIH0KKyAgICB9CisgICAgc2V0RGVzaXJlZENvbHVtbkNvdW50QW5kV2lkdGgo MSwgY29sdW1uV2lkdGgpOworfQorCiB2b2lkIFJlbmRlclZpZXc6OnBhaW50KFBhaW50SW5mbyYg cGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpCiB7CiAgICAgLy8gSWYg d2UgZXZlciByZXF1aXJlIGxheW91dCBidXQgcmVjZWl2ZSBhIHBhaW50IGFueXdheSwgc29tZXRo aW5nIGhhcyBnb25lIGhvcnJpYmx5IHdyb25nLgpAQCAtNzM0LDYgKzc0OCwyNCBAQCBpbnQgUmVu ZGVyVmlldzo6dmlld1dpZHRoKCkgY29uc3QKICAgICByZXR1cm4gd2lkdGg7CiB9CiAKK2ludCBS ZW5kZXJWaWV3Ojp2aWV3TG9naWNhbEhlaWdodCgpIGNvbnN0Cit7CisgICAgaW50IGhlaWdodCA9 IHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyB2aWV3SGVpZ2h0KCkgOiB2aWV3 V2lkdGgoKTsKKworICAgIGlmIChoYXNDb2x1bW5zKCkgJiYgIXN0eWxlKCktPmhhc0lubGluZUNv bHVtbkF4aXMoKSkgeworICAgICAgICBpZiAoRnJhbWUqIGZyYW1lID0gbV9mcmFtZVZpZXctPmZy YW1lKCkpIHsKKyAgICAgICAgICAgIGlmIChQYWdlKiBwYWdlID0gZnJhbWUtPnBhZ2UoKSkgewor ICAgICAgICAgICAgICAgIGlmIChmcmFtZSA9PSBwYWdlLT5tYWluRnJhbWUoKSkgeworICAgICAg ICAgICAgICAgICAgICBpZiAoaW50IHBhZ2VMZW5ndGggPSBwYWdlLT5wYWdpbmF0aW9uKCkucGFn ZUxlbmd0aCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGhlaWdodCA9IHBhZ2VMZW5ndGg7Cisg ICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorCisgICAg cmV0dXJuIGhlaWdodDsKK30KKwogZmxvYXQgUmVuZGVyVmlldzo6em9vbUZhY3RvcigpIGNvbnN0 CiB7CiAgICAgRnJhbWUqIGZyYW1lID0gbV9mcmFtZVZpZXctPmZyYW1lKCk7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHJldmlzaW9uIDEwMTUyNSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDcg KzYxLDcgQEAgcHVibGljOgogICAgIGludCB2aWV3SGVpZ2h0KCkgY29uc3Q7CiAgICAgaW50IHZp ZXdXaWR0aCgpIGNvbnN0OwogICAgIGludCB2aWV3TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1 cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZpZXdXaWR0aCgpIDogdmll d0hlaWdodCgpOyB9Ci0gICAgaW50IHZpZXdMb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4g c3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZpZXdIZWlnaHQoKSA6IHZpZXdX aWR0aCgpOyB9CisgICAgaW50IHZpZXdMb2dpY2FsSGVpZ2h0KCkgY29uc3Q7CiAKICAgICBmbG9h dCB6b29tRmFjdG9yKCkgY29uc3Q7CiAKQEAgLTE5NCw2ICsxOTQsOCBAQCBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCBib29sIHJlcXVpcmVzQ29sdW1ucyhpbnQgZGVzaXJlZENvbHVtbkNvdW50KSBj b25zdCBPVkVSUklERTsKIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIHZvaWQgY2FsY0NvbHVtbldp ZHRoKCkgT1ZFUlJJREU7CisKICAgICBib29sIHNob3VsZFJlcGFpbnQoY29uc3QgSW50UmVjdCYg cikgY29uc3Q7CiAKICAgICAvLyBUaGVzZSBmdW5jdGlvbnMgbWF5IG9ubHkgYmUgYWNjZXNzZWQg YnkgTGF5b3V0U3RhdGVNYWludGFpbmVyLgpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTAxNTQy KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MzQgQEAKKzIwMTEtMTEtMzAgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWJLaXQyIHBhcnQgb2Y6IEFsbG93IHRoZSBsZW5ndGggb2YgYSBwYWdlIGFsb25nIHRo ZSBwYWdpbmF0aW9uIGF4aXMgdG8gZGlmZmVyIGZyb20gdGhlIGxlbmd0aCBvZiB0aGUgdmlldwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM0NzYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9X ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNy ZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKTogRW5jb2RlIHBhZ2VMZW5ndGguCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6IERlY29kZSBwYWdlTGVu Z3RoLgorICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6IEFkZGVk IHBhZ2VMZW5ndGguCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAg ICAgIChXS1BhZ2VTZXRQYWdlTGVuZ3RoKTogQWRkZWQgdGhpcyBhY2Nlc3Nvci4KKyAgICAgICAg KFdLUGFnZUdldFBhZ2VMZW5ndGgpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQYWdlUHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdD b250ZXh0Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9s bGVyIHNldFBhZ2VMZW5ndGg6XSk6IERpdHRvLgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4 dENvbnRyb2xsZXIgcGFnZUxlbmd0aF0pOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L21hYy9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJQcml2YXRlLmg6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 V2ViUGFnZVByb3h5KTogQWRkZWQgaW5pdGlhbGl6ZXIgZm9yIG1fcGFnZUxlbmd0aC4KKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRQYWdlTGVuZ3RoKTogQWRkZWQuCisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKTogSW5pdGlhbGl6ZSBw YWdlTGVuZ3RoLgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpwYWdlTGVuZ3RoKTogQWRkZWQuCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpX ZWJQYWdlKTogU2V0IHRoZSBwYWdlIGxlbmd0aCBiYXNlZCBvbiB0aGUgY3JlYXRpb24gcGFyYW1l dGVycy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0UGFnZUxlbmd0aCk6IEFkZGVkLgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46IEFkZGVkIFNldFBhZ2VMZW5ndGguCisK IDIwMTEtMTEtMjkgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03Mjc1MQpJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAko cmV2aXNpb24gMTAxNTI1KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBAIHZvaWQgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKEMKICAgICBlbmNvZGVyLT5lbmNvZGUodXNl Rml4ZWRMYXlvdXQpOwogICAgIGVuY29kZXItPmVuY29kZShmaXhlZExheW91dFNpemUpOwogICAg IGVuY29kZXItPmVuY29kZUVudW0ocGFnaW5hdGlvbk1vZGUpOworICAgIGVuY29kZXItPmVuY29k ZShwYWdlTGVuZ3RoKTsKICAgICBlbmNvZGVyLT5lbmNvZGUoZ2FwQmV0d2VlblBhZ2VzKTsKICAg ICBlbmNvZGVyLT5lbmNvZGUodXNlckFnZW50KTsKICAgICBlbmNvZGVyLT5lbmNvZGUoc2Vzc2lv blN0YXRlKTsKQEAgLTk0LDYgKzk1LDggQEAgYm9vbCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz OjpkZWNvZGUoQwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGVFbnVtKHBhcmFtZXRlcnMucGFnaW5hdGlvbk1vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5wYWdlTGVuZ3RoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMuZ2Fw QmV0d2VlblBhZ2VzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci0+ ZGVjb2RlKHBhcmFtZXRlcnMudXNlckFnZW50KSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2aXNpb24gMTAxNTI1KQor KysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAkod29y a2luZyBjb3B5KQpAQCAtNjQsNiArNjQsNyBAQCBzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycyB7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBmaXhlZExheW91dFNpemU7CiAKICAgICBXZWJD b3JlOjpQYWdlOjpQYWdpbmF0aW9uOjpNb2RlIHBhZ2luYXRpb25Nb2RlOworICAgIGRvdWJsZSBw YWdlTGVuZ3RoOwogICAgIGRvdWJsZSBnYXBCZXR3ZWVuUGFnZXM7CiAKICAgICBTdHJpbmcgdXNl ckFnZW50OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHJldmlzaW9uIDEwMTUyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjEsNiArMTYxLDcgQEAgV2ViUGFnZVByb3h5OjpX ZWJQYWdlUHJveHkoUGFnZUNsaWVudCogcAogICAgICwgbV9hcmVNZW1vcnlDYWNoZUNsaWVudENh bGxzRW5hYmxlZCh0cnVlKQogICAgICwgbV91c2VGaXhlZExheW91dChmYWxzZSkKICAgICAsIG1f cGFnaW5hdGlvbk1vZGUoUGFnZTo6UGFnaW5hdGlvbjo6VW5wYWdpbmF0ZWQpCisgICAgLCBtX3Bh Z2VMZW5ndGgoMCkKICAgICAsIG1fZ2FwQmV0d2VlblBhZ2VzKDApCiAgICAgLCBtX2lzVmFsaWQo dHJ1ZSkKICAgICAsIG1faXNDbG9zZWQoZmFsc2UpCkBAIC0xMjk2LDYgKzEyOTcsMTggQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnNldFBhZ2luYXRpb25Nb2RlKFdlYgogICAgIHByb2Nlc3MoKS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0UGFnaW5hdGlvbk1vZGUobW9kZSksIG1fcGFnZUlEKTsK IH0KIAordm9pZCBXZWJQYWdlUHJveHk6OnNldFBhZ2VMZW5ndGgoZG91YmxlIHBhZ2VMZW5ndGgp Cit7CisgICAgaWYgKHBhZ2VMZW5ndGggPT0gbV9wYWdlTGVuZ3RoKQorICAgICAgICByZXR1cm47 CisKKyAgICBtX3BhZ2VMZW5ndGggPSBwYWdlTGVuZ3RoOworCisgICAgaWYgKCFpc1ZhbGlkKCkp CisgICAgICAgIHJldHVybjsKKyAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OlNldFBhZ2VMZW5ndGgocGFnZUxlbmd0aCksIG1fcGFnZUlEKTsKK30KKwogdm9pZCBXZWJQYWdl UHJveHk6OnNldEdhcEJldHdlZW5QYWdlcyhkb3VibGUgZ2FwKQogewogICAgIGlmIChnYXAgPT0g bV9nYXBCZXR3ZWVuUGFnZXMpCkBAIC0zMTkxLDYgKzMyMDQsNyBAQCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6CiAgICAgcGFyYW1ldGVycy51c2VGaXhlZExheW91dCA9 IG1fdXNlRml4ZWRMYXlvdXQ7CiAgICAgcGFyYW1ldGVycy5maXhlZExheW91dFNpemUgPSBtX2Zp eGVkTGF5b3V0U2l6ZTsKICAgICBwYXJhbWV0ZXJzLnBhZ2luYXRpb25Nb2RlID0gbV9wYWdpbmF0 aW9uTW9kZTsKKyAgICBwYXJhbWV0ZXJzLnBhZ2VMZW5ndGggPSBtX3BhZ2VMZW5ndGg7CiAgICAg cGFyYW1ldGVycy5nYXBCZXR3ZWVuUGFnZXMgPSBtX2dhcEJldHdlZW5QYWdlczsKICAgICBwYXJh bWV0ZXJzLnVzZXJBZ2VudCA9IHVzZXJBZ2VudCgpOwogICAgIHBhcmFtZXRlcnMuc2Vzc2lvblN0 YXRlID0gU2Vzc2lvblN0YXRlKG1fYmFja0ZvcndhcmRMaXN0LT5lbnRyaWVzKCksIG1fYmFja0Zv cndhcmRMaXN0LT5jdXJyZW50SW5kZXgoKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxMDE1MjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTQxNSw2ICs0MTUsOCBAQCBw dWJsaWM6CiAKICAgICB2b2lkIHNldFBhZ2luYXRpb25Nb2RlKFdlYkNvcmU6OlBhZ2U6OlBhZ2lu YXRpb246Ok1vZGUpOwogICAgIFdlYkNvcmU6OlBhZ2U6OlBhZ2luYXRpb246Ok1vZGUgcGFnaW5h dGlvbk1vZGUoKSBjb25zdCB7IHJldHVybiBtX3BhZ2luYXRpb25Nb2RlOyB9CisgICAgdm9pZCBz ZXRQYWdlTGVuZ3RoKGRvdWJsZSk7CisgICAgZG91YmxlIHBhZ2VMZW5ndGgoKSBjb25zdCB7IHJl dHVybiBtX3BhZ2VMZW5ndGg7IH0KICAgICB2b2lkIHNldEdhcEJldHdlZW5QYWdlcyhkb3VibGUp OwogICAgIGRvdWJsZSBnYXBCZXR3ZWVuUGFnZXMoKSBjb25zdCB7IHJldHVybiBtX2dhcEJldHdl ZW5QYWdlczsgfQogICAgIHVuc2lnbmVkIHBhZ2VDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFn ZUNvdW50OyB9CkBAIC05MDAsNiArOTAyLDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpJbnRT aXplIG1fZml4ZWRMYXlvdXRTaXplOwogCiAgICAgV2ViQ29yZTo6UGFnZTo6UGFnaW5hdGlvbjo6 TW9kZSBtX3BhZ2luYXRpb25Nb2RlOworICAgIGRvdWJsZSBtX3BhZ2VMZW5ndGg7CiAgICAgZG91 YmxlIG1fZ2FwQmV0d2VlblBhZ2VzOwogCiAgICAgLy8gSWYgdGhlIHByb2Nlc3MgYmFja2luZyB0 aGUgd2ViIHBhZ2UgaXMgYWxpdmUgYW5kIGtpY2tpbmcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMTAxNTI1KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3OSw2 ICszNzksMTYgQEAgV0tQYWdpbmF0aW9uTW9kZSBXS1BhZ2VHZXRQYWdpbmF0aW9uTW9kZQogICAg IHJldHVybiBrV0tQYWdpbmF0aW9uTW9kZVVucGFnaW5hdGVkOwogfQogCit2b2lkIFdLUGFnZVNl dFBhZ2VMZW5ndGgoV0tQYWdlUmVmIHBhZ2VSZWYsIGRvdWJsZSBwYWdlTGVuZ3RoKQoreworICAg IHRvSW1wbChwYWdlUmVmKS0+c2V0UGFnZUxlbmd0aChwYWdlTGVuZ3RoKTsKK30KKworZG91Ymxl IFdLUGFnZUdldFBhZ2VMZW5ndGgoV0tQYWdlUmVmIHBhZ2VSZWYpCit7CisgICAgcmV0dXJuIHRv SW1wbChwYWdlUmVmKS0+cGFnZUxlbmd0aCgpOworfQorCiB2b2lkIFdLUGFnZVNldEdhcEJldHdl ZW5QYWdlcyhXS1BhZ2VSZWYgcGFnZVJlZiwgZG91YmxlIGdhcCkKIHsKICAgICB0b0ltcGwocGFn ZVJlZiktPnNldEdhcEJldHdlZW5QYWdlcyhnYXApOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZVByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlUHJpdmF0ZS5oCShyZXZpc2lvbiAxMDE1MjUpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlUHJpdmF0ZS5oCSh3b3JraW5nIGNv cHkpCkBAIC02MSw2ICs2MSw4IEBAIHR5cGVkZWYgdWludDMyX3QgV0tQYWdpbmF0aW9uTW9kZTsK IAogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0UGFnaW5hdGlvbk1vZGUoV0tQYWdlUmVmIHBhZ2Us IFdLUGFnaW5hdGlvbk1vZGUgcGFnaW5hdGlvbk1vZGUpOwogV0tfRVhQT1JUIFdLUGFnaW5hdGlv bk1vZGUgV0tQYWdlR2V0UGFnaW5hdGlvbk1vZGUoV0tQYWdlUmVmIHBhZ2UpOworV0tfRVhQT1JU IHZvaWQgV0tQYWdlU2V0UGFnZUxlbmd0aChXS1BhZ2VSZWYgcGFnZSwgZG91YmxlIHBhZ2VzUGVy Vmlldyk7CitXS19FWFBPUlQgZG91YmxlIFdLUGFnZUdldFBhZ2VMZW5ndGgoV0tQYWdlUmVmIHBh Z2UpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0R2FwQmV0d2VlblBhZ2VzKFdLUGFnZVJlZiBw YWdlLCBkb3VibGUgZ2FwKTsKIFdLX0VYUE9SVCBkb3VibGUgV0tQYWdlR2V0R2FwQmV0d2VlblBh Z2VzKFdLUGFnZVJlZiBwYWdlKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5t bQkocmV2aXNpb24gMTAxNTI1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMv V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMzQsNiAr MjM0LDE2IEBAIC0gKFdLQnJvd3NpbmdDb250ZXh0UGFnaW5hdGlvbk1vZGUpcGFnaW4KICAgICBy ZXR1cm4gV0tQYWdpbmF0aW9uTW9kZVVucGFnaW5hdGVkOwogfQogCistICh2b2lkKXNldFBhZ2VM ZW5ndGg6KENHRmxvYXQpcGFnZUxlbmd0aAoreworICAgIFdLUGFnZVNldFBhZ2VMZW5ndGgoc2Vs Zi5wYWdlUmVmLCBwYWdlTGVuZ3RoKTsKK30KKworLSAoQ0dGbG9hdClwYWdlTGVuZ3RoCit7Cisg ICAgcmV0dXJuIFdLUGFnZUdldFBhZ2VMZW5ndGgoc2VsZi5wYWdlUmVmKTsKK30KKwogLSAodm9p ZClzZXRHYXBCZXR3ZWVuUGFnZXM6KENHRmxvYXQpZ2FwQmV0d2VlblBhZ2VzCiB7CiAgICAgV0tQ YWdlU2V0R2FwQmV0d2VlblBhZ2VzKHNlbGYucGFnZVJlZiwgZ2FwQmV0d2VlblBhZ2VzKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlclByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJQcml2YXRlLmgJKHJldmlzaW9uIDEw MTUyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250 ZXh0Q29udHJvbGxlclByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsOCBAQCB0 eXBlZGVmIE5TVUludGVnZXIgV0tCcm93c2luZ0NvbnRleHRQYWdpCiBAaW50ZXJmYWNlIFdLQnJv d3NpbmdDb250ZXh0Q29udHJvbGxlciAoUHJpdmF0ZSkKIAogQHByb3BlcnR5IFdLQnJvd3NpbmdD b250ZXh0UGFnaW5hdGlvbk1vZGUgcGFnaW5hdGlvbk1vZGU7CisvLyBTZXQgdG8gMCB0byBoYXZl IHRoZSBwYWdlIGxlbmd0aCBlcXVhbCB0aGUgdmlldyBsZW5ndGguCitAcHJvcGVydHkgQ0dGbG9h dCBwYWdlTGVuZ3RoOwogQHByb3BlcnR5IENHRmxvYXQgZ2FwQmV0d2VlblBhZ2VzOwogCiBAcHJv cGVydHkocmVhZG9ubHkpIE5TVUludGVnZXIgcGFnZUNvdW50OwpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTAxNTI1KQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yNDksNiArMjQ5LDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdl SUQsIGNvbnN0IAogICAgIHNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKHBhcmFtZXRlcnMu ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQpOwogCiAgICAgc2V0UGFnaW5hdGlvbk1vZGUocGFy YW1ldGVycy5wYWdpbmF0aW9uTW9kZSk7CisgICAgc2V0UGFnZUxlbmd0aChwYXJhbWV0ZXJzLnBh Z2VMZW5ndGgpOwogICAgIHNldEdhcEJldHdlZW5QYWdlcyhwYXJhbWV0ZXJzLmdhcEJldHdlZW5Q YWdlcyk7CiAKICAgICBzZXRNZW1vcnlDYWNoZU1lc3NhZ2VzRW5hYmxlZChwYXJhbWV0ZXJzLmFy ZU1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKTsKQEAgLTkzNCw2ICs5MzUsMTMgQEAgdm9p ZCBXZWJQYWdlOjpzZXRQYWdpbmF0aW9uTW9kZSh1aW50MzJfdAogICAgIG1fcGFnZS0+c2V0UGFn aW5hdGlvbihwYWdpbmF0aW9uKTsKIH0KIAordm9pZCBXZWJQYWdlOjpzZXRQYWdlTGVuZ3RoKGRv dWJsZSBwYWdlTGVuZ3RoKQoreworICAgIFBhZ2U6OlBhZ2luYXRpb24gcGFnaW5hdGlvbiA9IG1f cGFnZS0+cGFnaW5hdGlvbigpOworICAgIHBhZ2luYXRpb24ucGFnZUxlbmd0aCA9IHBhZ2VMZW5n dGg7CisgICAgbV9wYWdlLT5zZXRQYWdpbmF0aW9uKHBhZ2luYXRpb24pOworfQorCiB2b2lkIFdl YlBhZ2U6OnNldEdhcEJldHdlZW5QYWdlcyhkb3VibGUgZ2FwKQogewogICAgIFBhZ2U6OlBhZ2lu YXRpb24gcGFnaW5hdGlvbiA9IG1fcGFnZS0+cGFnaW5hdGlvbigpOwpJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiAxMDE1MjUpCisr KyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0yNjgsNiArMjY4LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Rml4ZWRMYXlvdXRT aXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKIAogICAgIHZvaWQgc2V0UGFnaW5hdGlvbk1v ZGUodWludDMyX3QgLyogV2ViQ29yZTo6UGFnZTo6UGFnaW5hdGlvbjo6TW9kZSAqLyk7CisgICAg dm9pZCBzZXRQYWdlTGVuZ3RoKGRvdWJsZSk7CiAgICAgdm9pZCBzZXRHYXBCZXR3ZWVuUGFnZXMo ZG91YmxlKTsKIAogICAgIGJvb2wgZHJhd3NCYWNrZ3JvdW5kKCkgY29uc3QgeyByZXR1cm4gbV9k cmF3c0JhY2tncm91bmQ7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxMDE1MjUpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkod29y a2luZyBjb3B5KQpAQCAtMTIyLDYgKzEyMiw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAg IFNldEZpeGVkTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXplIHNpemUpCiAKICAgICBTZXRQYWdp bmF0aW9uTW9kZSh1aW50MzJfdCBtb2RlKTsKKyAgICBTZXRQYWdlTGVuZ3RoKGRvdWJsZSBwYWdl TGVuZ3RoKTsKICAgICBTZXRHYXBCZXR3ZWVuUGFnZXMoZG91YmxlIGdhcCk7CiAKICAgICAjIEZp bmQuCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDE1NDIpCisrKyBTb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0x MS0zMCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdC9t YWMgcGFydCBvZjogQWxsb3cgdGhlIGxlbmd0aCBvZiBhIHBhZ2UgYWxvbmcgdGhlIHBhZ2luYXRp b24gYXhpcyB0byBkaWZmZXIgZnJvbSB0aGUgbGVuZ3RoIG9mIHRoZSB2aWV3CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzQ3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1t OgorICAgICAgICAoLVtXZWJWaWV3IF9zZXRQYWdlTGVuZ3RoOl0pOiBBZGRlZCB0aGlzIGFjY2Vz c29yLgorICAgICAgICAoLVtXZWJWaWV3IF9wYWdlTGVuZ3RoXSk6IERpdHRvLgorICAgICAgICAq IFdlYlZpZXcvV2ViVmlld1ByaXZhdGUuaDoKKwogMjAxMS0xMS0zMCAgQWxleGV5IFByb3NrdXJ5 YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBEb3dubG9hZCBwYWdlIFVSTCBzaG91bGQg YmUgc2V0IGJ5IFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0J KHJldmlzaW9uIDEwMTUyNSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtMjc3OCw2ICsyNzc4LDI3IEBAIC0gKFdlYlBhZ2luYXRpb25N b2RlKV9wYWdpbmF0aW9uTW9kZQogICAgIHJldHVybiBXZWJQYWdpbmF0aW9uTW9kZVVucGFnaW5h dGVkOwogfQogCistICh2b2lkKV9zZXRQYWdlTGVuZ3RoOihDR0Zsb2F0KXBhZ2VMZW5ndGgKK3sK KyAgICBQYWdlKiBwYWdlID0gY29yZShzZWxmKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJl dHVybjsKKworICAgIFBhZ2U6OlBhZ2luYXRpb24gcGFnaW5hdGlvbiA9IHBhZ2UtPnBhZ2luYXRp b24oKTsKKyAgICBwYWdpbmF0aW9uLnBhZ2VMZW5ndGggPSBwYWdlTGVuZ3RoOworCisgICAgcGFn ZS0+c2V0UGFnaW5hdGlvbihwYWdpbmF0aW9uKTsKK30KKworLSAoQ0dGbG9hdClfcGFnZUxlbmd0 aAoreworICAgIFBhZ2UqIHBhZ2UgPSBjb3JlKHNlbGYpOworICAgIGlmICghcGFnZSkKKyAgICAg ICAgcmV0dXJuIDE7CisKKyAgICByZXR1cm4gcGFnZS0+cGFnaW5hdGlvbigpLnBhZ2VMZW5ndGg7 Cit9CisKIC0gKHZvaWQpX3NldEdhcEJldHdlZW5QYWdlczooQ0dGbG9hdClwYWdlR2FwCiB7CiAg ICAgUGFnZSogcGFnZSA9IGNvcmUoc2VsZik7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYlZpZXdQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJWaWV3UHJpdmF0ZS5oCShyZXZpc2lvbiAxMDE1MjUpCisrKyBTb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU2Myw2ICs1 NjMsOSBAQCBDb3VsZCBiZSB3b3J0aCBhZGRpbmcgdG8gdGhlIEFQSS4KIAogLSAodm9pZClfc2V0 UGFnaW5hdGlvbk1vZGU6KFdlYlBhZ2luYXRpb25Nb2RlKXBhZ2luYXRpb25Nb2RlOwogLSAoV2Vi UGFnaW5hdGlvbk1vZGUpX3BhZ2luYXRpb25Nb2RlOworLy8gU2V0IHRvIDAgdG8gaGF2ZSB0aGUg cGFnZSBsZW5ndGggZXF1YWwgdGhlIHZpZXcgbGVuZ3RoLgorLSAodm9pZClfc2V0UGFnZUxlbmd0 aDooQ0dGbG9hdClwYWdlTGVuZ3RoOworLSAoQ0dGbG9hdClfcGFnZUxlbmd0aDsKIC0gKHZvaWQp X3NldEdhcEJldHdlZW5QYWdlczooQ0dGbG9hdClwYWdlR2FwOwogLSAoQ0dGbG9hdClfZ2FwQmV0 d2VlblBhZ2VzOwogLSAoTlNVSW50ZWdlcilfcGFnZUNvdW50Owo=