37246 2010-04-07 21:00:41 -0700 Refactor WebHTMLView printing code and add private methods to enter and exit printing mode 2010-04-07 21:12:18 -0700 1 1 1 Unclassified WebKit Printing 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned oldest_to_newest 209979 0 mitz 2010-04-07 21:00:41 -0700 Patch forthcoming. 209980 1 52823 mitz 2010-04-07 21:01:55 -0700 Created attachment 52823 Patch 209982 2 mitz 2010-04-07 21:12:18 -0700 Committed <http://trac.webkit.org/projects/webkit/changeset/57246>. 52823 2010-04-07 21:01:55 -0700 2010-04-07 21:10:14 -0700 Patch webhtmlview-printing-refactoring.diff text/plain 12728 mitz SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NzI0NSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTAtMDQtMDcgIERhbiBCZXJuc3RlaW4gIDxtaXR6 QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBSZWZhY3RvciBXZWJIVE1MVmlldyBwcmludGluZyBjb2RlIGFuZCBhZGQgcHJpdmF0ZSBt ZXRob2RzIHRvIGVudGVyIGFuZCBleGl0IHByaW50aW5nIG1vZGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzI0NgorCisgICAgICAgICogTWlzYy9X ZWJOU1ByaW50T3BlcmF0aW9uRXh0cmFzLmg6IERlY2xhcmVkIC1fd2ViX2F2YWlsYWJsZVBhcGVy V2lkdGggYW5kIC1fd2ViX2F2YWlsYWJsZVBhcGVySGVpZ2h0LgorICAgICAgICAqIE1pc2MvV2Vi TlNQcmludE9wZXJhdGlvbkV4dHJhcy5tOgorICAgICAgICAoLVtOU1ByaW50T3BlcmF0aW9uIF93 ZWJfYXZhaWxhYmxlUGFwZXJXaWR0aF0pOiBUdXJuZWQgLVtXZWJIVE1MVmlldyBfYXZhaWxhYmxl UGFwZXJXaWR0aEZvclByaW50T3BlcmF0aW9uOl0KKyAgICAgICAgaW50byB0aGlzIG1ldGhvZC4K KyAgICAgICAgKC1bTlNQcmludE9wZXJhdGlvbiBfd2ViX2F2YWlsYWJsZVBhcGVySGVpZ2h0XSk6 IFR1cm5lZCAtW1dlYkhUTUxWaWV3IF9jYWxjdWxhdGVQcmludEhlaWdodF0gaW50byB0aGlzCisg ICAgICAgIG1ldGhvZC4KKyAgICAgICAgKiBXZWJWaWV3L1dlYkhUTUxWaWV3Lm1tOgorICAgICAg ICAoLVtXZWJIVE1MVmlldyBfaXNJblByaW50TW9kZV0pOiBBZGRlZCB0aGlzIGFjY2Vzc29yLgor ICAgICAgICAoLVtXZWJIVE1MVmlldyBfYmVnaW5QcmludE1vZGVXaXRoUGFnZVdpZHRoOnNocmlu a1RvRml0Ol0pOiBBZGRlZC4gTW92ZWQgdGhlIGNvZGUgZnJvbSAta25vd3NQYWdlUmFuZ2U6IHRo YXQKKyAgICAgICAgY29tcHV0ZXMgdGhlIGxheW91dCB3aWR0aHMgYW5kIGVudGVycyBwcmludGlu ZyBtb2RlIGludG8gdGhpcyBwcml2YXRlIG1ldGhvZC4KKyAgICAgICAgKC1bV2ViSFRNTFZpZXcg X2VuZFByaW50TW9kZV0pOiBOZXcgcHJpdmF0ZSBtZXRob2QgKHRoZSBvbGQgLV9lbmRQcmludE1v ZGUgaGFzIGJlZW4gcmVuYW1lZCkuCisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9zY2FsZUZhY3Rv ckZvclByaW50T3BlcmF0aW9uOl0pOiBVc2UgLVtOU1ByaW50T3BlcmF0aW9uIF93ZWJfYXZhaWxh YmxlUGFwZXJXaWR0aF0uCisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9lbmRQcmludE1vZGVBbmRS ZXN0b3JlV2luZG93QXV0b2Rpc3BsYXldKTogUmVuYW1lZCAtX2VuZFByaW50TW9kZSB0byB0aGlz LCBjaGFuZ2VkIGl0IHRvIGNhbGwKKyAgICAgICAgX2VuZFByaW50TW9kZS4KKyAgICAgICAgKC1b V2ViSFRNTFZpZXcgX2RlbGF5ZWRFbmRQcmludE1vZGU6XSk6IFVwZGF0ZWQgZm9yIHJlbmFtZS4K KyAgICAgICAgKC1bV2ViSFRNTFZpZXcga25vd3NQYWdlUmFuZ2U6XSk6IFVzZSAtX2JlZ2luUHJp bnRNb2RlV2l0aFBhZ2VXaWR0aDpzaHJpbnRUb0ZpdDosCisgICAgICAgIC1bTlNQcmludE9wZXJh dGlvbiBfd2ViX2F2YWlsYWJsZVBhcGVyV2lkdGhdLCBhbmQgLVtOU1ByaW50T3BlcmF0aW9uIF93 ZWJfYXZhaWxhYmxlUGFwZXJIZWlnaHRdLiBVcGRhdGVkIGZvcgorICAgICAgICByZW5hbWUuCisg ICAgICAgICgtW1dlYkhUTUxWaWV3IGJlZ2luRG9jdW1lbnRdKTogVXBkYXRlZCBmb3IgcmVuYW1l LgorICAgICAgICAoLVtXZWJIVE1MVmlldyBlbmREb2N1bWVudF0pOiBEaXR0by4KKyAgICAgICAg KiBXZWJWaWV3L1dlYkhUTUxWaWV3UHJpdmF0ZS5oOiBEZWNsYXJlZCBuZXcgcHJpdmF0ZSBtZXRo b2RzIC1faXNJblByaW50TW9kZSwKKyAgICAgICAgLV9iZWdpblByaW50TW9kZVdpdGhQYWdlV2lk dGg6c2hyaW5rVG9GaXQ6IGFuZCAtX2VuZFByaW50TW9kZS4KKwogMjAxMC0wNC0wNyAgQW5kcmV5 IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1 cnkgU2VtaWtoYXRza3kuCkluZGV4OiBXZWJLaXQvbWFjL01pc2MvV2ViTlNQcmludE9wZXJhdGlv bkV4dHJhcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvTWlzYy9XZWJOU1ByaW50T3BlcmF0 aW9uRXh0cmFzLmgJKHJldmlzaW9uIDU3MjQ1KQorKysgV2ViS2l0L21hYy9NaXNjL1dlYk5TUHJp bnRPcGVyYXRpb25FeHRyYXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNSArMzEsNyBAQAogQGlu dGVyZmFjZSBOU1ByaW50T3BlcmF0aW9uIChXZWJLaXRFeHRyYXMpCiAKIC0gKGZsb2F0KV93ZWJf cGFnZVNldHVwU2NhbGVGYWN0b3I7CistIChmbG9hdClfd2ViX2F2YWlsYWJsZVBhcGVyV2lkdGg7 CistIChmbG9hdClfd2ViX2F2YWlsYWJsZVBhcGVySGVpZ2h0OwogCiBAZW5kCkluZGV4OiBXZWJL aXQvbWFjL01pc2MvV2ViTlNQcmludE9wZXJhdGlvbkV4dHJhcy5tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvTWlzYy9XZWJOU1ByaW50T3BlcmF0aW9uRXh0cmFzLm0JKHJldmlzaW9uIDU3MjQ1 KQorKysgV2ViS2l0L21hYy9NaXNjL1dlYk5TUHJpbnRPcGVyYXRpb25FeHRyYXMubQkod29ya2lu ZyBjb3B5KQpAQCAtMzUsNCArMzUsMTYgQEAgLSAoZmxvYXQpX3dlYl9wYWdlU2V0dXBTY2FsZUZh Y3RvcgogICAgIHJldHVybiBbW1tbc2VsZiBwcmludEluZm9dIGRpY3Rpb25hcnldIG9iamVjdEZv cktleTpOU1ByaW50U2NhbGluZ0ZhY3Rvcl0gZmxvYXRWYWx1ZV07CiB9CiAKKy0gKGZsb2F0KV93 ZWJfYXZhaWxhYmxlUGFwZXJXaWR0aAoreworICAgIE5TUHJpbnRJbmZvICpwcmludEluZm8gPSBb c2VsZiBwcmludEluZm9dOworICAgIHJldHVybiBbcHJpbnRJbmZvIHBhcGVyU2l6ZV0ud2lkdGgg LSBbcHJpbnRJbmZvIGxlZnRNYXJnaW5dIC0gW3ByaW50SW5mbyByaWdodE1hcmdpbl07Cit9CisK Ky0gKGZsb2F0KV93ZWJfYXZhaWxhYmxlUGFwZXJIZWlnaHQKK3sKKyAgICBOU1ByaW50SW5mbyAq cHJpbnRJbmZvID0gW3NlbGYgcHJpbnRJbmZvXTsKKyAgICByZXR1cm4gW3ByaW50SW5mbyBwYXBl clNpemVdLmhlaWdodCAtIFtwcmludEluZm8gdG9wTWFyZ2luXSAtIFtwcmludEluZm8gYm90dG9t TWFyZ2luXTsKK30KKwogQGVuZApJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2 aXNpb24gNTcyNDUpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdvcmtp bmcgY29weSkKQEAgLTMyMiw3ICszMjIsNiBAQCAtICh2b2lkKV9yZW1vdmVXaW5kb3dPYnNlcnZl cnM7CiAtIChCT09MKV9zaG91bGRJbnNlcnRGcmFnbWVudDooRE9NRG9jdW1lbnRGcmFnbWVudCAq KWZyYWdtZW50IHJlcGxhY2luZ0RPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlIGdpdmVuQWN0aW9u OihXZWJWaWV3SW5zZXJ0QWN0aW9uKWFjdGlvbjsKIC0gKEJPT0wpX3Nob3VsZEluc2VydFRleHQ6 KE5TU3RyaW5nICopdGV4dCByZXBsYWNpbmdET01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZSBnaXZl bkFjdGlvbjooV2ViVmlld0luc2VydEFjdGlvbilhY3Rpb247CiAtIChCT09MKV9zaG91bGRSZXBs YWNlU2VsZWN0aW9uV2l0aFRleHQ6KE5TU3RyaW5nICopdGV4dCBnaXZlbkFjdGlvbjooV2ViVmll d0luc2VydEFjdGlvbilhY3Rpb247Ci0tIChmbG9hdClfY2FsY3VsYXRlUHJpbnRIZWlnaHQ7CiAt IChET01SYW5nZSAqKV9zZWxlY3RlZFJhbmdlOwogLSAoQk9PTClfc2hvdWxkRGVsZXRlUmFuZ2U6 KERPTVJhbmdlICopcmFuZ2U7CiAtIChOU1ZpZXcgKilfaGl0Vmlld0ZvckV2ZW50OihOU0V2ZW50 ICopZXZlbnQ7CkBAIC05MDEsMTcgKzkwMCw2IEBAIC0gKEJPT0wpX3Nob3VsZFJlcGxhY2VTZWxl Y3Rpb25XaXRoVGV4dDoKICAgICByZXR1cm4gW3NlbGYgX3Nob3VsZEluc2VydFRleHQ6dGV4dCBy ZXBsYWNpbmdET01SYW5nZTpbc2VsZiBfc2VsZWN0ZWRSYW5nZV0gZ2l2ZW5BY3Rpb246YWN0aW9u XTsKIH0KIAotLy8gQ2FsY3VsYXRlIHRoZSB2ZXJ0aWNhbCBzaXplIG9mIHRoZSB2aWV3IHRoYXQg Zml0cyBvbiBhIHNpbmdsZSBwYWdlCi0tIChmbG9hdClfY2FsY3VsYXRlUHJpbnRIZWlnaHQKLXsK LSAgICAvLyBPYnRhaW4gdGhlIHByaW50IGluZm8gb2JqZWN0IGZvciB0aGUgY3VycmVudCBvcGVy YXRpb24KLSAgICBOU1ByaW50SW5mbyAqcGkgPSBbW05TUHJpbnRPcGVyYXRpb24gY3VycmVudE9w ZXJhdGlvbl0gcHJpbnRJbmZvXTsKLSAgICAKLSAgICAvLyBDYWxjdWxhdGUgdGhlIHBhZ2UgaGVp Z2h0IGluIHBvaW50cwotICAgIE5TU2l6ZSBwYXBlclNpemUgPSBbcGkgcGFwZXJTaXplXTsKLSAg ICByZXR1cm4gcGFwZXJTaXplLmhlaWdodCAtIFtwaSB0b3BNYXJnaW5dIC0gW3BpIGJvdHRvbU1h cmdpbl07Ci19Ci0KIC0gKERPTVJhbmdlICopX3NlbGVjdGVkUmFuZ2UKIHsKICAgICBGcmFtZSog Y29yZUZyYW1lID0gY29yZShbc2VsZiBfZnJhbWVdKTsKQEAgLTIyMDIsNiArMjE5MCwzNiBAQCAt IChOU1ZpZXcgKilfY29tcG9zaXRpbmdMYXllcnNIb3N0aW5nVmllCiAjZW5kaWYKIH0KIAorLSAo Qk9PTClfaXNJblByaW50TW9kZQoreworICAgIHJldHVybiBfcHJpdmF0ZS0+cHJpbnRpbmc7Cit9 CisKKy0gKEJPT0wpX2JlZ2luUHJpbnRNb2RlV2l0aFBhZ2VXaWR0aDooZmxvYXQpcGFnZVdpZHRo IHNocmlua1RvRml0OihCT09MKXNocmlua1RvRml0Cit7CisgICAgRnJhbWUqIGZyYW1lID0gY29y ZShbc2VsZiBfZnJhbWVdKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gTk87CisK KyAgICBmbG9hdCBtaW5MYXlvdXRXaWR0aCA9IDA7CisgICAgZmxvYXQgbWF4TGF5b3V0V2lkdGgg PSAwOworCisgICAgLy8gSWYgd2UgYXJlIGEgZnJhbWVzZXQganVzdCBwcmludCB3aXRoIHRoZSBs YXlvdXQgd2UgaGF2ZSBvbnNjcmVlbiwgb3RoZXJ3aXNlIHJlbGF5b3V0CisgICAgLy8gYWNjb3Jk aW5nIHRvIHRoZSBwYWdlIHdpZHRoLgorICAgIGlmICghZnJhbWUtPmRvY3VtZW50KCkgfHwgIWZy YW1lLT5kb2N1bWVudCgpLT5pc0ZyYW1lU2V0KCkpIHsKKyAgICAgICAgbWluTGF5b3V0V2lkdGgg PSBzaHJpbmtUb0ZpdCA/IHBhZ2VXaWR0aCAqIFByaW50aW5nTWluaW11bVNocmlua0ZhY3RvciA6 IHBhZ2VXaWR0aDsKKyAgICAgICAgbWF4TGF5b3V0V2lkdGggPSBzaHJpbmtUb0ZpdCA/IHBhZ2VX aWR0aCAqIFByaW50aW5nTWF4aW11bVNocmlua0ZhY3RvciA6IHBhZ2VXaWR0aDsKKyAgICB9Cisg ICAgW3NlbGYgX3NldFByaW50aW5nOllFUyBtaW5pbXVtUGFnZVdpZHRoOm1pbkxheW91dFdpZHRo IG1heGltdW1QYWdlV2lkdGg6bWF4TGF5b3V0V2lkdGggYWRqdXN0Vmlld1NpemU6WUVTXTsKKwor ICAgIHJldHVybiBZRVM7Cit9CisKKy0gKHZvaWQpX2VuZFByaW50TW9kZQoreworICAgIFtzZWxm IF9zZXRQcmludGluZzpOTyBtaW5pbXVtUGFnZVdpZHRoOjAgbWF4aW11bVBhZ2VXaWR0aDowIGFk anVzdFZpZXdTaXplOllFU107Cit9CisKIC0gKENHRmxvYXQpX2FkanVzdGVkQm90dG9tT2ZQYWdl V2l0aFRvcDooQ0dGbG9hdCl0b3AgYm90dG9tOihDR0Zsb2F0KWJvdHRvbSBsaW1pdDooQ0dGbG9h dClib3R0b21MaW1pdAogewogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoW3NlbGYgX2ZyYW1lXSk7 CkBAIC0zODI4LDEyICszODQ2LDYgQEAgLSAodm9pZClhZGp1c3RQYWdlSGVpZ2h0TmV3OihDR0Zs b2F0ICopbgogICAgIH0KIH0KIAotLSAoZmxvYXQpX2F2YWlsYWJsZVBhcGVyV2lkdGhGb3JQcmlu dE9wZXJhdGlvbjooTlNQcmludE9wZXJhdGlvbiAqKXByaW50T3BlcmF0aW9uCi17Ci0gICAgTlNQ cmludEluZm8gKnByaW50SW5mbyA9IFtwcmludE9wZXJhdGlvbiBwcmludEluZm9dOwotICAgIHJl dHVybiBbcHJpbnRJbmZvIHBhcGVyU2l6ZV0ud2lkdGggLSBbcHJpbnRJbmZvIGxlZnRNYXJnaW5d IC0gW3ByaW50SW5mbyByaWdodE1hcmdpbl07Ci19Ci0KIC0gKGZsb2F0KV9zY2FsZUZhY3RvckZv clByaW50T3BlcmF0aW9uOihOU1ByaW50T3BlcmF0aW9uICopcHJpbnRPcGVyYXRpb24KIHsKICAg ICBmbG9hdCB2aWV3V2lkdGggPSBOU1dpZHRoKFtzZWxmIGJvdW5kc10pOwpAQCAtMzg0NCw3ICsz ODU2LDcgQEAgLSAoZmxvYXQpX3NjYWxlRmFjdG9yRm9yUHJpbnRPcGVyYXRpb246KAogCiAgICAg ZmxvYXQgdXNlclNjYWxlRmFjdG9yID0gW3ByaW50T3BlcmF0aW9uIF93ZWJfcGFnZVNldHVwU2Nh bGVGYWN0b3JdOwogICAgIGZsb2F0IG1heFNocmlua1RvRml0U2NhbGVGYWN0b3IgPSAxLjBmIC8g UHJpbnRpbmdNYXhpbXVtU2hyaW5rRmFjdG9yOwotICAgIGZsb2F0IHNocmlua1RvRml0U2NhbGVG YWN0b3IgPSBbc2VsZiBfYXZhaWxhYmxlUGFwZXJXaWR0aEZvclByaW50T3BlcmF0aW9uOnByaW50 T3BlcmF0aW9uXS92aWV3V2lkdGg7CisgICAgZmxvYXQgc2hyaW5rVG9GaXRTY2FsZUZhY3RvciA9 IFtwcmludE9wZXJhdGlvbiBfd2ViX2F2YWlsYWJsZVBhcGVyV2lkdGhdIC8gdmlld1dpZHRoOwog ICAgIGZsb2F0IHNocmlua1RvQXZvaWRPcnBoYW4gPSBfcHJpdmF0ZS0+YXZvaWRpbmdQcmludE9y cGhhbiA/ICgxLjBmIC8gUHJpbnRpbmdPcnBoYW5TaHJpbmtBZGp1c3RtZW50KSA6IDEuMGY7CiAg ICAgcmV0dXJuIHVzZXJTY2FsZUZhY3RvciAqIG1heChtYXhTaHJpbmtUb0ZpdFNjYWxlRmFjdG9y LCBzaHJpbmtUb0ZpdFNjYWxlRmFjdG9yKSAqIHNocmlua1RvQXZvaWRPcnBoYW47CiB9CkBAIC0z ODY0LDkgKzM4NzYsOSBAQCAtICh2b2lkKXNldFBhZ2VXaWR0aEZvclByaW50aW5nOihmbG9hdClw CiAgICAgW3NlbGYgX3NldFByaW50aW5nOllFUyBtaW5pbXVtUGFnZVdpZHRoOnBhZ2VXaWR0aCBt YXhpbXVtUGFnZVdpZHRoOnBhZ2VXaWR0aCBhZGp1c3RWaWV3U2l6ZTpZRVNdOwogfQogCi0tICh2 b2lkKV9lbmRQcmludE1vZGUKKy0gKHZvaWQpX2VuZFByaW50TW9kZUFuZFJlc3RvcmVXaW5kb3dB dXRvZGlzcGxheQogewotICAgIFtzZWxmIF9zZXRQcmludGluZzpOTyBtaW5pbXVtUGFnZVdpZHRo OjAuMGYgbWF4aW11bVBhZ2VXaWR0aDowLjBmIGFkanVzdFZpZXdTaXplOllFU107CisgICAgW3Nl bGYgX2VuZFByaW50TW9kZV07CiAgICAgW1tzZWxmIHdpbmRvd10gc2V0QXV0b2Rpc3BsYXk6WUVT XTsKIH0KIApAQCAtMzg5Miw3ICszOTA0LDcgQEAgLSAodm9pZClfZGVsYXllZEVuZFByaW50TW9k ZTooTlNQcmludE9wZQogICAgICAgICAvLyBjYW5jZWxsZWQsIGJlZ2luRG9jdW1lbnQgYW5kIGVu ZERvY3VtZW50IG11c3Qgbm90IGhhdmUgYmVlbiBjYWxsZWQsIGFuZCB3ZSBuZWVkIHRvIGNsZWFu IHVwCiAgICAgICAgIC8vIHRoZSBwcmludCBtb2RlIGhlcmUuCiAgICAgICAgIEFTU0VSVChjdXJy ZW50T3BlcmF0aW9uID09IG5pbCk7Ci0gICAgICAgIFtzZWxmIF9lbmRQcmludE1vZGVdOworICAg ICAgICBbc2VsZiBfZW5kUHJpbnRNb2RlQW5kUmVzdG9yZVdpbmRvd0F1dG9kaXNwbGF5XTsKICAg ICB9CiB9CiAKQEAgLTM5MDIsMjIgKzM5MTQsMTIgQEAgLSAoQk9PTClrbm93c1BhZ2VSYW5nZToo TlNSYW5nZVBvaW50ZXIpcgogICAgIC8vIE11c3QgZG8gdGhpcyBleHBsaWNpdCBkaXNwbGF5IGhl cmUsIGJlY2F1c2Ugb3RoZXJ3aXNlIHRoZSB2aWV3IG1pZ2h0IHJlZGlzcGxheSB3aGlsZSB0aGUg cHJpbnQKICAgICAvLyBzaGVldCB3YXMgdXAsIHVzaW5nIHByaW50ZXIgZm9udHMgKGFuZCBsb29r aW5nIGRpZmZlcmVudCkuCiAgICAgW3NlbGYgZGlzcGxheUlmTmVlZGVkXTsKLSAgICBbW3NlbGYg d2luZG93XSBzZXRBdXRvZGlzcGxheTpOT107Ci0gICAgCi0gICAgLy8gSWYgd2UgYXJlIGEgZnJh bWVzZXQganVzdCBwcmludCB3aXRoIHRoZSBsYXlvdXQgd2UgaGF2ZSBvbnNjcmVlbiwgb3RoZXJ3 aXNlIHJlbGF5b3V0Ci0gICAgLy8gYWNjb3JkaW5nIHRvIHRoZSBwYXBlciBzaXplCi0gICAgZmxv YXQgbWluTGF5b3V0V2lkdGggPSAwLjBmOwotICAgIGZsb2F0IG1heExheW91dFdpZHRoID0gMC4w ZjsKLSAgICBGcmFtZSogZnJhbWUgPSBjb3JlKFtzZWxmIF9mcmFtZV0pOwotICAgIGlmICghZnJh bWUpCi0gICAgICAgIHJldHVybiBOTzsKLSAgICBpZiAoIWZyYW1lLT5kb2N1bWVudCgpIHx8ICFm cmFtZS0+ZG9jdW1lbnQoKS0+aXNGcmFtZVNldCgpKSB7Ci0gICAgICAgIGZsb2F0IHBhcGVyV2lk dGggPSBbc2VsZiBfYXZhaWxhYmxlUGFwZXJXaWR0aEZvclByaW50T3BlcmF0aW9uOltOU1ByaW50 T3BlcmF0aW9uIGN1cnJlbnRPcGVyYXRpb25dXTsKLSAgICAgICAgbWluTGF5b3V0V2lkdGggPSBw YXBlcldpZHRoICogUHJpbnRpbmdNaW5pbXVtU2hyaW5rRmFjdG9yOwotICAgICAgICBtYXhMYXlv dXRXaWR0aCA9IHBhcGVyV2lkdGggKiBQcmludGluZ01heGltdW1TaHJpbmtGYWN0b3I7Ci0gICAg fQotICAgIFtzZWxmIF9zZXRQcmludGluZzpZRVMgbWluaW11bVBhZ2VXaWR0aDptaW5MYXlvdXRX aWR0aCBtYXhpbXVtUGFnZVdpZHRoOm1heExheW91dFdpZHRoIGFkanVzdFZpZXdTaXplOllFU107 IC8vIHdpbGwgcmVsYXlvdXQKKyAgICBbW3NlbGYgd2luZG93XSBzZXRBdXRvZGlzcGxheTpOT107 ICAgIAorCiAgICAgTlNQcmludE9wZXJhdGlvbiAqcHJpbnRPcGVyYXRpb24gPSBbTlNQcmludE9w ZXJhdGlvbiBjdXJyZW50T3BlcmF0aW9uXTsKKyAgICBpZiAoIVtzZWxmIF9iZWdpblByaW50TW9k ZVdpdGhQYWdlV2lkdGg6W3ByaW50T3BlcmF0aW9uIF93ZWJfYXZhaWxhYmxlUGFwZXJXaWR0aF0g c2hyaW5rVG9GaXQ6WUVTXSkKKyAgICAgICAgcmV0dXJuIE5POworCiAgICAgLy8gQ2VydGFpbiB0 eXBlcyBvZiBlcnJvcnMsIGluY2x1ZGluZyBpbnZhbGlkIHBhZ2UgcmFuZ2VzLCBjYW4gY2F1c2Ug YmVnaW5Eb2N1bWVudCBhbmQKICAgICAvLyBlbmREb2N1bWVudCB0byBiZSBza2lwcGVkIGFmdGVy IHdlJ3ZlIHB1dCBvdXJzZWx2ZXMgaW4gcHJpbnQgbW9kZSAoc2VlIDQxNDU5MDUpLiBJbiB0aG9z ZSBjYXNlcwogICAgIC8vIHdlIG5lZWQgdG8gZ2V0IG91dCBvZiBwcmludCBtb2RlIHdpdGhvdXQg cmVseWluZyBvbiBhbnkgbW9yZSBjYWxsYmFja3MgZnJvbSB0aGUgcHJpbnRpbmcgbWVjaGFuaXNt LgpAQCAtMzkzNSw5ICszOTM3LDkgQEAgLSAoQk9PTClrbm93c1BhZ2VSYW5nZTooTlNSYW5nZVBv aW50ZXIpcgogICAgIGZsb2F0IHRvdGFsU2NhbGVGYWN0b3IgPSBbc2VsZiBfc2NhbGVGYWN0b3JG b3JQcmludE9wZXJhdGlvbjpwcmludE9wZXJhdGlvbl07CiAgICAgZmxvYXQgdXNlclNjYWxlRmFj dG9yID0gW3ByaW50T3BlcmF0aW9uIF93ZWJfcGFnZVNldHVwU2NhbGVGYWN0b3JdOwogICAgIFtf cHJpdmF0ZS0+cGFnZVJlY3RzIHJlbGVhc2VdOwotICAgIGZsb2F0IGZ1bGxQYWdlSGVpZ2h0ID0g Zmxvb3JmKFtzZWxmIF9jYWxjdWxhdGVQcmludEhlaWdodF0vdG90YWxTY2FsZUZhY3Rvcik7Ci0g ICAgTlNBcnJheSAqbmV3UGFnZVJlY3RzID0gW1tzZWxmIF9mcmFtZV0gX2NvbXB1dGVQYWdlUmVj dHNXaXRoUHJpbnRXaWR0aFNjYWxlRmFjdG9yOnVzZXJTY2FsZUZhY3RvcgotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcmludEhlaWdodDpmdWxsUGFnZUhlaWdodF07CisgICAgZmxvYXQgZnVsbFBhZ2VIZWln aHQgPSBmbG9vcmYoW3ByaW50T3BlcmF0aW9uIF93ZWJfYXZhaWxhYmxlUGFwZXJIZWlnaHRdIC8g dG90YWxTY2FsZUZhY3Rvcik7CisgICAgV2ViRnJhbWUgKmZyYW1lID0gW3NlbGYgX2ZyYW1lXTsK KyAgICBOU0FycmF5ICpuZXdQYWdlUmVjdHMgPSBbZnJhbWUgX2NvbXB1dGVQYWdlUmVjdHNXaXRo UHJpbnRXaWR0aFNjYWxlRmFjdG9yOnVzZXJTY2FsZUZhY3RvciBwcmludEhlaWdodDpmdWxsUGFn ZUhlaWdodF07CiAgICAgCiAgICAgLy8gQXBwS2l0IGdldHMgYWxsIG1lc3NlZCB1cCBpZiB5b3Ug Z2l2ZSBpdCBhIHplcm8tbGVuZ3RoIHBhZ2UgY291bnQgKHNlZSAzNTc2MzM0KSwgc28gaWYgd2UK ICAgICAvLyBoaXQgdGhhdCBjYXNlIHdlJ2xsIHBhc3MgYWxvbmcgYSBkZWdlbmVyYXRlIDEgcGl4 ZWwgc3F1YXJlIHRvIHByaW50LiBUaGlzIHdpbGwgcHJpbnQKQEAgLTM5NTAsOCArMzk1Miw3IEBA IC0gKEJPT0wpa25vd3NQYWdlUmFuZ2U6KE5TUmFuZ2VQb2ludGVyKXIKICAgICAgICAgLy8gY29u dGVudCBvbnRvIG9uZSBmZXdlciBwYWdlLiBJZiBpdCBkb2VzLCB1c2UgdGhlIGFkanVzdGVkIHNj YWxlLiBJZiBub3QsIHVzZSB0aGUgb3JpZ2luYWwgc2NhbGUuCiAgICAgICAgIGZsb2F0IGxhc3RQ YWdlSGVpZ2h0ID0gTlNIZWlnaHQoW1tuZXdQYWdlUmVjdHMgbGFzdE9iamVjdF0gcmVjdFZhbHVl XSk7CiAgICAgICAgIGlmIChsYXN0UGFnZUhlaWdodC9mdWxsUGFnZUhlaWdodCA8IExhc3RQcmlu dGVkUGFnZU9ycGhhblJhdGlvKSB7Ci0gICAgICAgICAgICBOU0FycmF5ICphZGp1c3RlZFBhZ2VS ZWN0cyA9IFtbc2VsZiBfZnJhbWVdIF9jb21wdXRlUGFnZVJlY3RzV2l0aFByaW50V2lkdGhTY2Fs ZUZhY3Rvcjp1c2VyU2NhbGVGYWN0b3IKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBy aW50SGVpZ2h0OmZ1bGxQYWdlSGVpZ2h0KlByaW50aW5nT3JwaGFuU2hyaW5rQWRqdXN0bWVudF07 CisgICAgICAgICAgICBOU0FycmF5ICphZGp1c3RlZFBhZ2VSZWN0cyA9IFtmcmFtZSBfY29tcHV0 ZVBhZ2VSZWN0c1dpdGhQcmludFdpZHRoU2NhbGVGYWN0b3I6dXNlclNjYWxlRmFjdG9yIHByaW50 SGVpZ2h0OmZ1bGxQYWdlSGVpZ2h0ICogUHJpbnRpbmdPcnBoYW5TaHJpbmtBZGp1c3RtZW50XTsK ICAgICAgICAgICAgIC8vIFVzZSB0aGUgYWRqdXN0ZWQgcmVjdHMgb25seSBpZiB0aGUgcGFnZSBj b3VudCB3ZW50IGRvd24KICAgICAgICAgICAgIGlmIChbYWRqdXN0ZWRQYWdlUmVjdHMgY291bnRd IDwgW25ld1BhZ2VSZWN0cyBjb3VudF0pIHsKICAgICAgICAgICAgICAgICBuZXdQYWdlUmVjdHMg PSBhZGp1c3RlZFBhZ2VSZWN0czsKQEAgLTM5OTEsNyArMzk5Miw3IEBAIC0gKHZvaWQpYmVnaW5E b2N1bWVudAogICAgIH0gQGNhdGNoIChOU0V4Y2VwdGlvbiAqbG9jYWxFeGNlcHRpb24pIHsKICAg ICAgICAgLy8gRXhjZXB0aW9uIGR1cmluZyBbc3VwZXIgYmVnaW5Eb2N1bWVudF0gbWVhbnMgdGhh dCBlbmREb2N1bWVudCB3aWxsIG5vdCBnZXQgY2FsbGVkLAogICAgICAgICAvLyBzbyB3ZSBuZWVk IHRvIGNsZWFuIHVwIG91ciAicHJpbnQgbW9kZSIgaGVyZS4KLSAgICAgICAgW3NlbGYgX2VuZFBy aW50TW9kZV07CisgICAgICAgIFtzZWxmIF9lbmRQcmludE1vZGVBbmRSZXN0b3JlV2luZG93QXV0 b2Rpc3BsYXldOwogICAgIH0KIH0KIApAQCAtMzk5OSw3ICs0MDAwLDcgQEAgLSAodm9pZCllbmRE b2N1bWVudAogewogICAgIFtzdXBlciBlbmREb2N1bWVudF07CiAgICAgLy8gTm90ZSBzYWRseSBh dCB0aGlzIHBvaW50IFtOU0dyYXBoaWNzQ29udGV4dCBjdXJyZW50Q29udGV4dERyYXdpbmdUb1Nj cmVlbl0gaXMgc3RpbGwgTk8gCi0gICAgW3NlbGYgX2VuZFByaW50TW9kZV07CisgICAgW3NlbGYg X2VuZFByaW50TW9kZUFuZFJlc3RvcmVXaW5kb3dBdXRvZGlzcGxheV07CiB9CiAKIC0gKHZvaWQp a2V5RG93bjooTlNFdmVudCAqKWV2ZW50CkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRN TFZpZXdQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxW aWV3UHJpdmF0ZS5oCShyZXZpc2lvbiA1NzI0NSkKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJI VE1MVmlld1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTMxLDYgKzEzMSw5IEBAIEBpbnRl cmZhY2UgV2ViSFRNTFZpZXcgKFdlYlByaXZhdGUpCiAvLyBUeXBpY2FsbHkgdGhpcyB3b3VsZCBi ZSBjYWxsZWQgZnJvbSBpbnNpZGUgYW4gb3ZlcnJpZGUgb2YgLVtOU1ZpZXcga25vd3NQYWdlUmFu Z2U6XS4KIC0gKHZvaWQpX2xheW91dEZvclByaW50aW5nOwogLSAoV2ViQ0dGbG9hdClfYWRqdXN0 ZWRCb3R0b21PZlBhZ2VXaXRoVG9wOihXZWJDR0Zsb2F0KXRvcCBib3R0b206KFdlYkNHRmxvYXQp Ym90dG9tIGxpbWl0OihXZWJDR0Zsb2F0KWJvdHRvbUxpbWl0OworLSAoQk9PTClfaXNJblByaW50 TW9kZTsKKy0gKEJPT0wpX2JlZ2luUHJpbnRNb2RlV2l0aFBhZ2VXaWR0aDooZmxvYXQpcGFnZVdp ZHRoIHNocmlua1RvRml0OihCT09MKXNocmlua1RvRml0OworLSAodm9pZClfZW5kUHJpbnRNb2Rl OwogCiAtIChCT09MKV9jYW5TbWFydFJlcGxhY2VXaXRoUGFzdGVib2FyZDooTlNQYXN0ZWJvYXJk ICopcGFzdGVib2FyZDsKIAo=