99413 2012-10-15 21:56:33 -0700 REGRESSION (r131365): WidthIterator::advance() is needlessly passed a GlyphBuffer in many cases 2012-10-15 22:08:40 -0700 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 742786 0 mitz 2012-10-15 21:56:33 -0700 REGRESSION (r131365): WidthIterator::advance() is needlessly passed a GlyphBuffer in many cases 742791 1 168850 mitz 2012-10-15 22:03:01 -0700 Created attachment 168850 Remove the GlyphBuffer* parameter to floadWidthForSimpleText() and make it pass a GlyphBuffer* to advance() only when necessary 742796 2 mitz 2012-10-15 22:08:40 -0700 Fixed in <http://trac.webkit.org/r131410>. 168850 2012-10-15 22:03:01 -0700 2012-10-15 22:05:56 -0700 Remove the GlyphBuffer* parameter to floadWidthForSimpleText() and make it pass a GlyphBuffer* to advance() only when necessary bug-99413-20121015220156.patch text/plain 6211 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTQwOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDEyLTEwLTE1ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjEzMTM2NSk6 IFdpZHRoSXRlcmF0b3I6OmFkdmFuY2UoKSBpcyBuZWVkbGVzc2x5IHBhc3NlZCBhIEdseXBoQnVm ZmVyIGluIG1hbnkgY2FzZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk5NDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgcjEzMTM2NSBtYWRlIEZvbnQ6OndpZHRoKCkgYWx3YXlzIHBhc3MgYSBHbHlwaEJ1 ZmZlciBwb2ludGVyIHRvIGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0IGFuZAorICAgICAgICBmcm9t IHRoZXJlIGRvd24gdG8gV2lkdGhJdGVyYXRvcjo6YWR2YW5jZSgpLiBIb3dldmVyLCB3aGVuIG1l YXN1cmluZyB0aGUgd2lkdGggb2YgYSBydW4sIGEKKyAgICAgICAgR2x5cGhCdWZmZXIgaXMgb25s eSBuZWVkZWQgaWYgZm9udCB0cmFuc2Zvcm1zIChrZXJuaW5nIGFuZCBsaWdhdHVyZXMpIG5lZWQg dG8gYmUgYXBwbGllZC4KKworICAgICAgICBObyBuZXcgdGVzdCwgYmVjYXVzZSB0aGVyZSBpcyBu byBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OndpZHRoKTogUmVtb3ZlZCB0aGUgbG9jYWwg R2x5cGhCdWZmZXIgdGhhdCB3YXMgcGFzc2VkIGRvd24gdG8KKyAgICAgICAgZmxvYXRXaWR0aEZv clNpbXBsZVRleHQoKS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmg6IFJlbW92 ZWQgdGhlIEdseXBoQnVmZmVyKiBwYXJhbWV0ZXIgdG8gZmxvYXRXaWR0aEZvclNpbXBsZVRleHQu CisgICAgICAgIEFsbCBidXQgdGhlIGFib3ZlIGNhbGxlciB3ZXJlIHBhc3NpbmcgMC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250RmFzdFBhdGguY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Rm9udDo6ZmxvYXRXaWR0aEZvclNpbXBsZVRleHQpOiBSZW1vdmVkIHRoZSBHbHlwaEJ1ZmZl ciogcGFyYW1ldGVyIGFuZCBhZGRlZCBhCisgICAgICAgIGxvY2FsIEdseXBoQnVmZmVyLCB3aGlj aCBpcyBwYXNzZWQgYnkgcmVmZXJlbmNlIHRvIFdpZHRoSXRlcmF0b3I6OmFkdmFuY2UoKSBvbmx5 IGlmCisgICAgICAgIHR5cGVzZXR0aW5nIGZlYXR1cmVzIHJlcXVpcmUgaXQuCisgICAgICAgIChX ZWJDb3JlOjpGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvclNpbXBsZVRleHQpOiBVcGRhdGVkIGZv ciBjaGFuZ2UgdG8KKyAgICAgICAgZmxvYXRXaWR0aEZvclNpbXBsZVRleHQuCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvcGFuZ28vRm9udFBhbmdvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnQ6OmZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dCk6IERpdHRvLgorCiAyMDEyLTEwLTE1ICBQ YWJsbyBGbG91cmV0ICA8cGFibG9mQG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBBZGQgZm9yY2Ug cGFyYW1ldGVyIHRvIERPTVRva2VuTGlzdC50b2dnbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCShyZXZpc2lvbiAxMzEzOTkpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg3LDgg KzE4Nyw3IEBAIGZsb2F0IEZvbnQ6OndpZHRoKGNvbnN0IFRleHRSdW4mIHJ1biwgSGEKICAgICAg ICAgLy8gSWYgdGhlIGNvbXBsZXggdGV4dCBpbXBsZW1lbnRhdGlvbiBjYW5ub3QgcmV0dXJuIGZh bGxiYWNrIGZvbnRzLCBhdm9pZAogICAgICAgICAvLyByZXR1cm5pbmcgdGhlbSBmb3Igc2ltcGxl IHRleHQgYXMgd2VsbC4KICAgICAgICAgc3RhdGljIGJvb2wgcmV0dXJuRmFsbGJhY2tGb250cyA9 IGNhblJldHVybkZhbGxiYWNrRm9udHNGb3JDb21wbGV4VGV4dCgpOwotICAgICAgICBHbHlwaEJ1 ZmZlciBnbHlwaEJ1ZmZlcjsKLSAgICAgICAgcmV0dXJuIGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0 KHJ1biwgJmdseXBoQnVmZmVyLCByZXR1cm5GYWxsYmFja0ZvbnRzID8gZmFsbGJhY2tGb250cyA6 IDAsIGNvZGVQYXRoVG9Vc2UgPT0gU2ltcGxlV2l0aEdseXBoT3ZlcmZsb3cgfHwgKGdseXBoT3Zl cmZsb3cgJiYgZ2x5cGhPdmVyZmxvdy0+Y29tcHV0ZUJvdW5kcykgPyBnbHlwaE92ZXJmbG93IDog MCk7CisgICAgICAgIHJldHVybiBmbG9hdFdpZHRoRm9yU2ltcGxlVGV4dChydW4sIHJldHVybkZh bGxiYWNrRm9udHMgPyBmYWxsYmFja0ZvbnRzIDogMCwgY29kZVBhdGhUb1VzZSA9PSBTaW1wbGVX aXRoR2x5cGhPdmVyZmxvdyB8fCAoZ2x5cGhPdmVyZmxvdyAmJiBnbHlwaE92ZXJmbG93LT5jb21w dXRlQm91bmRzKSA/IGdseXBoT3ZlcmZsb3cgOiAwKTsKICAgICB9CiAKICAgICByZXR1cm4gZmxv YXRXaWR0aEZvckNvbXBsZXhUZXh0KHJ1biwgZmFsbGJhY2tGb250cywgZ2x5cGhPdmVyZmxvdyk7 CkBAIC0yMDUsNyArMjA0LDcgQEAgZmxvYXQgRm9udDo6d2lkdGgoY29uc3QgVGV4dFJ1biYgcnVu LCBpbgogICAgIGdseXBoTmFtZSA9ICIiOwogCiAgICAgaWYgKGNvZGVQYXRoKHJ1bikgIT0gQ29t cGxleCkKLSAgICAgICAgcmV0dXJuIGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0KHJ1biwgMCk7Cisg ICAgICAgIHJldHVybiBmbG9hdFdpZHRoRm9yU2ltcGxlVGV4dChydW4pOwogCiAgICAgcmV0dXJu IGZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dChydW4pOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAkocmV2aXNpb24gMTMxMzk5KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjMsNyArMjIz LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiwgY29u c3QgU2ltcGxlRm9udERhdGEqLCBjb25zdCBHbHlwaEJ1ZmZlciYsIGludCBmcm9tLCBpbnQgdG8s IGNvbnN0IEZsb2F0UG9pbnQmKSBjb25zdDsKICAgICB2b2lkIGRyYXdHbHlwaEJ1ZmZlcihHcmFw aGljc0NvbnRleHQqLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgR2x5cGhCdWZmZXImLCBjb25zdCBG bG9hdFBvaW50JikgY29uc3Q7CiAgICAgdm9pZCBkcmF3RW1waGFzaXNNYXJrcyhHcmFwaGljc0Nv bnRleHQqLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgR2x5cGhCdWZmZXImLCBjb25zdCBBdG9taWNT dHJpbmcmLCBjb25zdCBGbG9hdFBvaW50JikgY29uc3Q7Ci0gICAgZmxvYXQgZmxvYXRXaWR0aEZv clNpbXBsZVRleHQoY29uc3QgVGV4dFJ1biYsIEdseXBoQnVmZmVyKiwgSGFzaFNldDxjb25zdCBT aW1wbGVGb250RGF0YSo+KiBmYWxsYmFja0ZvbnRzID0gMCwgR2x5cGhPdmVyZmxvdyogPSAwKSBj b25zdDsKKyAgICBmbG9hdCBmbG9hdFdpZHRoRm9yU2ltcGxlVGV4dChjb25zdCBUZXh0UnVuJiwg SGFzaFNldDxjb25zdCBTaW1wbGVGb250RGF0YSo+KiBmYWxsYmFja0ZvbnRzID0gMCwgR2x5cGhP dmVyZmxvdyogPSAwKSBjb25zdDsKICAgICBpbnQgb2Zmc2V0Rm9yUG9zaXRpb25Gb3JTaW1wbGVU ZXh0KGNvbnN0IFRleHRSdW4mLCBmbG9hdCBwb3NpdGlvbiwgYm9vbCBpbmNsdWRlUGFydGlhbEds eXBocykgY29uc3Q7CiAgICAgRmxvYXRSZWN0IHNlbGVjdGlvblJlY3RGb3JTaW1wbGVUZXh0KGNv bnN0IFRleHRSdW4mLCBjb25zdCBGbG9hdFBvaW50JiwgaW50IGgsIGludCBmcm9tLCBpbnQgdG8p IGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RmFz dFBhdGguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRGYXN0UGF0aC5jcHAJKHJldmlzaW9uIDEzMTM5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRGYXN0UGF0aC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2OSwx MCArNDY5LDExIEBAIHZvaWQgRm9udDo6ZHJhd0VtcGhhc2lzTWFya3MoR3JhcGhpY3NDb24KICAg ICBkcmF3R2x5cGhCdWZmZXIoY29udGV4dCwgcnVuLCBtYXJrQnVmZmVyLCBzdGFydFBvaW50KTsK IH0KIAotZmxvYXQgRm9udDo6ZmxvYXRXaWR0aEZvclNpbXBsZVRleHQoY29uc3QgVGV4dFJ1biYg cnVuLCBHbHlwaEJ1ZmZlciogZ2x5cGhCdWZmZXIsIEhhc2hTZXQ8Y29uc3QgU2ltcGxlRm9udERh dGEqPiogZmFsbGJhY2tGb250cywgR2x5cGhPdmVyZmxvdyogZ2x5cGhPdmVyZmxvdykgY29uc3QK K2Zsb2F0IEZvbnQ6OmZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwg SGFzaFNldDxjb25zdCBTaW1wbGVGb250RGF0YSo+KiBmYWxsYmFja0ZvbnRzLCBHbHlwaE92ZXJm bG93KiBnbHlwaE92ZXJmbG93KSBjb25zdAogewogICAgIFdpZHRoSXRlcmF0b3IgaXQodGhpcywg cnVuLCBmYWxsYmFja0ZvbnRzLCBnbHlwaE92ZXJmbG93KTsKLSAgICBpdC5hZHZhbmNlKHJ1bi5s ZW5ndGgoKSwgZ2x5cGhCdWZmZXIpOworICAgIEdseXBoQnVmZmVyIGdseXBoQnVmZmVyOworICAg IGl0LmFkdmFuY2UocnVuLmxlbmd0aCgpLCAodHlwZXNldHRpbmdGZWF0dXJlcygpICYgKEtlcm5p bmcgfCBMaWdhdHVyZXMpKSA/ICZnbHlwaEJ1ZmZlciA6IDApOwogCiAgICAgaWYgKGdseXBoT3Zl cmZsb3cpIHsKICAgICAgICAgZ2x5cGhPdmVyZmxvdy0+dG9wID0gbWF4PGludD4oZ2x5cGhPdmVy Zmxvdy0+dG9wLCBjZWlsZigtaXQubWluR2x5cGhCb3VuZGluZ0JveFkoKSkgLSAoZ2x5cGhPdmVy Zmxvdy0+Y29tcHV0ZUJvdW5kcyA/IDAgOiBmb250TWV0cmljcygpLmFzY2VudCgpKSk7CkBAIC01 MTEsNyArNTEyLDcgQEAgaW50IEZvbnQ6Om9mZnNldEZvclBvc2l0aW9uRm9yU2ltcGxlVGV4dAog ICAgIEdseXBoQnVmZmVyIGxvY2FsR2x5cGhCdWZmZXI7CiAgICAgdW5zaWduZWQgb2Zmc2V0Owog ICAgIGlmIChydW4ucnRsKCkpIHsKLSAgICAgICAgZGVsdGEgLT0gZmxvYXRXaWR0aEZvclNpbXBs ZVRleHQocnVuLCAwKTsKKyAgICAgICAgZGVsdGEgLT0gZmxvYXRXaWR0aEZvclNpbXBsZVRleHQo cnVuKTsKICAgICAgICAgd2hpbGUgKDEpIHsKICAgICAgICAgICAgIG9mZnNldCA9IGl0Lm1fY3Vy cmVudENoYXJhY3RlcjsKICAgICAgICAgICAgIGZsb2F0IHc7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9wYW5nby9Gb250UGFuZ28uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3BhbmdvL0ZvbnRQYW5nby5jcHAJKHJldmlz aW9uIDEzMTM5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3BhbmdvL0Zv bnRQYW5nby5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3MSw3ICszNzEsNyBAQCBmbG9hdCBGb250 OjpmbG9hdFdpZHRoRm9yQ29tcGxleFRleHQoY29uCiB7CiAjaWYgVVNFKEZSRUVUWVBFKQogICAg IGlmICghcHJpbWFyeUZvbnQoKS0+cGxhdGZvcm1EYXRhKCkubV9wYXR0ZXJuKQotICAgICAgICBy ZXR1cm4gZmxvYXRXaWR0aEZvclNpbXBsZVRleHQocnVuLCAwLCBmYWxsYmFja0ZvbnRzLCBvdmVy Zmxvdyk7CisgICAgICAgIHJldHVybiBmbG9hdFdpZHRoRm9yU2ltcGxlVGV4dChydW4sIGZhbGxi YWNrRm9udHMsIG92ZXJmbG93KTsKICNlbmRpZgogCiAgICAgaWYgKCFydW4ubGVuZ3RoKCkpCg==