53466 2011-01-31 18:22:08 -0800 Move WebKit2 to printing via API methods 2011-01-31 22:51:00 -0800 1 1 1 Unclassified WebKit Printing 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED P2 Normal --- 1 ap ap andersca sam sullivan oldest_to_newest 342953 0 ap 2011-01-31 18:22:08 -0800 We don't really need to use private methods. Patch forthcoming. 342959 1 80706 ap 2011-01-31 18:41:05 -0800 Created attachment 80706 proposed patch 342960 2 ap 2011-01-31 18:41:55 -0800 Sorry that this includes some unrelated fixes which I had to make to meaningfully debug this. These are small and hopefully won't make reviewing much harder. 342965 3 80706 mjs 2011-01-31 19:06:56 -0800 Comment on attachment 80706 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=80706&action=review r=me but see comments > Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm:114 > + return [[[[_printOperation printInfo] dictionary] objectForKey:NSPrintFirstPage] unsignedIntegerValue]; Perhaps it's worth it to encapsulate this dictionary lookup and its comment in a method, so that the similar calls below could reuse it. > Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm:123 > + // Need to directly access the dictionary because -[NSPrintOperation pageRange] verifies pagination, potentially causing recursion. > + NSUInteger firstPage = [[[[_printOperation printInfo] dictionary] objectForKey:NSPrintFirstPage] unsignedIntegerValue]; > + NSUInteger lastPage = [[[[_printOperation printInfo] dictionary] objectForKey:NSPrintLastPage] unsignedIntegerValue]; Aforementioned similar calls. > Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm:166 > + if (data) { Is it possible to change this if block to an early return with the reverse condition? 343025 4 ap 2011-01-31 21:55:26 -0800 > Is it possible to change this if block to an early return with the reverse condition? It's not, but only because the block encompassed too much code. Fixed now. Committed <http://trac.webkit.org/changeset/77220>. 80706 2011-01-31 18:41:05 -0800 2011-01-31 22:51:00 -0800 proposed patch UseAPI.txt text/plain 12530 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3MTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDEtMzEgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUzNDY2CisgICAgICAgIE1vdmUgV2ViS2l0MiB0byBwcmludGluZyB2aWEgQVBJIG1ldGhv ZHMKKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBFeHBvcnQgSW50UmVjdDo6c2NhbGUoKS4K KwogMjAxMS0wMS0zMSAgS3JpdGhpZ2Fzc3JlZSBTYW1iYW11cnRoeSAgPGtyaXRoaWdhc3NyZWUu c2FtYmFtdXJ0aHlAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0 LgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDc2ODIxKQorKysgU291cmNlL1dl YkNvcmUvV2ViQ29yZS5leHAuaW4JKHdvcmtpbmcgY29weSkKQEAgLTc1MSw2ICs3NTEsNyBAQCBf X1pON1dlYkNvcmU2V2lkZ2V0RDJFdgogX19aTjdXZWJDb3JlNnRvTm9kZUVOM0pTQzdKU1ZhbHVl RQogX19aTjdXZWJDb3JlN0NvbnNvbGUyMXNob3VsZFByaW50RXhjZXB0aW9uc0V2CiBfX1pON1dl YkNvcmU3Q29uc29sZTI0c2V0U2hvdWxkUHJpbnRFeGNlcHRpb25zRWIKK19fWk43V2ViQ29yZTdJ bnRSZWN0NXNjYWxlRWYKIF9fWk43V2ViQ29yZTdJbnRSZWN0NXVuaXRlRVJLUzBfCiBfX1pON1dl YkNvcmU3SW50UmVjdDlpbnRlcnNlY3RFUktTMF8KIF9fWk43V2ViQ29yZTdJbnRSZWN0QzFFUktO U185RmxvYXRSZWN0RQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gNzcxOTEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwzNCBAQAorMjAxMS0w MS0zMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTM0NjYKKyAgICAgICAgTW92ZSBXZWJLaXQyIHRvIHByaW50aW5n IHZpYSBBUEkgbWV0aG9kcworCisgICAgICAgIEFsc28gZml4ZXMgPHJkYXI6Ly9wcm9ibGVtLzg5 MzM3MjQ+IFJFR1JFU1NJT046IFdyb25nIHBhZ2VzIGFyZSBwcmludGVkIHdoZW4gbm90IHByaW50 aW5nIGZyb20gcGFnZSAxCisKKyAgICAgICAgQWxzbyBmaXhlcyBob3Jpem9udGFsIHRpbGluZyAo bm8gYnVnIGZpbGVkKS4KKworICAgICAgICBUaGUgbWFpbiBpZGVhIGhlcmUgaXMgdGhhdCB3ZSBk b24ndCBmb3JjZSBBcHBLaXQgdG8gdXNlIGEgZGlmZmVyZW50IHNjYWxpbmcgZmFjdG9yIHdoZW4K KyAgICAgICAgYSBXZWIgdmlldyBjYW4ndCBiZSByZXNpemVkIHRvIGV4YWN0IHBhZ2Ugc2l6ZSwg YW5kIHNjYWxlIHdoZW4gZHJhd2luZyBpbnN0ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9tYWMvV0tQcmludGluZ1ZpZXcubW06CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9maXJz dFByaW50ZWRQYWdlTnVtYmVyXSk6IEZhY3RvcmVkIG91dCBpbnRvIGEgc2VwYXJhdGUgbWV0aG9k LgorICAgICAgICAoLVtXS1ByaW50aW5nVmlldyBfbGFzdFByaW50ZWRQYWdlTnVtYmVyXSk6IERp dHRvLgorICAgICAgICAocGFnZURpZERyYXdUb1BERik6IEF2b2lkIGNyYXNoaW5nIGlmIGRhdGEg aXMgbnVsbC4KKyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcgX3ByZXBhcmVQREZEYXRhRm9yUHJp bnRpbmdPblNlY29uZGFyeVRocmVhZF0pOiBVc2UgLV9maXJzdFByaW50ZWRQYWdlTnVtYmVyCisg ICAgICAgIGFuZCAtX2xhc3RQcmludGVkUGFnZU51bWJlci4KKyAgICAgICAgKHBhZ2VEaWRDb21w dXRlUGFnZVJlY3RzKTogU2V0IGZyYW1lIHNpemUgdG8gd2hhdCBpdCB3b3VsZCBoYXZlIGJlZW4g Zm9yIGEgbm9ybWFsIE5TVmlldworICAgICAgICB0aGF0J3MgYmVlbiBhc2tlZCB0byByZXNpemUu CisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9wYWdlRm9yUmVjdDpdKTogQ2hlY2sgeCgpLCBi ZWNhdXNlIHNldmVyYWwgcGFnZXMgY2FuIGJlIGF0IHRoZSBzYW1lIHkoKQorICAgICAgICB3aGVu IHRpbGluZyBob3Jpem9udGFsbHkuCisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9kcmF3UERG RG9jdW1lbnQ6cGFnZTphdFBvaW50Ol0pOiBQb2ludCB0byBkcmF3IGF0IGFuZCBmcmFtZSBzaXpl IGFyZQorICAgICAgICBub3cgdXNpbmcgZGlmZmVyZW50IHVuaXRzLCB0cmFuc2xhdGUgYXMgYXBw cm9wcmlhdGUuCisgICAgICAgICgtW1dLUHJpbnRpbmdWaWV3IF9kcmF3UHJldmlldzpdKTogU2Nh bGUgdGhlIHJlY3QgdG8gV2ViQ29yZSB1bml0cy4KKyAgICAgICAgKC1bV0tQcmludGluZ1ZpZXcg ZHJhd1JlY3Q6XSk6IENvcnJlY3RseSBjYWxjdWxhdGUgcGFnZSBudW1iZXIgd2hlbiB0aGUgZmly c3QgcGFnZSB0byBwcmludAorICAgICAgICBpc24ndCBwYWdlIDEuCisgICAgICAgICgtW1dLUHJp bnRpbmdWaWV3IHJlY3RGb3JQYWdlOl0pOiBTY2FsZSB0aGUgcmVjdCB0byBBcHBLaXQgdW5pdHMu CisKIDIwMTEtMDEtMzEgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tQcmludGluZ1ZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tQcmludGluZ1ZpZXcubW0JKHJldmlzaW9uIDc3MTkxKQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tQcmludGluZ1ZpZXcubW0JKHdv cmtpbmcgY29weSkKQEAgLTMxLDEwICszMSw2IEBACiAjaW1wb3J0ICJXZWJEYXRhLmgiCiAjaW1w b3J0ICJXZWJQYWdlUHJveHkuaCIKIAotQGludGVyZmFjZSBOU1ZpZXcgKFdlYk5TVmlld0RldGFp bHMpCi0tICh2b2lkKV9yZWN1cnNpdmVEaXNwbGF5UmVjdElmTmVlZGVkSWdub3JpbmdPcGFjaXR5 OihOU1JlY3QpcmVjdCBpc1Zpc2libGVSZWN0OihCT09MKWlzVmlzaWJsZVJlY3QgcmVjdElzVmlz aWJsZVJlY3RGb3JWaWV3OihOU1ZpZXcgKil2aXNpYmxlVmlldyB0b3BWaWV3OihCT09MKXRvcFZp ZXc7Ci1AZW5kCi0KIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2UgV2Vi Q29yZTsKIApAQCAtMTEyLDYgKzEwOCwyNCBAQCAtIChCT09MKV9oYXNQYWdlUmVjdHMKICAgICBy ZXR1cm4gIV9wcmludGluZ1BhZ2VSZWN0cy5pc0VtcHR5KCk7CiB9CiAKKy0gKE5TVUludGVnZXIp X2ZpcnN0UHJpbnRlZFBhZ2VOdW1iZXIKK3sKKyAgICAvLyBOZWVkIHRvIGRpcmVjdGx5IGFjY2Vz cyB0aGUgZGljdGlvbmFyeSBiZWNhdXNlIC1bTlNQcmludE9wZXJhdGlvbiBwYWdlUmFuZ2VdIHZl cmlmaWVzIHBhZ2luYXRpb24sIHBvdGVudGlhbGx5IGNhdXNpbmcgcmVjdXJzaW9uLgorICAgIHJl dHVybiBbW1tbX3ByaW50T3BlcmF0aW9uIHByaW50SW5mb10gZGljdGlvbmFyeV0gb2JqZWN0Rm9y S2V5Ok5TUHJpbnRGaXJzdFBhZ2VdIHVuc2lnbmVkSW50ZWdlclZhbHVlXTsKK30KKworLSAoTlNV SW50ZWdlcilfbGFzdFByaW50ZWRQYWdlTnVtYmVyCit7CisgICAgQVNTRVJUKFtzZWxmIF9oYXNQ YWdlUmVjdHNdKTsKKworICAgIC8vIE5lZWQgdG8gZGlyZWN0bHkgYWNjZXNzIHRoZSBkaWN0aW9u YXJ5IGJlY2F1c2UgLVtOU1ByaW50T3BlcmF0aW9uIHBhZ2VSYW5nZV0gdmVyaWZpZXMgcGFnaW5h dGlvbiwgcG90ZW50aWFsbHkgY2F1c2luZyByZWN1cnNpb24uCisgICAgTlNVSW50ZWdlciBmaXJz dFBhZ2UgPSBbW1tbX3ByaW50T3BlcmF0aW9uIHByaW50SW5mb10gZGljdGlvbmFyeV0gb2JqZWN0 Rm9yS2V5Ok5TUHJpbnRGaXJzdFBhZ2VdIHVuc2lnbmVkSW50ZWdlclZhbHVlXTsKKyAgICBOU1VJ bnRlZ2VyIGxhc3RQYWdlID0gW1tbW19wcmludE9wZXJhdGlvbiBwcmludEluZm9dIGRpY3Rpb25h cnldIG9iamVjdEZvcktleTpOU1ByaW50TGFzdFBhZ2VdIHVuc2lnbmVkSW50ZWdlclZhbHVlXTsK KyAgICBpZiAobGFzdFBhZ2UgLSBmaXJzdFBhZ2UgPj0gX3ByaW50aW5nUGFnZVJlY3RzLnNpemUo KSkKKyAgICAgICAgcmV0dXJuIF9wcmludGluZ1BhZ2VSZWN0cy5zaXplKCk7CisgICAgcmV0dXJu IGxhc3RQYWdlOworfQorCiAtICh1aW50NjRfdClfZXhwZWN0ZWRQcmV2aWV3Q2FsbGJhY2tGb3JS ZWN0Oihjb25zdCBJbnRSZWN0JilyZWN0CiB7CiAgICAgZm9yIChIYXNoTWFwPHVpbnQ2NF90LCBX ZWJDb3JlOjpJbnRSZWN0Pjo6aXRlcmF0b3IgaXRlciA9IF9leHBlY3RlZFByZXZpZXdDYWxsYmFj a3MuYmVnaW4oKTsgaXRlciAhPSBfZXhwZWN0ZWRQcmV2aWV3Q2FsbGJhY2tzLmVuZCgpOyArK2l0 ZXIpIHsKQEAgLTE0OSwxNCArMTYzLDE2IEBAIHN0YXRpYyB2b2lkIHBhZ2VEaWREcmF3VG9QREYo V0tEYXRhUmVmIGQKICAgICAgICAgaWYgKGl0ZXIgIT0gdmlldy0+X2V4cGVjdGVkUHJldmlld0Nh bGxiYWNrcy5lbmQoKSkgewogICAgICAgICAgICAgQVNTRVJUKFt2aWV3IF9pc1ByaW50aW5nUHJl dmlld10pOwogCi0gICAgICAgICAgICBwYWlyPEhhc2hNYXA8V2ViQ29yZTo6SW50UmVjdCwgVmVj dG9yPHVpbnQ4X3Q+ID46Oml0ZXJhdG9yLCBib29sPiBlbnRyeSA9IHZpZXctPl9wYWdlUHJldmll d3MuYWRkKGl0ZXItPnNlY29uZCwgVmVjdG9yPHVpbnQ4X3Q+KCkpOwotICAgICAgICAgICAgZW50 cnkuZmlyc3QtPnNlY29uZC5hcHBlbmQoZGF0YS0+Ynl0ZXMoKSwgZGF0YS0+c2l6ZSgpKTsKLQot ICAgICAgICAgICAgYm9vbCByZWNlaXZlZFJlc3BvbnNlVG9MYXRlc3RSZXF1ZXN0ID0gdmlldy0+ X2xhdGVzdEV4cGVjdGVkUHJldmlld0NhbGxiYWNrID09IGNvbnRleHQtPmNhbGxiYWNrSUQ7Ci0g ICAgICAgICAgICB2aWV3LT5fbGF0ZXN0RXhwZWN0ZWRQcmV2aWV3Q2FsbGJhY2sgPSAwOwotICAg ICAgICAgICAgdmlldy0+X2V4cGVjdGVkUHJldmlld0NhbGxiYWNrcy5yZW1vdmUoY29udGV4dC0+ Y2FsbGJhY2tJRCk7Ci0gICAgICAgICAgICBpZiAocmVjZWl2ZWRSZXNwb25zZVRvTGF0ZXN0UmVx dWVzdCkKLSAgICAgICAgICAgICAgICBbdmlldyBfdXBkYXRlUHJldmlld107CisgICAgICAgICAg ICBpZiAoZGF0YSkgeworICAgICAgICAgICAgICAgIHBhaXI8SGFzaE1hcDxXZWJDb3JlOjpJbnRS ZWN0LCBWZWN0b3I8dWludDhfdD4gPjo6aXRlcmF0b3IsIGJvb2w+IGVudHJ5ID0gdmlldy0+X3Bh Z2VQcmV2aWV3cy5hZGQoaXRlci0+c2Vjb25kLCBWZWN0b3I8dWludDhfdD4oKSk7CisgICAgICAg ICAgICAgICAgZW50cnkuZmlyc3QtPnNlY29uZC5hcHBlbmQoZGF0YS0+Ynl0ZXMoKSwgZGF0YS0+ c2l6ZSgpKTsKKworICAgICAgICAgICAgICAgIGJvb2wgcmVjZWl2ZWRSZXNwb25zZVRvTGF0ZXN0 UmVxdWVzdCA9IHZpZXctPl9sYXRlc3RFeHBlY3RlZFByZXZpZXdDYWxsYmFjayA9PSBjb250ZXh0 LT5jYWxsYmFja0lEOworICAgICAgICAgICAgICAgIHZpZXctPl9sYXRlc3RFeHBlY3RlZFByZXZp ZXdDYWxsYmFjayA9IDA7CisgICAgICAgICAgICAgICAgdmlldy0+X2V4cGVjdGVkUHJldmlld0Nh bGxiYWNrcy5yZW1vdmUoY29udGV4dC0+Y2FsbGJhY2tJRCk7CisgICAgICAgICAgICAgICAgaWYg KHJlY2VpdmVkUmVzcG9uc2VUb0xhdGVzdFJlcXVlc3QpCisgICAgICAgICAgICAgICAgICAgIFt2 aWV3IF91cGRhdGVQcmV2aWV3XTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIH0K QEAgLTE3NywxMCArMTkzLDggQEAgLSAodm9pZClfcHJlcGFyZVBERkRhdGFGb3JQcmludGluZ09u U2VjbwogICAgIEFTU0VSVCghX3ByaW50ZWRQYWdlc1BERkRvY3VtZW50KTsKICAgICBBU1NFUlQo IV9leHBlY3RlZFByaW50Q2FsbGJhY2spOwogCi0gICAgdW5zaWduZWQgZmlyc3RQYWdlID0gW1tb W19wcmludE9wZXJhdGlvbiBwcmludEluZm9dIGRpY3Rpb25hcnldIG9iamVjdEZvcktleTpOU1By aW50Rmlyc3RQYWdlXSB1bnNpZ25lZEludFZhbHVlXTsKLSAgICB1bnNpZ25lZCBsYXN0UGFnZSA9 IFtbW1tfcHJpbnRPcGVyYXRpb24gcHJpbnRJbmZvXSBkaWN0aW9uYXJ5XSBvYmplY3RGb3JLZXk6 TlNQcmludExhc3RQYWdlXSB1bnNpZ25lZEludFZhbHVlXTsKLSAgICBpZiAobGFzdFBhZ2UgPiBf cHJpbnRpbmdQYWdlUmVjdHMuc2l6ZSgpKSAvLyBMYXN0IHBhZ2UgaXMgTlNJbnRlZ2VyTWF4IGlm IG5vdCBzZXQgYnkgdGhlIHVzZXIuCi0gICAgICAgIGxhc3RQYWdlID0gX3ByaW50aW5nUGFnZVJl Y3RzLnNpemUoKTsKKyAgICBOU1VJbnRlZ2VyIGZpcnN0UGFnZSA9IFtzZWxmIF9maXJzdFByaW50 ZWRQYWdlTnVtYmVyXTsKKyAgICBOU1VJbnRlZ2VyIGxhc3RQYWdlID0gW3NlbGYgX2xhc3RQcmlu dGVkUGFnZU51bWJlcl07CiAKICAgICBBU1NFUlQoZmlyc3RQYWdlID4gMCk7CiAgICAgQVNTRVJU KGZpcnN0UGFnZSA8PSBsYXN0UGFnZSk7CkBAIC0yMTgsNiArMjMyLDEzIEBAIHN0YXRpYyB2b2lk IHBhZ2VEaWRDb21wdXRlUGFnZVJlY3RzKGNvbnMKICAgICAgICAgdmlldy0+X3ByaW50aW5nUGFn ZVJlY3RzID0gcGFnZVJlY3RzOwogICAgICAgICB2aWV3LT5fdG90YWxTY2FsZUZhY3RvckZvclBy aW50aW5nID0gdG90YWxTY2FsZUZhY3RvckZvclByaW50aW5nOwogCisgICAgICAgIGNvbnN0IElu dFJlY3QmIGxhc3RQcmludGluZ1BhZ2VSZWN0ID0gdmlldy0+X3ByaW50aW5nUGFnZVJlY3RzW3Zp ZXctPl9wcmludGluZ1BhZ2VSZWN0cy5zaXplKCkgLSAxXTsKKyAgICAgICAgTlNSZWN0IG5ld0Zy YW1lU2l6ZSA9IE5TTWFrZVJlY3QoMCwgMCwgCisgICAgICAgICAgICBjZWlsKGxhc3RQcmludGlu Z1BhZ2VSZWN0LnJpZ2h0KCkgKiB2aWV3LT5fdG90YWxTY2FsZUZhY3RvckZvclByaW50aW5nKSwg CisgICAgICAgICAgICBjZWlsKGxhc3RQcmludGluZ1BhZ2VSZWN0LmJvdHRvbSgpICogdmlldy0+ X3RvdGFsU2NhbGVGYWN0b3JGb3JQcmludGluZykpOworICAgICAgICBMT0coVmlldywgIldLUHJp bnRpbmdWaWV3IHNldHRpbmcgZnJhbWUgc2l6ZSB0byB4OiVnIHk6JWcgd2lkdGg6JWcgaGVpZ2h0 OiVnIiwgbmV3RnJhbWVTaXplLm9yaWdpbi54LCBuZXdGcmFtZVNpemUub3JpZ2luLnksIG5ld0Zy YW1lU2l6ZS5zaXplLndpZHRoLCBuZXdGcmFtZVNpemUuc2l6ZS5oZWlnaHQpOworICAgICAgICBb dmlldyBzZXRGcmFtZTpuZXdGcmFtZVNpemVdOworCiAgICAgICAgIGlmIChbdmlldyBfaXNQcmlu dGluZ1ByZXZpZXddKSB7CiAgICAgICAgICAgICAvLyBTaG93IHBhZ2UgY291bnQsIGFuZCBhc2sg Zm9yIGFuIGFjdHVhbCBpbWFnZSB0byByZXBsYWNlIHBsYWNlaG9sZGVyLgogICAgICAgICAgICAg W3ZpZXcgX3VwZGF0ZVByZXZpZXddOwpAQCAtMzAxLDkgKzMyMiwxMiBAQCAtICh1bnNpZ25lZClf cGFnZUZvclJlY3Q6KE5TUmVjdClyZWN0CiB7CiAgICAgLy8gQXNzdW1pbmcgdGhhdCByZWN0IGV4 YWN0bHkgbWF0Y2hlcyBvbmUgb2YgdGhlIHBhZ2VzLgogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgX3ByaW50aW5nUGFnZVJlY3RzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGlmIChyZWN0Lm9y aWdpbi55ID09IF9wcmludGluZ1BhZ2VSZWN0c1tpXS55KCkpCisgICAgICAgIEludFJlY3QgY3Vy cmVudFJlY3QoX3ByaW50aW5nUGFnZVJlY3RzW2ldKTsKKyAgICAgICAgY3VycmVudFJlY3Quc2Nh bGUoX3RvdGFsU2NhbGVGYWN0b3JGb3JQcmludGluZyk7CisgICAgICAgIGlmIChyZWN0Lm9yaWdp bi55ID09IGN1cnJlbnRSZWN0LnkoKSAmJiByZWN0Lm9yaWdpbi54ID09IGN1cnJlbnRSZWN0Lngo KSkKICAgICAgICAgICAgIHJldHVybiBpICsgMTsKICAgICB9CisgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgcmV0dXJuIDA7IC8vIEludmFsaWQgcGFnZSBudW1iZXIuCiB9CiAKQEAgLTMy NCw5ICszNDgsOSBAQCAtICh2b2lkKV9kcmF3UERGRG9jdW1lbnQ6KENHUERGRG9jdW1lbnRSCiAg ICAgQ0dDb250ZXh0UmVmIGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDR0NvbnRleHRSZWY+KFtuc0dy YXBoaWNzQ29udGV4dCBncmFwaGljc1BvcnRdKTsKIAogICAgIENHQ29udGV4dFNhdmVHU3RhdGUo Y29udGV4dCk7Ci0gICAgLy8gRmxpcCB0aGUgZGVzdGluYXRpb24uCi0gICAgQ0dDb250ZXh0U2Nh bGVDVE0oY29udGV4dCwgMSwgLTEpOwotICAgIENHQ29udGV4dFRyYW5zbGF0ZUNUTShjb250ZXh0 LCBwb2ludC54LCAtcG9pbnQueSAtQ0dQREZQYWdlR2V0Qm94UmVjdChwZGZQYWdlLCBrQ0dQREZN ZWRpYUJveCkuc2l6ZS5oZWlnaHQpOworICAgIENHQ29udGV4dFRyYW5zbGF0ZUNUTShjb250ZXh0 LCBwb2ludC54LCBwb2ludC55KTsKKyAgICBDR0NvbnRleHRTY2FsZUNUTShjb250ZXh0LCBfdG90 YWxTY2FsZUZhY3RvckZvclByaW50aW5nLCAtX3RvdGFsU2NhbGVGYWN0b3JGb3JQcmludGluZyk7 CisgICAgQ0dDb250ZXh0VHJhbnNsYXRlQ1RNKGNvbnRleHQsIDAsIC1DR1BERlBhZ2VHZXRCb3hS ZWN0KHBkZlBhZ2UsIGtDR1BERk1lZGlhQm94KS5zaXplLmhlaWdodCk7CiAgICAgQ0dDb250ZXh0 RHJhd1BERlBhZ2UoY29udGV4dCwgcGRmUGFnZSk7CiAgICAgQ0dDb250ZXh0UmVzdG9yZUdTdGF0 ZShjb250ZXh0KTsKIH0KQEAgLTMzNiw2ICszNjAsNyBAQCAtICh2b2lkKV9kcmF3UHJldmlldzoo TlNSZWN0KW5zUmVjdAogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKICAgICBJbnRSZWN0 IHJlY3QobnNSZWN0KTsKKyAgICByZWN0LnNjYWxlKDEgLyBfdG90YWxTY2FsZUZhY3RvckZvclBy aW50aW5nKTsKICAgICBIYXNoTWFwPFdlYkNvcmU6OkludFJlY3QsIFZlY3Rvcjx1aW50OF90PiA+ OjppdGVyYXRvciBwYWdlUHJldmlld0l0ZXJhdG9yID0gX3BhZ2VQcmV2aWV3cy5maW5kKHJlY3Qp OwogICAgIGlmIChwYWdlUHJldmlld0l0ZXJhdG9yID09IF9wYWdlUHJldmlld3MuZW5kKCkpICB7 CiAgICAgICAgIC8vIEl0J3MgdG9vIGVhcmx5IHRvIGFzayBmb3IgcGFnZSBwcmV2aWV3IGlmIHdl IGRvbid0IGV2ZW4ga25vdyBwYWdlIHNpemUgYW5kIHNjYWxlLgpAQCAtMzc2LDEzICs0MDEsMTEg QEAgLSAodm9pZClfZHJhd1ByZXZpZXc6KE5TUmVjdCluc1JlY3QKICAgICBbc2VsZiBfZHJhd1BE RkRvY3VtZW50OnBkZkRvY3VtZW50LmdldCgpIHBhZ2U6MSBhdFBvaW50Ok5TTWFrZVBvaW50KG5z UmVjdC5vcmlnaW4ueCwgbnNSZWN0Lm9yaWdpbi55KV07CiB9CiAKLS8vIFRha2Ugb3ZlciBwcmlu dGluZy4gQXBwS2l0IGFwcGxpZXMgaW5jb3JyZWN0IGNsaXBwaW5nLCBhbmQgZG9lc24ndCBwcmlu dCBwYWdlcyBiZXlvbmQgdGhlIGZpcnN0IG9uZS4KLS0gKHZvaWQpX3JlY3Vyc2l2ZURpc3BsYXlS ZWN0SWZOZWVkZWRJZ25vcmluZ09wYWNpdHk6KE5TUmVjdCluc1JlY3QgaXNWaXNpYmxlUmVjdDoo Qk9PTClpc1Zpc2libGVSZWN0IHJlY3RJc1Zpc2libGVSZWN0Rm9yVmlldzooTlNWaWV3ICopdmlz aWJsZVZpZXcgdG9wVmlldzooQk9PTCl0b3BWaWV3CistICh2b2lkKWRyYXdSZWN0OihOU1JlY3Qp bnNSZWN0CiB7Ci0gICAgTE9HKFZpZXcsICJXS1ByaW50aW5nVmlldyBwcmludGluZyByZWN0IHg6 JWcsIHk6JWcsIHdpZHRoOiVnLCBoZWlnaHQ6JWciLCBuc1JlY3Qub3JpZ2luLngsIG5zUmVjdC5v cmlnaW4ueSwgbnNSZWN0LnNpemUud2lkdGgsIG5zUmVjdC5zaXplLmhlaWdodCk7CisgICAgTE9H KFZpZXcsICJXS1ByaW50aW5nVmlldyBwcmludGluZyByZWN0IHg6JWcsIHk6JWcsIHdpZHRoOiVn LCBoZWlnaHQ6JWclcyIsIG5zUmVjdC5vcmlnaW4ueCwgbnNSZWN0Lm9yaWdpbi55LCBuc1JlY3Qu c2l6ZS53aWR0aCwgbnNSZWN0LnNpemUuaGVpZ2h0LCBbc2VsZiBfaXNQcmludGluZ1ByZXZpZXdd ID8gIiBmb3IgcHJldmlldyIgOiAiIik7CiAKICAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09 IFtOU1ByaW50T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dKTsKLSAgICBBU1NFUlQoc2VsZiA9 PSB2aXNpYmxlVmlldyk7CiAKICAgICBpZiAoIV93ZWJGcmFtZS0+cGFnZSgpKQogICAgICAgICBy ZXR1cm47CkBAIC00MDAsNyArNDIzLDggQEAgLSAodm9pZClfcmVjdXJzaXZlRGlzcGxheVJlY3RJ Zk5lZWRlZElnbgogICAgICAgICBfcHJpbnRlZFBhZ2VzUERGRG9jdW1lbnQuYWRvcHRDRihDR1BE RkRvY3VtZW50Q3JlYXRlV2l0aFByb3ZpZGVyKHBkZkRhdGFQcm92aWRlci5nZXQoKSkpOwogICAg IH0KIAotICAgIFtzZWxmIF9kcmF3UERGRG9jdW1lbnQ6X3ByaW50ZWRQYWdlc1BERkRvY3VtZW50 LmdldCgpIHBhZ2U6W3NlbGYgX3BhZ2VGb3JSZWN0Om5zUmVjdF0gYXRQb2ludDpOU01ha2VQb2lu dChuc1JlY3Qub3JpZ2luLngsIG5zUmVjdC5vcmlnaW4ueSldOworICAgIHVuc2lnbmVkIHByaW50 ZWRQYWdlTnVtYmVyID0gW3NlbGYgX3BhZ2VGb3JSZWN0Om5zUmVjdF0gLSBbc2VsZiBfZmlyc3RQ cmludGVkUGFnZU51bWJlcl0gKyAxOworICAgIFtzZWxmIF9kcmF3UERGRG9jdW1lbnQ6X3ByaW50 ZWRQYWdlc1BERkRvY3VtZW50LmdldCgpIHBhZ2U6cHJpbnRlZFBhZ2VOdW1iZXIgYXRQb2ludDpO U01ha2VQb2ludChuc1JlY3Qub3JpZ2luLngsIG5zUmVjdC5vcmlnaW4ueSldOwogfQogCiAtICh2 b2lkKV9kcmF3UGFnZUJvcmRlcldpdGhTaXplT25NYWluVGhyZWFkOihOU1NpemUpYm9yZGVyU2l6 ZQpAQCAtNDU5LDE2ICs0ODMsNiBAQCAtICh2b2lkKWRyYXdQYWdlQm9yZGVyV2l0aFNpemU6KE5T U2l6ZSliCiAgICAgW2N1cnJlbnRDb250ZXh0IHJlc3RvcmVHcmFwaGljc1N0YXRlXTsKIH0KIAot Ly8gRklYTUUgMzQ5MTM0NDogVGhpcyBpcyBhbiBBcHBLaXQtaW50ZXJuYWwgbWV0aG9kIHRoYXQg d2UgbmVlZCB0byBvdmVycmlkZSBpbiBvcmRlcgotLy8gdG8gZ2V0IG91ciBzaHJpbmstdG8tZml0 IHRvIHdvcmsgd2l0aCBhIGN1c3RvbSBwYWdpbmF0aW9uIHNjaGVtZS4gV2UgY2FuIGRvIHRoaXMg YmV0dGVyCi0vLyBpZiBBcHBLaXQgbWFrZXMgaXQgU1BJL0FQSS4KLS0gKENHRmxvYXQpX3Byb3Zp ZGVUb3RhbFNjYWxlRmFjdG9yRm9yUHJpbnRPcGVyYXRpb246KE5TUHJpbnRPcGVyYXRpb24gKilw cmludE9wZXJhdGlvbiAKLXsKLSAgICBBU1NFUlQoX3ByaW50T3BlcmF0aW9uID09IHByaW50T3Bl cmF0aW9uKTsKLSAgICByZXR1cm4gX3RvdGFsU2NhbGVGYWN0b3JGb3JQcmludGluZzsKLX0KLQot Ly8gUmV0dXJuIHRoZSBkcmF3aW5nIHJlY3RhbmdsZSBmb3IgYSBwYXJ0aWN1bGFyIHBhZ2UgbnVt YmVyCiAtIChOU1JlY3QpcmVjdEZvclBhZ2U6KE5TSW50ZWdlcilwYWdlCiB7CiAgICAgQVNTRVJU KF9wcmludE9wZXJhdGlvbiA9PSBbTlNQcmludE9wZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXSk7 CkBAIC00NzgsOCArNDkyLDExIEBAIC0gKE5TUmVjdClyZWN0Rm9yUGFnZTooTlNJbnRlZ2VyKXBh Z2UKICAgICAgICAgQVNTRVJUKF9leHBlY3RlZENvbXB1dGVkUGFnZXNDYWxsYmFjayk7CiAgICAg ICAgIHJldHVybiBOU01ha2VSZWN0KDAsIDAsIDEsIDEpOwogICAgIH0KLSAgICBMT0coVmlldywg Ii1bV0tQcmludGluZ1ZpZXcgcmVjdEZvclBhZ2U6JWRdIC0+IHggJWQsIHkgJWQsIHdpZHRoICVk LCBoZWlnaHQgJWQiLCAoaW50KXBhZ2UsIF9wcmludGluZ1BhZ2VSZWN0c1twYWdlIC0gMV0ueCgp LCBfcHJpbnRpbmdQYWdlUmVjdHNbcGFnZSAtIDFdLnkoKSwgX3ByaW50aW5nUGFnZVJlY3RzW3Bh Z2UgLSAxXS53aWR0aCgpLCBfcHJpbnRpbmdQYWdlUmVjdHNbcGFnZSAtIDFdLmhlaWdodCgpKTsK LSAgICByZXR1cm4gX3ByaW50aW5nUGFnZVJlY3RzW3BhZ2UgLSAxXTsKKworICAgIEludFJlY3Qg cmVjdCA9IF9wcmludGluZ1BhZ2VSZWN0c1twYWdlIC0gMV07CisgICAgcmVjdC5zY2FsZShfdG90 YWxTY2FsZUZhY3RvckZvclByaW50aW5nKTsKKyAgICBMT0coVmlldywgIi1bV0tQcmludGluZ1Zp ZXcgcmVjdEZvclBhZ2U6JWRdIC0+IHggJWQsIHkgJWQsIHdpZHRoICVkLCBoZWlnaHQgJWQiLCAo aW50KXBhZ2UsIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp KTsKKyAgICByZXR1cm4gcmVjdDsKIH0KIAogLSAodm9pZCllbmREb2N1bWVudAo=