139004 2014-11-22 11:08:59 -0800 Make locale part of the SimpleLineLayout::FlowContent::Style 2014-11-22 11:37:24 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan zalan oldest_to_newest 1050728 0 koivisto 2014-11-22 11:08:59 -0800 It is the only thing extracted from the RenderStyle. 1050729 1 242121 koivisto 2014-11-22 11:30:19 -0800 Created attachment 242121 patch 1050730 2 koivisto 2014-11-22 11:37:24 -0800 https://trac.webkit.org/r176507 242121 2014-11-22 11:30:19 -0800 2014-11-22 11:33:27 -0800 patch simple-lines-locate-to-style.patch text/plain 5091 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjUwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTExLTIyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIGxvY2FsZSBwYXJ0IG9m IHRoZSBTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudDo6U3R5bGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTAwNAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoYXQncyB0aGUgb25seSB0aGluZyBu b3QgZXhyYWN0ZWQgb3V0IG9mIFJlbmRlclN0eWxlLgorCisgICAgICAgICogcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxl TGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpTdHlsZTo6U3R5bGUpOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpGbG93Q29udGVudHMpOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjphcHBlbmROZXh0UmVu ZGVyZXJDb250ZW50SWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5 b3V0Rmxvd0NvbnRlbnRzLmg6CisKKyAgICAgICAgICAgIEFsc28gcmVtb3ZlIFJlbmRlckJsb2Nr RmxvdyBzaW5jZSBpdCBpcyBub3cgdW51c2VkLgorCisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVM aW5lTGF5b3V0OjpGbG93Q29udGVudHM6OlN0eWxlOjpTdHlsZSk6IERlbGV0ZWQuCisKKyAgICAg ICAgICAgIE1vdmUgdG8gY3BwLgorCiAyMDE0LTExLTIyICBKb2FubWFyaWUgRGlnZ3MgIDxqZGln Z3NAaWdhbGlhLmNvbT4KIAogICAgICAgICBBWDogW0FUS10gQWNjZXNzaWJsZSBuYW1lcyBtaXNz aW5nIGZvciBpbWFnZW1hcCBpbWFnZXMgYW5kIGxpbmtzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3Bw CShyZXZpc2lvbiAxNzY1MDEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZsb3dDb250ZW50cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDE2ICszMywyOCBA QAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIFNpbXBsZUxpbmVMYXlvdXQgewogCitG bG93Q29udGVudHM6OlN0eWxlOjpTdHlsZShjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUpCisgICAg OiBmb250KHN0eWxlLmZvbnQoKSkKKyAgICAsIHRleHRBbGlnbihzdHlsZS50ZXh0QWxpZ24oKSkK KyAgICAsIGNvbGxhcHNlV2hpdGVzcGFjZShzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSkKKyAg ICAsIHByZXNlcnZlTmV3bGluZShzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSkKKyAgICAsIHdyYXBM aW5lcyhzdHlsZS5hdXRvV3JhcCgpKQorICAgICwgYnJlYWtXb3JkT25PdmVyZmxvdyhzdHlsZS5v dmVyZmxvd1dyYXAoKSA9PSBCcmVha092ZXJmbG93V3JhcCAmJiAod3JhcExpbmVzIHx8IHByZXNl cnZlTmV3bGluZSkpCisgICAgLCBzcGFjZVdpZHRoKGZvbnQud2lkdGgoVGV4dFJ1bigmc3BhY2Us IDEpKSkKKyAgICAsIHRhYldpZHRoKGNvbGxhcHNlV2hpdGVzcGFjZSA/IDAgOiBzdHlsZS50YWJT aXplKCkpCisgICAgLCBsb2NhbGUoc3R5bGUubG9jYWxlKCkpCit7Cit9CisKIEZsb3dDb250ZW50 czo6Rmxvd0NvbnRlbnRzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKLSAgICA6IG1fZmxv dyhmbG93KQotICAgICwgbV9zdHlsZShmbG93LnN0eWxlKCkpCisgICAgOiBtX3N0eWxlKGZsb3cu c3R5bGUoKSkKICAgICAsIG1fbGluZUJyZWFrSXRlcmF0b3IoZG93bmNhc3Q8UmVuZGVyVGV4dD4o KmZsb3cuZmlyc3RDaGlsZCgpKS50ZXh0KCksIGZsb3cuc3R5bGUoKS5sb2NhbGUoKSkKICAgICAs IG1fbGFzdFJlbmRlcmVySW5kZXgoMCkKIHsKICAgICB1bnNpZ25lZCBzdGFydFBvc2l0aW9uID0g MDsKLSAgICBmb3IgKGNvbnN0IFJlbmRlclRleHQqIHRleHRSZW5kZXJlciA9IGRvd25jYXN0PFJl bmRlclRleHQ+KG1fZmxvdy5maXJzdENoaWxkKCkpOyB0ZXh0UmVuZGVyZXI7IHRleHRSZW5kZXJl ciA9IGRvd25jYXN0PFJlbmRlclRleHQ+KHRleHRSZW5kZXJlci0+bmV4dFNpYmxpbmcoKSkpIHsK LSAgICAgICAgdW5zaWduZWQgY29udGVudExlbmd0aCA9IHRleHRSZW5kZXJlci0+dGV4dCgpLT5s ZW5ndGgoKTsKLSAgICAgICAgbV90ZXh0UmFuZ2VzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihzdGFy dFBvc2l0aW9uLCB0ZXh0UmVuZGVyZXIpKTsKKyAgICBmb3IgKGF1dG8mIHRleHRDaGlsZCA6IGNo aWxkcmVuT2ZUeXBlPFJlbmRlclRleHQ+KGZsb3cpKSB7CisgICAgICAgIHVuc2lnbmVkIGNvbnRl bnRMZW5ndGggPSB0ZXh0Q2hpbGQudGV4dCgpLT5sZW5ndGgoKTsKKyAgICAgICAgbV90ZXh0UmFu Z2VzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihzdGFydFBvc2l0aW9uLCAmdGV4dENoaWxkKSk7CiAg ICAgICAgIHN0YXJ0UG9zaXRpb24gKz0gY29udGVudExlbmd0aDsKICAgICB9CiAgICAgLy8gRW5k IGl0ZW0uCkBAIC0xNTcsNyArMTY5LDcgQEAgYm9vbCBGbG93Q29udGVudHM6OmFwcGVuZE5leHRS ZW5kZXJlckNvbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICArK21fbGFzdFJlbmRlcmVy SW5kZXg7Ci0gICAgbV9saW5lQnJlYWtJdGVyYXRvci5yZXNldFN0cmluZ0FuZFJlbGVhc2VJdGVy YXRvcihzdHJpbmcgKyBTdHJpbmcobmV4dFJlbmRlcmVyLT50ZXh0KCkpLCBtX2Zsb3cuc3R5bGUo KS5sb2NhbGUoKSwgTGluZUJyZWFrSXRlcmF0b3JNb2RlVUFYMTQpOworICAgIG1fbGluZUJyZWFr SXRlcmF0b3IucmVzZXRTdHJpbmdBbmRSZWxlYXNlSXRlcmF0b3Ioc3RyaW5nICsgU3RyaW5nKG5l eHRSZW5kZXJlci0+dGV4dCgpKSwgbV9zdHlsZS5sb2NhbGUsIExpbmVCcmVha0l0ZXJhdG9yTW9k ZVVBWDE0KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCShyZXZp c2lvbiAxNzY1MDEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91 dEZsb3dDb250ZW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC01MSwxOSArNTEsOCBAQCBwdWJsaWM6 CiAgICAgYm9vbCByZXNvbHZlUmVuZGVyZXJQb3NpdGlvbnMoY29uc3QgUmVuZGVyVGV4dCYsIHVu c2lnbmVkJiBzdGFydFBvc2l0aW9uLCB1bnNpZ25lZCYgZW5kUG9zaXRpb24pIGNvbnN0OwogICAg IGNvbnN0IFJlbmRlclRleHQqIHJlbmRlcmVyKHVuc2lnbmVkIHBvc2l0aW9uLCB1bnNpZ25lZCog c3RhcnRQb3NpdGlvbiA9IG51bGxwdHIpIGNvbnN0OwogCi0gICAgY2xhc3MgU3R5bGUgewotICAg IHB1YmxpYzoKLSAgICAgICAgU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQotICAgICAg ICAgICAgOiBmb250KHN0eWxlLmZvbnQoKSkKLSAgICAgICAgICAgICwgdGV4dEFsaWduKHN0eWxl LnRleHRBbGlnbigpKQotICAgICAgICAgICAgLCBjb2xsYXBzZVdoaXRlc3BhY2Uoc3R5bGUuY29s bGFwc2VXaGl0ZVNwYWNlKCkpCi0gICAgICAgICAgICAsIHByZXNlcnZlTmV3bGluZShzdHlsZS5w cmVzZXJ2ZU5ld2xpbmUoKSkKLSAgICAgICAgICAgICwgd3JhcExpbmVzKHN0eWxlLmF1dG9XcmFw KCkpCi0gICAgICAgICAgICAsIGJyZWFrV29yZE9uT3ZlcmZsb3coc3R5bGUub3ZlcmZsb3dXcmFw KCkgPT0gQnJlYWtPdmVyZmxvd1dyYXAgJiYgKHdyYXBMaW5lcyB8fCBwcmVzZXJ2ZU5ld2xpbmUp KQotICAgICAgICAgICAgLCBzcGFjZVdpZHRoKGZvbnQud2lkdGgoVGV4dFJ1bigmc3BhY2UsIDEp KSkKLSAgICAgICAgICAgICwgdGFiV2lkdGgoY29sbGFwc2VXaGl0ZXNwYWNlID8gMCA6IHN0eWxl LnRhYlNpemUoKSkKLSAgICAgICAgewotICAgICAgICB9CisgICAgc3RydWN0IFN0eWxlIHsKKyAg ICAgICAgZXhwbGljaXQgU3R5bGUoY29uc3QgUmVuZGVyU3R5bGUmKTsKIAogICAgICAgICBjb25z dCBGb250JiBmb250OwogICAgICAgICBFVGV4dEFsaWduIHRleHRBbGlnbjsKQEAgLTczLDYgKzYy LDcgQEAgcHVibGljOgogICAgICAgICBib29sIGJyZWFrV29yZE9uT3ZlcmZsb3c7CiAgICAgICAg IGZsb2F0IHNwYWNlV2lkdGg7CiAgICAgICAgIHVuc2lnbmVkIHRhYldpZHRoOworICAgICAgICBB dG9taWNTdHJpbmcgbG9jYWxlOwogICAgIH07CiAgICAgY29uc3QgU3R5bGUmIHN0eWxlKCkgY29u c3QgeyByZXR1cm4gbV9zdHlsZTsgfQogCkBAIC04MSw3ICs3MSw2IEBAIHByaXZhdGU6CiAgICAg dW5zaWduZWQgbmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbiwgdW5z aWduZWQmIHNwYWNlQ291bnQpIGNvbnN0OwogICAgIGZsb2F0IHJ1bldpZHRoKGNvbnN0IFJlbmRl clRleHQmLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9uKSBjb25z dDsKIAotICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgbV9mbG93OwogICAgIGNvbnN0IFN0eWxl IG1fc3R5bGU7CiAgICAgbXV0YWJsZSBMYXp5TGluZUJyZWFrSXRlcmF0b3IgbV9saW5lQnJlYWtJ dGVyYXRvcjsKICAgICBWZWN0b3I8c3RkOjpwYWlyPHVuc2lnbmVkLCBjb25zdCBSZW5kZXJUZXh0 Kj4+IG1fdGV4dFJhbmdlczsK