143522 2015-04-08 09:12:28 -0700 [WinCairo] Fix a broken build due to the changes in http://webkit.org/b/143316 2015-04-10 10:17:23 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows 8 RESOLVED DUPLICATE 143531 https://bugs.webkit.org/show_bug.cgi?id=143316 P2 Normal --- 1 sungmann.cho webkit-unassigned bfulgham commit-queue galpeter koivisto oldest_to_newest 1083627 0 sungmann.cho 2015-04-08 09:12:28 -0700 ToT currently breaks at: ..\platform\network\curl\CurlCacheEntry.cpp(293): error C2440: '=' : cannot convert from 'WTF::Optional<std::chrono::microseconds>' to 'double' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called ..\platform\network\curl\CurlCacheEntry.cpp(308): error C2440: '=' : cannot convert from 'WTF::Optional<std::chrono::system_clock::time_point>' to 'double' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called ..\platform\network\curl\CurlCacheEntry.cpp(312): error C2440: '=' : cannot convert from 'WTF::Optional<std::chrono::system_clock::time_point>' to 'double' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called ..\platform\network\curl\CurlCacheEntry.cpp(316): error C2440: '=' : cannot convert from 'WTF::Optional<std::chrono::system_clock::time_point>' to 'double' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called This is due to the changes in http://webkit.org/b/143316. 1083635 1 250357 sungmann.cho 2015-04-08 09:39:09 -0700 Created attachment 250357 Patch 1083643 2 galpeter 2015-04-08 10:03:16 -0700 The code looks logically sane to me, but sadly I'm not a reviewer. Maybe Brent could do the review. 1084130 3 sungmann.cho 2015-04-09 16:49:49 -0700 Thanks Peter! +bfulgham@ for review. 1084183 4 bfulgham 2015-04-09 20:54:08 -0700 I think this might be a duplicate. Isn't this the same issue as Bug 143531? 1084191 5 sungmann.cho 2015-04-09 21:34:08 -0700 Oops. Same patches were submitted on same day. Thanks for letting me know it. Close the issue. 1084192 6 sungmann.cho 2015-04-09 21:34:34 -0700 *** This bug has been marked as a duplicate of bug 143531 *** 250357 2015-04-08 09:39:09 -0700 2015-04-10 10:17:23 -0700 Patch bug-143522-20150409013818.patch text/plain 6803 sungmann.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWEwYTMxNzU1ZjQ5OGIw NjZiN2EyZmRlNGY0YTkyNWExZjRmYTE5YS4uZDk5ZWEzNzZjNDA2MTA0MmJjOTdkNmE4NjliMTg3 ZDMxOGEzNTRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA0LTA4ICBTdW5n bWFubiBDaG8gIDxzdW5nbWFubi5jaG9AbmF2ZXJjb3JwLmNvbT4KKworICAgICAgICBbV2luQ2Fp cm9dIEZpeCBhIGJyb2tlbiBidWlsZCBkdWUgdG8gdGhlIGNoYW5nZXMgaW4gaHR0cDovL3dlYmtp dC5vcmcvYi8xNDMzMTYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0MzUyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZUVudHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkN1cmxDYWNoZUVudHJ5OjpDdXJsQ2FjaGVFbnRyeSk6CisgICAgICAgIChXZWJDb3JlOjpDdXJs Q2FjaGVFbnRyeTo6aXNDYWNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybENhY2hlRW50cnk6 OnBhcnNlUmVzcG9uc2VIZWFkZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENhY2hlRW50cnkuaDoKKwogMjAxNS0wNC0wNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIE9wZW4gV2ViU29ja2V0cyBzaG91bGQgbm90IHByZXZlbnQgYSBw YWdlIGZyb20gZW50ZXJpbmcgUGFnZUNhY2hlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlRW50cnkuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZUVudHJ5LmNwcAppbmRleCAxM2M2YmJlZGM2 NmZkNjNmNTlmM2QwNWEzN2Y3YzE1ODVkNWJlMTM1Li5iODkxMjkyNTJmZjgwMzQ3YTNhY2YwNzFh NTkzOWFkOTlmYzM2MGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvQ3VybENhY2hlRW50cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9DdXJsQ2FjaGVFbnRyeS5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgQ3VybENh Y2hlRW50cnk6OkN1cmxDYWNoZUVudHJ5KGNvbnN0IFN0cmluZyYgdXJsLCBSZXNvdXJjZUhhbmRs ZSogam9iLCBjb25zdCBTdHIKICAgICAsIG1fY29udGVudEZpbGVuYW1lKGNhY2hlRGlyKQogICAg ICwgbV9jb250ZW50RmlsZShpbnZhbGlkUGxhdGZvcm1GaWxlSGFuZGxlKQogICAgICwgbV9lbnRy eVNpemUoMCkKLSAgICAsIG1fZXhwaXJlRGF0ZSgtMSkKKyAgICAsIG1fZXhwaXJlRGF0ZShzdGQ6 OmNocm9ubzo6bWlsbGlzZWNvbmRzOjpkdXJhdGlvbigtMSkpCiAgICAgLCBtX2hlYWRlclBhcnNl ZChmYWxzZSkKICAgICAsIG1faXNMb2FkaW5nKGZhbHNlKQogICAgICwgbV9qb2Ioam9iKQpAQCAt ODYsNyArODYsNyBAQCBib29sIEN1cmxDYWNoZUVudHJ5Ojppc0NhY2hlZCgpCiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgaWYgKG1fZXhwaXJlRGF0ZSA8IGN1cnJlbnRU aW1lTVMoKSkgeworICAgIGlmIChtX2V4cGlyZURhdGUgPCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Ns b2NrOjpub3coKSkgewogICAgICAgICBtX2hlYWRlclBhcnNlZCA9IGZhbHNlOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMjcxLDY3ICsyNzEsNDEgQEAgdm9pZCBDdXJsQ2FjaGVF bnRyeTo6aW52YWxpZGF0ZSgpCiAKIGJvb2wgQ3VybENhY2hlRW50cnk6OnBhcnNlUmVzcG9uc2VI ZWFkZXJzKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewotICAgIGRvdWJsZSBm aWxlVGltZTsKLSAgICB0aW1lX3QgZmlsZU1vZGlmaWNhdGlvbkRhdGU7Ci0KLSAgICBpZiAoZ2V0 RmlsZU1vZGlmaWNhdGlvblRpbWUobV9oZWFkZXJGaWxlbmFtZSwgZmlsZU1vZGlmaWNhdGlvbkRh dGUpKSB7Ci0gICAgICAgIGZpbGVUaW1lID0gZGlmZnRpbWUoZmlsZU1vZGlmaWNhdGlvbkRhdGUs IDApOwotICAgICAgICBmaWxlVGltZSAqPSAxMDAwLjA7Ci0gICAgfSBlbHNlCi0gICAgICAgIGZp bGVUaW1lID0gY3VycmVudFRpbWVNUygpOyAvLyBHTVQKLQotICAgIGlmIChyZXNwb25zZS5jYWNo ZUNvbnRyb2xDb250YWluc05vQ2FjaGUoKSB8fCByZXNwb25zZS5jYWNoZUNvbnRyb2xDb250YWlu c05vU3RvcmUoKSkKKyAgICBpZiAocmVzcG9uc2UuY2FjaGVDb250cm9sQ29udGFpbnNOb0NhY2hl KCkKKyAgICAgICAgfHwgcmVzcG9uc2UuY2FjaGVDb250cm9sQ29udGFpbnNOb1N0b3JlKCkKKyAg ICAgICAgfHwgIXJlc3BvbnNlLmhhc0NhY2hlVmFsaWRhdG9yRmllbGRzKCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAorICAgIHRpbWVfdCBmaWxlTW9kaWZpY2F0aW9uRGF0ZTsKKyAgICBzdGQ6 OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IGZpbGVUaW1lOworICAgIGlmIChnZXRG aWxlTW9kaWZpY2F0aW9uVGltZShtX2hlYWRlckZpbGVuYW1lLCBmaWxlTW9kaWZpY2F0aW9uRGF0 ZSkpCisgICAgICAgIGZpbGVUaW1lID0gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6ZnJvbV90 aW1lX3QoZmlsZU1vZGlmaWNhdGlvbkRhdGUpOworICAgIGVsc2UKKyAgICAgICAgZmlsZVRpbWUg PSBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjpub3coKTsKIAotICAgIGRvdWJsZSBtYXhBZ2Ug PSAwOwotICAgIGJvb2wgbWF4QWdlSXNWYWxpZCA9IGZhbHNlOwotCi0gICAgaWYgKHJlc3BvbnNl LmNhY2hlQ29udHJvbENvbnRhaW5zTXVzdFJldmFsaWRhdGUoKSkKLSAgICAgICAgbWF4QWdlID0g MDsKLSAgICBlbHNlIHsKKyAgICBXVEY6Ok9wdGlvbmFsPHN0ZDo6Y2hyb25vOjptaWNyb3NlY29u ZHM+IG1heEFnZTsKKyAgICBpZiAoIXJlc3BvbnNlLmNhY2hlQ29udHJvbENvbnRhaW5zTXVzdFJl dmFsaWRhdGUoKSkKICAgICAgICAgbWF4QWdlID0gcmVzcG9uc2UuY2FjaGVDb250cm9sTWF4QWdl KCk7Ci0gICAgICAgIGlmIChzdGQ6OmlzbmFuKG1heEFnZSkpCi0gICAgICAgICAgICBtYXhBZ2Ug PSAwOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtYXhBZ2VJc1ZhbGlkID0gdHJ1ZTsKLSAg ICB9CiAKLSAgICBpZiAoIXJlc3BvbnNlLmhhc0NhY2hlVmFsaWRhdG9yRmllbGRzKCkpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICBXVEY6Ok9wdGlvbmFsPHN0ZDo6Y2hyb25vOjpzeXN0ZW1f Y2xvY2s6OnRpbWVfcG9pbnQ+IGxhc3RNb2RpZmljYXRpb25EYXRlID0gcmVzcG9uc2UubGFzdE1v ZGlmaWVkKCk7CisgICAgV1RGOjpPcHRpb25hbDxzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0 aW1lX3BvaW50PiByZXNwb25zZURhdGUgPSByZXNwb25zZS5kYXRlKCk7CisgICAgV1RGOjpPcHRp b25hbDxzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50PiBleHBpcmF0aW9uRGF0 ZSA9IHJlc3BvbnNlLmV4cGlyZXMoKTsKIAotCi0gICAgZG91YmxlIGxhc3RNb2RpZmljYXRpb25E YXRlID0gMDsKLSAgICBkb3VibGUgcmVzcG9uc2VEYXRlID0gMDsKLSAgICBkb3VibGUgZXhwaXJh dGlvbkRhdGUgPSAwOwotCi0gICAgbGFzdE1vZGlmaWNhdGlvbkRhdGUgPSByZXNwb25zZS5sYXN0 TW9kaWZpZWQoKTsKLSAgICBpZiAoc3RkOjppc25hbihsYXN0TW9kaWZpY2F0aW9uRGF0ZSkpCi0g ICAgICAgIGxhc3RNb2RpZmljYXRpb25EYXRlID0gMDsKLQotICAgIHJlc3BvbnNlRGF0ZSA9IHJl c3BvbnNlLmRhdGUoKTsKLSAgICBpZiAoc3RkOjppc25hbihyZXNwb25zZURhdGUpKQotICAgICAg ICByZXNwb25zZURhdGUgPSAwOwotCi0gICAgZXhwaXJhdGlvbkRhdGUgPSByZXNwb25zZS5leHBp cmVzKCk7Ci0gICAgaWYgKHN0ZDo6aXNuYW4oZXhwaXJhdGlvbkRhdGUpKQotICAgICAgICBleHBp cmF0aW9uRGF0ZSA9IDA7Ci0KLQotICAgIGlmIChtYXhBZ2VJc1ZhbGlkKSB7Ci0gICAgICAgIC8v IFdoZW4gYm90aCB0aGUgY2FjaGUgZW50cnkgYW5kIHRoZSByZXNwb25zZSBjb250YWluIG1heC1h Z2UsIHRoZSBsZXNzZXIgb25lIHRha2VzIHByaW9yaXR5Ci0gICAgICAgIGRvdWJsZSBleHBpcmVz ID0gZmlsZVRpbWUgKyBtYXhBZ2UgKiAxMDAwOwotICAgICAgICBpZiAobV9leHBpcmVEYXRlID09 IC0xIHx8IG1fZXhwaXJlRGF0ZSA+IGV4cGlyZXMpCisgICAgaWYgKG1heEFnZSkgeworICAgICAg ICAvLyBXaGVuIGJvdGggdGhlIGNhY2hlIGVudHJ5IGFuZCB0aGUgcmVzcG9uc2UgY29udGFpbiBt YXgtYWdlLCB0aGUgbGVzc2VyIG9uZSB0YWtlcyBwcmlvcml0eS4KKyAgICAgICAgc3RkOjpjaHJv bm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCBleHBpcmVzID0gZmlsZVRpbWUgKyBtYXhBZ2Uu dmFsdWUoKTsKKyAgICAgICAgaWYgKG1fZXhwaXJlRGF0ZS50aW1lX3NpbmNlX2Vwb2NoKCkgPT0g c3RkOjpjaHJvbm86Om1pbGxpc2Vjb25kczo6ZHVyYXRpb24oLTEpIHx8IG1fZXhwaXJlRGF0ZSA+ IGV4cGlyZXMpCiAgICAgICAgICAgICBtX2V4cGlyZURhdGUgPSBleHBpcmVzOwotICAgIH0gZWxz ZSBpZiAocmVzcG9uc2VEYXRlID4gMCAmJiBleHBpcmF0aW9uRGF0ZSA+PSByZXNwb25zZURhdGUp Ci0gICAgICAgIG1fZXhwaXJlRGF0ZSA9IGZpbGVUaW1lICsgKGV4cGlyYXRpb25EYXRlIC0gcmVz cG9uc2VEYXRlKTsKKyAgICAgICAgZWxzZSBpZiAocmVzcG9uc2VEYXRlICYmIGV4cGlyYXRpb25E YXRlICYmIGV4cGlyYXRpb25EYXRlLnZhbHVlKCkgPj0gcmVzcG9uc2VEYXRlLnZhbHVlKCkpCisg ICAgICAgICAgICBtX2V4cGlyZURhdGUgPSBmaWxlVGltZSArIChleHBpcmF0aW9uRGF0ZS52YWx1 ZSgpIC0gcmVzcG9uc2VEYXRlLnZhbHVlKCkpOworICAgIH0KIAotICAgIC8vIElmIHRoZXJlIGlz IG5vIGxpZmV0aW1lIGluZm9ybWF0aW9uCi0gICAgaWYgKG1fZXhwaXJlRGF0ZSA9PSAtMSkgewot ICAgICAgICBpZiAobGFzdE1vZGlmaWNhdGlvbkRhdGUgPiAwKQotICAgICAgICAgICAgbV9leHBp cmVEYXRlID0gZmlsZVRpbWUgKyAoZmlsZVRpbWUgLSBsYXN0TW9kaWZpY2F0aW9uRGF0ZSkgKiAw LjE7CisgICAgLy8gSWYgdGhlcmUgaXMgbm8gbGlmZXRpbWUgaW5mb3JtYXRpb24uCisgICAgaWYg KG1fZXhwaXJlRGF0ZS50aW1lX3NpbmNlX2Vwb2NoKCkgPT0gc3RkOjpjaHJvbm86Om1pbGxpc2Vj b25kczo6ZHVyYXRpb24oLTEpKSB7CisgICAgICAgIGlmIChsYXN0TW9kaWZpY2F0aW9uRGF0ZSkK KyAgICAgICAgICAgIG1fZXhwaXJlRGF0ZSA9IGZpbGVUaW1lICsgc3RkOjpjaHJvbm86OmR1cmF0 aW9uX2Nhc3Q8c3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcz4oKGZpbGVUaW1lIC0gbGFzdE1vZGlm aWNhdGlvbkRhdGUudmFsdWUoKSkgKiAwLjEpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBt X2V4cGlyZURhdGUgPSAwOworICAgICAgICAgICAgbV9leHBpcmVEYXRlID0gc3RkOjpjaHJvbm86 OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludCgpOwogICAgIH0KIAogICAgIFN0cmluZyBldGFnID0g cmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpFVGFnKTsKQEAgLTQwNSw2 ICszNzksNiBAQCBib29sIEN1cmxDYWNoZUVudHJ5OjpjbG9zZUNvbnRlbnRGaWxlKCkKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KIAotfQorfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi0jZW5kaWYKKyNl bmRpZiAvLyBVU0UoQ1VSTCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY3VybC9DdXJsQ2FjaGVFbnRyeS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0N1cmxDYWNoZUVudHJ5LmgKaW5kZXggNGFmMDQ2NGM4NjA0M2NkNzdkYmUxZGYx ZjYyYzVkNDZmNTJmZGIwNi4uZmExM2ZjYTYyMjNiMjM5NzQzMzhjZGI0MTBiY2M3ODY0NTk1M2E1 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxD YWNoZUVudHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxDYWNoZUVudHJ5LmgKQEAgLTQxLDcgKzQxLDYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog Y2xhc3MgQ3VybENhY2hlRW50cnkgewotCiBwdWJsaWM6CiAgICAgQ3VybENhY2hlRW50cnkoY29u c3QgU3RyaW5nJiB1cmwsIFJlc291cmNlSGFuZGxlKiBqb2IsIGNvbnN0IFN0cmluZyYgY2FjaGVE aXIpOwogICAgIH5DdXJsQ2FjaGVFbnRyeSgpOwpAQCAtNzksNyArNzgsNyBAQCBwcml2YXRlOgog ICAgIFBsYXRmb3JtRmlsZUhhbmRsZSBtX2NvbnRlbnRGaWxlOwogCiAgICAgc2l6ZV90IG1fZW50 cnlTaXplOwotICAgIGRvdWJsZSBtX2V4cGlyZURhdGU7CisgICAgc3RkOjpjaHJvbm86OnN5c3Rl bV9jbG9jazo6dGltZV9wb2ludCBtX2V4cGlyZURhdGU7CiAgICAgYm9vbCBtX2hlYWRlclBhcnNl ZDsKICAgICBib29sIG1faXNMb2FkaW5nOwogICAgIExpc3RIYXNoU2V0PFJlc291cmNlSGFuZGxl Kj4gbV9jbGllbnRzOwpAQCAtOTcsNiArOTYsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgY2xvc2VD b250ZW50RmlsZSgpOwogfTsKIAotfQorfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYg Ly8gQ3VybENhY2hlRW50cnlfaAo=