99348 2012-10-15 12:13:41 -0700 Add computeLogicalHeight override methods to RenderView and RenderMultiColumnSet 2012-10-15 19:26:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96804 1 tony tony donggwan.kim ojan oldest_to_newest 742260 0 tony 2012-10-15 12:13:41 -0700 Add computeLogicalHeight override methods to RenderView and RenderMultiColumnSet 742261 1 168752 tony 2012-10-15 12:17:55 -0700 Created attachment 168752 Patch 742263 2 tony 2012-10-15 12:19:45 -0700 Last one. After this, I should be able to clean up a bunch of code that saves the oldHeight, calls updateLogicalHeight, then restores the oldHeight. 742272 3 168752 ojan 2012-10-15 12:24:34 -0700 Comment on attachment 168752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168752&action=review > Source/WebCore/rendering/RenderMultiColumnSet.cpp:69 > void RenderMultiColumnSet::updateLogicalHeight() > { > // Make sure our column height is up to date. FIXME maybe? To point out that this is the last method to be removed in order to make updateLogicalHeight non-virtual? 742348 4 168768 tony 2012-10-15 13:15:32 -0700 Created attachment 168768 Patch for landing 742384 5 tony 2012-10-15 13:54:45 -0700 Committed r131351: <http://trac.webkit.org/changeset/131351> 168752 2012-10-15 12:17:55 -0700 2012-10-15 13:15:30 -0700 Patch bug-99348-20121015121646.patch text/plain 5298 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZlZDYyM2ZjYmI3NmI2 ZjQ2ZTI2YjNjZDQ4YmIxODc1NjM1MDM1Mi4uMmM1YTIxYWIzODM2YmMyNzY3OGZkMGJiYmY5NWU3 NzQ0YTFkYjhiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTE1ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIGNvbXB1dGVMb2dpY2Fs SGVpZ2h0IG92ZXJyaWRlIG1ldGhvZHMgdG8gUmVuZGVyVmlldyBhbmQgUmVuZGVyTXVsdGlDb2x1 bW5TZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5 MzQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGNvbXB1dGVMb2dpY2FsSGVpZ2h0IHRvIHRoZSBsYXN0IDIgUmVuZGVyQm94ZXMgdGhhdCBvdmVy cmlkZSB0aGUgbWV0aG9kLgorICAgICAgICBJJ20gdW5hYmxlIHRvIHJlbW92ZSBSZW5kZXJNdWx0 aUNvbHVtblNldDo6dXBkYXRlTG9naWNhbEhlaWdodCBhbmQgbWFrZSB0aGUgbWV0aG9kCisgICAg ICAgIG5vbi12aXJ0dWFsIHNpbmNlIGl0IHNldHMgQ29tcHV0ZWRDb2x1bW5IZWlnaHQuICBJJ2Qg bGlrZSB0byByZW1vdmUgdGhpcworICAgICAgICBldmVudHVhbGx5LgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgdGhpcyBpcyBqdXN0IGEgY29kZSByZWZhY3Rvci4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN dWx0aUNvbHVtblNldDo6dXBkYXRlTG9naWNhbEhlaWdodCk6IFNldCBjb21wdXRlZENvbHVtbkhl aWdodC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb21wdXRlTG9n aWNhbEhlaWdodCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTXVsdGlDb2x1bW5TZXQuaDoKKyAgICAgICAgKFJlbmRlck11bHRpQ29sdW1uU2V0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJWaWV3Ojpjb21wdXRlTG9naWNhbEhlaWdodCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clZpZXcuaDoKKwogMjAxMi0xMC0xNSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTY3JpcHRzIGZvciBkeW5hbWljYWxseSBh ZGRlZCBzY3JpcHQgZWxlbWVudHMgYXJlIG5vdCBzaG93biBpbiBzb3VyY2VzIHBhbmVsLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAKaW5k ZXggODNkMWRlYTUwZTc2NjIzN2UzYWEzMTUzNzAzYWRiNjY1ZGFjZmVhMC4uYzgyMzYwYzk1YTVh MjhkNDI1YjUwYjI1YTExNTYwZGQ2MDQ4N2IxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCkBAIC02NywxMyArNjcsMjAgQEAgdm9p ZCBSZW5kZXJNdWx0aUNvbHVtblNldDo6dXBkYXRlTG9naWNhbFdpZHRoKCkKIHZvaWQgUmVuZGVy TXVsdGlDb2x1bW5TZXQ6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQogewogICAgIC8vIE1ha2Ugc3Vy ZSBvdXIgY29sdW1uIGhlaWdodCBpcyB1cCB0byBkYXRlLgotICAgIFJlbmRlck11bHRpQ29sdW1u QmxvY2sqIHBhcmVudEJsb2NrID0gdG9SZW5kZXJNdWx0aUNvbHVtbkJsb2NrKHBhcmVudCgpKTsK LSAgICBzZXRDb21wdXRlZENvbHVtbkhlaWdodChwYXJlbnRCbG9jay0+Y29sdW1uSGVpZ2h0KCkp OyAvLyBGSVhNRTogT25jZSB3ZSBtYWtlIG1vcmUgdGhhbiBvbmUgY29sdW1uIHNldCwgdGhpcyB3 aWxsIGJlY29tZSB2YXJpYWJsZS4KKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29t cHV0ZWRWYWx1ZXM7CisgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoMCwgMCwgY29tcHV0ZWRWYWx1 ZXMpOworICAgIHNldENvbXB1dGVkQ29sdW1uSGVpZ2h0KGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 KTsgLy8gRklYTUU6IE9uY2Ugd2UgbWFrZSBtb3JlIHRoYW4gb25lIGNvbHVtbiBzZXQsIHRoaXMg d2lsbCBiZWNvbWUgdmFyaWFibGUuCiAgICAgCiAgICAgLy8gT3VyIGxvZ2ljYWwgaGVpZ2h0IGlz IGFsd2F5cyBqdXN0IHRoZSBoZWlnaHQgb2Ygb3VyIGNvbHVtbnMuCiAgICAgc2V0TG9naWNhbEhl aWdodChjb21wdXRlZENvbHVtbkhlaWdodCgpKTsKIH0KIAordm9pZCBSZW5kZXJNdWx0aUNvbHVt blNldDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5pdCwgTGF5b3V0VW5pdCwgTG9naWNh bEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKK3sKKyAgICBSZW5k ZXJNdWx0aUNvbHVtbkJsb2NrKiBwYXJlbnRCbG9jayA9IHRvUmVuZGVyTXVsdGlDb2x1bW5CbG9j ayhwYXJlbnQoKSk7CisgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBwYXJlbnRCbG9jay0+ Y29sdW1uSGVpZ2h0KCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNv bHVtbkdhcCgpIGNvbnN0CiB7CiAgICAgaWYgKHN0eWxlKCktPmhhc05vcm1hbENvbHVtbkdhcCgp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1u U2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaApp bmRleCBmOGZhMzc3OTVhZDEzOGVkMjZiMTYyZWIzZGFjMGZlMmIwZmI5ZjkxLi5kOTU3OGVhODVj YmRhZGE2YTE4NTk4MTRmZDc3ZTlmZGYyYmIyNDJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaApAQCAtNjQsNiArNjQsNyBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2FsV2lkdGgoKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNhbEhlaWdodCgpIE9WRVJSSURFOworICAg IHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJikg Y29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRSZXBsYWNlZChQYWludElu Zm8mLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpIE9WRVJSSURFOwogICAgIHZpcnR1 YWwgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQm LCBjb25zdCBIaXRUZXN0TG9jYXRpb24mLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRP ZmZzZXQsIEhpdFRlc3RBY3Rpb24pIE9WRVJSSURFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclZpZXcuY3BwCmluZGV4IDI3YmMxNGFiZGE2ZDNkOWZiMDYzYWZmNzM4N2I1MzUzZjlkMWFl MmMuLmFmNWVkOTFjZDg1Mjg5MGU1ZTA5MmYzMGQ0NjczNzFjZjcxODQ3YWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTEwMCwxMCArMTAwLDkgQEAgYm9vbCBS ZW5kZXJWaWV3OjpoaXRUZXN0KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBI aXRUZXN0TG9jYXRpb24mIGwKICAgICByZXR1cm4gaW5zaWRlOwogfQogCi12b2lkIFJlbmRlclZp ZXc6OnVwZGF0ZUxvZ2ljYWxIZWlnaHQoKQordm9pZCBSZW5kZXJWaWV3Ojpjb21wdXRlTG9naWNh bEhlaWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQsIExvZ2ljYWxFeHRl bnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNvbnN0CiB7Ci0gICAgaWYgKCFzaG91 bGRVc2VQcmludGluZ0xheW91dCgpICYmIG1fZnJhbWVWaWV3KQotICAgICAgICBzZXRMb2dpY2Fs SGVpZ2h0KHZpZXdMb2dpY2FsSGVpZ2h0KCkpOworICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 ID0gKCFzaG91bGRVc2VQcmludGluZ0xheW91dCgpICYmIG1fZnJhbWVWaWV3KSA/IExheW91dFVu aXQodmlld0xvZ2ljYWxIZWlnaHQoKSkgOiBsb2dpY2FsSGVpZ2h0OwogfQogCiB2b2lkIFJlbmRl clZpZXc6OnVwZGF0ZUxvZ2ljYWxXaWR0aCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaAppbmRleCA1YWYxN2ExMTYyNDQ1MDBhNDBmNzJmNmUwMWFiN2Y4MTMxYmI2MTNmLi4xNjcx ZjFkOTBhODllYWZiNjY3Zjk2YTgwNjU1OTAwNTVkYWQ4ODE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmgKQEAgLTYwLDcgKzYwLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVh bCB2b2lkIGxheW91dCgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2Fs V2lkdGgoKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNhbEhlaWdodCgp IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzJikgY29uc3QgT1ZFUlJJREU7CiAgICAgLy8gRklYTUU6IFRoaXMgb3ZlcnJp ZGUgaXMgbm90IG5lZWRlZCBhbmQgc2hvdWxkIGJlIHJlbW92ZWQKICAgICAvLyBpdCBvbmx5IGV4 aXN0cyB0byBtYWtlIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIHB1YmxpYy4KICAgICB2 aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKSBPVkVSUklERTsK 168768 2012-10-15 13:15:32 -0700 2012-10-15 13:15:32 -0700 Patch for landing bug-99348-20121015131422.patch text/plain 5534 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZlZDYyM2ZjYmI3NmI2 ZjQ2ZTI2YjNjZDQ4YmIxODc1NjM1MDM1Mi4uNzgxNThjZjI5MWRiMjlkZjM2MTk2YjNiMzJmOWNj NTk2NWM5NjQwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTE1ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIGNvbXB1dGVMb2dpY2Fs SGVpZ2h0IG92ZXJyaWRlIG1ldGhvZHMgdG8gUmVuZGVyVmlldyBhbmQgUmVuZGVyTXVsdGlDb2x1 bW5TZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5 MzQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KKworICAgICAgICBBZGQgY29t cHV0ZUxvZ2ljYWxIZWlnaHQgdG8gdGhlIGxhc3QgMiBSZW5kZXJCb3hlcyB0aGF0IG92ZXJyaWRl IHRoZSBtZXRob2QuCisgICAgICAgIEknbSB1bmFibGUgdG8gcmVtb3ZlIFJlbmRlck11bHRpQ29s dW1uU2V0Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0IGFuZCBtYWtlIHRoZSBtZXRob2QKKyAgICAgICAg bm9uLXZpcnR1YWwgc2luY2UgaXQgc2V0cyBDb21wdXRlZENvbHVtbkhlaWdodC4gIEknZCBsaWtl IHRvIHJlbW92ZSB0aGlzCisgICAgICAgIGV2ZW50dWFsbHkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGp1c3QgYSBjb2RlIHJlZmFjdG9yLgorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRp Q29sdW1uU2V0Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KTogU2V0IGNvbXB1dGVkQ29sdW1uSGVpZ2h0 LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJN dWx0aUNvbHVtblNldC5oOgorICAgICAgICAoUmVuZGVyTXVsdGlDb2x1bW5TZXQpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclZp ZXc6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmll dy5oOgorCiAyMDEyLTEwLTE1ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNjcmlwdHMgZm9yIGR5bmFtaWNhbGx5IGFkZGVk IHNjcmlwdCBlbGVtZW50cyBhcmUgbm90IHNob3duIGluIHNvdXJjZXMgcGFuZWwuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcAppbmRleCA4 M2QxZGVhNTBlNzY2MjM3ZTNhYTMxNTM3MDNhZGI2NjVkYWNmZWEwLi42NDEyNTA2Y2Y1MjA4NDgz ZTc2MzcyZGQyYjRmM2FkNTUzMjUxNmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAKQEAgLTY2LDE0ICs2NiwyMyBAQCB2b2lkIFJl bmRlck11bHRpQ29sdW1uU2V0Ojp1cGRhdGVMb2dpY2FsV2lkdGgoKQogCiB2b2lkIFJlbmRlck11 bHRpQ29sdW1uU2V0Ojp1cGRhdGVMb2dpY2FsSGVpZ2h0KCkKIHsKKyAgICAvLyBGSVhNRTogVGhp cyBpcyB0aGUgb25seSBjbGFzcyB0aGF0IG92ZXJyaWRlcyB1cGRhdGVMb2dpY2FsSGVpZ2h0LiBJ ZiB3ZSBkaWRuJ3QgaGF2ZSB0byBzZXQgY29tcHV0ZWRDb2x1bW5IZWlnaHQsCisgICAgLy8gd2Ug Y291bGQgcmVtb3ZlIHRoaXMgYW5kIG1ha2UgdXBkYXRlTG9naWNhbEhlaWdodCBub24tdmlydHVh bC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODA0CiAgICAgLy8g TWFrZSBzdXJlIG91ciBjb2x1bW4gaGVpZ2h0IGlzIHVwIHRvIGRhdGUuCi0gICAgUmVuZGVyTXVs dGlDb2x1bW5CbG9jayogcGFyZW50QmxvY2sgPSB0b1JlbmRlck11bHRpQ29sdW1uQmxvY2socGFy ZW50KCkpOwotICAgIHNldENvbXB1dGVkQ29sdW1uSGVpZ2h0KHBhcmVudEJsb2NrLT5jb2x1bW5I ZWlnaHQoKSk7IC8vIEZJWE1FOiBPbmNlIHdlIG1ha2UgbW9yZSB0aGFuIG9uZSBjb2x1bW4gc2V0 LCB0aGlzIHdpbGwgYmVjb21lIHZhcmlhYmxlLgorICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZh bHVlcyBjb21wdXRlZFZhbHVlczsKKyAgICBjb21wdXRlTG9naWNhbEhlaWdodCgwLCAwLCBjb21w dXRlZFZhbHVlcyk7CisgICAgc2V0Q29tcHV0ZWRDb2x1bW5IZWlnaHQoY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQpOyAvLyBGSVhNRTogT25jZSB3ZSBtYWtlIG1vcmUgdGhhbiBvbmUgY29sdW1uIHNl dCwgdGhpcyB3aWxsIGJlY29tZSB2YXJpYWJsZS4KICAgICAKICAgICAvLyBPdXIgbG9naWNhbCBo ZWlnaHQgaXMgYWx3YXlzIGp1c3QgdGhlIGhlaWdodCBvZiBvdXIgY29sdW1ucy4KICAgICBzZXRM b2dpY2FsSGVpZ2h0KGNvbXB1dGVkQ29sdW1uSGVpZ2h0KCkpOwogfQogCit2b2lkIFJlbmRlck11 bHRpQ29sdW1uU2V0Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbml0LCBMYXlvdXRVbml0 LCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAorewor ICAgIFJlbmRlck11bHRpQ29sdW1uQmxvY2sqIHBhcmVudEJsb2NrID0gdG9SZW5kZXJNdWx0aUNv bHVtbkJsb2NrKHBhcmVudCgpKTsKKyAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IHBhcmVu dEJsb2NrLT5jb2x1bW5IZWlnaHQoKTsKK30KKwogTGF5b3V0VW5pdCBSZW5kZXJNdWx0aUNvbHVt blNldDo6Y29sdW1uR2FwKCkgY29uc3QKIHsKICAgICBpZiAoc3R5bGUoKS0+aGFzTm9ybWFsQ29s dW1uR2FwKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVs dGlDb2x1bW5TZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVt blNldC5oCmluZGV4IGY4ZmEzNzc5NWFkMTM4ZWQyNmIxNjJlYjNkYWMwZmUyYjBmYjlmOTEuLmQ5 NTc4ZWE4NWNiZGFkYTZhMTg1OTgxNGZkNzdlOWZkZjJiYjI0MmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCkBAIC02NCw2ICs2NCw3IEBA IHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxvZ2ljYWxXaWR0aCgp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2FsSGVpZ2h0KCkgT1ZFUlJJ REU7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9n aWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRW YWx1ZXMmKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgdm9pZCBwYWludFJlcGxhY2Vk KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCBib29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVz dFJlc3VsdCYsIGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYsIGNvbnN0IExheW91dFBvaW50JiBhY2N1 bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFjdGlvbikgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggMjdiYzE0YWJkYTZkM2Q5ZmIwNjNhZmY3Mzg3YjUz NTNmOWQxYWUyYy4uYWY1ZWQ5MWNkODUyODkwZTVlMDkyZjMwZDQ2NzM3MWNmNzE4NDdhYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtMTAwLDEwICsxMDAsOSBA QCBib29sIFJlbmRlclZpZXc6OmhpdFRlc3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IEhpdFRlc3RMb2NhdGlvbiYgbAogICAgIHJldHVybiBpbnNpZGU7CiB9CiAKLXZvaWQg UmVuZGVyVmlldzo6dXBkYXRlTG9naWNhbEhlaWdodCgpCit2b2lkIFJlbmRlclZpZXc6OmNvbXB1 dGVMb2dpY2FsSGVpZ2h0KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCwgTG9n aWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKLSAgICBp ZiAoIXNob3VsZFVzZVByaW50aW5nTGF5b3V0KCkgJiYgbV9mcmFtZVZpZXcpCi0gICAgICAgIHNl dExvZ2ljYWxIZWlnaHQodmlld0xvZ2ljYWxIZWlnaHQoKSk7CisgICAgY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQgPSAoIXNob3VsZFVzZVByaW50aW5nTGF5b3V0KCkgJiYgbV9mcmFtZVZpZXcpID8g TGF5b3V0VW5pdCh2aWV3TG9naWNhbEhlaWdodCgpKSA6IGxvZ2ljYWxIZWlnaHQ7CiB9CiAKIHZv aWQgUmVuZGVyVmlldzo6dXBkYXRlTG9naWNhbFdpZHRoKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlldy5oCmluZGV4IDVhZjE3YTExNjI0NDUwMGE0MGY3MmY2ZTAxYWI3ZjgxMzFiYjYx M2YuLjE2NzFmMWQ5MGE4OWVhZmI2NjdmOTZhODA2NTU5MDA1NWRhZDg4MTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaApAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0 ZUxvZ2ljYWxXaWR0aCgpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMb2dpY2Fs SGVpZ2h0KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dpY2FsSGVpZ2h0 KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMb2dpY2Fs RXh0ZW50Q29tcHV0ZWRWYWx1ZXMmKSBjb25zdCBPVkVSUklERTsKICAgICAvLyBGSVhNRTogVGhp cyBvdmVycmlkZSBpcyBub3QgbmVlZGVkIGFuZCBzaG91bGQgYmUgcmVtb3ZlZAogICAgIC8vIGl0 IG9ubHkgZXhpc3RzIHRvIG1ha2UgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMgcHVibGlj LgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpIE9WRVJS SURFOwo=