60329 2011-05-05 18:35:35 -0700 nrwt: minor cleanup in printing module 2011-05-27 19:16:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 399272 0 dpranke 2011-05-05 18:35:35 -0700 nrwt: minor cleanup in printing module 399273 1 92524 dpranke 2011-05-05 18:36:56 -0700 Created attachment 92524 Patch 399761 2 92524 eric 2011-05-06 13:14:57 -0700 Comment on attachment 92524 Patch OK. 411770 3 dpranke 2011-05-27 19:16:25 -0700 Committed r87594: <http://trac.webkit.org/changeset/87594> 92524 2011-05-05 18:36:56 -0700 2011-05-06 13:14:57 -0700 Patch bug-60329-20110505183654.patch text/plain 5020 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODU2NjUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNDQzNzVjY2EyMDdiZjZlNWE5MjQyMTM2MmU4YWEyNDIw ZmZiMDU2Li4xZmViNDQwNzhlNWRiYzkyOWI0M2VjYzNmYmMxNjcyYWRlNDA5OTA0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTUg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBOUldU OiBtaW5vciBjbGVhbnVwIGluIHByaW50aW5nIG1vZHVsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjAzMjkKKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nLnB5OgorCisyMDExLTA1 LTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIE5SV1QgbmVlZHMgYSB3YXkgdG8gbG9n IHRvIGEgZmlsZSB3aXRob3V0IGluY2x1ZGluZyBiYWNrc3BhY2VzIHdpdGhvdXQgbmVlZGluZyAt LXZlcmJvc2UKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYwMzI4CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL3ByaW50aW5nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKaW5kZXggNzBkZmVjNzA5N2M5OWZh MTY2MWQyZjdjNWQ4YTQ1OWY4ZWRiNGUzOS4uNzkwZTgyMTM0YzBiYTViZDE1MWE3MjQxMTA1OWNm ODM3ZDVhOTcyNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkKQEAgLTM3LDYgKzM3LDcg QEAgZnJvbSB3ZWJraXRweS5jb21tb24ubmV0IGltcG9ydCByZXN1bHRzanNvbnBhcnNlcgogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1wb3J0IG1ldGVyZWRfc3Ry ZWFtCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZSBpbXBvcnQgdGVz dF9leHBlY3RhdGlvbnMKIAorIyBGSVhNRTogQ2hhbmdlIHRoaXMgdG8gX19maWxlX18gd2hlbiB3 ZSBjYW4gZml4IHRlc3Qtd2Via2l0cHkncyBsb2dnaW5nIGNvbmZpZ3VyYXRpb24uCiBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoIndlYmtpdHB5LmxheW91dF90ZXN0cy5wcmludGVyIikKIAogVGVz dEV4cGVjdGF0aW9uc0ZpbGUgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zRmls ZQpAQCAtMzUyLDE2ICszNTMsOSBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAKICAgICBkZWYg cHJpbnRfcHJvZ3Jlc3Moc2VsZiwgcmVzdWx0X3N1bW1hcnksIHJldHJ5aW5nLCB0ZXN0X2xpc3Qp OgogICAgICAgICAiIiJQcmludCBwcm9ncmVzcyB0aHJvdWdoIHRoZSB0ZXN0cyBhcyBkZXRlcm1p bmVkIGJ5IC0tcHJpbnQuIiIiCi0gICAgICAgIGlmIHNlbGYuZW5hYmxlZCgnb25lLWxpbmUtcHJv Z3Jlc3MnKToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50X29uZV9saW5lX3Byb2dyZXNzKHJlc3Vs dF9zdW1tYXJ5LCByZXRyeWluZykKLSAgICAgICAgZWxzZToKKyAgICAgICAgaWYgc2VsZi5kaXNh YmxlZCgnb25lLWxpbmUtcHJvZ3Jlc3MnKToKICAgICAgICAgICAgIHJldHVybgogCi0gICAgICAg IGlmIHJlc3VsdF9zdW1tYXJ5LnJlbWFpbmluZyA9PSAwOgotICAgICAgICAgICAgc2VsZi5fbWV0 ZXIudXBkYXRlKCcnKQotCi0gICAgZGVmIF9wcmludF9vbmVfbGluZV9wcm9ncmVzcyhzZWxmLCBy ZXN1bHRfc3VtbWFyeSwgcmV0cnlpbmcpOgotICAgICAgICAiIiJEaXNwbGF5cyB0aGUgcHJvZ3Jl c3MgdGhyb3VnaCB0aGUgdGVzdCBydW4uIiIiCiAgICAgICAgIG5vdyA9IHRpbWUudGltZSgpCiAg ICAgICAgIGlmIHNlbGYuX2xhc3RfdXBkYXRlX3RpbWUgaXMgTm9uZToKICAgICAgICAgICAgIHNl bGYuX2xhc3RfdXBkYXRlX3RpbWUgPSBub3cKQEAgLTM4MSw2ICszNzUsOSBAQCBjbGFzcyBQcmlu dGVyKG9iamVjdCk6CiAgICAgICAgICAgICAoYWN0aW9uLCBwZXJjZW50X2NvbXBsZXRlLCByZXN1 bHRfc3VtbWFyeS5leHBlY3RlZCwKICAgICAgICAgICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVj dGVkLCByZXN1bHRfc3VtbWFyeS5yZW1haW5pbmcpKQogCisgICAgICAgIGlmIHJlc3VsdF9zdW1t YXJ5LnJlbWFpbmluZyA9PSAwOgorICAgICAgICAgICAgc2VsZi5fbWV0ZXIudXBkYXRlKCcnKQor CiAgICAgZGVmIHByaW50X3VuZXhwZWN0ZWRfcmVzdWx0cyhzZWxmLCB1bmV4cGVjdGVkX3Jlc3Vs dHMpOgogICAgICAgICAiIiJQcmludHMgYSBsaXN0IG9mIHRoZSB1bmV4cGVjdGVkIHJlc3VsdHMg dG8gdGhlIGJ1aWxkYm90IHN0cmVhbS4iIiIKICAgICAgICAgaWYgc2VsZi5kaXNhYmxlZCgndW5l eHBlY3RlZC1yZXN1bHRzJyk6CkBAIC0zOTAsMjcgKzM4NywzMCBAQCBjbGFzcyBQcmludGVyKG9i amVjdCk6CiAgICAgICAgIGZsYWt5ID0ge30KICAgICAgICAgcmVncmVzc2lvbnMgPSB7fQogCi0g ICAgICAgIGRlZiBhZGRfcmVzdWx0KHRlc3QsIHJlc3VsdHMpOgorICAgICAgICBkZWYgYWRkX3Rv X2RpY3Rfb2ZfbGlzdHMoZGljdCwga2V5LCB2YWx1ZSk6CisgICAgICAgICAgICBkaWN0LnNldGRl ZmF1bHQoa2V5LCBbXSkuYXBwZW5kKHZhbHVlKQorCisgICAgICAgIGRlZiBhZGRfcmVzdWx0KHRl c3QsIHJlc3VsdHMsIHBhc3Nlcz1wYXNzZXMsIGZsYWt5PWZsYWt5LCByZWdyZXNzaW9ucz1yZWdy ZXNzaW9ucyk6CiAgICAgICAgICAgICBhY3R1YWwgPSByZXN1bHRzWydhY3R1YWwnXS5zcGxpdCgi ICIpCiAgICAgICAgICAgICBleHBlY3RlZCA9IHJlc3VsdHNbJ2V4cGVjdGVkJ10uc3BsaXQoIiAi KQogICAgICAgICAgICAgaWYgYWN0dWFsID09IFsnUEFTUyddOgogICAgICAgICAgICAgICAgIGlm ICdDUkFTSCcgaW4gZXhwZWN0ZWQ6Ci0gICAgICAgICAgICAgICAgICAgIF9hZGRfdG9fZGljdF9v Zl9saXN0cyhwYXNzZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnRXhwZWN0ZWQgdG8gY3Jhc2gsIGJ1dCBwYXNzZWQnLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGVzdCkKKyAgICAgICAgICAgICAgICAgICAgYWRkX3RvX2Rp Y3Rfb2ZfbGlzdHMocGFzc2VzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnRXhwZWN0ZWQgdG8gY3Jhc2gsIGJ1dCBwYXNzZWQnLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0ZXN0KQogICAgICAgICAgICAgICAgIGVsaWYgJ1RJTUVP VVQnIGluIGV4cGVjdGVkOgotICAgICAgICAgICAgICAgICAgICBfYWRkX3RvX2RpY3Rfb2ZfbGlz dHMocGFzc2VzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0V4 cGVjdGVkIHRvIHRpbWVvdXQsIGJ1dCBwYXNzZWQnLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHRlc3QpCi0gICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAg ICAgICAgICAgICAgX2FkZF90b19kaWN0X29mX2xpc3RzKHBhc3NlcywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdFeHBlY3RlZCB0byBmYWlsLCBidXQgcGFzc2Vk JywKKyAgICAgICAgICAgICAgICAgICAgYWRkX3RvX2RpY3Rfb2ZfbGlzdHMocGFzc2VzLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnRXhwZWN0ZWQgdG8gdGltZW91 dCwgYnV0IHBhc3NlZCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0ZXN0KQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgIGFkZF90 b19kaWN0X29mX2xpc3RzKHBhc3NlcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ0V4cGVjdGVkIHRvIGZhaWwsIGJ1dCBwYXNzZWQnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0KQogICAgICAgICAgICAgZWxpZiBsZW4oYWN0 dWFsKSA+IDE6CiAgICAgICAgICAgICAgICAgIyBXZSBncm91cCBmbGFreSB0ZXN0cyBieSB0aGUg Zmlyc3QgYWN0dWFsIHJlc3VsdCB3ZSBnb3QuCi0gICAgICAgICAgICAgICAgX2FkZF90b19kaWN0 X29mX2xpc3RzKGZsYWt5LCBhY3R1YWxbMF0sIHRlc3QpCisgICAgICAgICAgICAgICAgYWRkX3Rv X2RpY3Rfb2ZfbGlzdHMoZmxha3ksIGFjdHVhbFswXSwgdGVzdCkKICAgICAgICAgICAgIGVsc2U6 Ci0gICAgICAgICAgICAgICAgX2FkZF90b19kaWN0X29mX2xpc3RzKHJlZ3Jlc3Npb25zLCByZXN1 bHRzWydhY3R1YWwnXSwgdGVzdCkKKyAgICAgICAgICAgICAgICBhZGRfdG9fZGljdF9vZl9saXN0 cyhyZWdyZXNzaW9ucywgcmVzdWx0c1snYWN0dWFsJ10sIHRlc3QpCiAKICAgICAgICAgcmVzdWx0 c2pzb25wYXJzZXIuZm9yX2VhY2hfdGVzdCh1bmV4cGVjdGVkX3Jlc3VsdHNbJ3Rlc3RzJ10sIGFk ZF9yZXN1bHQpCiAKQEAgLTQ3OSwxMSArNDc5LDMgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgog ICAgICAgICAgICAgc2VsZi5fbWV0ZXIudXBkYXRlKG1zZykKICAgICAgICAgZWxzZToKICAgICAg ICAgICAgIHNlbGYuX3dyaXRlKG1zZykKLQotIwotIyBVdGlsaXR5IHJvdXRpbmVzIHVzZWQgYnkg dGhlIENvbnRyb2xsZXIgY2xhc3MKLSMKLQotCi1kZWYgX2FkZF90b19kaWN0X29mX2xpc3RzKGRp Y3QsIGtleSwgdmFsdWUpOgotICAgIGRpY3Quc2V0ZGVmYXVsdChrZXksIFtdKS5hcHBlbmQodmFs dWUpCg==