105903 2013-01-01 16:39:59 -0800 Clean up the loadXXXStyle() idiom in StyleResolver. 2013-01-02 13:15:17 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Trivial --- 90834 1 mkwst mkwst allan.jensen cmarcelo kling macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 798498 0 mkwst 2013-01-01 16:39:59 -0800 See https://bugs.webkit.org/show_bug.cgi?id=90834#c11 for details. 798532 1 ap 2013-01-01 20:57:28 -0800 > See https://bugs.webkit.org/show_bug.cgi?id=90834#c11 for details. Can you post adequate information here? It's a simple copy/paste for you, but extra effort for multiple other people to do the research. 798560 2 mkwst 2013-01-02 01:14:15 -0800 (In reply to comment #1) > > See https://bugs.webkit.org/show_bug.cgi?id=90834#c11 for details. > > Can you post adequate information here? It's a simple copy/paste for you, but extra effort for multiple other people to do the research. Very fair. This was meant as a note to myself, but you're absolutely right; the bug tracker should be a source of truth. --- In https://bugs.webkit.org/show_bug.cgi?id=90834#c11, akling@ suggested: > Source/WebCore/css/StyleResolver.cpp:1361 > + if (!defaultSeamlessStyle) > + loadSeamlessStyle(); > + matchUARules(result, defaultSeamlessStyle); This pattern seems overly verbose, it would be nicer if we could just do: matchUARules(result, defaultSeamlessStyle()); (I see that we already have code like this elsewhere in StyleResolver.cpp, but I think we can do better.) > Source/WebCore/css/StyleResolver.cpp:5304 > + if (!defaultSeamlessStyle) > + loadSeamlessStyle(); > + m_features.add(defaultSeamlessStyle->features()); Again, would be nicer with just: m_features.add(defaultSeamlessStyle()->features()); 798581 3 181018 mkwst 2013-01-02 02:00:24 -0800 Created attachment 181018 Patch 798582 4 mkwst 2013-01-02 02:01:29 -0800 akling@: Hopefully this is more or less what you were looking for. What do you think? 798724 5 181018 darin 2013-01-02 10:36:46 -0800 Comment on attachment 181018 Patch Looks OK. Also not sure that adding “UA” to these function names improved anything. It just seems like mysterious additional acronym/jargon. Not sure that it even helps in the name matchUARules. 798803 6 mkwst 2013-01-02 12:29:19 -0800 (In reply to comment #5) > (From update of attachment 181018 [details]) > Looks OK. Thanks. I'm dropping the seamless bit from the patch, as that got rolled back and it looks like we'll be doing things entirely differently. The view source bit is still relevant, however, so I appreciate the review. > Also not sure that adding “UA” to these function names improved anything. It just seems like mysterious additional acronym/jargon. Not sure that it even helps in the name matchUARules. In context, I think you're right. I'll drop UA from this method name. I don't think I want to touch matchUARules, however. I'll leave that decision for someone who knows what they're doing. :) 798825 7 181050 mkwst 2013-01-02 12:57:25 -0800 Created attachment 181050 Patch for landing 798835 8 181050 webkit.review.bot 2013-01-02 13:15:13 -0800 Comment on attachment 181050 Patch for landing Clearing flags on attachment: 181050 Committed r138639: <http://trac.webkit.org/changeset/138639> 798836 9 webkit.review.bot 2013-01-02 13:15:17 -0800 All reviewed patches have been landed. Closing bug. 181018 2013-01-02 02:00:24 -0800 2013-01-02 12:57:20 -0800 Patch bug-105903-20130102105731.patch text/plain 5275 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGVlZDk2Y2JjNWNjYTI1 MDE4NDhiYjZhNTY1MTRkYzM5MjI0YzU1OC4uMWY2ZTU2ODhhNmVmNjNiY2ViODA3MTJjZjJiZTVk YjRkMmI1NTlhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEzLTAxLTAyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgQ2xlYW4gdXAgdGhlIGxvYWRY WFhTdHlsZSgpIGlkaW9tIGluIFN0eWxlUmVzb2x2ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU5MDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlZmFjdG9ycyAnbG9hZFNlYW1s ZXNzU3R5bGUnIGFuZCAnbG9hZFZpZXdTb3VyY2VTdHlsZScgaW4KKyAgICAgICAgb3JkZXIgdG8g YXZvaWQgdGhlIG5lY2Vzc2l0eSBvZiBlYWNoIGNhbGwgc2l0ZSBjaGVja2luZyB3aGV0aGVyIHRo ZQorICAgICAgICByZWxldmFudCBkYXRhIGhhcyBiZWVuIGxvYWRlZC4gVGhlIG5ldyAnc2VhbWxl c3NVQVN0eWxlJyBhbmQKKyAgICAgICAgJ3ZpZXdTb3VyY2VVQVN0eWxlJyB3aWxsIGxvYWQgdGhl IGRhdGEgaWYgcmVxdWlyZWQsIGFuZCByZXR1cm4gYQorICAgICAgICBwb2ludGVyIHdoaWNoIGNh biBiZSB1c2VkIGRpcmVjdGx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhpcyByZWZh Y3RvcmluZyBzaG91bGQgZXhoaWJpdCBubyB2aXNpYmxlIGNoYW5nZSBpbgorICAgICAgICBiZWhh dmlvci4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnZpZXdTb3VyY2VVQVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OnNlYW1sZXNzVUFTdHls ZSk6CisgICAgICAgICAgICBMYXppbHkgcG9wdWxhdGUgdGhlIHN0YXRpYyAnZGVmYXVsdFZpZXdT b3VyY2VTdHlsZScgYW5kCisgICAgICAgICAgICAnZGVmYXVsdFNlYW1sZXNzU3R5bGUnIHdpdGgg ZGF0YS4gSSBoYXZlbid0IHJlbW92ZWQgZWl0aGVyIG9mCisgICAgICAgICAgICB0aGVzZSBzdGF0 aWMgdmFyaWFibGVzLCBhcyB0aGV5J3JlIHVzZWQgZGlyZWN0bHkgaW4KKyAgICAgICAgICAgIFN0 eWxlUmVzb2x2ZXI6OnJlcG9ydE1lbW9yeVVzYWdlLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVS ZXNvbHZlcjo6bWF0Y2hVQVJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6 OmNvbGxlY3RGZWF0dXJlcyk6CisgICAgICAgICAgICBVc2UgdGhlIG5ldyBob3RuZXNzIHJhdGhl ciB0aGFuIHRoZSBvbGQsIGxhbWUgbWV0aG9kcy4KKworMjAxMy0wMS0wMiAgTWlrZSBXZXN0ICA8 bWt3c3RAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFRoZSAnYm9keScgb2Ygc2VhbWxlc3MgSUZy YW1lcyBzaG91bGQgZGVmYXVsdCB0byAnbWFyZ2luOiAwJwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4MzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVz b2x2ZXIuY3BwCmluZGV4IDIyYTRiNWMwYTkzZWNjODBkMDljY2YzZTY2YmUxNGZlOTAwMTBmYWIu LmQzZDdiMDU5YTIyNjQwMDI0MjQ1MGUxNmI3NTI4ZTI4YTFjZjQ4NDcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTUzOCwyMCArNTM4LDI0IEBAIHN0YXRpYyB2b2lkIGxv YWRTaW1wbGVEZWZhdWx0U3R5bGUoKQogICAgIC8vIE5vIG5lZWQgdG8gaW5pdGlhbGl6ZSBxdWly a3Mgc2hlZXQgeWV0IGFzIHRoZXJlIGFyZSBubyBxdWlyayBydWxlcyBmb3IgZWxlbWVudHMgYWxs b3dlZCBpbiBzaW1wbGUgZGVmYXVsdCBzdHlsZS4KIH0KIAotc3RhdGljIHZvaWQgbG9hZFZpZXdT b3VyY2VTdHlsZSgpCitzdGF0aWMgUnVsZVNldCogdmlld1NvdXJjZVVBU3R5bGUoKQogewotICAg IEFTU0VSVCghZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSk7Ci0gICAgZGVmYXVsdFZpZXdTb3VyY2VT dHlsZSA9IFJ1bGVTZXQ6OmNyZWF0ZSgpLmxlYWtQdHIoKTsKLSAgICBkZWZhdWx0Vmlld1NvdXJj ZVN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChwYXJzZVVBU2hlZXQoc291cmNlVXNlckFnZW50U3R5 bGVTaGVldCwgc2l6ZW9mKHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQpKSwgc2NyZWVuRXZhbCgp KTsKKyAgICBpZiAoIWRlZmF1bHRWaWV3U291cmNlU3R5bGUpIHsKKyAgICAgICAgZGVmYXVsdFZp ZXdTb3VyY2VTdHlsZSA9IFJ1bGVTZXQ6OmNyZWF0ZSgpLmxlYWtQdHIoKTsKKyAgICAgICAgZGVm YXVsdFZpZXdTb3VyY2VTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocGFyc2VVQVNoZWV0KHNvdXJj ZVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihzb3VyY2VVc2VyQWdlbnRTdHlsZVNoZWV0KSks IHNjcmVlbkV2YWwoKSk7CisgICAgfQorICAgIHJldHVybiBkZWZhdWx0Vmlld1NvdXJjZVN0eWxl OwogfQogCi1zdGF0aWMgdm9pZCBsb2FkU2VhbWxlc3NTdHlsZSgpCitzdGF0aWMgUnVsZVNldCog c2VhbWxlc3NVQVN0eWxlKCkKIHsKLSAgICBBU1NFUlQoIWRlZmF1bHRTZWFtbGVzc1N0eWxlKTsK ICNpZiBFTkFCTEUoSUZSQU1FX1NFQU1MRVNTKQotICAgIGRlZmF1bHRTZWFtbGVzc1N0eWxlID0g UnVsZVNldDo6Y3JlYXRlKCkubGVha1B0cigpOwotICAgIGRlZmF1bHRTZWFtbGVzc1N0eWxlLT5h ZGRSdWxlc0Zyb21TaGVldChwYXJzZVVBU2hlZXQoc2VhbWxlc3NVc2VyQWdlbnRTdHlsZVNoZWV0 LCBzaXplb2Yoc2VhbWxlc3NVc2VyQWdlbnRTdHlsZVNoZWV0KSksIHNjcmVlbkV2YWwoKSk7Cisg ICAgaWYgKCFkZWZhdWx0U2VhbWxlc3NTdHlsZSkgeworICAgICAgICBkZWZhdWx0U2VhbWxlc3NT dHlsZSA9IFJ1bGVTZXQ6OmNyZWF0ZSgpLmxlYWtQdHIoKTsKKyAgICAgICAgZGVmYXVsdFNlYW1s ZXNzU3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBhcnNlVUFTaGVldChzZWFtbGVzc1VzZXJBZ2Vu dFN0eWxlU2hlZXQsIHNpemVvZihzZWFtbGVzc1VzZXJBZ2VudFN0eWxlU2hlZXQpKSwgc2NyZWVu RXZhbCgpKTsKKyAgICB9CiAjZW5kaWYKKyAgICByZXR1cm4gZGVmYXVsdFNlYW1sZXNzU3R5bGU7 CiB9CiAKIHN0YXRpYyB2b2lkIGVuc3VyZURlZmF1bHRTdHlsZVNoZWV0c0ZvckVsZW1lbnQoRWxl bWVudCogZWxlbWVudCkKQEAgLTEzNDgsMTggKzEzNTIsMTIgQEAgdm9pZCBTdHlsZVJlc29sdmVy OjptYXRjaFVBUnVsZXMoTWF0Y2hSZXN1bHQmIHJlc3VsdCkKICAgICAgICAgbWF0Y2hVQVJ1bGVz KHJlc3VsdCwgZGVmYXVsdFF1aXJrc1N0eWxlKTsKIAogICAgIC8vIElmIGRvY3VtZW50IHVzZXMg dmlldyBzb3VyY2Ugc3R5bGVzIChpbiB2aWV3IHNvdXJjZSBtb2RlIG9yIGluIHhtbCB2aWV3ZXIg bW9kZSksIHRoZW4gd2UgbWF0Y2ggcnVsZXMgZnJvbSB0aGUgdmlldyBzb3VyY2Ugc3R5bGUgc2hl ZXQuCi0gICAgaWYgKGRvY3VtZW50KCktPmlzVmlld1NvdXJjZSgpKSB7Ci0gICAgICAgIGlmICgh ZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSkKLSAgICAgICAgICAgIGxvYWRWaWV3U291cmNlU3R5bGUo KTsKLSAgICAgICAgbWF0Y2hVQVJ1bGVzKHJlc3VsdCwgZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSk7 Ci0gICAgfQorICAgIGlmIChkb2N1bWVudCgpLT5pc1ZpZXdTb3VyY2UoKSkKKyAgICAgICAgbWF0 Y2hVQVJ1bGVzKHJlc3VsdCwgdmlld1NvdXJjZVVBU3R5bGUoKSk7CiAKICAgICAvLyBJZiB0aGUg ZG9jdW1lbnQgaXMgbG9hZGVkIGluc2lkZSBhIHNlYW1sZXNzIGlmcmFtZSwgdGhlbiB3ZSBtYXRj aCBydWxlcyBmcm9tIHRoZSBzZWFtbGVzcyBzaGVldC4KLSAgICBpZiAoZG9jdW1lbnQoKS0+c2hv dWxkRGlzcGxheVNlYW1sZXNzbHlXaXRoUGFyZW50KCkpIHsKLSAgICAgICAgaWYgKCFkZWZhdWx0 U2VhbWxlc3NTdHlsZSkKLSAgICAgICAgICAgIGxvYWRTZWFtbGVzc1N0eWxlKCk7Ci0gICAgICAg IG1hdGNoVUFSdWxlcyhyZXN1bHQsIGRlZmF1bHRTZWFtbGVzc1N0eWxlKTsKLSAgICB9CisgICAg aWYgKGRvY3VtZW50KCktPnNob3VsZERpc3BsYXlTZWFtbGVzc2x5V2l0aFBhcmVudCgpKQorICAg ICAgICBtYXRjaFVBUnVsZXMocmVzdWx0LCBzZWFtbGVzc1VBU3R5bGUoKSk7CiB9CiAKIHN0YXRp YyB2b2lkIHNldFN0eWxlc0ZvclBhZ2luYXRpb25Nb2RlKFBhZ2luYXRpb246Ok1vZGUgcGFnaW5h dGlvbk1vZGUsIFJlbmRlclN0eWxlKiBzdHlsZSkKQEAgLTUyOTMsMTYgKzUyOTEsMTAgQEAgdm9p ZCBTdHlsZVJlc29sdmVyOjpjb2xsZWN0RmVhdHVyZXMoKQogICAgIC8vIHNoYXJpbmcgY2FuZGlk YXRlcy4KICAgICBtX2ZlYXR1cmVzLmFkZChkZWZhdWx0U3R5bGUtPmZlYXR1cmVzKCkpOwogICAg IG1fZmVhdHVyZXMuYWRkKG1fYXV0aG9yU3R5bGUtPmZlYXR1cmVzKCkpOwotICAgIGlmIChkb2N1 bWVudCgpLT5pc1ZpZXdTb3VyY2UoKSkgewotICAgICAgICBpZiAoIWRlZmF1bHRWaWV3U291cmNl U3R5bGUpCi0gICAgICAgICAgICBsb2FkVmlld1NvdXJjZVN0eWxlKCk7Ci0gICAgICAgIG1fZmVh dHVyZXMuYWRkKGRlZmF1bHRWaWV3U291cmNlU3R5bGUtPmZlYXR1cmVzKCkpOwotICAgIH0KLSAg ICBpZiAoZG9jdW1lbnQoKS0+c2hvdWxkRGlzcGxheVNlYW1sZXNzbHlXaXRoUGFyZW50KCkpIHsK LSAgICAgICAgaWYgKCFkZWZhdWx0U2VhbWxlc3NTdHlsZSkKLSAgICAgICAgICAgIGxvYWRTZWFt bGVzc1N0eWxlKCk7Ci0gICAgICAgIG1fZmVhdHVyZXMuYWRkKGRlZmF1bHRTZWFtbGVzc1N0eWxl LT5mZWF0dXJlcygpKTsKLSAgICB9CisgICAgaWYgKGRvY3VtZW50KCktPmlzVmlld1NvdXJjZSgp KQorICAgICAgICBtX2ZlYXR1cmVzLmFkZCh2aWV3U291cmNlVUFTdHlsZSgpLT5mZWF0dXJlcygp KTsKKyAgICBpZiAoZG9jdW1lbnQoKS0+c2hvdWxkRGlzcGxheVNlYW1sZXNzbHlXaXRoUGFyZW50 KCkpCisgICAgICAgIG1fZmVhdHVyZXMuYWRkKHNlYW1sZXNzVUFTdHlsZSgpLT5mZWF0dXJlcygp KTsKIAogICAgIGlmIChtX3Njb3BlUmVzb2x2ZXIpCiAgICAgICAgIG1fc2NvcGVSZXNvbHZlci0+ Y29sbGVjdEZlYXR1cmVzVG8obV9mZWF0dXJlcyk7Cg== 181050 2013-01-02 12:57:25 -0800 2013-01-02 13:15:13 -0800 Patch for landing bug-105903-20130102215432.patch text/plain 3716 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFhZWZkMDcxNzlmMGJk MTFmNjhjNzk2YjkwOTYwMDk3YTg5NWRhZi4uYzkyYTJjNThkYjYyM2M1ZDdhYTVhYjliOTM0YTEw Mzk0ZDcwNDUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTAxLTAyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgdGhlIGxvYWRY WFhTdHlsZSgpIGlkaW9tIGluIFN0eWxlUmVzb2x2ZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU5MDMKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBUaGlzIHBhdGNoIHJlZmFjdG9ycyAnbG9hZFZpZXdTb3Vy Y2VTdHlsZScgaW4gb3JkZXIgdG8gYXZvaWQgdGhlCisgICAgICAgIG5lY2Vzc2l0eSBvZiBlYWNo IGNhbGwgc2l0ZSBjaGVja2luZyB3aGV0aGVyIHRoZSByZWxldmFudCBkYXRhIGhhcworICAgICAg ICBiZWVuIGxvYWRlZC4gVGhlIG5ldyAndmlld1NvdXJjZVN0eWxlJyB3aWxsIGxvYWQgdGhlIGRh dGEgaWYgcmVxdWlyZWQsCisgICAgICAgIGFuZCByZXR1cm4gYSBwb2ludGVyIHdoaWNoIGNhbiBi ZSB1c2VkIGRpcmVjdGx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYXMgdGhpcyByZWZhY3Rv cmluZyBzaG91bGQgZXhoaWJpdCBubyB2aXNpYmxlIGNoYW5nZSBpbgorICAgICAgICBiZWhhdmlv ci4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnZpZXdTb3VyY2VTdHlsZSk6CisgICAgICAgICAgICBMYXppbHkgcG9wdWxhdGUgdGhlIHN0YXRp YyAnZGVmYXVsdFZpZXdTb3VyY2VTdHlsZScgd2l0aCBkYXRhLiBJCisgICAgICAgICAgICBoYXZl bid0IHJlbW92ZWQgdGhlIG91dGVyIHZhcmlhYmxlLCBhcyBpdCdzIHVzZWQgZGlyZWN0bHkgaW4K KyAgICAgICAgICAgIFN0eWxlUmVzb2x2ZXI6OnJlcG9ydE1lbW9yeVVzYWdlLgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6bWF0Y2hVQVJ1bGVzKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlUmVzb2x2ZXI6OmNvbGxlY3RGZWF0dXJlcyk6CisgICAgICAgICAgICBVc2UgdGhlIG5l dyBob3RuZXNzIHJhdGhlciB0aGFuIHRoZSBvbGQsIGxhbWUgbWV0aG9kLgorCiAyMDEzLTAxLTAy ICBLb25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAogICAg ICAgICBbRUZMXSBbV2ViR0xdIE1pbm9yIGNsZWFudXAgaW4gUGxhdGZvcm1Db250ZXh0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGMwNjNkZTNlNGM4ZWRkNzU5OGE5MTFj YWQyNWI5ZjNjNGQxYWQ1YmQuLmI3ZjQxZTc1ZGZhODY0NzhkYTNhZDNjNWU4MTViOGFjNDQ1NzI1 ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTUzNywxMSArNTM3LDEz IEBAIHN0YXRpYyB2b2lkIGxvYWRTaW1wbGVEZWZhdWx0U3R5bGUoKQogICAgIC8vIE5vIG5lZWQg dG8gaW5pdGlhbGl6ZSBxdWlya3Mgc2hlZXQgeWV0IGFzIHRoZXJlIGFyZSBubyBxdWlyayBydWxl cyBmb3IgZWxlbWVudHMgYWxsb3dlZCBpbiBzaW1wbGUgZGVmYXVsdCBzdHlsZS4KIH0KIAotc3Rh dGljIHZvaWQgbG9hZFZpZXdTb3VyY2VTdHlsZSgpCitzdGF0aWMgUnVsZVNldCogdmlld1NvdXJj ZVN0eWxlKCkKIHsKLSAgICBBU1NFUlQoIWRlZmF1bHRWaWV3U291cmNlU3R5bGUpOwotICAgIGRl ZmF1bHRWaWV3U291cmNlU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKS5sZWFrUHRyKCk7Ci0gICAg ZGVmYXVsdFZpZXdTb3VyY2VTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocGFyc2VVQVNoZWV0KHNv dXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihzb3VyY2VVc2VyQWdlbnRTdHlsZVNoZWV0 KSksIHNjcmVlbkV2YWwoKSk7CisgICAgaWYgKCFkZWZhdWx0Vmlld1NvdXJjZVN0eWxlKSB7Cisg ICAgICAgIGRlZmF1bHRWaWV3U291cmNlU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKS5sZWFrUHRy KCk7CisgICAgICAgIGRlZmF1bHRWaWV3U291cmNlU3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBh cnNlVUFTaGVldChzb3VyY2VVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2Yoc291cmNlVXNlckFn ZW50U3R5bGVTaGVldCkpLCBzY3JlZW5FdmFsKCkpOworICAgIH0KKyAgICByZXR1cm4gZGVmYXVs dFZpZXdTb3VyY2VTdHlsZTsKIH0KIAogc3RhdGljIHZvaWQgZW5zdXJlRGVmYXVsdFN0eWxlU2hl ZXRzRm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50KQpAQCAtMTMzOCwxMSArMTM0MCw4IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6bWF0Y2hVQVJ1bGVzKE1hdGNoUmVzdWx0JiByZXN1bHQpCiAgICAg ICAgIG1hdGNoVUFSdWxlcyhyZXN1bHQsIGRlZmF1bHRRdWlya3NTdHlsZSk7CiAKICAgICAvLyBJ ZiBkb2N1bWVudCB1c2VzIHZpZXcgc291cmNlIHN0eWxlcyAoaW4gdmlldyBzb3VyY2UgbW9kZSBv ciBpbiB4bWwgdmlld2VyIG1vZGUpLCB0aGVuIHdlIG1hdGNoIHJ1bGVzIGZyb20gdGhlIHZpZXcg c291cmNlIHN0eWxlIHNoZWV0LgotICAgIGlmIChkb2N1bWVudCgpLT5pc1ZpZXdTb3VyY2UoKSkg ewotICAgICAgICBpZiAoIWRlZmF1bHRWaWV3U291cmNlU3R5bGUpCi0gICAgICAgICAgICBsb2Fk Vmlld1NvdXJjZVN0eWxlKCk7Ci0gICAgICAgIG1hdGNoVUFSdWxlcyhyZXN1bHQsIGRlZmF1bHRW aWV3U291cmNlU3R5bGUpOwotICAgIH0KKyAgICBpZiAoZG9jdW1lbnQoKS0+aXNWaWV3U291cmNl KCkpCisgICAgICAgIG1hdGNoVUFSdWxlcyhyZXN1bHQsIHZpZXdTb3VyY2VTdHlsZSgpKTsKIH0K IAogc3RhdGljIHZvaWQgc2V0U3R5bGVzRm9yUGFnaW5hdGlvbk1vZGUoUGFnaW5hdGlvbjo6TW9k ZSBwYWdpbmF0aW9uTW9kZSwgUmVuZGVyU3R5bGUqIHN0eWxlKQpAQCAtNTI3NiwxMSArNTI3NSw4 IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6Y29sbGVjdEZlYXR1cmVzKCkKICAgICAvLyBzaGFyaW5n IGNhbmRpZGF0ZXMuCiAgICAgbV9mZWF0dXJlcy5hZGQoZGVmYXVsdFN0eWxlLT5mZWF0dXJlcygp KTsKICAgICBtX2ZlYXR1cmVzLmFkZChtX2F1dGhvclN0eWxlLT5mZWF0dXJlcygpKTsKLSAgICBp ZiAoZG9jdW1lbnQoKS0+aXNWaWV3U291cmNlKCkpIHsKLSAgICAgICAgaWYgKCFkZWZhdWx0Vmll d1NvdXJjZVN0eWxlKQotICAgICAgICAgICAgbG9hZFZpZXdTb3VyY2VTdHlsZSgpOwotICAgICAg ICBtX2ZlYXR1cmVzLmFkZChkZWZhdWx0Vmlld1NvdXJjZVN0eWxlLT5mZWF0dXJlcygpKTsKLSAg ICB9CisgICAgaWYgKGRvY3VtZW50KCktPmlzVmlld1NvdXJjZSgpKQorICAgICAgICBtX2ZlYXR1 cmVzLmFkZCh2aWV3U291cmNlU3R5bGUoKS0+ZmVhdHVyZXMoKSk7CiAKICAgICBpZiAobV9zY29w ZVJlc29sdmVyKQogICAgICAgICBtX3Njb3BlUmVzb2x2ZXItPmNvbGxlY3RGZWF0dXJlc1RvKG1f ZmVhdHVyZXMpOwo=