173847 2017-06-26 12:37:57 -0700 Add RenderEmbeddedObject::getReplacementTextGeometry helper. 2017-06-27 12:52:10 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan bfulgham simon.fraser zalan oldest_to_newest 1322950 0 zalan 2017-06-26 12:37:57 -0700 ssia. 1322952 1 313862 zalan 2017-06-26 12:41:49 -0700 Created attachment 313862 Patch 1323208 2 zalan 2017-06-27 12:52:10 -0700 Committed r218838: <http://trac.webkit.org/changeset/218838> 313862 2017-06-26 12:41:49 -0700 2017-06-27 12:52:03 -0700 Patch bug-173847-20170626124148.patch text/plain 6053 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmNmNzAwYWUxMmI3NjIz MzE1NTFhZWJiNmFlZjJkMTBkODYwOWMzZS4uNWJhZTlkNmI0ZGMyNzUwNmM2YjQyNmQ1NDg5ZWM5 MDJhNDIxYmU1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFJlbmRlckVtYmVkZGVk T2JqZWN0OjpnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeSBoZWxwZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM4NDcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAuLi5hbmQgcmVtb3ZlIGdldFJlcGxh Y2VtZW50VGV4dEdlb21ldHJ5J3MgcmVkdW5kYW50IHJldHVybiB2YWx1ZS4gCisKKyAgICAgICAg Tm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy RW1iZWRkZWRPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OnBhaW50UmVwbGFjZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckVtYmVkZGVkT2JqZWN0Ojp1bmF2YWlsYWJsZVBsdWdpbkluZGljYXRvckJvdW5kcyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6aXNJblVuYXZhaWxhYmxlUGx1Z2lu SW5kaWNhdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoK KwogMjAxNy0wNi0yNiAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0FUS10gQWRkIHN1cHBvcnQgZm9yIGFyaWEtZGV0YWlscyBhbmQgYXJpYS1lcnJvcm1l c3NhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRl ZE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmpl Y3QuY3BwCmluZGV4IDViYzFiMzRlY2Q0NjE4NTI4ZTc3ZjJmOGFhNjU2MmRlNjVkYmJlYzcuLjAw NzQ2NzdmYjZlNGIxYmNmMGU2NWUwZWE0ZDg5ZmU2OTliZGY4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcApAQCAtMzAxLDggKzMw MSw3IEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBhaW50UmVwbGFjZWQoUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50CiAgICAgRm9udENhc2NhZGUgZm9udDsKICAg ICBUZXh0UnVuIHJ1bihlbXB0eVN0cmluZygpKTsKICAgICBmbG9hdCB0ZXh0V2lkdGg7Ci0gICAg aWYgKCFnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShwYWludE9mZnNldCwgY29udGVudFJlY3Qs IGluZGljYXRvclJlY3QsIHJlcGxhY2VtZW50VGV4dFJlY3QsIGFycm93UmVjdCwgZm9udCwgcnVu LCB0ZXh0V2lkdGgpKQotICAgICAgICByZXR1cm47CisgICAgZ2V0UmVwbGFjZW1lbnRUZXh0R2Vv bWV0cnkocGFpbnRPZmZzZXQsIGNvbnRlbnRSZWN0LCBpbmRpY2F0b3JSZWN0LCByZXBsYWNlbWVu dFRleHRSZWN0LCBhcnJvd1JlY3QsIGZvbnQsIHJ1biwgdGV4dFdpZHRoKTsKIAogICAgIFBhdGgg YmFja2dyb3VuZDsKICAgICBiYWNrZ3JvdW5kLmFkZFJvdW5kZWRSZWN0KGluZGljYXRvclJlY3Qs IEZsb2F0U2l6ZShyZXBsYWNlbWVudFRleHRSb3VuZGVkUmVjdFJhZGl1cywgcmVwbGFjZW1lbnRU ZXh0Um91bmRlZFJlY3RSYWRpdXMpKTsKQEAgLTM0OSw3ICszNDgsMjAgQEAgdm9pZCBSZW5kZXJF bWJlZGRlZE9iamVjdDo6c2V0VW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3JJc0hpZGRlbihib29s IGhpZGRlbikKICAgICByZXBhaW50KCk7CiB9CiAKLWJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6 OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRl ZE9mZnNldCwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgRmxvYXRSZWN0JiBpbmRpY2F0b3JSZWN0 LCBGbG9hdFJlY3QmIHJlcGxhY2VtZW50VGV4dFJlY3QsIEZsb2F0UmVjdCYgYXJyb3dSZWN0LCBG b250Q2FzY2FkZSYgZm9udCwgVGV4dFJ1biYgcnVuLCBmbG9hdCYgdGV4dFdpZHRoKSBjb25zdAor TGF5b3V0UmVjdCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6Z2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0 cnkoY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KSBjb25zdAoreworICAgIEZs b2F0UmVjdCBjb250ZW50UmVjdDsKKyAgICBGbG9hdFJlY3QgaW5kaWNhdG9yUmVjdDsKKyAgICBG bG9hdFJlY3QgcmVwbGFjZW1lbnRUZXh0UmVjdDsKKyAgICBGbG9hdFJlY3QgYXJyb3dSZWN0Owor ICAgIEZvbnRDYXNjYWRlIGZvbnQ7CisgICAgVGV4dFJ1biBydW4oZW1wdHlTdHJpbmcoKSk7Cisg ICAgZmxvYXQgdGV4dFdpZHRoOworICAgIGdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGFjY3Vt dWxhdGVkT2Zmc2V0LCBjb250ZW50UmVjdCwgaW5kaWNhdG9yUmVjdCwgcmVwbGFjZW1lbnRUZXh0 UmVjdCwgYXJyb3dSZWN0LCBmb250LCBydW4sIHRleHRXaWR0aCk7CisgICAgcmV0dXJuIExheW91 dFJlY3QoaW5kaWNhdG9yUmVjdCk7Cit9CisKK3ZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6Omdl dFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9m ZnNldCwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgRmxvYXRSZWN0JiBpbmRpY2F0b3JSZWN0LCBG bG9hdFJlY3QmIHJlcGxhY2VtZW50VGV4dFJlY3QsIEZsb2F0UmVjdCYgYXJyb3dSZWN0LCBGb250 Q2FzY2FkZSYgZm9udCwgVGV4dFJ1biYgcnVuLCBmbG9hdCYgdGV4dFdpZHRoKSBjb25zdAogewog ICAgIGJvb2wgaW5jbHVkZXNBcnJvdyA9IHNob3VsZFVuYXZhaWxhYmxlUGx1Z2luTWVzc2FnZUJl QnV0dG9uKHBhZ2UoKSwgbV9wbHVnaW5VbmF2YWlsYWJpbGl0eVJlYXNvbik7CiAKQEAgLTM4MSwy MyArMzkzLDExIEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmdldFJlcGxhY2VtZW50VGV4 dEdlb21ldHJ5KGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsCiAgICAgICAgIGFycm93UmVjdC5z ZXRXaWR0aChhcnJvd1JlY3QuaGVpZ2h0KCkpOwogICAgICAgICBpbmRpY2F0b3JSZWN0LnVuaXRl KGFycm93UmVjdCk7CiAgICAgfQotCi0gICAgcmV0dXJuIHRydWU7CiB9CiAKIExheW91dFJlY3Qg UmVuZGVyRW1iZWRkZWRPYmplY3Q6OnVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yQm91bmRzKGNv bnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCkgY29uc3QKIHsKLSAgICBGbG9hdFJl Y3QgY29udGVudFJlY3Q7Ci0gICAgRmxvYXRSZWN0IGluZGljYXRvclJlY3Q7Ci0gICAgRmxvYXRS ZWN0IHJlcGxhY2VtZW50VGV4dFJlY3Q7Ci0gICAgRmxvYXRSZWN0IGFycm93UmVjdDsKLSAgICBG b250Q2FzY2FkZSBmb250OwotICAgIFRleHRSdW4gcnVuKGVtcHR5U3RyaW5nKCkpOwotICAgIGZs b2F0IHRleHRXaWR0aDsKLSAgICBpZiAoZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkoYWNjdW11 bGF0ZWRPZmZzZXQsIGNvbnRlbnRSZWN0LCBpbmRpY2F0b3JSZWN0LCByZXBsYWNlbWVudFRleHRS ZWN0LCBhcnJvd1JlY3QsIGZvbnQsIHJ1biwgdGV4dFdpZHRoKSkKLSAgICAgICAgcmV0dXJuIExh eW91dFJlY3QoaW5kaWNhdG9yUmVjdCk7Ci0KLSAgICByZXR1cm4gTGF5b3V0UmVjdCgpOworICAg IHJldHVybiBnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShhY2N1bXVsYXRlZE9mZnNldCk7CiB9 CiAKIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzUmVwbGFjZW1lbnRPYnNjdXJlZCgpIGNv bnN0CkBAIC01ODAsMTUgKzU4MCw3IEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmxvZ2lj YWxTY3JvbGwoU2Nyb2xsTG9naWNhbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjcm9sCiAKIGJvb2wg UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcihjb25z dCBGbG9hdFBvaW50JiBwb2ludCkgY29uc3QKIHsKLSAgICBGbG9hdFJlY3QgY29udGVudFJlY3Q7 Ci0gICAgRmxvYXRSZWN0IGluZGljYXRvclJlY3Q7Ci0gICAgRmxvYXRSZWN0IHJlcGxhY2VtZW50 VGV4dFJlY3Q7Ci0gICAgRmxvYXRSZWN0IGFycm93UmVjdDsKLSAgICBGb250Q2FzY2FkZSBmb250 OwotICAgIFRleHRSdW4gcnVuKGVtcHR5U3RyaW5nKCkpOwotICAgIGZsb2F0IHRleHRXaWR0aDsK LSAgICByZXR1cm4gZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkoSW50UG9pbnQoKSwgY29udGVu dFJlY3QsIGluZGljYXRvclJlY3QsIHJlcGxhY2VtZW50VGV4dFJlY3QsIGFycm93UmVjdCwgZm9u dCwgcnVuLCB0ZXh0V2lkdGgpCi0gICAgICAgICYmIGluZGljYXRvclJlY3QuY29udGFpbnMocG9p bnQpOworICAgIHJldHVybiBnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShMYXlvdXRQb2ludCgp KS5jb250YWlucyhMYXlvdXRQb2ludChwb2ludCkpOwogfQogCiBib29sIFJlbmRlckVtYmVkZGVk T2JqZWN0Ojppc0luVW5hdmFpbGFibGVQbHVnaW5JbmRpY2F0b3IoY29uc3QgTW91c2VFdmVudCYg ZXZlbnQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RW1iZWRkZWRPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRl ZE9iamVjdC5oCmluZGV4IGJiN2QwYzg3ODBmM2IwNTJjZmJhMzVlOTJmYTkzZTg3MjI5OWRhNTAu LmJmZmZmNTRmMWEwZTdmN2ZjNWZiMmJmM2E2YzIyMTNjOWQ3NzU0N2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5oCkBAIC04Niw3ICs4Niw4 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRVbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcklzUHJl c3NlZChib29sKTsKICAgICBib29sIGlzSW5VbmF2YWlsYWJsZVBsdWdpbkluZGljYXRvcihjb25z dCBNb3VzZUV2ZW50JikgY29uc3Q7CiAgICAgYm9vbCBpc0luVW5hdmFpbGFibGVQbHVnaW5JbmRp Y2F0b3IoY29uc3QgRmxvYXRQb2ludCYpIGNvbnN0OwotICAgIGJvb2wgZ2V0UmVwbGFjZW1lbnRU ZXh0R2VvbWV0cnkoY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBGbG9hdFJl Y3QmIGNvbnRlbnRSZWN0LCBGbG9hdFJlY3QmIGluZGljYXRvclJlY3QsIEZsb2F0UmVjdCYgcmVw bGFjZW1lbnRUZXh0UmVjdCwgRmxvYXRSZWN0JiBhcnJvd1JlY3QsIEZvbnRDYXNjYWRlJiwgVGV4 dFJ1biYsIGZsb2F0JiB0ZXh0V2lkdGgpIGNvbnN0OworICAgIHZvaWQgZ2V0UmVwbGFjZW1lbnRU ZXh0R2VvbWV0cnkoY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBGbG9hdFJl Y3QmIGNvbnRlbnRSZWN0LCBGbG9hdFJlY3QmIGluZGljYXRvclJlY3QsIEZsb2F0UmVjdCYgcmVw bGFjZW1lbnRUZXh0UmVjdCwgRmxvYXRSZWN0JiBhcnJvd1JlY3QsIEZvbnRDYXNjYWRlJiwgVGV4 dFJ1biYsIGZsb2F0JiB0ZXh0V2lkdGgpIGNvbnN0OworICAgIExheW91dFJlY3QgZ2V0UmVwbGFj ZW1lbnRUZXh0R2VvbWV0cnkoY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0KSBj b25zdDsKICAgICBMYXlvdXRSZWN0IHVuYXZhaWxhYmxlUGx1Z2luSW5kaWNhdG9yQm91bmRzKGNv bnN0IExheW91dFBvaW50JikgY29uc3Q7CiAKICAgICBib29sIGNhbkhhdmVDaGlsZHJlbigpIGNv bnN0IGZpbmFsOwo=