91278 2012-07-13 14:10:07 -0700 Improve block margin estimation function to account for not having a layout and for quirks mode 2012-07-13 15:57:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric webkit.review.bot oldest_to_newest 669403 0 hyatt 2012-07-13 14:10:07 -0700 Improve block margin estimation function to account for not having a layout and for quirks mode. 669407 1 152328 hyatt 2012-07-13 14:12:30 -0700 Created attachment 152328 Patch 669527 2 hyatt 2012-07-13 15:57:27 -0700 Landed in r122639. 152328 2012-07-13 14:12:30 -0700 2012-07-13 14:15:21 -0700 Patch patch.txt text/plain 6511 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMjYyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA3LTEzICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTEyNzgKKyAgICAgICAgSW1wcm92ZSBibG9jayBtYXJnaW4gZXN0 aW1hdGlvbiBmdW5jdGlvbiB0byBhY2NvdW50IGZvciBub3QgaGF2aW5nIGEgbGF5b3V0IGFuZCBm b3IgcXVpcmtzIG1vZGUKKyAgICAgICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrOjptYXJnaW5CZWZvcmVFc3RpbWF0ZUZvckNoaWxkKToKKyAgICAg ICAgUmV2aXNlIG1hcmdpbkJlZm9yZUVzdGltYXRlRm9yQ2hpbGQgc28gdGhhdCBpdCBjb21wdXRl cyBibG9jayBtYXJnaW5zIGZvciB0aGUgZ3JhbmRjaGlsZCBiZWZvcmUKKyAgICAgICAgcmVjdXJy aW5nLiBUaGlzIGluY2x1ZGVzIHRoZSBxdWlya3MgbWFyZ2luIGluZm9ybWF0aW9uIGFzIHdlbGwu IFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBtYXJnaW5zIGFyZQorICAgICAgICB1cC10by1kYXRlIHdo ZW4gY2hlY2tlZCwgZXZlbiBiZWZvcmUgdGhlIG9iamVjdCBoYXMgaGFkIGl0cyBmaXJzdCBsYXlv dXQuCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnNldE1hcmdpblN0YXJ0Rm9yQ2hpbGQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnNldE1hcmdpbkVuZEZvckNoaWxkKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpzZXRNYXJnaW5CZWZvcmVGb3JDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2V0TWFyZ2luQWZ0ZXJGb3JDaGlsZCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6 OmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJCb3guaDoKKyAgICAgICAgKFJlbmRlckJveCk6CisgICAgICAgIEFkZCBjb25zdHMgaW4gb3Jk ZXIgdG8gY29tcGlsZS4KKwogMjAxMi0wNy0xMyAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBBbHdheXMgYWdncmVzc2l2ZWx5IHByZWxvYWQgb24gaU9T CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9u IDEyMjQ4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIwOTEsOCArMjA5MSwxMSBAQCBMYXlvdXRVbml0IFJlbmRlckJsb2Nr OjpjbGVhckZsb2F0c0lmTmVlCiAKIHZvaWQgUmVuZGVyQmxvY2s6Om1hcmdpbkJlZm9yZUVzdGlt YXRlRm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCYgcG9zaXRpdmVNYXJnaW5C ZWZvcmUsIExheW91dFVuaXQmIG5lZ2F0aXZlTWFyZ2luQmVmb3JlKSBjb25zdAogewotICAgIC8v IEZJWE1FOiBXZSBjb3VsZCBnZXQgZXZlbiBtb3JlIHF1aXJrcyBtb2RlIGNhc2VzIHJpZ2h0IGlm IHdlIGRlYWx0IHdpdGggcXVpcmsgY29udGFpbmVycy4KICAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IGRlYWwgd2l0aCB0aGUgbWFyZ2luLWNvbGxhcHNlLSogc3R5bGUgZXh0ZW5zaW9ucyB0aGF0IHBy ZXZlbnQgY29sbGFwc2luZyBhbmQgdGhhdCBkaXNjYXJkIG1hcmdpbnMuCisgICAgLy8gR2l2ZSB1 cCBpZiBpbiBxdWlya3MgbW9kZSBhbmQgd2UncmUgYSBib2R5L3RhYmxlIGNlbGwgYW5kIHRoZSB0 b3AgbWFyZ2luIG9mIHRoZSBjaGlsZCBib3ggaXMgcXVpcmt5LgorICAgIGlmIChkb2N1bWVudCgp LT5pblF1aXJrc01vZGUoKSAmJiBjaGlsZC0+aXNNYXJnaW5CZWZvcmVRdWlyaygpICYmIChpc1Rh YmxlQ2VsbCgpIHx8IGlzQm9keSgpKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgTGF5b3V0VW5p dCBiZWZvcmVDaGlsZE1hcmdpbiA9IG1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxkKTsKICAgICBw b3NpdGl2ZU1hcmdpbkJlZm9yZSA9IG1heChwb3NpdGl2ZU1hcmdpbkJlZm9yZSwgYmVmb3JlQ2hp bGRNYXJnaW4pOwogICAgIG5lZ2F0aXZlTWFyZ2luQmVmb3JlID0gbWF4KG5lZ2F0aXZlTWFyZ2lu QmVmb3JlLCAtYmVmb3JlQ2hpbGRNYXJnaW4pOwpAQCAtMjExOCw2ICsyMTIxLDEzIEBAIHZvaWQg UmVuZGVyQmxvY2s6Om1hcmdpbkJlZm9yZUVzdGltYXRlRm8KICAgICBpZiAoIWdyYW5kY2hpbGRC b3ggfHwgZ3JhbmRjaGlsZEJveC0+c3R5bGUoKS0+Y2xlYXIoKSAhPSBDTk9ORSkKICAgICAgICAg cmV0dXJuOwogCisgICAgLy8gTWFrZSBzdXJlIHRvIHVwZGF0ZSB0aGUgYmxvY2sgbWFyZ2lucyBu b3cgZm9yIHRoZSBncmFuZGNoaWxkIGJveCBzbyB0aGF0IHdlJ3JlIGxvb2tpbmcgYXQgY3VycmVu dCB2YWx1ZXMuCisgICAgaWYgKGdyYW5kY2hpbGRCb3gtPm5lZWRzTGF5b3V0KCkpIHsKKyAgICAg ICAgZ3JhbmRjaGlsZEJveC0+Y29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyh0aGlzKTsgCisg ICAgICAgIGdyYW5kY2hpbGRCb3gtPnNldE1hcmdpbkJlZm9yZVF1aXJrKGdyYW5kY2hpbGRCb3gt PnN0eWxlKCktPm1hcmdpbkJlZm9yZSgpLnF1aXJrKCkpOworICAgICAgICBncmFuZGNoaWxkQm94 LT5zZXRNYXJnaW5BZnRlclF1aXJrKGdyYW5kY2hpbGRCb3gtPnN0eWxlKCktPm1hcmdpbkFmdGVy KCkucXVpcmsoKSk7CisgICAgfQorCiAgICAgLy8gQ29sbGFwc2UgdGhlIG1hcmdpbiBvZiB0aGUg Z3JhbmRjaGlsZCBib3ggd2l0aCBvdXIgb3duIHRvIHByb2R1Y2UgYW4gZXN0aW1hdGUuCiAgICAg Y2hpbGRCbG9jay0+bWFyZ2luQmVmb3JlRXN0aW1hdGVGb3JDaGlsZChncmFuZGNoaWxkQm94LCBw b3NpdGl2ZU1hcmdpbkJlZm9yZSwgbmVnYXRpdmVNYXJnaW5CZWZvcmUpOwogfQpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDEyMjQ4OCkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0y OTUsMTAgKzI5NSwxMCBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5BZnRlckZvckNo aWxkKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjaGlsZCkgY29uc3QgeyByZXR1cm4gY2hp bGQtPm1hcmdpbkFmdGVyKHN0eWxlKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5TdGFydEZv ckNoaWxkKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0KiBjaGlsZCkgY29uc3QgeyByZXR1cm4g Y2hpbGQtPm1hcmdpblN0YXJ0KHN0eWxlKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5FbmRG b3JDaGlsZChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCogY2hpbGQpIGNvbnN0IHsgcmV0dXJu IGNoaWxkLT5tYXJnaW5FbmQoc3R5bGUoKSk7IH0KLSAgICB2b2lkIHNldE1hcmdpblN0YXJ0Rm9y Q2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCB2YWx1ZSkgeyBjaGlsZC0+c2V0TWFy Z2luU3RhcnQodmFsdWUsIHN0eWxlKCkpOyB9Ci0gICAgdm9pZCBzZXRNYXJnaW5FbmRGb3JDaGls ZChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IHZhbHVlKSB7IGNoaWxkLT5zZXRNYXJnaW5F bmQodmFsdWUsIHN0eWxlKCkpOyB9Ci0gICAgdm9pZCBzZXRNYXJnaW5CZWZvcmVGb3JDaGlsZChS ZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IHZhbHVlKSB7IGNoaWxkLT5zZXRNYXJnaW5CZWZv cmUodmFsdWUsIHN0eWxlKCkpOyB9Ci0gICAgdm9pZCBzZXRNYXJnaW5BZnRlckZvckNoaWxkKFJl bmRlckJveCogY2hpbGQsIExheW91dFVuaXQgdmFsdWUpIHsgY2hpbGQtPnNldE1hcmdpbkFmdGVy KHZhbHVlLCBzdHlsZSgpKTsgfQorICAgIHZvaWQgc2V0TWFyZ2luU3RhcnRGb3JDaGlsZChSZW5k ZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IHZhbHVlKSBjb25zdCB7IGNoaWxkLT5zZXRNYXJnaW5T dGFydCh2YWx1ZSwgc3R5bGUoKSk7IH0KKyAgICB2b2lkIHNldE1hcmdpbkVuZEZvckNoaWxkKFJl bmRlckJveCogY2hpbGQsIExheW91dFVuaXQgdmFsdWUpIGNvbnN0IHsgY2hpbGQtPnNldE1hcmdp bkVuZCh2YWx1ZSwgc3R5bGUoKSk7IH0KKyAgICB2b2lkIHNldE1hcmdpbkJlZm9yZUZvckNoaWxk KFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgdmFsdWUpIGNvbnN0IHsgY2hpbGQtPnNldE1h cmdpbkJlZm9yZSh2YWx1ZSwgc3R5bGUoKSk7IH0KKyAgICB2b2lkIHNldE1hcmdpbkFmdGVyRm9y Q2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCB2YWx1ZSkgY29uc3QgeyBjaGlsZC0+ c2V0TWFyZ2luQWZ0ZXIodmFsdWUsIHN0eWxlKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBjb2xsYXBz ZWRNYXJnaW5CZWZvcmVGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqIGNoaWxkKSBjb25zdDsKICAg ICBMYXlvdXRVbml0IGNvbGxhcHNlZE1hcmdpbkFmdGVyRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94 KiBjaGlsZCkgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCShyZXZpc2lvbiAxMjI0ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjMzNiw3ICsyMzM2LDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmF2YWlsYWJsZUxvZ2ljYWxIZQogICAgIHJldHVybiBjb250YWluaW5nQmxvY2so KS0+YXZhaWxhYmxlTG9naWNhbEhlaWdodCgpOwogfQogCi12b2lkIFJlbmRlckJveDo6Y29tcHV0 ZUJsb2NrRGlyZWN0aW9uTWFyZ2lucyhSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrKQordm9p ZCBSZW5kZXJCb3g6OmNvbXB1dGVCbG9ja0RpcmVjdGlvbk1hcmdpbnMoY29uc3QgUmVuZGVyQmxv Y2sqIGNvbnRhaW5pbmdCbG9jaykKIHsKICAgICBpZiAoaXNUYWJsZUNlbGwoKSkgewogICAgICAg ICAvLyBGSVhNRTogTm90IHJpZ2h0IGlmIHdlIGFsbG93IGNlbGxzIHRvIGhhdmUgZGlmZmVyZW50 IGRpcmVjdGlvbmFsaXR5IHRoYW4gdGhlIHRhYmxlLiAgSWYgd2UgZG8gYWxsb3cgdGhpcywgdGhv dWdoLApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAkocmV2aXNpb24gMTIy NDg4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCSh3b3JraW5nIGNv cHkpCkBAIC0yOTAsNyArMjkwLDcgQEAgcHVibGljOgogICAgIHZvaWQgY29tcHV0ZUlubGluZURp cmVjdGlvbk1hcmdpbnMoUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaywgTGF5b3V0VW5pdCBj b250YWluZXJXaWR0aCwgTGF5b3V0VW5pdCBjaGlsZFdpZHRoKTsKIAogICAgIC8vIFVzZWQgdG8g cmVzb2x2ZSBtYXJnaW5zIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdyBkaXJl Y3Rpb24uCi0gICAgdm9pZCBjb21wdXRlQmxvY2tEaXJlY3Rpb25NYXJnaW5zKFJlbmRlckJsb2Nr KiBjb250YWluaW5nQmxvY2spOworICAgIHZvaWQgY29tcHV0ZUJsb2NrRGlyZWN0aW9uTWFyZ2lu cyhjb25zdCBSZW5kZXJCbG9jayogY29udGFpbmluZ0Jsb2NrKTsKIAogICAgIGVudW0gUmVuZGVy Qm94UmVnaW9uSW5mb0ZsYWdzIHsgQ2FjaGVSZW5kZXJCb3hSZWdpb25JbmZvLCBEb05vdENhY2hl UmVuZGVyQm94UmVnaW9uSW5mbyB9OwogICAgIExheW91dFJlY3QgYm9yZGVyQm94UmVjdEluUmVn aW9uKFJlbmRlclJlZ2lvbiosIExheW91dFVuaXQgb2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0 UGFnZSA9IDAsIFJlbmRlckJveFJlZ2lvbkluZm9GbGFncyA9IENhY2hlUmVuZGVyQm94UmVnaW9u SW5mbykgY29uc3Q7Cg==