59027 2011-04-20 14:28:04 -0700 move page generation into a single function 2011-04-20 14:45:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan dpranke eric tony oldest_to_newest 389527 0 ojan 2011-04-20 14:28:04 -0700 move page generation into a single function 389528 1 90415 ojan 2011-04-20 14:30:18 -0700 Created attachment 90415 Patch 389536 2 90415 eric 2011-04-20 14:39:35 -0700 Comment on attachment 90415 Patch OK. 389542 3 ojan 2011-04-20 14:45:40 -0700 Committed r84420: <http://trac.webkit.org/changeset/84420> 90415 2011-04-20 14:30:18 -0700 2011-04-20 14:39:35 -0700 Patch bug-59027-20110420143017.patch text/plain 7421 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogODQ0MDUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMTI3M2Q4MjM5ZTgwNWUzM2VkNjUyM2Q2MjQyYzkxYzQw OTY2Y2YwLi5mYjEyOGU0ZWQ5NmUzZTVkZjFkMTkxY2Y1YzVhMTRmZTAzODg0OGM4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMTgg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBtb3Zl IHBhZ2UgZ2VuZXJhdGlvbiBpbnRvIGEgc2luZ2xlIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTAyNworCisgICAgICAgIE5vdyBleGVj dXRpbmcgdGhlIHNjcmlwdCBkb2Vzbid0IGNyZWF0ZSBhbnkgc3RhdGUuIFdlIHNob3VsZCB0aGVu CisgICAgICAgIGJlIGFibGUgdG8gd3JpdGUgdGVzdHMgZm9yIHRoaXMgYnkgc2V0dGluZyBjdXN0 b20gcmVzdWx0cyBkYXRhLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzLmh0bWw6CisKKzIwMTEtMDQtMjAgIE9qYW4g VmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKwogICAgICAgICBtb3ZlIGdsb2JhbCBzdGF0ZSBpbnRvIGEgc2hhcmVkIG9iamVj dAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwMjMK IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvanNvbl9yZXN1bHRzLmh0bWwgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHMuaHRtbAppbmRleCA3MTkwODAyMmMx MTAxNjhjZGI1ZWQxYzk2Y2U1YjRhYmFmZGU5ODhjLi5mYjEyNjM0ZTQxMDRlMDdlZjY1OTNlZjE1 MDJmYzQ2ZDAyMmU3ZTNhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHMuaHRtbAorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHMuaHRt bApAQCAtMTA2LDYgKzEwNiw3IEBAIGxhYmVsIHsKICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOwog fQogPC9zdHlsZT4KKzxzdHlsZSBpZD0idW5leHBlY3RlZC1zdHlsZSI+PC9zdHlsZT4KIAogPHNj cmlwdD4KIHZhciBnX3N0YXRlOwpAQCAtMzMzLDM2ICszMzQsMTEgQEAgZnVuY3Rpb24gdGFibGVS b3dzKCkKICAgICByZXR1cm4gaHRtbDsKIH0KIAotdmFyIGh0bWwgPSAnPGRpdiBpZD1vcHRpb25z PicgKwotICAgICc8YSBocmVmPSJqYXZhc2NyaXB0OnZvaWQoKSIgY2xhc3M9ImV4cGFuZC1hbGwi IG9uY2xpY2s9ImV4cGFuZEFsbEV4cGVjdGF0aW9ucygpIj5leHBhbmQgYWxsPC9hPiAnICsKLSAg ICAnPGEgaHJlZj0iamF2YXNjcmlwdDp2b2lkKCkiIGNsYXNzPSJjb2xsYXBzZS1hbGwiIG9uY2xp Y2s9ImNvbGxhcHNlQWxsRXhwZWN0YXRpb25zKCkiPmNvbGxhcHNlIGFsbDwvYT4nOwotCi1pZiAo Z2xvYmFsU3RhdGUoKS5yZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUpCi0gICAgaHRtbCAr PSAnPGxhYmVsPjxpbnB1dCBjbGFzcz0idW5leHBlY3RlZC1yZXN1bHRzIiB0eXBlPWNoZWNrYm94 IGNoZWNrZWQgb25jaGFuZ2U9InVwZGF0ZUV4cGVjdGVkUmVzdWx0cygpIj5Pbmx5IHNob3cgdW5l eHBlY3RlZCByZXN1bHRzPC9sYWJlbD4nOwotCi1odG1sICs9ICc8L2Rpdj4nOwotCi12YXIgdGFi bGVSb3dzSHRtbCA9IHRhYmxlUm93cygpOwotCi1pZiAodGFibGVSb3dzSHRtbCkgewotICAgIGh0 bWwgKz0gJzxwPlRlc3RzIHdoZXJlIHJlc3VsdHMgZGlkIG5vdCBtYXRjaCBleHBlY3RlZCByZXN1 bHRzOjwvcD4nICsKLSAgICAgICAgJzx0YWJsZSBpZD0icmVzdWx0cy10YWJsZSI+PHRoZWFkPjx0 cj4nICsKLSAgICAgICAgJzx0aD50ZXN0PC90aD4nICsKLSAgICAgICAgJzx0aCBpZD0idGV4dC1y ZXN1bHRzLWhlYWRlciI+dGV4dCByZXN1bHRzPC90aD4nICsKLSAgICAgICAgJzx0aCBpZD0iaW1h Z2UtcmVzdWx0cy1oZWFkZXIiPmltYWdlIHJlc3VsdHM8L3RoPicgKwotICAgICAgICAnPHRoPmZh aWx1cmUgdHlwZTwvdGg+JzsKLSAgICAgICAgCi0gICAgaWYgKGdsb2JhbFN0YXRlKCkucmVzdWx0 cy51c2VzX2V4cGVjdGF0aW9uc19maWxlKQotICAgICAgICBodG1sICs9ICc8dGg+ZXhwZWN0ZWQg ZmFpbHVyZSB0eXBlPC90aD4nOwotCi0gICAgaHRtbCArPSAnPC90cj48L3RoZWFkPicgKyB0YWJs ZVJvd3NIdG1sICsgJzwvdGFibGU+JzsKLX0KLQotZnVuY3Rpb24gYXBwZW5kVGVzdExpc3QodGVz dHMsIGhlYWRlciwgdGFibGVJZCwgZmlsZVN1ZmZpeCwgbGlua05hbWUpCitmdW5jdGlvbiB0ZXN0 TGlzdCh0ZXN0cywgaGVhZGVyLCB0YWJsZUlkLCBmaWxlU3VmZml4LCBsaW5rTmFtZSkKIHsKICAg ICB0ZXN0cy5zb3J0KCk7CiAKLSAgICBodG1sICs9ICc8cD4nICsgaGVhZGVyICsgJzwvcD48dGFi bGUgaWQ9IicgKyB0YWJsZUlkICsgJyI+JzsKKyAgICB2YXIgaHRtbCA9ICc8cD4nICsgaGVhZGVy ICsgJzwvcD48dGFibGUgaWQ9IicgKyB0YWJsZUlkICsgJyI+JzsKICAgICBmb3IgKHZhciBpID0g MDsgaSA8IHRlc3RzLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgIHZhciB0ZXN0ID0gdGVzdHNbaV07 CiAgICAgICAgIGh0bWwgKz0gJzx0Ym9keT48dHI+PHRkPicgKyB0ZXN0TGluayh0ZXN0KSArICc8 L3RkPjx0ZD4nOwpAQCAtMzgxLDIyICszNTcsMTAgQEAgZnVuY3Rpb24gYXBwZW5kVGVzdExpc3Qo dGVzdHMsIGhlYWRlciwgdGFibGVJZCwgZmlsZVN1ZmZpeCwgbGlua05hbWUpCiAgICAgICAgIAog ICAgICAgICBodG1sICs9ICc8L3RkPjwvdHI+PC90Ym9keT4nOwogICAgIH0KLSAgICBodG1sICs9 ICc8L3RhYmxlPicKLX0KLQotaWYgKGdsb2JhbFN0YXRlKCkubmV3VGVzdHMubGVuZ3RoKQotICAg IGFwcGVuZFRlc3RMaXN0KGdsb2JhbFN0YXRlKCkubmV3VGVzdHMsICdUZXN0cyB0aGF0IGhhZCBu byBleHBlY3RlZCByZXN1bHRzIChwcm9iYWJseSBuZXcpOicsICduZXctdGVzdHMtdGFibGUnLCAn LWFjdHVhbC50eHQnLCAncmVzdWx0Jyk7Ci0KLWlmIChnbG9iYWxTdGF0ZSgpLnRlc3RzV2l0aFN0 ZGVyci5sZW5ndGgpCi0gICAgYXBwZW5kVGVzdExpc3QoZ2xvYmFsU3RhdGUoKS50ZXN0c1dpdGhT dGRlcnIsICdUZXN0cyB0aGF0IGhhZCBzdGRlcnIgb3V0cHV0OicsICdzdGRlcnItdGFibGUnLCAn LXN0ZGVyci50eHQnLCAnc3RkZXJyJyk7Ci0KLWlmIChnbG9iYWxTdGF0ZSgpLmhhc0h0dHBUZXN0 cykgewotICAgIGh0bWwgKz0gJzxwPmh0dHBkIGFjY2VzcyBsb2c6IDxhIGhyZWY9ImFjY2Vzc19s b2cudHh0Ij5hY2Nlc3NfbG9nLnR4dDwvYT48L3A+JyArCi0gICAgICAgICc8cD5odHRwZCBlcnJv ciBsb2c6IDxhIGhyZWY9ImVycm9yX2xvZy50eHQiPmVycm9yX2xvZy50eHQ8L2E+PC9wPic7Cisg ICAgaHRtbCArPSAnPC90YWJsZT4nOworICAgIHJldHVybiBodG1sOwogfQogCi1kb2N1bWVudC53 cml0ZShodG1sKTsKLQogZnVuY3Rpb24gdG9BcnJheShub2RlTGlzdCkKIHsKICAgICByZXR1cm4g QXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwobm9kZUxpc3QpOwpAQCAtNTAxLDEwICs0NjUsNiBA QCBUYWJsZVNvcnRlci5fc29ydCA9IGZ1bmN0aW9uKG5ld0hlYWRlcikKICAgICBUYWJsZVNvcnRl ci5fc29ydFJvd3MobmV3SGVhZGVyLCByZXZlcnNlZCk7CiB9CiAKLWlmIChkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgncmVzdWx0cy10YWJsZScpKQotICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCdyZXN1bHRzLXRhYmxlJykuYWRkRXZlbnRMaXN0ZW5lcignY2xpY2snLCBUYWJsZVNvcnRlci5o YW5kbGVDbGljaywgZmFsc2UpOwotVGFibGVTb3J0ZXIuc29ydENvbHVtbigwKTsKLQogdmFyIFBp eGVsWm9vbWVyID0ge307CiAKIFBpeGVsWm9vbWVyLl9jcmVhdGVDb250YWluZXIgPSBmdW5jdGlv bihlKQpAQCAtNTY1LDI1ICs1MjUsNjUgQEAgUGl4ZWxab29tZXIuaGFuZGxlTW91c2VNb3ZlID0g ZnVuY3Rpb24oZSkgewogICAgIFBpeGVsWm9vbWVyLl9wb3NpdGlvbihlKTsKIH0KIAotZG9jdW1l bnQuYm9keS5hZGRFdmVudExpc3RlbmVyKCdtb3VzZW1vdmUnLCBQaXhlbFpvb21lci5oYW5kbGVN b3VzZU1vdmUsIGZhbHNlKTsKLQotCi12YXIgdW5leHBlY3RlZFN0eWxlTm9kZSA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoJ3N0eWxlJyk7Ci1kb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHVuZXhw ZWN0ZWRTdHlsZU5vZGUpOworZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcignbW91c2Vtb3ZlJywg UGl4ZWxab29tZXIuaGFuZGxlTW91c2VNb3ZlLCBmYWxzZSk7CiAKIGZ1bmN0aW9uIHVwZGF0ZUV4 cGVjdGVkUmVzdWx0cygpCiB7CiAgICAgdmFyIGNoZWNrQm94ID0gZG9jdW1lbnQucXVlcnlTZWxl Y3RvcignLnVuZXhwZWN0ZWQtcmVzdWx0cycpOwotICAgIGlmICghY2hlY2tCb3ggfHwgY2hlY2tC b3guY2hlY2tlZCkKLSAgICAgICAgdW5leHBlY3RlZFN0eWxlTm9kZS5pbm5lclRleHQgPSAnLmV4 cGVjdGVkIHsgZGlzcGxheTogbm9uZTsgfSc7Ci0gICAgZWxzZQotICAgICAgICB1bmV4cGVjdGVk U3R5bGVOb2RlLmlubmVyVGV4dCA9ICcnOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd1 bmV4cGVjdGVkLXN0eWxlJykuaW5uZXJUZXh0ID0gKCFjaGVja0JveCB8fCBjaGVja0JveC5jaGVj a2VkKSA/CisgICAgICAgICcuZXhwZWN0ZWQgeyBkaXNwbGF5OiBub25lOyB9JyA6ICcnOwogfQog Ci11cGRhdGVFeHBlY3RlZFJlc3VsdHMoKTsKK2Z1bmN0aW9uIGdlbmVyYXRlUGFnZSgpCit7Cisg ICAgdmFyIGh0bWwgPSAnPGRpdiBpZD1vcHRpb25zPicgKworICAgICAgICAnPGEgaHJlZj0iamF2 YXNjcmlwdDp2b2lkKCkiIGNsYXNzPSJleHBhbmQtYWxsIiBvbmNsaWNrPSJleHBhbmRBbGxFeHBl Y3RhdGlvbnMoKSI+ZXhwYW5kIGFsbDwvYT4gJyArCisgICAgICAgICc8YSBocmVmPSJqYXZhc2Ny aXB0OnZvaWQoKSIgY2xhc3M9ImNvbGxhcHNlLWFsbCIgb25jbGljaz0iY29sbGFwc2VBbGxFeHBl Y3RhdGlvbnMoKSI+Y29sbGFwc2UgYWxsPC9hPic7CisKKyAgICBpZiAoZ2xvYmFsU3RhdGUoKS5y ZXN1bHRzLnVzZXNfZXhwZWN0YXRpb25zX2ZpbGUpCisgICAgICAgIGh0bWwgKz0gJzxsYWJlbD48 aW5wdXQgY2xhc3M9InVuZXhwZWN0ZWQtcmVzdWx0cyIgdHlwZT1jaGVja2JveCBjaGVja2VkIG9u Y2hhbmdlPSJ1cGRhdGVFeHBlY3RlZFJlc3VsdHMoKSI+T25seSBzaG93IHVuZXhwZWN0ZWQgcmVz dWx0czwvbGFiZWw+JzsKKworICAgIGh0bWwgKz0gJzwvZGl2Pic7CisKKyAgICB2YXIgdGFibGVS b3dzSHRtbCA9IHRhYmxlUm93cygpOworCisgICAgaWYgKHRhYmxlUm93c0h0bWwpIHsKKyAgICAg ICAgaHRtbCArPSAnPHA+VGVzdHMgd2hlcmUgcmVzdWx0cyBkaWQgbm90IG1hdGNoIGV4cGVjdGVk IHJlc3VsdHM6PC9wPicgKworICAgICAgICAgICAgJzx0YWJsZSBpZD0icmVzdWx0cy10YWJsZSI+ PHRoZWFkPjx0cj4nICsKKyAgICAgICAgICAgICc8dGg+dGVzdDwvdGg+JyArCisgICAgICAgICAg ICAnPHRoIGlkPSJ0ZXh0LXJlc3VsdHMtaGVhZGVyIj50ZXh0IHJlc3VsdHM8L3RoPicgKworICAg ICAgICAgICAgJzx0aCBpZD0iaW1hZ2UtcmVzdWx0cy1oZWFkZXIiPmltYWdlIHJlc3VsdHM8L3Ro PicgKworICAgICAgICAgICAgJzx0aD5mYWlsdXJlIHR5cGU8L3RoPic7CisKKyAgICAgICAgaWYg KGdsb2JhbFN0YXRlKCkucmVzdWx0cy51c2VzX2V4cGVjdGF0aW9uc19maWxlKQorICAgICAgICAg ICAgaHRtbCArPSAnPHRoPmV4cGVjdGVkIGZhaWx1cmUgdHlwZTwvdGg+JzsKKworICAgICAgICBo dG1sICs9ICc8L3RyPjwvdGhlYWQ+JyArIHRhYmxlUm93c0h0bWwgKyAnPC90YWJsZT4nOworICAg IH0KKworICAgIGlmIChnbG9iYWxTdGF0ZSgpLm5ld1Rlc3RzLmxlbmd0aCkKKyAgICAgICAgaHRt bCArPSB0ZXN0TGlzdChnbG9iYWxTdGF0ZSgpLm5ld1Rlc3RzLCAnVGVzdHMgdGhhdCBoYWQgbm8g ZXhwZWN0ZWQgcmVzdWx0cyAocHJvYmFibHkgbmV3KTonLCAnbmV3LXRlc3RzLXRhYmxlJywgJy1h Y3R1YWwudHh0JywgJ3Jlc3VsdCcpOworCisgICAgaWYgKGdsb2JhbFN0YXRlKCkudGVzdHNXaXRo U3RkZXJyLmxlbmd0aCkKKyAgICAgICAgaHRtbCArPSB0ZXN0TGlzdChnbG9iYWxTdGF0ZSgpLnRl c3RzV2l0aFN0ZGVyciwgJ1Rlc3RzIHRoYXQgaGFkIHN0ZGVyciBvdXRwdXQ6JywgJ3N0ZGVyci10 YWJsZScsICctc3RkZXJyLnR4dCcsICdzdGRlcnInKTsKKworICAgIGlmIChnbG9iYWxTdGF0ZSgp Lmhhc0h0dHBUZXN0cykgeworICAgICAgICBodG1sICs9ICc8cD5odHRwZCBhY2Nlc3MgbG9nOiA8 YSBocmVmPSJhY2Nlc3NfbG9nLnR4dCI+YWNjZXNzX2xvZy50eHQ8L2E+PC9wPicgKworICAgICAg ICAgICAgJzxwPmh0dHBkIGVycm9yIGxvZzogPGEgaHJlZj0iZXJyb3JfbG9nLnR4dCI+ZXJyb3Jf bG9nLnR4dDwvYT48L3A+JzsKKyAgICB9CiAKLWlmICghZ2xvYmFsU3RhdGUoKS5oYXNUZXh0RmFp bHVyZXMpCi0gIGRvY3VtZW50LmJvZHkuZ2V0RWxlbWVudEJ5SWQoJ3RleHQtcmVzdWx0cy1oZWFk ZXInKS50ZXh0Q29udGVudCA9ICcnOwotaWYgKCFnbG9iYWxTdGF0ZSgpLmhhc0ltYWdlRmFpbHVy ZXMpCi0gIGRvY3VtZW50LmJvZHkuZ2V0RWxlbWVudEJ5SWQoJ2ltYWdlLXJlc3VsdHMtaGVhZGVy JykudGV4dENvbnRlbnQgPSAnJzsKKyAgICBkb2N1bWVudC5ib2R5LmlubmVySFRNTCA9IGh0bWw7 CisKKyAgICBpZiAoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdHMtdGFibGUnKSkKKyAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdHMtdGFibGUnKS5hZGRFdmVudExp c3RlbmVyKCdjbGljaycsIFRhYmxlU29ydGVyLmhhbmRsZUNsaWNrLCBmYWxzZSk7CisgICAgVGFi bGVTb3J0ZXIuc29ydENvbHVtbigwKTsKKyAgICAKKyAgICB1cGRhdGVFeHBlY3RlZFJlc3VsdHMo KTsKKworICAgIGlmICghZ2xvYmFsU3RhdGUoKS5oYXNUZXh0RmFpbHVyZXMpCisgICAgICBkb2N1 bWVudC5ib2R5LmdldEVsZW1lbnRCeUlkKCd0ZXh0LXJlc3VsdHMtaGVhZGVyJykudGV4dENvbnRl bnQgPSAnJzsKKyAgICBpZiAoIWdsb2JhbFN0YXRlKCkuaGFzSW1hZ2VGYWlsdXJlcykKKyAgICAg IGRvY3VtZW50LmJvZHkuZ2V0RWxlbWVudEJ5SWQoJ2ltYWdlLXJlc3VsdHMtaGVhZGVyJykudGV4 dENvbnRlbnQgPSAnJzsKK30KIDwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJnZW5lcmF0ZVBhZ2Uo KSI+PC9ib2R5Pgo=