117455 2013-06-10 17:53:11 -0700 Make more functions const 2013-06-10 18:11:23 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa benjamin commit-queue kling koivisto oldest_to_newest 898929 0 rniwa 2013-06-10 17:53:11 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/886866f5034d7f30f8aa607b909313f99db1f3b4. 898931 1 204267 rniwa 2013-06-10 17:55:35 -0700 Created attachment 204267 Cleanup 898943 2 rniwa 2013-06-10 18:11:23 -0700 Committed r151415: <http://trac.webkit.org/changeset/151415> 204267 2013-06-10 17:55:35 -0700 2013-06-10 18:09:52 -0700 Cleanup bug-117455-20130610175358.patch text/plain 4738 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTQxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA2LTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgbW9yZSBmdW5jdGlvbnMg Y29uc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEx NzQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1l cmdlIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJvbWl1bS9ibGluay8rLzg4 Njg2NmY1MDM0ZDdmMzBmOGFhNjA3YjkwOTMxM2Y5OWRiMWYzYjQuCisKKyAgICAgICAgKiBlZGl0 aW5nL1Zpc2libGVVbml0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRMb2dpY2FsbHlP cmRlcmVkTGVhZkJveGVzOjpib3hJbmRleEluTGVhdmVzKToKKyAgICAgICAgKiBodG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZUxpc3Q6OmV2YWxE aXNhYmxlZEVycm9yTWVzc2FnZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGlu ZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMaW5lV2lkdGg6OnNob3VsZEluZGVudFRl eHQpOgorCiAyMDEzLTA2LTEwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjE1MTMwMik6IE1hbnkgYnJva2VuIHdlYmF1ZGlvLyB0ZXN0cyBv biBNYWMgcG9ydC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVVuaXRzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVVbml0cy5jcHAJ KHJldmlzaW9uIDE1MTM2MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVVuaXRz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDEwICsxMzAsMTAgQEAgcHVibGljOgogCiAgICAg c2l6ZV90IHNpemUoKSBjb25zdCB7IHJldHVybiBtX2xlYWZCb3hlcy5zaXplKCk7IH0KICAgICBj b25zdCBJbmxpbmVCb3gqIGZpcnN0Qm94KCkgY29uc3QgeyByZXR1cm4gbV9sZWFmQm94ZXNbMF07 IH0KLSAgICAKKwogcHJpdmF0ZToKICAgICBjb25zdCBWZWN0b3I8SW5saW5lQm94Kj4mIGNvbGxl Y3RCb3hlcyhjb25zdCBSb290SW5saW5lQm94Kik7Ci0gICAgaW50IGJveEluZGV4SW5MZWF2ZXMo Y29uc3QgSW5saW5lVGV4dEJveCopOworICAgIGludCBib3hJbmRleEluTGVhdmVzKGNvbnN0IElu bGluZVRleHRCb3gqKSBjb25zdDsKIAogICAgIGNvbnN0IFJvb3RJbmxpbmVCb3gqIG1fcm9vdElu bGluZUJveDsKICAgICBWZWN0b3I8SW5saW5lQm94Kj4gbV9sZWFmQm94ZXM7CkBAIC0xOTIsNyAr MTkyLDcgQEAgY29uc3QgVmVjdG9yPElubGluZUJveCo+JiBDYWNoZWRMb2dpY2FsbAogICAgIHJl dHVybiBtX2xlYWZCb3hlczsKIH0KIAotaW50IENhY2hlZExvZ2ljYWxseU9yZGVyZWRMZWFmQm94 ZXM6OmJveEluZGV4SW5MZWF2ZXMoY29uc3QgSW5saW5lVGV4dEJveCogYm94KQoraW50IENhY2hl ZExvZ2ljYWxseU9yZGVyZWRMZWFmQm94ZXM6OmJveEluZGV4SW5MZWF2ZXMoY29uc3QgSW5saW5l VGV4dEJveCogYm94KSBjb25zdAogewogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9sZWFm Qm94ZXMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgaWYgKGJveCA9PSBtX2xlYWZCb3hlc1tpXSkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJp bmdDb250ZXh0LmNwcAkocmV2aXNpb24gMTUxMzYwKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk2LDcg KzE5Niw3IEBAIG5hbWVzcGFjZSB7CiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAg IGJvb2wgaGFzTW9yZUNoYXJhY3RlcnMoKQorICAgICAgICBib29sIGhhc01vcmVDaGFyYWN0ZXJz KCkgY29uc3QKICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIChtX3Bvc2l0aW9uIDwgbV9s ZW5ndGgpOwogICAgICAgICB9CkBAIC0yMTMsNyArMjEzLDcgQEAgbmFtZXNwYWNlIHsKIAogICAg ICAgICB2b2lkIHByb2Nlc3MoVUNoYXIpOwogCi0gICAgICAgIGJvb2wgcGVlayhVQ2hhciYgY2hh cmFjdGVyKQorICAgICAgICBib29sIHBlZWsoVUNoYXImIGNoYXJhY3RlcikgY29uc3QKICAgICAg ICAgewogICAgICAgICAgICAgaWYgKG1fcG9zaXRpb24gKyAxID49IG1fbGVuZ3RoKQogICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIyMSw3ICsyMjEsNyBAQCBuYW1lc3BhY2Ugewog ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KIAotICAgICAgICBVQ2hhciBjdXJy ZW50KCkKKyAgICAgICAgVUNoYXIgY3VycmVudCgpIGNvbnN0CiAgICAgICAgIHsKICAgICAgICAg ICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKG1fcG9zaXRpb24gPCBtX2xlbmd0 aCk7CiAgICAgICAgICAgICByZXR1cm4gbV9zb3VyY2VTdHJpbmdbbV9wb3NpdGlvbl07CkBAIC0y MzIsNyArMjMyLDcgQEAgbmFtZXNwYWNlIHsKICAgICAgICAgICAgICsrbV9wb3NpdGlvbjsKICAg ICAgICAgfQogCi0gICAgICAgIGJvb2wgaXNOZXdsaW5lKFVDaGFyIGNoYXJhY3RlcikKKyAgICAg ICAgYm9vbCBpc05ld2xpbmUoVUNoYXIgY2hhcmFjdGVyKSBjb25zdAogICAgICAgICB7CiAgICAg ICAgICAgICAvLyBEb24ndCBhdHRlbXB0IHRvIGNhbm9uaWNhbGl6ZSBuZXdsaW5lIHJlbGF0ZWQg Y2hhcmFjdGVycy4KICAgICAgICAgICAgIHJldHVybiAoY2hhcmFjdGVyID09ICdcbicgfHwgY2hh cmFjdGVyID09ICdccicpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJp dHlQb2xpY3kuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNl Y3VyaXR5UG9saWN5LmNwcAkocmV2aXNpb24gMTUxMzYwKQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NTMsNyArODUz LDcgQEAgcHVibGljOgogICAgIGJvb2wgYWxsb3dCYXNlVVJJKGNvbnN0IEtVUkwmLCBDb250ZW50 U2VjdXJpdHlQb2xpY3k6OlJlcG9ydGluZ1N0YXR1cykgY29uc3Q7CiAKICAgICB2b2lkIGdhdGhl clJlcG9ydFVSSXMoRE9NU3RyaW5nTGlzdCYpIGNvbnN0OwotICAgIGNvbnN0IFN0cmluZyYgZXZh bERpc2FibGVkRXJyb3JNZXNzYWdlKCkgeyByZXR1cm4gbV9ldmFsRGlzYWJsZWRFcnJvck1lc3Nh Z2U7IH0KKyAgICBjb25zdCBTdHJpbmcmIGV2YWxEaXNhYmxlZEVycm9yTWVzc2FnZSgpIGNvbnN0 IHsgcmV0dXJuIG1fZXZhbERpc2FibGVkRXJyb3JNZXNzYWdlOyB9CiAgICAgQ29udGVudFNlY3Vy aXR5UG9saWN5OjpSZWZsZWN0ZWRYU1NEaXNwb3NpdGlvbiByZWZsZWN0ZWRYU1NEaXNwb3NpdGlv bigpIGNvbnN0IHsgcmV0dXJuIG1fcmVmbGVjdGVkWFNTRGlzcG9zaXRpb247IH0KICAgICBib29s IGlzUmVwb3J0T25seSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVwb3J0T25seTsgfQogICAgIGNvbnN0 IFZlY3RvcjxLVVJMPiYgcmVwb3J0VVJJcygpIGNvbnN0IHsgcmV0dXJuIG1fcmVwb3J0VVJJczsg fQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGlu ZUxheW91dC5jcHAJKHJldmlzaW9uIDE1MTM2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDMsNyArMTQz LDcgQEAgcHVibGljOgogICAgIHZvaWQgZml0QmVsb3dGbG9hdHMoKTsKICAgICB2b2lkIHNldFRy YWlsaW5nV2hpdGVzcGFjZVdpZHRoKGZsb2F0IHdpZHRoKSB7IG1fdHJhaWxpbmdXaGl0ZXNwYWNl V2lkdGggPSB3aWR0aDsgfQogCi0gICAgYm9vbCBzaG91bGRJbmRlbnRUZXh0KCkgeyByZXR1cm4g bV9zaG91bGRJbmRlbnRUZXh0ID09IEluZGVudFRleHQ7IH0KKyAgICBib29sIHNob3VsZEluZGVu dFRleHQoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZEluZGVudFRleHQgPT0gSW5kZW50VGV4dDsg fQogCiBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZUF2YWlsYWJsZVdpZHRoRnJvbUxlZnRBbmRS aWdodCgpCg==