130287 2014-03-14 22:38:11 -0700 Rewrite WebHTMLConverter::_elementIsBlockLevel in C++ 2014-03-17 18:38:25 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130284 130227 1 rniwa rniwa andersca darin enrica kling koivisto sam oldest_to_newest 990823 0 rniwa 2014-03-14 22:38:11 -0700 Rewrite it for better performance. 990824 1 226809 rniwa 2014-03-14 22:41:37 -0700 Created attachment 226809 Patch 991501 2 rniwa 2014-03-17 18:38:25 -0700 Committed r165787: <http://trac.webkit.org/changeset/165787> 226809 2014-03-14 22:41:37 -0700 2014-03-14 22:50:42 -0700 Patch bug-130287-20140314224120.patch text/plain 5993 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFiNjk0MzkzOWRjMWUy ZTJmZjU1MmZmZTQ2NzlkYzYwNWJkNmNjYy4uNjVmMzBlNDVhNjg1ZmYzYjg1OGVjM2U2OTQ5Njkx OTM5MzY4YzIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAzLTE0ICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCisgICAgICAgIFJld3JpdGUgV2ViSFRNTENv bnZlcnRlcjo6X2VsZW1lbnRJc0Jsb2NrTGV2ZWwgaW4gQysrCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyODcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXdyb3RlIF9lbGVtZW50SXNCbG9ja0xldmVs IGFzIEhUTUxDb252ZXJ0ZXJDYWNoZXM6OmlzQmxvY2tFbGVtZW50LiBBbHNvIHJlbW92ZWQgdGhl IGNvZGUgdG8gdXBkYXRlCisgICAgICAgIF9lbGVtZW50SXNCbG9ja0xldmVsIGluIF90cmF2ZXJz ZU5vZGUgYXMgY29tcHV0aW5nIHRoZSB2YWx1ZSBvZiBfZWxlbWVudElzQmxvY2tMZXZlbCBpcyBu b3cgZmFzdC4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLmg6CisgICAg ICAgICogcGxhdGZvcm0vbWFjL0hUTUxDb252ZXJ0ZXIubW06CisgICAgICAgIChIVE1MQ29udmVy dGVyQ2FjaGVzOjppc0Jsb2NrRWxlbWVudCk6CisgICAgICAgICgtW1dlYkhUTUxDb252ZXJ0ZXIg X2VsZW1lbnRJc0Jsb2NrTGV2ZWw6XSk6CisgICAgICAgICgtW1dlYkhUTUxDb252ZXJ0ZXIgX3Ry YXZlcnNlTm9kZTpkZXB0aDplbWJlZGRlZDpdKToKKyAgICAgICAgKC1bV2ViSFRNTENvbnZlcnRl ciBkZWFsbG9jXSk6CisgICAgICAgICgtW1dlYkhUTUxDb252ZXJ0ZXIgaW5pdF0pOgorCisyMDE0 LTAzLTE0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCiAgICAgICAgIFJld3Jp dGUgV2ViSFRNTENvbnZlcnRlcjo6X2dldENvbXB1dGVkRmxvYXQgaW4gQysrCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyODQKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0hUTUxDb252ZXJ0ZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLmgKaW5kZXggYzJmNjA2ODczYTA2ZWVm NWEwMTQ5MzJiNDJhYWFhZWM1MjYyNzk0YS4uNTI5MTNlM2NkNDExYzk5OWRlMzVmYjM3OTQyYzk5 ZDE3M2JlOGQ0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0hUTUxD b252ZXJ0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRl ci5oCkBAIC01OCw3ICs1OCw2IEBAIGNsYXNzIEhUTUxDb252ZXJ0ZXJDYWNoZXM7CiAgICAgTlNN dXRhYmxlQXJyYXkgKl90ZXh0VGFibGVSb3dCYWNrZ3JvdW5kQ29sb3JzOwogICAgIE5TTXV0YWJs ZURpY3Rpb25hcnkgKl9jb2xvcnNGb3JOb2RlczsKICAgICBOU011dGFibGVEaWN0aW9uYXJ5ICpf YXR0cmlidXRlc0ZvckVsZW1lbnRzOwotICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKl9lbGVtZW50 SXNCbG9ja0xldmVsOwogICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKl9mb250Q2FjaGU7CiAgICAg TlNNdXRhYmxlQXJyYXkgKl93cml0aW5nRGlyZWN0aW9uQXJyYXk7CiAgICAgTlNVSW50ZWdlciBf ZG9tUmFuZ2VTdGFydEluZGV4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0hUTUxDb252ZXJ0ZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENv bnZlcnRlci5tbQppbmRleCAxMDY2N2JhYWIyNjJiY2RkYzBlYWU0YmJkZThlNzg0OTE3NGI0N2Zm Li45ZDllODczODBhZTJkZTAyYWM5ZGIzZjA1NDNlMzQ3ZDFjYzNjOWEzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRlci5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRlci5tbQpAQCAtNDAyLDYgKzQwMiw3IEBA IGNsYXNzIEhUTUxDb252ZXJ0ZXJDYWNoZXMgewogcHVibGljOgogICAgIFN0cmluZyBwcm9wZXJ0 eVZhbHVlRm9yTm9kZShOb2RlJiwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUpOwogICAgIGJv b2wgZmxvYXRQcm9wZXJ0eVZhbHVlRm9yTm9kZShOb2RlJiwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0 eU5hbWUsIGZsb2F0Jik7CisgICAgYm9vbCBpc0Jsb2NrRWxlbWVudChFbGVtZW50Jik7CiAKICAg ICBQYXNzUmVmUHRyPENTU1ZhbHVlPiBjb21wdXRlZFN0eWxlUHJvcGVydHlGb3JFbGVtZW50KEVs ZW1lbnQmLCBjb25zdCBTdHJpbmcmKTsKICAgICBQYXNzUmVmUHRyPENTU1ZhbHVlPiBpbmxpbmVT dHlsZVByb3BlcnR5Rm9yRWxlbWVudChFbGVtZW50JiwgY29uc3QgU3RyaW5nJik7CkBAIC05Mjks MjQgKzkzMCwyMCBAQCBzdGF0aWMgaW5saW5lIE5TU2hhZG93ICpfc2hhZG93Rm9yU2hhZG93U3R5 bGUoTlNTdHJpbmcgKnNoYWRvd1N0eWxlKQogICAgIHJldHVybiBzaGFkb3c7CiB9CiAKLS0gKEJP T0wpX2VsZW1lbnRJc0Jsb2NrTGV2ZWw6KERPTUVsZW1lbnQgKillbGVtZW50Citib29sIEhUTUxD b252ZXJ0ZXJDYWNoZXM6OmlzQmxvY2tFbGVtZW50KEVsZW1lbnQmIGVsZW1lbnQpCiB7Ci0gICAg Qk9PTCBpc0Jsb2NrTGV2ZWwgPSBOTzsKLSAgICBOU051bWJlciAqdmFsID0gbmlsOwotICAgIHZh bCA9IFtfZWxlbWVudElzQmxvY2tMZXZlbCBvYmplY3RGb3JLZXk6ZWxlbWVudF07Ci0gICAgaWYg KHZhbCkKLSAgICAgICAgaXNCbG9ja0xldmVsID0gW3ZhbCBib29sVmFsdWVdOwotICAgIGVsc2Ug ewotICAgICAgICBOU1N0cmluZyAqZGlzcGxheVZhbCA9IFtzZWxmIF9zdHJpbmdGb3JOb2RlOmVs ZW1lbnQgcHJvcGVydHk6QCJkaXNwbGF5Il07Ci0gICAgICAgIE5TU3RyaW5nICpmbG9hdFZhbCA9 IFtzZWxmIF9zdHJpbmdGb3JOb2RlOmVsZW1lbnQgcHJvcGVydHk6QCJmbG9hdCJdOwotICAgICAg ICBpZiAoZmxvYXRWYWwgJiYgKFtAImxlZnQiIGlzRXF1YWxUb1N0cmluZzpmbG9hdFZhbF0gfHwg W0AicmlnaHQiIGlzRXF1YWxUb1N0cmluZzpmbG9hdFZhbF0pKQotICAgICAgICAgICAgaXNCbG9j a0xldmVsID0gWUVTOwotICAgICAgICBlbHNlIGlmIChkaXNwbGF5VmFsKQotICAgICAgICAgICAg aXNCbG9ja0xldmVsID0gKFtAImJsb2NrIiBpc0VxdWFsVG9TdHJpbmc6ZGlzcGxheVZhbF0gfHwg W0AibGlzdC1pdGVtIiBpc0VxdWFsVG9TdHJpbmc6ZGlzcGxheVZhbF0gfHwgW2Rpc3BsYXlWYWwg aGFzUHJlZml4OkAidGFibGUiXSk7CisgICAgU3RyaW5nIGRpc3BsYXlWYWx1ZSA9IHByb3BlcnR5 VmFsdWVGb3JOb2RlKGVsZW1lbnQsICJkaXNwbGF5Iik7CisgICAgaWYgKGRpc3BsYXlWYWx1ZSA9 PSAiYmxvY2siIHx8IGRpc3BsYXlWYWx1ZSA9PSAibGlzdC1pdGVtIiB8fCBkaXNwbGF5VmFsdWUu c3RhcnRzV2l0aCgidGFibGUiKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgU3RyaW5nIGZs b2F0VmFsdWUgPSBwcm9wZXJ0eVZhbHVlRm9yTm9kZShlbGVtZW50LCAiZmxvYXQiKTsKKyAgICBp ZiAoZmxvYXRWYWx1ZSA9PSAibGVmdCIgfHwgZmxvYXRWYWx1ZSA9PSAicmlnaHQiKQorICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKLSAgICAgICAgW19lbGVtZW50 SXNCbG9ja0xldmVsIHNldE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6aXNCbG9ja0xl dmVsXSBmb3JLZXk6ZWxlbWVudF07Ci0gICAgfQotICAgIHJldHVybiBpc0Jsb2NrTGV2ZWw7Cist IChCT09MKV9lbGVtZW50SXNCbG9ja0xldmVsOihET01FbGVtZW50ICopZWxlbWVudAoreworICAg IHJldHVybiBlbGVtZW50ICYmIF9jYWNoZXMtPmlzQmxvY2tFbGVtZW50KCpjb3JlKGVsZW1lbnQp KTsKIH0KIAogLSAoQk9PTClfZWxlbWVudEhhc093bkJhY2tncm91bmRDb2xvcjooRE9NRWxlbWVu dCAqKWVsZW1lbnQKQEAgLTIyODEsMTQgKzIyNzgsNyBAQCAtICh2b2lkKV90cmF2ZXJzZU5vZGU6 KERPTU5vZGUgKilub2RlIGRlcHRoOihOU0ludGVnZXIpZGVwdGggZW1iZWRkZWQ6KEJPT0wpZW1i ZQogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChub2RlVHlwZSA9PSBET01fRUxFTUVOVF9OT0RF KSB7CiAgICAgICAgIERPTUVsZW1lbnQgKmVsZW1lbnQgPSAoRE9NRWxlbWVudCAqKW5vZGU7Ci0g ICAgICAgIE5TU3RyaW5nICp0YWcgPSBbZWxlbWVudCB0YWdOYW1lXSwgKmRpc3BsYXlWYWwgPSBb c2VsZiBfc3RyaW5nRm9yTm9kZTplbGVtZW50IHByb3BlcnR5OkAiZGlzcGxheSJdLCAqZmxvYXRW YWwgPSBbc2VsZiBfc3RyaW5nRm9yTm9kZTplbGVtZW50IHByb3BlcnR5OkAiZmxvYXQiXTsKLSAg ICAgICAgQk9PTCBpc0Jsb2NrTGV2ZWwgPSBOTzsKLSAgICAgICAgaWYgKGZsb2F0VmFsICYmIChb QCJsZWZ0IiBpc0VxdWFsVG9TdHJpbmc6ZmxvYXRWYWxdIHx8IFtAInJpZ2h0IiBpc0VxdWFsVG9T dHJpbmc6ZmxvYXRWYWxdKSkgewotICAgICAgICAgICAgaXNCbG9ja0xldmVsID0gWUVTOwotICAg ICAgICB9IGVsc2UgaWYgKGRpc3BsYXlWYWwpIHsKLSAgICAgICAgICAgIGlzQmxvY2tMZXZlbCA9 IChbQCJibG9jayIgaXNFcXVhbFRvU3RyaW5nOmRpc3BsYXlWYWxdIHx8IFtAImxpc3QtaXRlbSIg aXNFcXVhbFRvU3RyaW5nOmRpc3BsYXlWYWxdIHx8IFtkaXNwbGF5VmFsIGhhc1ByZWZpeDpAInRh YmxlIl0pOwotICAgICAgICB9Ci0gICAgICAgIFtfZWxlbWVudElzQmxvY2tMZXZlbCBzZXRPYmpl Y3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOmlzQmxvY2tMZXZlbF0gZm9yS2V5OmVsZW1lbnRd OworICAgICAgICBOU1N0cmluZyAqdGFnID0gW2VsZW1lbnQgdGFnTmFtZV0sICpkaXNwbGF5VmFs ID0gW3NlbGYgX3N0cmluZ0Zvck5vZGU6ZWxlbWVudCBwcm9wZXJ0eTpAImRpc3BsYXkiXTsKICAg ICAgICAgaWYgKFtzZWxmIF9lbnRlckVsZW1lbnQ6ZWxlbWVudCB0YWc6dGFnIGRpc3BsYXk6ZGlz cGxheVZhbCBlbWJlZGRlZDplbWJlZGRlZF0pIHsKICAgICAgICAgICAgIE5TVUludGVnZXIgc3Rh cnRJbmRleCA9IFtfYXR0clN0ciBsZW5ndGhdOwogICAgICAgICAgICAgaWYgKFtzZWxmIF9wcm9j ZXNzRWxlbWVudDplbGVtZW50IHRhZzp0YWcgZGlzcGxheTpkaXNwbGF5VmFsIGRlcHRoOmRlcHRo XSkgewpAQCAtMjQxNiw3ICsyNDA2LDYgQEAgLSAodm9pZClkZWFsbG9jCiAgICAgW190ZXh0VGFi bGVSb3dCYWNrZ3JvdW5kQ29sb3JzIHJlbGVhc2VdOwogICAgIFtfY29sb3JzRm9yTm9kZXMgcmVs ZWFzZV07CiAgICAgW19hdHRyaWJ1dGVzRm9yRWxlbWVudHMgcmVsZWFzZV07Ci0gICAgW19lbGVt ZW50SXNCbG9ja0xldmVsIHJlbGVhc2VdOwogICAgIFtfZm9udENhY2hlIHJlbGVhc2VdOwogICAg IFtfd3JpdGluZ0RpcmVjdGlvbkFycmF5IHJlbGVhc2VdOwogICAgIFtzdXBlciBkZWFsbG9jXTsK QEAgLTI0NDIsNyArMjQzMSw2IEBAIC0gKGlkKWluaXQKICAgICBfdGV4dFRhYmxlUm93QmFja2dy b3VuZENvbG9ycyA9IFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdOwogICAgIF9jb2xvcnNG b3JOb2RlcyA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF07CiAgICAgX2F0dHJp YnV0ZXNGb3JFbGVtZW50cyA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5pdF07Ci0g ICAgX2VsZW1lbnRJc0Jsb2NrTGV2ZWwgPSBbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGlu aXRdOwogICAgIF9mb250Q2FjaGUgPSBbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRd OwogICAgIF93cml0aW5nRGlyZWN0aW9uQXJyYXkgPSBbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBp bml0XTsKIAo=