152622 2015-12-31 12:17:53 -0800 Move decoration context setup calls to InlineTextBox::paintDecoration. 2015-12-31 13:09:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield simon.fraser oldest_to_newest 1151758 0 zalan 2015-12-31 12:17:53 -0800 ssia. 1151759 1 268049 zalan 2015-12-31 12:19:06 -0800 Created attachment 268049 Patch 1151763 2 zalan 2015-12-31 13:09:29 -0800 Committed r194467: <http://trac.webkit.org/changeset/194467> 268049 2015-12-31 12:19:06 -0800 2015-12-31 12:23:24 -0800 Patch bug-152622-20151231121832.patch text/plain 5326 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWVhNjIwNzZkNmNhZWE1 MzUxZTljNWM3ZDNjMjZjMzVlZTNlZGE0Zi4uNTcyNTFlNDBiNTlmYWE3NGY3M2EyNTFkNjU0YzZm NWVkYjY4ODI5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTEyLTMxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBkZWNvcmF0aW9uIGNv bnRleHQgc2V0dXAgY2FsbHMgdG8gSW5saW5lVGV4dEJveDo6cGFpbnREZWNvcmF0aW9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjIyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGlu IGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludCk6CisgICAgICAgIChXZWJD b3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludERlY29yYXRpb24pOgorICAgICAgICAqIHJlbmRlcmlu Zy9JbmxpbmVUZXh0Qm94Lmg6CisKKzIwMTUtMTItMzEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KKwogICAgICAgICB0ZXh0LWRlY29yYXRpb246IGxpbmUtdGhyb3VnaCBpcyBtaXNw b3NpdGlvbmVkIHdoZW4gdGV4dCBoYXMgb3ZlcmxpbmUvdW5kZXJsaW5lIHRvby4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYxOQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggZDBjMjZjNTc1ZmUxNTUx OGFkMjFlZTg0YTljMTFiZDY0Nzk2NDk3NS4uMzljNTI3YmU5NDAzNjkwNzFlNGRjZGQyOTUwODA3 ZjM2YzdlNDgyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRl eHRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNw cApAQCAtNTYwLDE0ICs1NjAsOCBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50KFBhaW50SW5m byYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQsCiAKICAgICAvLyBQ YWludCBkZWNvcmF0aW9ucwogICAgIFRleHREZWNvcmF0aW9uIHRleHREZWNvcmF0aW9ucyA9IGxp bmVTdHlsZS50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpOwotICAgIGlmICh0ZXh0RGVjb3JhdGlv bnMgIT0gVGV4dERlY29yYXRpb25Ob25lICYmIHBhaW50SW5mby5waGFzZSAhPSBQYWludFBoYXNl U2VsZWN0aW9uKSB7Ci0gICAgICAgIHVwZGF0ZUdyYXBoaWNzQ29udGV4dChjb250ZXh0LCB0ZXh0 UGFpbnRTdHlsZSk7Ci0gICAgICAgIGlmIChjb21iaW5lZFRleHQpCi0gICAgICAgICAgICBjb250 ZXh0LmNvbmNhdENUTShyb3RhdGlvbihib3hSZWN0LCBDbG9ja3dpc2UpKTsKLSAgICAgICAgcGFp bnREZWNvcmF0aW9uKGNvbnRleHQsIGZvbnQsIHRleHRSdW4sIHRleHRPcmlnaW4sIGJveE9yaWdp biwgdGV4dERlY29yYXRpb25zLCB0ZXh0U2hhZG93KTsKLSAgICAgICAgaWYgKGNvbWJpbmVkVGV4 dCkKLSAgICAgICAgICAgIGNvbnRleHQuY29uY2F0Q1RNKHJvdGF0aW9uKGJveFJlY3QsIENvdW50 ZXJjbG9ja3dpc2UpKTsKLSAgICB9CisgICAgaWYgKHRleHREZWNvcmF0aW9ucyAhPSBUZXh0RGVj b3JhdGlvbk5vbmUgJiYgcGFpbnRJbmZvLnBoYXNlICE9IFBhaW50UGhhc2VTZWxlY3Rpb24pCisg ICAgICAgIHBhaW50RGVjb3JhdGlvbihjb250ZXh0LCBmb250LCBjb21iaW5lZFRleHQsIHRleHRS dW4sIHRleHRPcmlnaW4sIGJveFJlY3QsIHRleHREZWNvcmF0aW9ucywgdGV4dFBhaW50U3R5bGUs IHRleHRTaGFkb3cpOwogCiAgICAgaWYgKHBhaW50SW5mby5waGFzZSA9PSBQYWludFBoYXNlRm9y ZWdyb3VuZCkgewogICAgICAgICBwYWludERvY3VtZW50TWFya2Vycyhjb250ZXh0LCBib3hPcmln aW4sIGxpbmVTdHlsZSwgZm9udCwgZmFsc2UpOwpAQCAtNjk5LDEzICs2OTMsMTYgQEAgdm9pZCBJ bmxpbmVUZXh0Qm94OjpwYWludENvbXBvc2l0aW9uQmFja2dyb3VuZChHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIGNvbnN0IEYKICAgICBjb250ZXh0LmZpbGxSZWN0KHNuYXBSZWN0VG9EZXZpY2VQ aXhlbHNXaXRoV3JpdGluZ0RpcmVjdGlvbihzZWxlY3Rpb25SZWN0LCByZW5kZXJlcigpLmRvY3Vt ZW50KCkuZGV2aWNlU2NhbGVGYWN0b3IoKSwgdGV4dFJ1bi5sdHIoKSksIGNvbXBvc2l0aW9uQ29s b3IpOwogfQogCi12b2lkIElubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlvbihHcmFwaGljc0Nv bnRleHQmIGNvbnRleHQsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250LCBjb25zdCBUZXh0UnVuJiB0 ZXh0UnVuLCBjb25zdCBGbG9hdFBvaW50JiB0ZXh0T3JpZ2luLCBjb25zdCBGbG9hdFBvaW50JiBi b3hPcmlnaW4sCi0gICAgVGV4dERlY29yYXRpb24gZGVjb3JhdGlvbiwgY29uc3QgU2hhZG93RGF0 YSogc2hhZG93KQordm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludERlY29yYXRpb24oR3JhcGhpY3ND b250ZXh0JiBjb250ZXh0LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udCwgUmVuZGVyQ29tYmluZVRl eHQqIGNvbWJpbmVkVGV4dCwgY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgY29uc3QgRmxvYXRQb2lu dCYgdGV4dE9yaWdpbiwKKyAgICBjb25zdCBGbG9hdFJlY3QmIGJveFJlY3QsIFRleHREZWNvcmF0 aW9uIGRlY29yYXRpb24sIFRleHRQYWludFN0eWxlIHRleHRQYWludFN0eWxlLCBjb25zdCBTaGFk b3dEYXRhKiBzaGFkb3cpCiB7CiAgICAgaWYgKG1fdHJ1bmNhdGlvbiA9PSBjRnVsbFRydW5jYXRp b24pCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0UG9pbnQgbG9jYWxPcmlnaW4gPSBib3hP cmlnaW47CisgICAgRmxvYXRQb2ludCBsb2NhbE9yaWdpbiA9IGJveFJlY3QubG9jYXRpb24oKTsK KyAgICB1cGRhdGVHcmFwaGljc0NvbnRleHQoY29udGV4dCwgdGV4dFBhaW50U3R5bGUpOworICAg IGlmIChjb21iaW5lZFRleHQpCisgICAgICAgIGNvbnRleHQuY29uY2F0Q1RNKHJvdGF0aW9uKGJv eFJlY3QsIENsb2Nrd2lzZSkpOwogCiAgICAgZmxvYXQgd2lkdGggPSBtX2xvZ2ljYWxXaWR0aDsK ICAgICBpZiAobV90cnVuY2F0aW9uICE9IGNOb1RydW5jYXRpb24pIHsKQEAgLTcyNCw2ICs3MjEs OSBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlvbihHcmFwaGljc0NvbnRleHQm IGNvbnRleHQsIGNvbnN0IEZvbnRDYXNjYWRlJgogICAgIGRlY29yYXRpb25QYWludGVyLmFkZFRl eHRTaGFkb3coc2hhZG93KTsKIAogICAgIGRlY29yYXRpb25QYWludGVyLnBhaW50VGV4dERlY29y YXRpb24odGV4dFJ1biwgdGV4dE9yaWdpbiwgbG9jYWxPcmlnaW4pOworCisgICAgaWYgKGNvbWJp bmVkVGV4dCkKKyAgICAgICAgY29udGV4dC5jb25jYXRDVE0ocm90YXRpb24oYm94UmVjdCwgQ291 bnRlcmNsb2Nrd2lzZSkpOwogfQogCiBzdGF0aWMgR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1h cmtlckxpbmVTdHlsZSBsaW5lU3R5bGVGb3JNYXJrZXJUeXBlKERvY3VtZW50TWFya2VyOjpNYXJr ZXJUeXBlIG1hcmtlclR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lVGV4dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu aAppbmRleCBmM2RkNjc1MDRkNWRkN2E1Mzc4MTkzOTc0ZDZiMDU0Y2MwZWFiZTZjLi41M2I4NDhm YzA2MTdhYThmMGI2ODdkZWM4NmIxZTlhNjUxNDE1ZWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVUZXh0Qm94LmgKQEAgLTMwLDggKzMwLDEwIEBACiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKIHN0cnVjdCBDb21wb3NpdGlvblVuZGVybGluZTsKK2NsYXNzIFJlbmRlckNvbWJpbmVU ZXh0OwogY2xhc3MgUmVuZGVyZWREb2N1bWVudE1hcmtlcjsKIGNsYXNzIFRleHRQYWludGVyOwor c3RydWN0IFRleHRQYWludFN0eWxlOwogCiBjb25zdCB1bnNpZ25lZCBzaG9ydCBjTm9UcnVuY2F0 aW9uID0gVVNIUlRfTUFYOwogY29uc3QgdW5zaWduZWQgc2hvcnQgY0Z1bGxUcnVuY2F0aW9uID0g VVNIUlRfTUFYIC0gMTsKQEAgLTE1OSw3ICsxNjEsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBw YWludENvbXBvc2l0aW9uVW5kZXJsaW5lKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IEZsb2F0UG9p bnQmIGJveE9yaWdpbiwgY29uc3QgQ29tcG9zaXRpb25VbmRlcmxpbmUmKTsKIAogcHJpdmF0ZToK LSAgICB2b2lkIHBhaW50RGVjb3JhdGlvbihHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGb250Q2Fz Y2FkZSYsIGNvbnN0IFRleHRSdW4mLCBjb25zdCBGbG9hdFBvaW50JiB0ZXh0T3JpZ2luLCBjb25z dCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIFRleHREZWNvcmF0aW9uLCBjb25zdCBTaGFkb3dEYXRh Kik7CisgICAgdm9pZCBwYWludERlY29yYXRpb24oR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRm9u dENhc2NhZGUmLCBSZW5kZXJDb21iaW5lVGV4dCosIGNvbnN0IFRleHRSdW4mLCBjb25zdCBGbG9h dFBvaW50JiB0ZXh0T3JpZ2luLCBjb25zdCBGbG9hdFJlY3QmIGJveFJlY3QsCisgICAgICAgIFRl eHREZWNvcmF0aW9uLCBUZXh0UGFpbnRTdHlsZSwgY29uc3QgU2hhZG93RGF0YSopOwogICAgIHZv aWQgcGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgRmxvYXRQb2ludCYgYm94 T3JpZ2luLCBjb25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IEZvbnRDYXNjYWRlJiwgQ29sb3IgdGV4 dENvbG9yKTsKICAgICB2b2lkIHBhaW50RG9jdW1lbnRNYXJrZXIoR3JhcGhpY3NDb250ZXh0Jiwg Y29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBSZW5kZXJlZERvY3VtZW50TWFya2VyJiwgY29u c3QgUmVuZGVyU3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYsIGJvb2wgZ3JhbW1hcik7CiAgICAg dm9pZCBwYWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQmLCBjb25zdCBGbG9hdFBv aW50JiBib3hPcmlnaW4sIFJlbmRlcmVkRG9jdW1lbnRNYXJrZXImLCBjb25zdCBSZW5kZXJTdHls ZSYsIGNvbnN0IEZvbnRDYXNjYWRlJik7Cg==