119816 2013-08-14 14:15:19 -0700 Attempt to make it more clear what FloatIntervalSearchAdaptor::collectIfNeeded is doing 2013-08-23 09:57:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 917284 0 bjonesbe 2013-08-14 14:15:19 -0700 Attempt to make it more clear what FloatIntervalSearchAdaptor::collectIfNeeded is doing 917287 1 208760 bjonesbe 2013-08-14 14:33:28 -0700 Created attachment 208760 Patch Ported from blink 920250 2 208760 hyatt 2013-08-23 09:47:50 -0700 Comment on attachment 208760 Patch r=me 920260 3 208760 commit-queue 2013-08-23 09:57:14 -0700 Comment on attachment 208760 Patch Clearing flags on attachment: 208760 Committed r154494: <http://trac.webkit.org/changeset/154494> 920261 4 commit-queue 2013-08-23 09:57:16 -0700 All reviewed patches have been landed. Closing bug. 208760 2013-08-14 14:33:28 -0700 2013-08-23 09:57:14 -0700 Patch bug-119816-20130814143327.patch text/plain 6353 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UzMGY2YTAyNjMwYmJh MmY3MjhkNjk4MTY1NzdiZmUxNDZhODFjNi4uNGM2MmExZTdlN2NhYmQxMTZhYTdiMTFhNzcyNmZk OTllNDdhYjY0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUyIEBACiAyMDEzLTA4LTE0ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIEF0dGVtcHQgdG8gbWFr ZSBpdCBtb3JlIGNsZWFyIHdoYXQgRmxvYXRJbnRlcnZhbFNlYXJjaEFkYXB0b3I6OmNvbGxlY3RJ Zk5lZWRlZCBpcyBkb2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE5ODE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhpcyBpcyBhIHBvcnQgZnJvbSBCbGluayBvZgorICAgICAgICBodHRwczovL3Ny Yy5jaHJvbWl1bS5vcmcvdmlld3ZjL2JsaW5rP3JldmlzaW9uPTE1NTg4NSZ2aWV3PXJldmlzaW9u CisgICAgICAgIE9yaWdpbmFsIFBhdGNoIGJ5IEVyaWMgU2VpZGVsCisKKyAgICAgICAgT3JpZ2lu YWwgY29tbWVudHM6CisKKyAgICAgICAgIkl0IHNlZW1lZCB0byBtZSB0aGF0IHRlbXBsYXRlIHNw ZWNpZmljYXRpb25zIHdvdWxkIGJlIGNsZWFyZXIgdGhhbiBhbgorICAgICAgICBpZi4gIFRoZXkg YWxzbyBhbGxvdyBmb3IgY29tcGlsZS10aW1lIGVycm9yIGNoZWNraW5nIHdlcmUgYSAzcmQgdHlw ZQorICAgICAgICBvZiBmbG9hdCB0byBjb21lIGludG8gZXhpc3RhbmNlIGluIENTUzQuIDpwCisK KyAgICAgICAgRm9yIGFueSB1bmZhbWlsaWFyIHdpdGggdGhpcyBtZXRob2QsIHRoaXMgdGhlIG9i amVjdCB1c2VkIGZvcgorICAgICAgICBwZXJmb3JtaW5nIGEgc2VhcmNoIG9uIGEgUmVkQmxhY2tU cmVlIGluIFdURi4KKworICAgICAgICBXZSBjcmVhdGUgb25lIG9mIHRoZXNlIGFkYXB0b3JzLCBz cGVjaWZ5aW5nIHRoYXQgd2Ugd2FudCB0byBzZWFyY2ggZm9yCisgICAgICAgIHZhbHVlcyBpbiBh IHNwZWNpZmljIChsb2dpY2FsKSBZIGludGVydmFsLCBhbmQgdGhpcyBhZGFwdG9yIGlzIGNhbGxl ZAorICAgICAgICBiYWNrIGZvciBhbnkgdmFsdWVzIGluIHRoZSBSQlRyZWUgY29vcmVzcG9uZGlu ZyB0byB0aGF0IGludGVydmFsCisgICAgICAgIHJhbmdlLgorCisgICAgICAgIFRoZSBqb2Igb2Yg dGhpcyBhZGFwdG9yIGlzIHRvIGNvbGxlY3QgdGhlIHZhcmlvdXMgdmFsdWVzIHdlIGNhcmUKKyAg ICAgICAgYWJvdXQsIGluY2x1ZGluZyB0aGUgbGVmdCBvciByaWdodC1tb3N0IG9mZnNldCBvZiB0 aGUgZmxvYXRzIGluIHRoYXQKKyAgICAgICAgWS1yYW5nZSBhcyB3ZWxsIGFzIHdoYXQgdGhlIGxh c3QgKGRvY3VtZW50IG9yZGVyKSBmbG9hdCBzZWVuIGluIHRoYXQKKyAgICAgICAgcmFuZ2UuCisK KyAgICAgICAgSXQgYWxzbyBjb2xsZWN0cyB0aGUgcmVtYWluaW5nIGF2YWlsYWJsZSBoZWlnaHQg Zm9yIHRoZSBibG9jayBidXQgSSdtCisgICAgICAgIGxlc3MgY2xlYXIgb24gaG93IHRoYXQgcGFy YW1ldGVyIGlzIHVzZWQuIgorCisgICAgICAgIE5vdGUgdGhhdCBpbiBhZGRpdGlvbiB0byB0aGUg b3JpZ2luYWwgY2hhbmdlLCBJIGhhdmUgbWFkZSB0aGUKKyAgICAgICAgdXBkYXRlT2Zmc2V0SWZO ZWVkZWQgYW5kIHJhbmdlc0ludGVyc2VjdCBtZXRob2RzIGlubGluZSwgYXMgdGhpcyB3YXMKKyAg ICAgICAgc2hvd24gdG8gYmUgYSBwZXJmb3JtYW5jZSB3aW4gaW4KKyAgICAgICAgaHR0cHM6Ly9z cmMuY2hyb21pdW0ub3JnL3ZpZXd2Yy9ibGluaz9yZXZpc2lvbj0xNTYwNjQmdmlldz1yZXZpc2lv bgorICAgICAgICBhbmQgaXQgc2VlbWVkIGEgcmF0aGVyIHRyaXZpYWwgY2hhbmdlIHRvIGJlIHN1 YmplY3QgdG8gYSBzZXBhcmF0ZQorICAgICAgICBwYXRjaCB3aGVuIHBvcnRpbmcuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6Ojp1cGRhdGVPZmZzZXRJZk5l ZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjo6OmNvbGxlY3RJZk5lZWRlZCk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisKKzIwMTMtMDgtMTQgIEJlbSBKb25lcy1CZXkgIDxi am9uZXNiZUBhZG9iZS5jb20+CisKICAgICAgICAgRmluaXNoIG1ha2luZyBGbG9hdGluZ09iamVj dCBhIHJlYWwgY2xhc3Mgd2l0aCBwcml2YXRlIG1lbWJlcnMKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTgwNwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCBmOTA1YzI1ZjJkNWQ0NDk4ZDMwN2QzMGEyMmRhMjgw YTIzODM4NDU0Li4zNmY5OTAzZGY4ZDdlYzcxZGYwYjgxYmU2MjFlNGE3Yjg4N2I3NTE4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTQ0MDUsNyArNDQwNSw3 IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNsZWFyUGVyY2VudEhlaWdodERlc2NlbmRhbnRzRnJvbShS ZW5kZXJCb3gqIHBhcmVudCkKICAgICB9CiB9CiAKLXN0YXRpYyBib29sIHJhbmdlc0ludGVyc2Vj dChpbnQgZmxvYXRUb3AsIGludCBmbG9hdEJvdHRvbSwgaW50IG9iamVjdFRvcCwgaW50IG9iamVj dEJvdHRvbSkKK2lubGluZSBzdGF0aWMgYm9vbCByYW5nZXNJbnRlcnNlY3QoaW50IGZsb2F0VG9w LCBpbnQgZmxvYXRCb3R0b20sIGludCBvYmplY3RUb3AsIGludCBvYmplY3RCb3R0b20pCiB7CiAg ICAgaWYgKG9iamVjdFRvcCA+PSBmbG9hdEJvdHRvbSB8fCBvYmplY3RCb3R0b20gPCBmbG9hdFRv cCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNDQyNSwzMiArNDQyNSw0MyBAQCBzdGF0aWMg Ym9vbCByYW5nZXNJbnRlcnNlY3QoaW50IGZsb2F0VG9wLCBpbnQgZmxvYXRCb3R0b20sIGludCBv YmplY3RUb3AsIGludCBvYgogICAgIHJldHVybiBmYWxzZTsKIH0KIAordGVtcGxhdGU8PgoraW5s aW5lIGJvb2wgUmVuZGVyQmxvY2s6OkZsb2F0SW50ZXJ2YWxTZWFyY2hBZGFwdGVyPFJlbmRlckJs b2NrOjpGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0Pjo6dXBkYXRlT2Zmc2V0SWZOZWVkZWQoY29u c3QgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0KSBjb25zdAoreworICAgIGlmIChtX3Jl bmRlcmVyLT5sb2dpY2FsUmlnaHRGb3JGbG9hdChmbG9hdGluZ09iamVjdCkgPiBtX29mZnNldCkg eworICAgICAgICBtX29mZnNldCA9IG1fcmVuZGVyZXItPmxvZ2ljYWxSaWdodEZvckZsb2F0KGZs b2F0aW5nT2JqZWN0KTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBm YWxzZTsKK30KKwordGVtcGxhdGU8PgoraW5saW5lIGJvb2wgUmVuZGVyQmxvY2s6OkZsb2F0SW50 ZXJ2YWxTZWFyY2hBZGFwdGVyPFJlbmRlckJsb2NrOjpGbG9hdGluZ09iamVjdDo6RmxvYXRSaWdo dD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09i amVjdCkgY29uc3QKK3sKKyAgICBpZiAobV9yZW5kZXJlci0+bG9naWNhbExlZnRGb3JGbG9hdChm bG9hdGluZ09iamVjdCkgPCBtX29mZnNldCkgeworICAgICAgICBtX29mZnNldCA9IG1fcmVuZGVy ZXItPmxvZ2ljYWxMZWZ0Rm9yRmxvYXQoZmxvYXRpbmdPYmplY3QpOworICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB0ZW1wbGF0ZSA8UmVuZGVyQmxv Y2s6OkZsb2F0aW5nT2JqZWN0OjpUeXBlIEZsb2F0VHlwZVZhbHVlPgogaW5saW5lIHZvaWQgUmVu ZGVyQmxvY2s6OkZsb2F0SW50ZXJ2YWxTZWFyY2hBZGFwdGVyPEZsb2F0VHlwZVZhbHVlPjo6Y29s bGVjdElmTmVlZGVkKGNvbnN0IEludGVydmFsVHlwZSYgaW50ZXJ2YWwpIGNvbnN0CiB7Ci0gICAg Y29uc3QgRmxvYXRpbmdPYmplY3QqIHIgPSBpbnRlcnZhbC5kYXRhKCk7Ci0gICAgaWYgKHItPnR5 cGUoKSAhPSBGbG9hdFR5cGVWYWx1ZSB8fCAhcmFuZ2VzSW50ZXJzZWN0KGludGVydmFsLmxvdygp LCBpbnRlcnZhbC5oaWdoKCksIG1fbG93VmFsdWUsIG1faGlnaFZhbHVlKSkKKyAgICBjb25zdCBG bG9hdGluZ09iamVjdCogZmxvYXRpbmdPYmplY3QgPSBpbnRlcnZhbC5kYXRhKCk7CisgICAgaWYg KGZsb2F0aW5nT2JqZWN0LT50eXBlKCkgIT0gRmxvYXRUeXBlVmFsdWUgfHwgIXJhbmdlc0ludGVy c2VjdChpbnRlcnZhbC5sb3coKSwgaW50ZXJ2YWwuaGlnaCgpLCBtX2xvd1ZhbHVlLCBtX2hpZ2hW YWx1ZSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIEFsbCB0aGUgb2JqZWN0cyByZXR1cm5l ZCBmcm9tIHRoZSB0cmVlIHNob3VsZCBiZSBhbHJlYWR5IHBsYWNlZC4KLSAgICBBU1NFUlQoci0+ aXNQbGFjZWQoKSAmJiByYW5nZXNJbnRlcnNlY3QobV9yZW5kZXJlci0+bG9naWNhbFRvcEZvckZs b2F0KHIpLCBtX3JlbmRlcmVyLT5sb2dpY2FsQm90dG9tRm9yRmxvYXQociksIG1fbG93VmFsdWUs IG1faGlnaFZhbHVlKSk7CisgICAgQVNTRVJUKGZsb2F0aW5nT2JqZWN0LT5pc1BsYWNlZCgpKTsK KyAgICBBU1NFUlQocmFuZ2VzSW50ZXJzZWN0KG1fcmVuZGVyZXItPnBpeGVsU25hcHBlZExvZ2lj YWxUb3BGb3JGbG9hdChmbG9hdGluZ09iamVjdCksIG1fcmVuZGVyZXItPnBpeGVsU25hcHBlZExv Z2ljYWxCb3R0b21Gb3JGbG9hdChmbG9hdGluZ09iamVjdCksIG1fbG93VmFsdWUsIG1faGlnaFZh bHVlKSk7CiAKLSAgICBpZiAoRmxvYXRUeXBlVmFsdWUgPT0gRmxvYXRpbmdPYmplY3Q6OkZsb2F0 TGVmdCAKLSAgICAgICAgJiYgbV9yZW5kZXJlci0+bG9naWNhbFJpZ2h0Rm9yRmxvYXQocikgPiBt X29mZnNldCkgewotICAgICAgICBtX29mZnNldCA9IG1fcmVuZGVyZXItPmxvZ2ljYWxSaWdodEZv ckZsb2F0KHIpOwotICAgICAgICBpZiAobV9oZWlnaHRSZW1haW5pbmcpCi0gICAgICAgICAgICAq bV9oZWlnaHRSZW1haW5pbmcgPSBtX3JlbmRlcmVyLT5sb2dpY2FsQm90dG9tRm9yRmxvYXQocikg LSBtX2xvd1ZhbHVlOwotICAgIH0KLQotICAgIGlmIChGbG9hdFR5cGVWYWx1ZSA9PSBGbG9hdGlu Z09iamVjdDo6RmxvYXRSaWdodAotICAgICAgICAmJiBtX3JlbmRlcmVyLT5sb2dpY2FsTGVmdEZv ckZsb2F0KHIpIDwgbV9vZmZzZXQpIHsKLSAgICAgICAgbV9vZmZzZXQgPSBtX3JlbmRlcmVyLT5s b2dpY2FsTGVmdEZvckZsb2F0KHIpOwotICAgICAgICBpZiAobV9oZWlnaHRSZW1haW5pbmcpCi0g ICAgICAgICAgICAqbV9oZWlnaHRSZW1haW5pbmcgPSBtX3JlbmRlcmVyLT5sb2dpY2FsQm90dG9t Rm9yRmxvYXQocikgLSBtX2xvd1ZhbHVlOwotICAgIH0KKyAgICBib29sIGZsb2F0SXNOZXdFeHRy ZW1lID0gdXBkYXRlT2Zmc2V0SWZOZWVkZWQoZmxvYXRpbmdPYmplY3QpOworICAgIGlmIChmbG9h dElzTmV3RXh0cmVtZSAmJiBtX2hlaWdodFJlbWFpbmluZykKKyAgICAgICAgKm1faGVpZ2h0UmVt YWluaW5nID0gbV9yZW5kZXJlci0+bG9naWNhbEJvdHRvbUZvckZsb2F0KGZsb2F0aW5nT2JqZWN0 KSAtIG1fbG93VmFsdWU7CiAKICNpZiBFTkFCTEUoQ1NTX1NIQVBFUykKLSAgICBtX2xhc3QgPSBy OworICAgIG1fbGFzdCA9IGZsb2F0aW5nT2JqZWN0OwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggMTA3MmExZTZjYzdlNGJhZmVkOTNiNGRiZmRm MjQ1MTAyMWYyMGE2My4uNzc3MzcyMjM4OTcxMmU0OTAzZmRjNjdjNzA0ZDZkM2NiNzk2MDk3NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTEyMjcsNiArMTIyNyw4 IEBAIHByb3RlY3RlZDoKICNlbmRpZgogCiAgICAgcHJpdmF0ZToKKyAgICAgICAgYm9vbCB1cGRh dGVPZmZzZXRJZk5lZWRlZChjb25zdCBGbG9hdGluZ09iamVjdCopIGNvbnN0OworCiAgICAgICAg IGNvbnN0IFJlbmRlckJsb2NrKiBtX3JlbmRlcmVyOwogICAgICAgICBpbnQgbV9sb3dWYWx1ZTsK ICAgICAgICAgaW50IG1faGlnaFZhbHVlOwo=