61589 2011-05-26 18:47:59 -0700 Implement webkit margin collapse CSS properties in CSSStyleApplyProperty 2011-05-26 23:27:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned commit-queue dglazkov eric macpherson oldest_to_newest 411060 0 macpherson 2011-05-26 18:47:59 -0700 Implement webkit margin collapse CSS properties in CSSStyleApplyProperty 411061 1 95091 macpherson 2011-05-26 18:51:53 -0700 Created attachment 95091 Patch 411082 2 95091 eric 2011-05-26 19:34:56 -0700 Comment on attachment 95091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95091&action=review OK. > Source/WebCore/css/CSSStyleSelector.cpp:-4976 > - m_style->setMarginBeforeCollapse(MCOLLAPSE); > - m_style->setMarginAfterCollapse(MCOLLAPSE); I assume initial* correctly returns these values? 411108 3 95091 macpherson 2011-05-26 20:35:44 -0700 Comment on attachment 95091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95091&action=review >> Source/WebCore/css/CSSStyleSelector.cpp:-4976 >> - m_style->setMarginAfterCollapse(MCOLLAPSE); > > I assume initial* correctly returns these values? That is correct. These should have been calling RenderStyle::initialMarginBeforeCollapse/AfterCollapse, which return MCOLLAPSE. 411115 4 95091 eric 2011-05-26 21:08:08 -0700 Comment on attachment 95091 Patch I can't remember if you're a committer yet or not, but I'll set the cq+ just in case. :) 411197 5 95091 commit-queue 2011-05-26 23:27:11 -0700 Comment on attachment 95091 Patch Clearing flags on attachment: 95091 Committed r87474: <http://trac.webkit.org/changeset/87474> 411199 6 commit-queue 2011-05-26 23:27:16 -0700 All reviewed patches have been landed. Closing bug. 95091 2011-05-26 18:51:53 -0700 2011-05-26 23:27:11 -0700 Patch bug-61589-20110527115151.patch text/plain 5110 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3NDYwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDUtMjYgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgd2Via2l0IG1hcmdpbiBjb2xs YXBzZSBDU1MgcHJvcGVydGllcyBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNTg5CisKKyAgICAgICAgTm8g bmV3IHRlc3RzIGFzIG5vIG5ldyBmdW5jdGlvbmFsaXR5IGFkZGVkLgorCisgICAgICAgICogY3Nz L0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZUFw cGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgIEFkZCBoYW5kbGVy cyBmb3I6CisgICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZvcmVDb2xsYXBzZQor ICAgICAgICAgIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQWZ0ZXJDb2xsYXBzZQorICAgICAgICAg IENTU1Byb3BlcnR5V2Via2l0TWFyZ2luVG9wQ29sbGFwc2UKKyAgICAgICAgICBDU1NQcm9wZXJ0 eVdlYmtpdE1hcmdpbkJvdHRvbUNvbGxhcHNlCisgICAgICAgICAgQ1NTUHJvcGVydHlXZWJraXRN YXJnaW5Db2xsYXBzZQorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBS ZW1vdmUgY2FzZXMgdGhhdCBhcmUgbm8gbG9uZ2VyIHJlcXVpcmVkLgorCiAyMDExLTA1LTI2ICBT dGVwaGFuaWUgTGV3aXMgIDxzbGV3aXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEdlb2ZmIEdhcmVuLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9w ZXJ0eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQ cm9wZXJ0eS5jcHAJKHJldmlzaW9uIDg3NDUzKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4MSw2ICs1ODEsMTIgQEAg Q1NTU3R5bGVBcHBseVByb3BlcnR5OjpDU1NTdHlsZUFwcGx5UHJvcAogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eU1hcmdpbkxlZnQsIG5ldyBBcHBseVByb3BlcnR5TGVuZ3RoPEF1 dG9FbmFibGVkPigmUmVuZGVyU3R5bGU6Om1hcmdpbkxlZnQsICZSZW5kZXJTdHlsZTo6c2V0TWFy Z2luTGVmdCwgJlJlbmRlclN0eWxlOjppbml0aWFsTWFyZ2luKSk7CiAgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5TWFyZ2luLCBuZXcgQXBwbHlQcm9wZXJ0eUV4cGFuZGluZzxTdXBw cmVzc1ZhbHVlPihwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlNYXJnaW5Ub3ApLCBwcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlNYXJnaW5SaWdodCksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eU1hcmdpbkJvdHRvbSksIHByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU1hcmdpbkxlZnQp KSk7CiAKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZv cmVDb2xsYXBzZSwgbmV3IEFwcGx5UHJvcGVydHlEZWZhdWx0PEVNYXJnaW5Db2xsYXBzZT4oJlJl bmRlclN0eWxlOjptYXJnaW5CZWZvcmVDb2xsYXBzZSwgJlJlbmRlclN0eWxlOjpzZXRNYXJnaW5C ZWZvcmVDb2xsYXBzZSwgJlJlbmRlclN0eWxlOjppbml0aWFsTWFyZ2luQmVmb3JlQ29sbGFwc2Up KTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5BZnRlckNv bGxhcHNlLCBuZXcgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RU1hcmdpbkNvbGxhcHNlPigmUmVuZGVy U3R5bGU6Om1hcmdpbkFmdGVyQ29sbGFwc2UsICZSZW5kZXJTdHlsZTo6c2V0TWFyZ2luQWZ0ZXJD b2xsYXBzZSwgJlJlbmRlclN0eWxlOjppbml0aWFsTWFyZ2luQWZ0ZXJDb2xsYXBzZSkpOworICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpblRvcENvbGxhcHNlLCBD U1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkJlZm9yZUNvbGxhcHNlKTsKKyAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5Cb3R0b21Db2xsYXBzZSwgQ1NTUHJvcGVydHlX ZWJraXRNYXJnaW5BZnRlckNvbGxhcHNlKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRNYXJnaW5Db2xsYXBzZSwgbmV3IEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8U3Vw cHJlc3NWYWx1ZT4ocHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQmVmb3Jl Q29sbGFwc2UpLCBwcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5BZnRlckNv bGxhcHNlKSkpOworCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5UGFkZGluZ1Rv cCwgbmV3IEFwcGx5UHJvcGVydHlMZW5ndGg8PigmUmVuZGVyU3R5bGU6OnBhZGRpbmdUb3AsICZS ZW5kZXJTdHlsZTo6c2V0UGFkZGluZ1RvcCwgJlJlbmRlclN0eWxlOjppbml0aWFsUGFkZGluZykp OwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVBhZGRpbmdSaWdodCwgbmV3IEFw cGx5UHJvcGVydHlMZW5ndGg8PigmUmVuZGVyU3R5bGU6OnBhZGRpbmdSaWdodCwgJlJlbmRlclN0 eWxlOjpzZXRQYWRkaW5nUmlnaHQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFBhZGRpbmcpKTsKICAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlQYWRkaW5nQm90dG9tLCBuZXcgQXBwbHlQ cm9wZXJ0eUxlbmd0aDw+KCZSZW5kZXJTdHlsZTo6cGFkZGluZ0JvdHRvbSwgJlJlbmRlclN0eWxl OjpzZXRQYWRkaW5nQm90dG9tLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxQYWRkaW5nKSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA4NzQ1MykK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDk2NiwyNiArNDk2Niw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9w ZXJ0eShpbnQKICAgICAgICAgbV9zdHlsZS0+c2V0VGV4dE92ZXJmbG93KHByaW1pdGl2ZVZhbHVl LT5nZXRJZGVudCgpID09IENTU1ZhbHVlRWxsaXBzaXMpOwogICAgICAgICByZXR1cm47CiAgICAg fQotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5Db2xsYXBzZTogewotICAgICAgICBp ZiAoaXNJbmhlcml0KSB7Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRNYXJnaW5CZWZvcmVDb2xs YXBzZShtX3BhcmVudFN0eWxlLT5tYXJnaW5CZWZvcmVDb2xsYXBzZSgpKTsKLSAgICAgICAgICAg IG1fc3R5bGUtPnNldE1hcmdpbkFmdGVyQ29sbGFwc2UobV9wYXJlbnRTdHlsZS0+bWFyZ2luQWZ0 ZXJDb2xsYXBzZSgpKTsKLSAgICAgICAgfQotICAgICAgICBlbHNlIGlmIChpc0luaXRpYWwpIHsK LSAgICAgICAgICAgIG1fc3R5bGUtPnNldE1hcmdpbkJlZm9yZUNvbGxhcHNlKE1DT0xMQVBTRSk7 Ci0gICAgICAgICAgICBtX3N0eWxlLT5zZXRNYXJnaW5BZnRlckNvbGxhcHNlKE1DT0xMQVBTRSk7 Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRNYXJnaW5CZWZvcmVDb2xsYXBzZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 TWFyZ2luVG9wQ29sbGFwc2U6Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FO RF9QUklNSVRJVkUobWFyZ2luQmVmb3JlQ29sbGFwc2UsIE1hcmdpbkJlZm9yZUNvbGxhcHNlKQot ICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkFmdGVyQ29s bGFwc2U6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkJvdHRvbUNvbGxhcHNlOgot ICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKG1hcmdpbkFm dGVyQ29sbGFwc2UsIE1hcmdpbkFmdGVyQ29sbGFwc2UpCi0gICAgICAgIHJldHVybjsKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0TGluZUNsYW1wOiB7CiAgICAgICAgIEhBTkRMRV9JTkhFUklU X0FORF9JTklUSUFMKGxpbmVDbGFtcCwgTGluZUNsYW1wKQogICAgICAgICBpZiAoIXByaW1pdGl2 ZVZhbHVlKQpAQCAtNTI2Nyw2ICs1MjQ3LDExIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBw bHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luU3RhcnQ6CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkJlZm9yZToKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0TWFyZ2luQWZ0ZXI6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkNv bGxhcHNlOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZvcmVDb2xsYXBzZToK KyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFyZ2luVG9wQ29sbGFwc2U6CisgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdE1hcmdpbkFmdGVyQ29sbGFwc2U6CisgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdE1hcmdpbkJvdHRvbUNvbGxhcHNlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRQ YWRkaW5nRW5kOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRQYWRkaW5nU3RhcnQ6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBhZGRpbmdCZWZvcmU6Cg==