103969 2012-12-03 21:03:40 -0800 [BlackBerry] On taking over a backingstore, reset the previous page's tiles 2012-12-05 14:13:54 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits anilsson manyoso mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 782193 0 jpetsovits 2012-12-03 21:03:40 -0800 With buffers being explicitly reclaimed from backingstore geometries, we have to make sure that the previously active backingstore releases its front buffers for use in the newly active one. Previously, this clearing of backingstore tiles occurred after the dormant backingstore is reactivated, the backingstore active in the meantime would just use the back buffer anyway and leave the dormant one with dangling pointers that would just not be shown. Now that we have a counted list of back buffers, we need to be explicit about this thing upfront. The patch below fixes a crash that would occur after switching ownership of the backingstore to a different WebPage. 782200 1 177410 jpetsovits 2012-12-03 21:10:40 -0800 Created attachment 177410 Patch 782301 2 177410 webkit.review.bot 2012-12-04 00:09:11 -0800 Comment on attachment 177410 Patch Clearing flags on attachment: 177410 Committed r136483: <http://trac.webkit.org/changeset/136483> 782302 3 webkit.review.bot 2012-12-04 00:09:15 -0800 All reviewed patches have been landed. Closing bug. 784047 4 jpetsovits 2012-12-05 13:15:27 -0800 The above patch didn't cover all the cases; in particular, it did not take into account that resetTiles() would sometimes return early without having swapped the tiles and thus reclaiming them. This would cause a crash when switching back from a tab that had already been made invisible. The follow-up patch below removes the early returns, because it's safe to swap in an empty geometry at any time and we should always take the chance when we get it. Also the code that calls resetTiles() on an owner switch should be put right into setCurrentBackingStoreOwner(), so that it will also release the buffers when the BackingStore is destroyed (the function is then called with 0). 784055 5 177817 jpetsovits 2012-12-05 13:23:44 -0800 Created attachment 177817 Patch 784060 6 177817 manyoso 2012-12-05 13:25:17 -0800 Comment on attachment 177817 Patch Good stuff! 784103 7 177817 webkit.review.bot 2012-12-05 14:13:51 -0800 Comment on attachment 177817 Patch Clearing flags on attachment: 177817 Committed r136761: <http://trac.webkit.org/changeset/136761> 784104 8 webkit.review.bot 2012-12-05 14:13:54 -0800 All reviewed patches have been landed. Closing bug. 177410 2012-12-03 21:10:40 -0800 2012-12-05 13:24:26 -0800 Patch bug-103969-20121204000755.patch text/plain 2760 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBiMDk1YTk3OTE0N2ZkYTE0YjcyODQ0ZmQ2YzRjZGZhMDFhNmZjZDdlLi5lYjkyODU5NGZi MDdmNzFhNzBkNDExNjA1MGYyNjkxYmYwYzE5NzMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0xMi0wMyAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBPbiB0YWtpbmcgb3ZlciBh IGJhY2tpbmdzdG9yZSwgcmVzZXQgdGhlIHByZXZpb3VzIHBhZ2UncyB0aWxlcy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzk2OQorICAgICAgICBS SU0gUFIgMjUzNDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2l0aCBidWZmZXJzIGJlaW5nIGV4cGxpY2l0bHkgcmVjbGFpbWVkIGZyb20gYmFja2lu Z3N0b3JlCisgICAgICAgIGdlb21ldHJpZXMsIHdlIGhhdmUgdG8gbWFrZSBzdXJlIHRoYXQgdGhl IHByZXZpb3VzbHkKKyAgICAgICAgYWN0aXZlIGJhY2tpbmdzdG9yZSByZWxlYXNlcyBpdHMgZnJv bnQgYnVmZmVycyBmb3IgdXNlCisgICAgICAgIGluIHRoZSBuZXdseSBhY3RpdmUgb25lLgorCisg ICAgICAgIFByZXZpb3VzbHksIHRoaXMgY2xlYXJpbmcgb2YgYmFja2luZ3N0b3JlIHRpbGVzIG9j Y3VycmVkCisgICAgICAgIGFmdGVyIHRoZSBkb3JtYW50IGJhY2tpbmdzdG9yZSBpcyByZWFjdGl2 YXRlZCwKKyAgICAgICAgdGhlIGJhY2tpbmdzdG9yZSBhY3RpdmUgaW4gdGhlIG1lYW50aW1lIHdv dWxkIGp1c3QgdXNlCisgICAgICAgIHRoZSBiYWNrIGJ1ZmZlciBhbnl3YXkgYW5kIGxlYXZlIHRo ZSBkb3JtYW50IG9uZSB3aXRoCisgICAgICAgIGRhbmdsaW5nIHBvaW50ZXJzIHRoYXQgd291bGQg anVzdCBub3QgYmUgc2hvd24uCisgICAgICAgIE5vdyB0aGF0IHdlIGhhdmUgYSBjb3VudGVkIGxp c3Qgb2YgYmFjayBidWZmZXJzLAorICAgICAgICB3ZSBuZWVkIHRvIGJlIGV4cGxpY2l0IGFib3V0 IHRoaXMgdGhpbmcgdXBmcm9udC4KKworICAgICAgICBGaXhlcyBhIGNyYXNoIHRoYXQgd291bGQg b2NjdXIgYWZ0ZXIgc3dpdGNoaW5nIG93bmVyc2hpcAorICAgICAgICBvZiB0aGUgYmFja2luZ3N0 b3JlIHRvIGEgZGlmZmVyZW50IFdlYlBhZ2UuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5jcHA6 CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyZXN1bWVCYWNr aW5nU3RvcmUpOgorCiAyMDEyLTEyLTA0ICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJp bS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFN0b3JlIHJlbmRlcmVkIHJlZ2lvbnMgaW4g cGl4ZWwgY29udGVudHMgY29vcmRpbmF0ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9X ZWJQYWdlLmNwcAppbmRleCBiMDI5ZmFmZjdkYTU2NGFlZTExYTllOWM4NjI1OWI4NjhmMGNhZDYy Li5iYzRiYmYxM2IwYmZhNDM0Y2EzNWNjNzRkNGU3NzMyY2ZhNzdiMjZjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTM1MTMsOCArMzUxMywxMiBAQCB2b2lk IFdlYlBhZ2VQcml2YXRlOjpyZXN1bWVCYWNraW5nU3RvcmUoKQogICAgIGlmICghbV9iYWNraW5n U3RvcmUtPmQtPmlzQWN0aXZlKCkKICAgICAgICAgfHwgc2hvdWxkUmVzZXRUaWxlc1doZW5TaG93 bigpCiAgICAgICAgIHx8IGRpcmVjdFJlbmRlcmluZykgewotICAgICAgICAvLyBXZSBuZWVkIHRv IHJlc2V0IGFsbCB0aWxlcyBzbyB0aGF0IHdlIGRvIG5vdCBzaG93IGFueSB0aWxlcyB3aG9zZSBj b250ZW50IG1heQotICAgICAgICAvLyBoYXZlIGJlZW4gcmVwbGFjZWQgYnkgYW5vdGhlciBXZWJQ YWdlIGluc3RhbmNlIChpLmUuIGFub3RoZXIgdGFiKS4KKyAgICAgICAgLy8gTGV0IHRoZSBwcmV2 aW91c2x5IGFjdGl2ZSBiYWNraW5nc3RvcmUgcmVsZWFzZSBpdHMgdGlsZSBidWZmZXJzIHNvCisg ICAgICAgIC8vIHRoZSBuZXcgV2ViUGFnZSBpbnN0YW5jZSAoZS5nLiBhbm90aGVyIHRhYikgY2Fu IHJlbmRlciBpdHMgY29udGVudHMuCisgICAgICAgIFdlYlBhZ2UqIGN1cnJlbnRPd25lciA9IEJh Y2tpbmdTdG9yZVByaXZhdGU6OmN1cnJlbnRCYWNraW5nU3RvcmVPd25lcigpOworICAgICAgICBp ZiAoY3VycmVudE93bmVyICYmIGN1cnJlbnRPd25lciAhPSBtX3dlYlBhZ2UpCisgICAgICAgICAg ICBCYWNraW5nU3RvcmVQcml2YXRlOjpjdXJyZW50QmFja2luZ1N0b3JlT3duZXIoKS0+ZC0+bV9i YWNraW5nU3RvcmUtPmQtPnJlc2V0VGlsZXMoKTsKKwogICAgICAgICBCYWNraW5nU3RvcmVQcml2 YXRlOjpzZXRDdXJyZW50QmFja2luZ1N0b3JlT3duZXIobV93ZWJQYWdlKTsKIAogICAgICAgICAv LyBJZiB3ZSdyZSBPcGVuR0wgY29tcG9zaXRpbmcsIHN3aXRjaGluZyB0byBhY2NlbCBjb21wIGRy YXdpbmcgb2YgdGhlIHJvb3QgbGF5ZXIK 177817 2012-12-05 13:23:44 -0800 2012-12-05 14:13:51 -0800 Patch bug-103969-20121205162057.patch text/plain 5958 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NTQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwZjU2NzQ1NDE3YjE1MWMxNzUyMThkMzJlOTAyMmRiNTg0MmQ3NWFlLi4xZTNmNDNmZDE2 ZTAxM2Q1MzA2ZjJjMWI0NTUwOWY0NTEyMzI5MjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMi0xMi0wNSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBCZXR0ZXIgY3Jhc2ggZml4 IGZvciByZXNldHRpbmcgdGlsZXMgb24gYSBiYWNraW5nc3RvcmUgdGFrZW92ZXIuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5NjkKKyAgICAgICAg UklNIFBSIDI1ODQxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSBwcmV2aW91cyBhdHRlbXB0IGZvciByZWxlYXNpbmcgdGlsZSBidWZmZXJzIGZy b20gdGhlCisgICAgICAgIHByZXZpb3VzbHkgYWN0aXZlIGJhY2tpbmdzdG9yZSBkaWQgbm90IHRh a2UgaW50byBhY2NvdW50CisgICAgICAgIHRoYXQgcmVzZXRUaWxlcygpIHdvdWxkIHNvbWV0aW1l cyByZXR1cm4gZWFybHkgd2l0aG91dAorICAgICAgICBoYXZpbmcgc3dhcHBlZCB0aGUgdGlsZXMg YW5kIHRodXMgcmVjbGFpbWluZyB0aGVtLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVtb3ZlcyB0 aGUgZWFybHkgcmV0dXJucywgYmVjYXVzZSBpdCdzIHNhZmUKKyAgICAgICAgdG8gc3dhcCBpbiBh biBlbXB0eSBnZW9tZXRyeSBhdCBhbnkgdGltZSBhbmQgd2Ugc2hvdWxkCisgICAgICAgIGFsd2F5 cyB0YWtlIHRoZSBjaGFuY2Ugd2hlbiB3ZSBnZXQgaXQuCisKKyAgICAgICAgQWxzbyBwdXQgdGhl IGNvZGUgdGhhdCBjYWxscyByZXNldFRpbGVzKCkgb24gYW4gb3duZXIKKyAgICAgICAgc3dpdGNo IHJpZ2h0IGludG8gc2V0Q3VycmVudEJhY2tpbmdTdG9yZU93bmVyKCksIHNvIHRoYXQKKyAgICAg ICAgaXQgd2lsbCBhbHNvIHJlbGVhc2UgdGhlIGJ1ZmZlcnMgd2hlbiB0aGUgQmFja2luZ1N0b3Jl CisgICAgICAgIGlzIGRlc3Ryb3llZCAodGhlIGZ1bmN0aW9uIGlzIHRoZW4gY2FsbGVkIHdpdGgg MCkuCisKKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVzZXRUaWxlcyk6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpCYWNraW5nU3RvcmVQcml2YXRl OjpzZXRDdXJyZW50QmFja2luZ1N0b3JlT3duZXIpOgorICAgICAgICAqIEFwaS9CYWNraW5nU3Rv cmUuaDogSGFkIHRvIGFkZCB0aGUgZnJpZW5kIGhlcmUgdG8gbWFrZSB0aGUgbW92ZWQgY29kZSB3 b3JrIGZyb20gdGhlIHN0YXRpYyBmdW5jdGlvbi4KKyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3Jl X3AuaDoKKyAgICAgICAgKEJhY2tpbmdTdG9yZVByaXZhdGUpOgorICAgICAgICAqIEFwaS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnJl c3VtZUJhY2tpbmdTdG9yZSk6CisKIDIwMTItMTItMDQgIE1pa2UgRmVudG9uICA8bWlmZW50b25A cmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gUmVtb3ZlIGFzc2VydCBhbmQgZml4IGNv bmRpdGlvbmFsIGZvciBvdXQgb2YgYm91bmRzIHJlcXVlc3RzIGluIElucHV0SGFuZGxlcjo6c3Bh bm5hYmxlVGV4dEluUmFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2lu Z1N0b3JlLmNwcAppbmRleCA1N2VjYjQ2NTdmZjFjZjA5YTAyYzc1NzFjY2RiMWMyMTU1YmQ2OGNi Li5jMWYwNjczOTY5NzEwYTMxMzQ3NDRjY2FkMWFhNzU4ODdjNWVkNGQwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCkBAIC0xNzAyLDE0ICsxNzAy LDYgQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpjbGVhclZpc2libGVab29tKCkKIAogdm9p ZCBCYWNraW5nU3RvcmVQcml2YXRlOjpyZXNldFRpbGVzKCkKIHsKLSAgICBpZiAoIW1fd2ViUGFn ZS0+aXNWaXNpYmxlKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGlmICghaXNBY3RpdmUoKSkg ewotICAgICAgICBtX3dlYlBhZ2UtPmQtPnNldFNob3VsZFJlc2V0VGlsZXNXaGVuU2hvd24odHJ1 ZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBCYWNraW5nU3RvcmVHZW9tZXRyeSog Y3VycmVudFN0YXRlID0gZnJvbnRTdGF0ZSgpOwogCiAgICAgbV9yZW5kZXJRdWV1ZS0+Y2xlYXIo Y3VycmVudFN0YXRlLT5iYWNraW5nU3RvcmVSZWN0KCksIHRydWUgLypjbGVhclJlZ3VsYXJSZW5k ZXJKb2JzKi8pOwpAQCAtMjQ5MSw2ICsyNDgzLDE3IEBAIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0 ZTo6ZHJhd0FuZEJsZW5kTGF5ZXJzRm9yRGlyZWN0UmVuZGVyaW5nKGNvbnN0IFBsYXRmb3JtOjpJ CiB9CiAjZW5kaWYKIAorLy8gc3RhdGljCit2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OnNldEN1 cnJlbnRCYWNraW5nU3RvcmVPd25lcihXZWJQYWdlKiB3ZWJQYWdlKQoreworICAgIC8vIExldCB0 aGUgcHJldmlvdXNseSBhY3RpdmUgYmFja2luZ3N0b3JlIHJlbGVhc2UgaXRzIHRpbGUgYnVmZmVy cyBzbworICAgIC8vIHRoZSBuZXcgb25lIChlLmcuIGFub3RoZXIgdGFiKSBjYW4gdXNlIHRoZSBi dWZmZXJzIHRvIHJlbmRlciBjb250ZW50cy4KKyAgICBpZiAoQmFja2luZ1N0b3JlUHJpdmF0ZTo6 c19jdXJyZW50QmFja2luZ1N0b3JlT3duZXIgJiYgQmFja2luZ1N0b3JlUHJpdmF0ZTo6c19jdXJy ZW50QmFja2luZ1N0b3JlT3duZXIgIT0gd2ViUGFnZSkKKyAgICAgICAgQmFja2luZ1N0b3JlUHJp dmF0ZTo6c19jdXJyZW50QmFja2luZ1N0b3JlT3duZXItPmQtPm1fYmFja2luZ1N0b3JlLT5kLT5y ZXNldFRpbGVzKCk7CisKKyAgICBCYWNraW5nU3RvcmVQcml2YXRlOjpzX2N1cnJlbnRCYWNraW5n U3RvcmVPd25lciA9IHdlYlBhZ2U7Cit9CisKIGJvb2wgQmFja2luZ1N0b3JlUHJpdmF0ZTo6aXNB Y3RpdmUoKSBjb25zdAogewogICAgIHJldHVybiBCYWNraW5nU3RvcmVQcml2YXRlOjpzX2N1cnJl bnRCYWNraW5nU3RvcmVPd25lciA9PSBtX3dlYlBhZ2UgJiYgU3VyZmFjZVBvb2w6Omdsb2JhbFN1 cmZhY2VQb29sKCktPmlzQWN0aXZlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQXBpL0JhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9C YWNraW5nU3RvcmUuaAppbmRleCBhNWY5OWI3ZGI4NzNkY2FiOTg2MGMzNGU3YjIxNWI1NzMwMGU2 ZjYyLi5kZGE0NGVhODdjZDNiNWM3MjhiYjA0ZWUyNWZlNDc1OGJiNmIxOGM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmgKQEAgLTgyLDYgKzgyLDcgQEAg cHVibGljOgogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBCbGFja0JlcnJ5OjpXZWJLaXQ6 OkJhY2tpbmdTdG9yZUNsaWVudDsKKyAgICBmcmllbmQgY2xhc3MgQmxhY2tCZXJyeTo6V2ViS2l0 OjpCYWNraW5nU3RvcmVQcml2YXRlOwogICAgIGZyaWVuZCBjbGFzcyBCbGFja0JlcnJ5OjpXZWJL aXQ6OldlYlBhZ2U7CiAgICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZVByaXZhdGU7IC8vIEZJWE1FOiBGb3Igbm93LCB3ZSBleHBvc2Ugb3VyIGludGVybmFscyB0byBX ZWJQYWdlUHJpdmF0ZS4gU2VlIFBSICMxMjAzMDEuCiAgICAgZnJpZW5kIGNsYXNzIEJsYWNrQmVy cnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmVfcC5oCmluZGV4IDkxNTRhMjM0NDU5OTMxMzU0Y2Rl Mjg1MzI4ODEyMzZjZWM1Yjg5YTguLjgzNmYwZDkyNzczNTg4NWY5ZjZiZWJiOTFkYjhiMGQ1NDcy Yjg3OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0 b3JlX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZV9w LmgKQEAgLTMzMSw3ICszMzEsNyBAQCBwdWJsaWM6CiAgICAgQmFja2luZ1N0b3JlV2luZG93QnVm ZmVyU3RhdGUqIHdpbmRvd0Zyb250QnVmZmVyU3RhdGUoKSBjb25zdDsKICAgICBCYWNraW5nU3Rv cmVXaW5kb3dCdWZmZXJTdGF0ZSogd2luZG93QmFja0J1ZmZlclN0YXRlKCkgY29uc3Q7CiAKLSAg ICBzdGF0aWMgdm9pZCBzZXRDdXJyZW50QmFja2luZ1N0b3JlT3duZXIoV2ViUGFnZSogd2ViUGFn ZSkgeyBCYWNraW5nU3RvcmVQcml2YXRlOjpzX2N1cnJlbnRCYWNraW5nU3RvcmVPd25lciA9IHdl YlBhZ2U7IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRDdXJyZW50QmFja2luZ1N0b3JlT3duZXIoV2Vi UGFnZSopOwogICAgIHN0YXRpYyBXZWJQYWdlKiBjdXJyZW50QmFja2luZ1N0b3JlT3duZXIoKSB7 IHJldHVybiBCYWNraW5nU3RvcmVQcml2YXRlOjpzX2N1cnJlbnRCYWNraW5nU3RvcmVPd25lcjsg fQogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZS5jcHAKaW5kZXggYmM0YmJmMTNiMGJmYTQzNGNhMzVjYzc0ZDRlNzczMmNmYTc3 YjI2Yy4uNGEwNGYwNjJhNjkyYmMzMWY4MjViMDYzMDhlZjQ1NmQ1YTdjYTk4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCkBAIC0zNTEzLDEyICszNTEzLDYgQEAg dm9pZCBXZWJQYWdlUHJpdmF0ZTo6cmVzdW1lQmFja2luZ1N0b3JlKCkKICAgICBpZiAoIW1fYmFj a2luZ1N0b3JlLT5kLT5pc0FjdGl2ZSgpCiAgICAgICAgIHx8IHNob3VsZFJlc2V0VGlsZXNXaGVu U2hvd24oKQogICAgICAgICB8fCBkaXJlY3RSZW5kZXJpbmcpIHsKLSAgICAgICAgLy8gTGV0IHRo ZSBwcmV2aW91c2x5IGFjdGl2ZSBiYWNraW5nc3RvcmUgcmVsZWFzZSBpdHMgdGlsZSBidWZmZXJz IHNvCi0gICAgICAgIC8vIHRoZSBuZXcgV2ViUGFnZSBpbnN0YW5jZSAoZS5nLiBhbm90aGVyIHRh YikgY2FuIHJlbmRlciBpdHMgY29udGVudHMuCi0gICAgICAgIFdlYlBhZ2UqIGN1cnJlbnRPd25l ciA9IEJhY2tpbmdTdG9yZVByaXZhdGU6OmN1cnJlbnRCYWNraW5nU3RvcmVPd25lcigpOwotICAg ICAgICBpZiAoY3VycmVudE93bmVyICYmIGN1cnJlbnRPd25lciAhPSBtX3dlYlBhZ2UpCi0gICAg ICAgICAgICBCYWNraW5nU3RvcmVQcml2YXRlOjpjdXJyZW50QmFja2luZ1N0b3JlT3duZXIoKS0+ ZC0+bV9iYWNraW5nU3RvcmUtPmQtPnJlc2V0VGlsZXMoKTsKLQogICAgICAgICBCYWNraW5nU3Rv cmVQcml2YXRlOjpzZXRDdXJyZW50QmFja2luZ1N0b3JlT3duZXIobV93ZWJQYWdlKTsKIAogICAg ICAgICAvLyBJZiB3ZSdyZSBPcGVuR0wgY29tcG9zaXRpbmcsIHN3aXRjaGluZyB0byBhY2NlbCBj b21wIGRyYXdpbmcgb2YgdGhlIHJvb3QgbGF5ZXIK