114713 2013-04-16 16:38:32 -0700 Re-name Page::layoutMilestones() to Page::requestedLayoutMilestones() 2013-04-16 20:54:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin bdakin commit-queue esprehn+autocc sam simon.fraser oldest_to_newest 876944 0 bdakin 2013-04-16 16:38:32 -0700 We should re-name Page::layoutMilestones() to Page::requestedLayoutMilestones(). This makes their purpose more clear. 876945 1 198451 bdakin 2013-04-16 16:41:48 -0700 Created attachment 198451 Patch 876952 2 bdakin 2013-04-16 16:54:54 -0700 I should note that this re-name came up originally in https://bugs.webkit.org/show_bug.cgi?id=114706 877009 3 bdakin 2013-04-16 20:54:41 -0700 Thank you! http://trac.webkit.org/changeset/148590 198451 2013-04-16 16:41:48 -0700 2013-04-16 17:08:02 -0700 Patch for-review.txt text/plain 7120 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODU3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA0LTE2ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZS1uYW1lIFBhZ2U6OmxheW91dE1p bGVzdG9uZXMoKSB0byBQYWdlOjpyZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDcxMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpwZXJmb3JtUG9zdExheW91dFRhc2tz KToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZTo6UGFn ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjphZGRMYXlvdXRNaWxlc3RvbmVzKToKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2U6OnJlbW92ZUxheW91dE1pbGVzdG9uZXMpOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6aXNDb3VudGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cyk6CisgICAgICAg ICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpyZXF1ZXN0ZWRMYXlvdXRN aWxlc3RvbmVzKToKKyAgICAgICAgKFBhZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMpOgorCiAyMDEzLTA0LTE2ICBKZXIgTm9ibGUg IDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4OyBh ZGQgbmV3IEpTQXVkaW9CdWZmZXIuY3BwIGZpbGUgdG8gbW9yZSBidWlsZCBzeXN0ZW1zLgpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMTQ4NTYyKQorKysgU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjk3LDE3ICsy Njk3LDE3IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtUG9zdExheW91dFRhc2tzKCkKICAgICBt X2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0Q2FyZXRSZWN0TmVlZHNVcGRhdGUoKTsKICAgICBtX2Zy YW1lLT5zZWxlY3Rpb24oKS0+dXBkYXRlQXBwZWFyYW5jZSgpOwogCi0gICAgTGF5b3V0TWlsZXN0 b25lcyBtaWxlc3RvbmVzT2ZJbnRlcmVzdCA9IDA7CisgICAgTGF5b3V0TWlsZXN0b25lcyByZXF1 ZXN0ZWRNaWxlc3RvbmVzID0gMDsKICAgICBMYXlvdXRNaWxlc3RvbmVzIG1pbGVzdG9uZXNBY2hp ZXZlZCA9IDA7CiAgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKICAgICBpZiAocGFn ZSkKLSAgICAgICAgbWlsZXN0b25lc09mSW50ZXJlc3QgPSBwYWdlLT5sYXlvdXRNaWxlc3RvbmVz KCk7CisgICAgICAgIHJlcXVlc3RlZE1pbGVzdG9uZXMgPSBwYWdlLT5yZXF1ZXN0ZWRMYXlvdXRN aWxlc3RvbmVzKCk7CiAKICAgICBpZiAobV9uZXN0ZWRMYXlvdXRDb3VudCA8PSAxKSB7CiAgICAg ICAgIGlmIChtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nKSB7CiAgICAgICAgICAgICBtX2Zp cnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7CiAgICAgICAgICAgICBtX2ZyYW1lLT5s b2FkZXIoKS0+ZGlkRmlyc3RMYXlvdXQoKTsKLSAgICAgICAgICAgIGlmIChtaWxlc3RvbmVzT2ZJ bnRlcmVzdCAmIERpZEZpcnN0TGF5b3V0KQorICAgICAgICAgICAgaWYgKHJlcXVlc3RlZE1pbGVz dG9uZXMgJiBEaWRGaXJzdExheW91dCkKICAgICAgICAgICAgICAgICBtaWxlc3RvbmVzQWNoaWV2 ZWQgfD0gRGlkRmlyc3RMYXlvdXQ7CiAgICAgICAgICAgICBpZiAocGFnZSkgewogICAgICAgICAg ICAgICAgIGlmIChwYWdlLT5tYWluRnJhbWUoKSA9PSBtX2ZyYW1lKQpAQCAtMjcyMiw3ICsyNzIy LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnBlcmZvcm1Qb3N0TGF5b3V0VGFza3MoKQogICAgICAgICAv LyBJZiB0aGUgbGF5b3V0IHdhcyBkb25lIHdpdGggcGVuZGluZyBzaGVldHMsIHdlIGFyZSBub3Qg aW4gZmFjdCB2aXN1YWxseSBub24tZW1wdHkgeWV0LgogICAgICAgICBpZiAobV9pc1Zpc3VhbGx5 Tm9uRW1wdHkgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmRpZExheW91dFdpdGhQZW5kaW5nU3R5 bGVzaGVldHMoKSAmJiBtX2ZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dENhbGxiYWNrUGVuZGlu ZykgewogICAgICAgICAgICAgbV9maXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXRDYWxsYmFja1Bl bmRpbmcgPSBmYWxzZTsKLSAgICAgICAgICAgIGlmIChtaWxlc3RvbmVzT2ZJbnRlcmVzdCAmIERp ZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dCkKKyAgICAgICAgICAgIGlmIChyZXF1ZXN0ZWRN aWxlc3RvbmVzICYgRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0KQogICAgICAgICAgICAg ICAgIG1pbGVzdG9uZXNBY2hpZXZlZCB8PSBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7 CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHJldmlzaW9uIDE0ODU2 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3 NCw3ICsxNzQsNyBAQCBQYWdlOjpQYWdlKFBhZ2VDbGllbnRzJiBwYWdlQ2xpZW50cykKICAgICAs IG1fdmlzaWJpbGl0eVN0YXRlKFBhZ2VWaXNpYmlsaXR5U3RhdGVWaXNpYmxlKQogI2VuZGlmCiAg ICAgLCBtX2Rpc3BsYXlJRCgwKQotICAgICwgbV9sYXlvdXRNaWxlc3RvbmVzKDApCisgICAgLCBt X3JlcXVlc3RlZExheW91dE1pbGVzdG9uZXMoMCkKICAgICAsIG1faXNDb3VudGluZ1JlbGV2YW50 UmVwYWludGVkT2JqZWN0cyhmYWxzZSkKICNpZm5kZWYgTkRFQlVHCiAgICAgLCBtX2lzUGFpbnRp bmcoZmFsc2UpCkBAIC0xMjcxLDEyICsxMjcxLDEyIEBAIFBhZ2VWaXNpYmlsaXR5U3RhdGUgUGFn ZTo6dmlzaWJpbGl0eVN0YXQKIHZvaWQgUGFnZTo6YWRkTGF5b3V0TWlsZXN0b25lcyhMYXlvdXRN aWxlc3RvbmVzIG1pbGVzdG9uZXMpCiB7CiAgICAgLy8gSW4gdGhlIGZ1dHVyZSwgd2UgbWF5IHdh bnQgYSBmdW5jdGlvbiB0aGF0IHJlcGxhY2VzIG1fbGF5b3V0TWlsZXN0b25lcyBpbnN0ZWFkIG9m IGp1c3QgYWRkaW5nIHRvIGl0LgotICAgIG1fbGF5b3V0TWlsZXN0b25lcyB8PSBtaWxlc3RvbmVz OworICAgIG1fcmVxdWVzdGVkTGF5b3V0TWlsZXN0b25lcyB8PSBtaWxlc3RvbmVzOwogfQogCiB2 b2lkIFBhZ2U6OnJlbW92ZUxheW91dE1pbGVzdG9uZXMoTGF5b3V0TWlsZXN0b25lcyBtaWxlc3Rv bmVzKQogewotICAgIG1fbGF5b3V0TWlsZXN0b25lcyAmPSB+bWlsZXN0b25lczsKKyAgICBtX3Jl cXVlc3RlZExheW91dE1pbGVzdG9uZXMgJj0gfm1pbGVzdG9uZXM7CiB9CiAKIC8vIFRoZXNlIGFy ZSBtYWdpY2FsIGNvbnN0YW50cyB0aGF0IG1pZ2h0IGJlIHR3ZWFrZWQgb3ZlciB0aW1lLgpAQCAt MTI4NSw3ICsxMjg1LDcgQEAgc3RhdGljIGRvdWJsZSBnTWF4aW11bVVucGFpbnRlZEFyZWFSYXRp bwogCiBib29sIFBhZ2U6OmlzQ291bnRpbmdSZWxldmFudFJlcGFpbnRlZE9iamVjdHMoKSBjb25z dAogewotICAgIHJldHVybiBtX2lzQ291bnRpbmdSZWxldmFudFJlcGFpbnRlZE9iamVjdHMgJiYg KG1fbGF5b3V0TWlsZXN0b25lcyAmIERpZEhpdFJlbGV2YW50UmVwYWludGVkT2JqZWN0c0FyZWFU aHJlc2hvbGQpOworICAgIHJldHVybiBtX2lzQ291bnRpbmdSZWxldmFudFJlcGFpbnRlZE9iamVj dHMgJiYgKG1fcmVxdWVzdGVkTGF5b3V0TWlsZXN0b25lcyAmIERpZEhpdFJlbGV2YW50UmVwYWlu dGVkT2JqZWN0c0FyZWFUaHJlc2hvbGQpOwogfQogCiB2b2lkIFBhZ2U6OnN0YXJ0Q291bnRpbmdS ZWxldmFudFJlcGFpbnRlZE9iamVjdHMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgJKHJldmlzaW9uIDE0 ODU2NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0z NTMsNyArMzUzLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGRMYXlvdXRNaWxlc3RvbmVzKExh eW91dE1pbGVzdG9uZXMpOwogICAgIHZvaWQgcmVtb3ZlTGF5b3V0TWlsZXN0b25lcyhMYXlvdXRN aWxlc3RvbmVzKTsKLSAgICBMYXlvdXRNaWxlc3RvbmVzIGxheW91dE1pbGVzdG9uZXMoKSBjb25z dCB7IHJldHVybiBtX2xheW91dE1pbGVzdG9uZXM7IH0KKyAgICBMYXlvdXRNaWxlc3RvbmVzIHJl cXVlc3RlZExheW91dE1pbGVzdG9uZXMoKSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3RlZExheW91 dE1pbGVzdG9uZXM7IH0KIAogICAgIGJvb2wgaXNDb3VudGluZ1JlbGV2YW50UmVwYWludGVkT2Jq ZWN0cygpIGNvbnN0OwogICAgIHZvaWQgc3RhcnRDb3VudGluZ1JlbGV2YW50UmVwYWludGVkT2Jq ZWN0cygpOwpAQCAtNTAyLDcgKzUwMiw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICBQbGF0Zm9y bURpc3BsYXlJRCBtX2Rpc3BsYXlJRDsKIAotICAgIExheW91dE1pbGVzdG9uZXMgbV9sYXlvdXRN aWxlc3RvbmVzOworICAgIExheW91dE1pbGVzdG9uZXMgbV9yZXF1ZXN0ZWRMYXlvdXRNaWxlc3Rv bmVzOwogCiAgICAgSGFzaFNldDxSZW5kZXJPYmplY3QqPiBtX3JlbGV2YW50VW5wYWludGVkUmVu ZGVyT2JqZWN0czsKICAgICBSZWdpb24gbV90b3BSZWxldmFudFBhaW50ZWRSZWdpb247CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAkocmV2aXNpb24gMTQ4NTY0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3OSw3ICszNzksNyBAQCB2 b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQZW5kaW5nCiAgICAgaWYgKG1faGVhZGVy TGF5ZXJBd2FpdGluZ0ZpcnN0Rmx1c2gpIHsKICAgICAgICAgbV9oZWFkZXJMYXllckF3YWl0aW5n Rmlyc3RGbHVzaCA9IGZhbHNlOwogICAgICAgICBpZiAoUGFnZSogcGFnZSA9IHRoaXMtPnBhZ2Uo KSkgewotICAgICAgICAgICAgaWYgKHBhZ2UtPmxheW91dE1pbGVzdG9uZXMoKSAmIERpZEZpcnN0 Rmx1c2hGb3JIZWFkZXJMYXllcikgeworICAgICAgICAgICAgaWYgKHBhZ2UtPnJlcXVlc3RlZExh eW91dE1pbGVzdG9uZXMoKSAmIERpZEZpcnN0Rmx1c2hGb3JIZWFkZXJMYXllcikgewogICAgICAg ICAgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSBwYWdlLT5tYWluRnJhbWUoKSkKICAgICAgICAg ICAgICAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5kaWRMYXlvdXQoRGlkRmlyc3RGbHVzaEZvckhl YWRlckxheWVyKTsKICAgICAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9u IDE0ODU3MCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDEzLTA0LTE2ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNv bT4KKworICAgICAgICBSZS1uYW1lIFBhZ2U6OmxheW91dE1pbGVzdG9uZXMoKSB0byBQYWdlOjpy ZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNDcxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJW aWV3IF9sYXlvdXRNaWxlc3RvbmVzXSk6CisKIDIwMTMtMDQtMTUgIFNhbSBXZWluaWcgIDxzYW1A d2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgbW9yZSAjaW5jbHVkZXMgZnJvbSBGcmFtZS5o CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAxNDg1NjIp CisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkK QEAgLTI5MzEsNyArMjkzMSw3IEBAIC0gKFdlYkxheW91dE1pbGVzdG9uZXMpX2xheW91dE1pbGVz dG9uZXMKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgcmV0dXJuIGtp dExheW91dE1pbGVzdG9uZXMocGFnZS0+bGF5b3V0TWlsZXN0b25lcygpKTsKKyAgICByZXR1cm4g a2l0TGF5b3V0TWlsZXN0b25lcyhwYWdlLT5yZXF1ZXN0ZWRMYXlvdXRNaWxlc3RvbmVzKCkpOwog fQogCiAtICh2b2lkKV9zZXRWaXNpYmlsaXR5U3RhdGU6KFdlYlBhZ2VWaXNpYmlsaXR5U3RhdGUp dmlzaWJpbGl0eVN0YXRlIGlzSW5pdGlhbFN0YXRlOihCT09MKWlzSW5pdGlhbFN0YXRlCg==