157796 2016-05-17 09:33:49 -0700 Fix the !ENABLE(WEB_TIMING) build after r200887 2016-05-17 10:06:26 -0700 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 157669 1 ossy ossy achristensen cdumez commit-queue japhet yoav oldest_to_newest 1193843 0 ossy 2016-05-17 09:33:49 -0700 https://trac.webkit.org/changeset/200887 broke the !ENABLE(WEB_TIMING) build, let's fix it. ResourceTimingInformation should be used only inside #if ENABLE(WEB_TIMING) compile time guard. 1193845 1 279132 ossy 2016-05-17 09:36:50 -0700 Created attachment 279132 Patch 1193848 2 279132 cdumez 2016-05-17 09:44:35 -0700 Comment on attachment 279132 Patch r=me 1193858 3 279132 commit-queue 2016-05-17 10:06:21 -0700 Comment on attachment 279132 Patch Clearing flags on attachment: 279132 Committed r201018: <http://trac.webkit.org/changeset/201018> 1193859 4 commit-queue 2016-05-17 10:06:26 -0700 All reviewed patches have been landed. Closing bug. 279132 2016-05-17 09:36:50 -0700 2016-05-17 10:06:21 -0700 Patch bug-157796-20160517093746.patch text/plain 5550 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFiYzE3Njg4YTc4MTBk OGQ0NzY0NDk1ZjcyYjk4OWRhNzlkY2QzNC4uOWY2M2Q4YTcyMTlhYWU4ZWFiYWM2MWIwNzc2M2Fl OTYyNDY4ZjlkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2LTA1LTE3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IHRoZSAhRU5B QkxFKFdFQl9USU1JTkcpIGJ1aWxkIGFmdGVyIHIyMDA4ODcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Nzc5NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRp ZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9h ZGVyOjpsb2FkUmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNl KToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXZhbGlkYXRlUmVz b3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmxvYWRSZXNv dXJjZSk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmg6CisK IDIwMTYtMDUtMTcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OKHI1NDcyOSk6IExpbmUgYnJlYWtpbmcgaW4gY29tcGxleCBtaXhl ZC1kaXJlY3Rpb24gdGV4dCBpcyBpbmNvbnNpc3RlbnQgYWNyb3NzIHBhZ2UgcmVmcmVzaGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3Bw CmluZGV4IDg1M2IwMjE0ZTgwMzE0OWI2N2VmN2U4N2Q5MThmNDY2M2M2ZGRmYjkuLjRiMmE3NmMx N2RmNDkxYzI4MWMwY2IyYjU4ZWFmZjA2ZmUwZmYyMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC0zMjUsOCArMzI1LDEw IEBAIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRS ZXNvdXJjZSogcmVzb3VyY2UpCiAKIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpkaWRG aW5pc2hMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZpbmlzaFRpbWUp CiB7CisjaWYgRU5BQkxFKFdFQl9USU1JTkcpCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVy ZXM6OnNoYXJlZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkpCiAgICAgICAgIG1f cmVzb3VyY2VUaW1pbmdJbmZvLmFkZFJlc291cmNlVGltaW5nKG1fcmVzb3VyY2UuZ2V0KCksICZt X2RvY3VtZW50KTsKKyNlbmRpZgogCiAgICAgaWYgKG1fYWN0dWFsUmVxdWVzdCkgewogICAgICAg ICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZpbmlzaExvYWRpbmcobV9kb2N1bWVudC5m cmFtZSgpLCBtX2RvY3VtZW50LmZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCksIGlk ZW50aWZpZXIsIGZpbmlzaFRpbWUpOwpAQCAtMzk2LDggKzM5OCwxMCBAQCB2b2lkIERvY3VtZW50 VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBTZWN1cgogICAgICAgICBpZiAobV9yZXNvdXJjZSkgewogICAgICAgICAgICAgbV9yZXNv dXJjZS0+YWRkQ2xpZW50KHRoaXMpOwogCisjaWYgRU5BQkxFKFdFQl9USU1JTkcpCiAgICAgICAg ICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJj ZVRpbWluZ0VuYWJsZWQoKSkKICAgICAgICAgICAgICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5z dG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24obV9yZXNvdXJjZSwgbmV3UmVx dWVzdCwgbV9kb2N1bWVudC5mcmFtZSgpKTsKKyNlbmRpZgogICAgICAgICB9CiAKICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFk YWJsZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxv YWRlci5oCmluZGV4IGI0MjFlODdmMjQzYjJmNzkxNDZhYjViMzI1MDYzOTUwYTA3NWEwNTYuLjNh MzRjMWU1MTM4MDNiMTI3Mzc5ZTU3ZDQzMWRkZjViNDhkMzFhZDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmgKQEAgLTEwNiw3ICsxMDYs OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFRocmVhZGFibGVMb2FkZXJDbGllbnQq IG1fY2xpZW50OwogICAgICAgICBEb2N1bWVudCYgbV9kb2N1bWVudDsKICAgICAgICAgVGhyZWFk YWJsZUxvYWRlck9wdGlvbnMgbV9vcHRpb25zOworI2lmIEVOQUJMRShXRUJfVElNSU5HKQogICAg ICAgICBSZXNvdXJjZVRpbWluZ0luZm9ybWF0aW9uIG1fcmVzb3VyY2VUaW1pbmdJbmZvOworI2Vu ZGlmCiAgICAgICAgIGJvb2wgbV9zYW1lT3JpZ2luUmVxdWVzdDsKICAgICAgICAgYm9vbCBtX3Np bXBsZVJlcXVlc3Q7CiAgICAgICAgIGJvb2wgbV9hc3luYzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGMxNzY4MWZh MDk5OGE3NjNjZTU4MmNjYTg4NDRiNzQwMDE2MDg4NGIuLmU2ZDUxYzI4MDk5M2VlOGJhOTI1YTM3 ODFiMTM3NTBhMjIyZTJjMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNjE4LDEwICs2MTgsMTIgQEAgQ2FjaGVk UmVzb3VyY2VIYW5kbGU8Q2FjaGVkUmVzb3VyY2U+IENhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1 ZXN0UmVzb3VyY2UoQ2FjaGUKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgICAgICBs b2dNZW1vcnlDYWNoZVJlc291cmNlUmVxdWVzdChmcmFtZSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6OmluTWVtb3J5Q2FjaGVLZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjp1c2VkS2V5KCkp OwogICAgICAgICBtZW1vcnlDYWNoZS5yZXNvdXJjZUFjY2Vzc2VkKCpyZXNvdXJjZSk7CisjaWYg RU5BQkxFKFdFQl9USU1JTkcpCiAgICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz aGFyZWRGZWF0dXJlcygpLnJlc291cmNlVGltaW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBt X3Jlc291cmNlVGltaW5nSW5mby5zdG9yZVJlc291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRp b24ocmVzb3VyY2UsIHJlcXVlc3QsIGZyYW1lKCkpOwogICAgICAgICAgICAgbV9yZXNvdXJjZVRp bWluZ0luZm8uYWRkUmVzb3VyY2VUaW1pbmcocmVzb3VyY2UuZ2V0KCksIGRvY3VtZW50KCkpOwog ICAgICAgICB9CisjZW5kaWYKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC02NzMsOCArNjc1 LDEyIEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJlc291cmNlPiBDYWNoZWRSZXNvdXJj ZUxvYWRlcjo6cmV2YWxpZGF0ZVJlc291cmNlKGNvCiAgICAgCiAgICAgbWVtb3J5Q2FjaGUucmVt b3ZlKCpyZXNvdXJjZSk7CiAgICAgbWVtb3J5Q2FjaGUuYWRkKCpuZXdSZXNvdXJjZSk7CisjaWYg RU5BQkxFKFdFQl9USU1JTkcpCiAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJl ZEZlYXR1cmVzKCkucmVzb3VyY2VUaW1pbmdFbmFibGVkKCkpCiAgICAgICAgIG1fcmVzb3VyY2VU aW1pbmdJbmZvLnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZvcm1hdGlvbihyZXNvdXJj ZSwgcmVxdWVzdCwgZnJhbWUoKSk7CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShyZXF1ZXN0KTsK KyNlbmRpZgogICAgIHJldHVybiBuZXdSZXNvdXJjZTsKIH0KIApAQCAtNjg5LDggKzY5NSwxMCBA QCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OmxvYWRSZXNvdXJjZShDYWNoZWRSZQogCiAgICAgaWYgKHJlcXVlc3QuYWxsb3dzQ2FjaGlu ZygpICYmICFtZW1vcnlDYWNoZS5hZGQoKnJlc291cmNlKSkKICAgICAgICAgcmVzb3VyY2UtPnNl dE93bmluZ0NhY2hlZFJlc291cmNlTG9hZGVyKHRoaXMpOworI2lmIEVOQUJMRShXRUJfVElNSU5H KQogICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnJlc291 cmNlVGltaW5nRW5hYmxlZCgpKQogICAgICAgICBtX3Jlc291cmNlVGltaW5nSW5mby5zdG9yZVJl c291cmNlVGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24ocmVzb3VyY2UsIHJlcXVlc3QsIGZyYW1l KCkpOworI2VuZGlmCiAgICAgcmV0dXJuIHJlc291cmNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCmluZGV4IDJiNTYxYjY1 OWJiZGU5Y2Q5MzkwNDkzZDlmZTBiNWZiMDJmOGMxYmMuLjU2ZmIxMjZjNWEwY2IwNDllMTZhNTc0 NTU4NmU3OTc0YzU4MzMwMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCkBAIC0xNzcsNyArMTc3LDkgQEAgcHJpdmF0ZToKIAog ICAgIFRpbWVyIG1fZ2FyYmFnZUNvbGxlY3REb2N1bWVudFJlc291cmNlc1RpbWVyOwogCisjaWYg RU5BQkxFKFdFQl9USU1JTkcpCiAgICAgUmVzb3VyY2VUaW1pbmdJbmZvcm1hdGlvbiBtX3Jlc291 cmNlVGltaW5nSW5mbzsKKyNlbmRpZgogCiAgICAgLy8gMjkgYml0cyBsZWZ0CiAgICAgYm9vbCBt X2F1dG9Mb2FkSW1hZ2VzIDogMTsK