128314 2014-02-06 09:59:31 -0800 [CSS Shapes] Simplify BasicShapeInset creation 2014-02-07 09:36:55 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124173 1 zoltan zoltan commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard oldest_to_newest 977404 0 zoltan 2014-02-06 09:59:31 -0800 Introduce convertToLengthSize helper function in order to simplify and make BasicShapeInset more readable. 977410 1 223343 zoltan 2014-02-06 10:01:58 -0800 Created attachment 223343 Patch 977434 2 223343 hyatt 2014-02-06 11:01:21 -0800 Comment on attachment 223343 Patch r=me 977451 3 223343 commit-queue 2014-02-06 11:29:40 -0800 Comment on attachment 223343 Patch Clearing flags on attachment: 223343 Committed r163552: <http://trac.webkit.org/changeset/163552> 977452 4 commit-queue 2014-02-06 11:29:43 -0800 All reviewed patches have been landed. Closing bug. 223343 2014-02-06 10:01:58 -0800 2014-02-06 11:29:40 -0800 Patch patch text/plain 5335 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMmVhOGVhLi40NTE3MTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMDItMDYgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgW0NTUyBTaGFwZXNdIFNpbXBsaWZ5IEJhc2ljU2hhcGVJbnNldCBjcmVhdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MzE0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW50cm9kdWNlIGNv bnZlcnRUb0xlbmd0aFNpemUgaGVscGVyIGZ1bmN0aW9uIGluIG9yZGVyIHRvIHNpbXBsaWZ5IGFu ZCBtYWtlIEJhc2ljU2hhcGVJbnNldCBtb3JlIHJlYWRhYmxlLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0Jhc2ljU2hhcGVGdW5j dGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydFRvTGVuZ3RoU2l6ZSk6CisgICAg ICAgIChXZWJDb3JlOjpiYXNpY1NoYXBlRm9yVmFsdWUpOgorCiAyMDE0LTAyLTA2ICBLb29wIE1h c3QgPGt3bUBGcmVlQlNELm9yZz4KIAogICAgICAgICBVc2Ugc3lzdGVtIGRlZmF1bHQgY29tcGls ZXIgaW5zdGVhZCBvZiBnY2MsIGFzIGZpbmFsIGZhbGwgdGhyb3VnaC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRleCA1YjRiYTEyLi44OTJjMzY1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCkBAIC0xODYsNiArMTg2 LDE1IEBAIHN0YXRpYyBMZW5ndGggY29udmVydFRvTGVuZ3RoKGNvbnN0IFJlbmRlclN0eWxlKiBz dHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHJvb3RTCiAgICAgcmV0dXJuIHZhbHVlLT5jb252ZXJ0 VG9MZW5ndGg8Rml4ZWRJbnRlZ2VyQ29udmVyc2lvbiB8IEZpeGVkRmxvYXRDb252ZXJzaW9uIHwg UGVyY2VudENvbnZlcnNpb24gfCBDYWxjdWxhdGVkQ29udmVyc2lvbiB8IFZpZXdwb3J0UGVyY2Vu dGFnZUNvbnZlcnNpb24+KHN0eWxlLCByb290U3R5bGUsIHN0eWxlLT5lZmZlY3RpdmVab29tKCkp OwogfQogCitzdGF0aWMgTGVuZ3RoU2l6ZSBjb252ZXJ0VG9MZW5ndGhTaXplKGNvbnN0IFJlbmRl clN0eWxlKiBzdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgQ1NTUHJpbWl0aXZl VmFsdWUqIHZhbHVlKQoreworICAgIGlmICghdmFsdWUpCisgICAgICAgIHJldHVybiBMZW5ndGhT aXplKExlbmd0aCgwLCBGaXhlZCksIExlbmd0aCgwLCBGaXhlZCkpOworCisgICAgUGFpciogcGFp ciA9IHZhbHVlLT5nZXRQYWlyVmFsdWUoKTsKKyAgICByZXR1cm4gTGVuZ3RoU2l6ZShjb252ZXJ0 VG9MZW5ndGgoc3R5bGUsIHJvb3RTdHlsZSwgcGFpci0+Zmlyc3QoKSksIGNvbnZlcnRUb0xlbmd0 aChzdHlsZSwgcm9vdFN0eWxlLCBwYWlyLT5zZWNvbmQoKSkpOworfQorCiBzdGF0aWMgQmFzaWNT aGFwZUNlbnRlckNvb3JkaW5hdGUgY29udmVydFRvQ2VudGVyQ29vcmRpbmF0ZShjb25zdCBSZW5k ZXJTdHlsZSogc3R5bGUsIGNvbnN0IFJlbmRlclN0eWxlKiByb290U3R5bGUsIENTU1ByaW1pdGl2 ZVZhbHVlKiB2YWx1ZSkKIHsKICAgICBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZTo6RGlyZWN0 aW9uIGRpcmVjdGlvbjsKQEAgLTM1Niw1MCArMzY1LDE1IEBAIFBhc3NSZWZQdHI8QmFzaWNTaGFw ZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgUmVu ZGVyCiAgICAgICAgIGNvbnN0IENTU0Jhc2ljU2hhcGVJbnNldCogcmVjdFZhbHVlID0gc3RhdGlj X2Nhc3Q8Y29uc3QgQ1NTQmFzaWNTaGFwZUluc2V0KiA+KGJhc2ljU2hhcGVWYWx1ZSk7CiAgICAg ICAgIFJlZlB0cjxCYXNpY1NoYXBlSW5zZXQ+IHJlY3QgPSBCYXNpY1NoYXBlSW5zZXQ6OmNyZWF0 ZSgpOwogCi0gICAgICAgIGlmIChyZWN0VmFsdWUtPnRvcCgpKQotICAgICAgICAgICAgcmVjdC0+ c2V0VG9wKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFsdWUtPnRvcCgp KSk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgcmVjdC0+c2V0VG9wKExlbmd0aCgwLCBG aXhlZCkpOwotICAgICAgICAgICAgcmV0dXJuIHJlY3Q7Ci0gICAgICAgIH0KLSAgICAgICAgaWYg KHJlY3RWYWx1ZS0+cmlnaHQoKSkKLSAgICAgICAgICAgIHJlY3QtPnNldFJpZ2h0KGNvbnZlcnRU b0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFsdWUtPnJpZ2h0KCkpKTsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgcmVjdC0+c2V0UmlnaHQoTGVuZ3RoKDAsIEZpeGVkKSk7Ci0KLSAg ICAgICAgaWYgKHJlY3RWYWx1ZS0+Ym90dG9tKCkpCi0gICAgICAgICAgICByZWN0LT5zZXRCb3R0 b20oY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHJlY3RWYWx1ZS0+Ym90dG9tKCkp KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVjdC0+c2V0Qm90dG9tKExlbmd0aCgwLCBG aXhlZCkpOwotCi0gICAgICAgIGlmIChyZWN0VmFsdWUtPmxlZnQoKSkKLSAgICAgICAgICAgIHJl Y3QtPnNldExlZnQoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHJlY3RWYWx1ZS0+ bGVmdCgpKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHJlY3QtPnNldExlZnQoTGVuZ3Ro KDAsIEZpeGVkKSk7Ci0KLSAgICAgICAgaWYgKHJlY3RWYWx1ZS0+dG9wTGVmdFJhZGl1cygpKSB7 Ci0gICAgICAgICAgICBQYWlyKiB0b3BMZWZ0UmFkaXVzID0gcmVjdFZhbHVlLT50b3BMZWZ0UmFk aXVzKCktPmdldFBhaXJWYWx1ZSgpOwotICAgICAgICAgICAgcmVjdC0+c2V0VG9wTGVmdFJhZGl1 cyhMZW5ndGhTaXplKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCB0b3BMZWZ0UmFk aXVzLT5maXJzdCgpKSwgY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHRvcExlZnRS YWRpdXMtPnNlY29uZCgpKSkpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHJlY3QtPnNl dFRvcExlZnRSYWRpdXMoTGVuZ3RoU2l6ZShMZW5ndGgoMCwgRml4ZWQpLCBMZW5ndGgoMCwgRml4 ZWQpKSk7Ci0KLSAgICAgICAgaWYgKHJlY3RWYWx1ZS0+dG9wUmlnaHRSYWRpdXMoKSkgewotICAg ICAgICAgICAgUGFpciogdG9wUmlnaHRSYWRpdXMgPSByZWN0VmFsdWUtPnRvcFJpZ2h0UmFkaXVz KCktPmdldFBhaXJWYWx1ZSgpOwotICAgICAgICAgICAgcmVjdC0+c2V0VG9wUmlnaHRSYWRpdXMo TGVuZ3RoU2l6ZShjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RTdHlsZSwgdG9wUmlnaHRSYWRp dXMtPmZpcnN0KCkpLCBjb252ZXJ0VG9MZW5ndGgoc3R5bGUsIHJvb3RTdHlsZSwgdG9wUmlnaHRS YWRpdXMtPnNlY29uZCgpKSkpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHJlY3QtPnNl dFRvcFJpZ2h0UmFkaXVzKExlbmd0aFNpemUoTGVuZ3RoKDAsIEZpeGVkKSwgTGVuZ3RoKDAsIEZp eGVkKSkpOwotCi0gICAgICAgIGlmIChyZWN0VmFsdWUtPmJvdHRvbVJpZ2h0UmFkaXVzKCkpIHsK LSAgICAgICAgICAgIFBhaXIqIGJvdHRvbVJpZ2h0UmFkaXVzID0gcmVjdFZhbHVlLT5ib3R0b21S aWdodFJhZGl1cygpLT5nZXRQYWlyVmFsdWUoKTsKLSAgICAgICAgICAgIHJlY3QtPnNldEJvdHRv bVJpZ2h0UmFkaXVzKExlbmd0aFNpemUoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUs IGJvdHRvbVJpZ2h0UmFkaXVzLT5maXJzdCgpKSwgY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290 U3R5bGUsIGJvdHRvbVJpZ2h0UmFkaXVzLT5zZWNvbmQoKSkpKTsKLSAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICByZWN0LT5zZXRCb3R0b21SaWdodFJhZGl1cyhMZW5ndGhTaXplKExlbmd0aCgw LCBGaXhlZCksIExlbmd0aCgwLCBGaXhlZCkpKTsKLQotICAgICAgICBpZiAocmVjdFZhbHVlLT50 b3BMZWZ0UmFkaXVzKCkpIHsKLSAgICAgICAgICAgIFBhaXIqIGJvdHRvbUxlZnRSYWRpdXMgPSBy ZWN0VmFsdWUtPmJvdHRvbUxlZnRSYWRpdXMoKS0+Z2V0UGFpclZhbHVlKCk7Ci0gICAgICAgICAg ICByZWN0LT5zZXRCb3R0b21MZWZ0UmFkaXVzKExlbmd0aFNpemUoY29udmVydFRvTGVuZ3RoKHN0 eWxlLCByb290U3R5bGUsIGJvdHRvbUxlZnRSYWRpdXMtPmZpcnN0KCkpLCBjb252ZXJ0VG9MZW5n dGgoc3R5bGUsIHJvb3RTdHlsZSwgYm90dG9tTGVmdFJhZGl1cy0+c2Vjb25kKCkpKSk7Ci0gICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgcmVjdC0+c2V0Qm90dG9tTGVmdFJhZGl1cyhMZW5ndGhT aXplKExlbmd0aCgwLCBGaXhlZCksIExlbmd0aCgwLCBGaXhlZCkpKTsKKyAgICAgICAgcmVjdC0+ c2V0VG9wKGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFsdWUtPnRvcCgp KSk7CisgICAgICAgIHJlY3QtPnNldFJpZ2h0KGNvbnZlcnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0 eWxlLCByZWN0VmFsdWUtPnJpZ2h0KCkpKTsKKyAgICAgICAgcmVjdC0+c2V0Qm90dG9tKGNvbnZl cnRUb0xlbmd0aChzdHlsZSwgcm9vdFN0eWxlLCByZWN0VmFsdWUtPmJvdHRvbSgpKSk7CisgICAg ICAgIHJlY3QtPnNldExlZnQoY29udmVydFRvTGVuZ3RoKHN0eWxlLCByb290U3R5bGUsIHJlY3RW YWx1ZS0+bGVmdCgpKSk7CisKKyAgICAgICAgcmVjdC0+c2V0VG9wTGVmdFJhZGl1cyhjb252ZXJ0 VG9MZW5ndGhTaXplKHN0eWxlLCByb290U3R5bGUsIHJlY3RWYWx1ZS0+dG9wTGVmdFJhZGl1cygp KSk7CisgICAgICAgIHJlY3QtPnNldFRvcFJpZ2h0UmFkaXVzKGNvbnZlcnRUb0xlbmd0aFNpemUo c3R5bGUsIHJvb3RTdHlsZSwgcmVjdFZhbHVlLT50b3BSaWdodFJhZGl1cygpKSk7CisgICAgICAg IHJlY3QtPnNldEJvdHRvbVJpZ2h0UmFkaXVzKGNvbnZlcnRUb0xlbmd0aFNpemUoc3R5bGUsIHJv b3RTdHlsZSwgcmVjdFZhbHVlLT5ib3R0b21SaWdodFJhZGl1cygpKSk7CisgICAgICAgIHJlY3Qt PnNldEJvdHRvbUxlZnRSYWRpdXMoY29udmVydFRvTGVuZ3RoU2l6ZShzdHlsZSwgcm9vdFN0eWxl LCByZWN0VmFsdWUtPmJvdHRvbUxlZnRSYWRpdXMoKSkpOwogCiAgICAgICAgIGJhc2ljU2hhcGUg PSByZWN0LnJlbGVhc2UoKTsKICAgICAgICAgYnJlYWs7Cg==