74315 2011-12-12 12:13:04 -0800 [CSSRegions]Revert RenderObject::style() to its state before region styling 2011-12-12 16:56:34 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea mihnea tony webkit.review.bot oldest_to_newest 519372 0 mihnea 2011-12-12 12:13:04 -0800 The region styling patch adding support for background color (https://bugs.webkit.org/show_bug.cgi?id=71488) introduced a regression in performance (https://bugs.webkit.org/show_bug.cgi?id=74141). I am reverting RenderObject::style() to its shape before the region styling patch. 519425 1 118834 mihnea 2011-12-12 13:39:21 -0800 Created attachment 118834 Patch 519427 2 tony 2011-12-12 13:40:56 -0800 thanks! 519431 3 webkit.review.bot 2011-12-12 13:42:47 -0800 Attachment 118834 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plat..." exit_code: 1 ERROR: FAILURES FOR <lucid, x86_64, release, cpu> in LayoutTests/platform/chromium/test_expectations.txt ERROR: Line:3249 Duplicate or ambiguous expectation. fast/regions/region-style-block-background-color.html ERROR: Line:3250 Duplicate or ambiguous expectation. fast/regions/region-style-block-background-color2.html ERROR: Line:3251 Duplicate or ambiguous expectation. fast/regions/region-style-image-background-color.html ERROR: Line:3252 Duplicate or ambiguous expectation. fast/regions/region-style-inline-background-color.html LayoutTests/platform/chromium/test_expectations.txt:3249: Duplicate or ambiguous expectation. fast/regions/region-style-block-background-color.html [test/expectations] [5] LayoutTests/platform/chromium/test_expectations.txt:3250: Duplicate or ambiguous expectation. fast/regions/region-style-block-background-color2.html [test/expectations] [5] LayoutTests/platform/chromium/test_expectations.txt:3251: Duplicate or ambiguous expectation. fast/regions/region-style-image-background-color.html [test/expectations] [5] LayoutTests/platform/chromium/test_expectations.txt:3252: Duplicate or ambiguous expectation. fast/regions/region-style-inline-background-color.html [test/expectations] [5] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 519492 4 118852 mihnea 2011-12-12 14:43:02 -0800 Created attachment 118852 Patch for landing 519672 5 118852 webkit.review.bot 2011-12-12 16:41:53 -0800 Comment on attachment 118852 Patch for landing Rejecting attachment 118852 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: T (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Prefix internal methods in Objective-C API files with an underscore When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 158. Full output: http://queues.webkit.org/results/10848127 519691 6 tony 2011-12-12 16:56:34 -0800 Committed r102641: <http://trac.webkit.org/changeset/102641> 118834 2011-12-12 13:39:21 -0800 2011-12-12 14:42:55 -0800 Patch 74315.patch text/plain 3590 mihnea ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4YmU4Nzk2Li4wNDlhZjZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTIt MTIgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTU1Jl Z2lvbnNdUmV2ZXJ0IFJlbmRlck9iamVjdDo6c3R5bGUoKSB0byBpdHMgc3RhdGUgYmVmb3JlIHJl Z2lvbiBzdHlsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NDMxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorICAgICAgICAq IHBsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkOgorCiAyMDExLTEyLTEyICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBy ZW1vdmUgWDg2XzY0IG1vZGlmaWVyIGZyb20gR1RLIHRlc3RfZXhwZWN0YXRpb25zIGxpc3QuCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9u cy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50 eHQKaW5kZXggYTJiZTNkOC4uMzdiNmUzNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dApAQCAtMzI0NSw2ICszMjQ1LDExIEBA IEJVR1dLNzQxMzcgOiBmYXN0L3JlZ2lvbnMvd2Via2l0LWZsb3ctaW5saW5lcy1pbnNpZGUtcmVn aW9ucy1ib3VuZHMtdmVydGljYWwtcmwuCiBCVUdXSzc0MTM3IDogZmFzdC9yZWdpb25zL3dlYmtp dC1mbG93LWlubGluZXMtaW5zaWRlLXJlZ2lvbnMtYm91bmRzLXZlcnRpY2FsLmh0bWwgPSBQQVNT IEZBSUwgTUlTU0lORwogQlVHV0s3NDEzNyA6IGZhc3QvcmVnaW9ucy93ZWJraXQtZmxvdy1pbmxp bmVzLWluc2lkZS1yZWdpb25zLWJvdW5kcy5odG1sID0gUEFTUyBGQUlMIE1JU1NJTkcKIAorQlVH V0s3NDE0MSBTS0lQIDogZmFzdC9yZWdpb25zL3JlZ2lvbi1zdHlsZS1ibG9jay1iYWNrZ3JvdW5k LWNvbG9yLmh0bWwgPSBGQUlMCitCVUdXSzc0MTQxIFNLSVAgOiBmYXN0L3JlZ2lvbnMvcmVnaW9u LXN0eWxlLWJsb2NrLWJhY2tncm91bmQtY29sb3IyLmh0bWwgPSBGQUlMCitCVUdXSzc0MTQxIFNL SVAgOiBmYXN0L3JlZ2lvbnMvcmVnaW9uLXN0eWxlLWltYWdlLWJhY2tncm91bmQtY29sb3IuaHRt bCA9IEZBSUwKK0JVR1dLNzQxNDEgU0tJUCA6IGZhc3QvcmVnaW9ucy9yZWdpb24tc3R5bGUtaW5s aW5lLWJhY2tncm91bmQtY29sb3IuaHRtbCA9IEZBSUwKKwogLy8gQ1NTIEZpbHRlcnMgc3VwcG9y dCBub3QgeWV0IGVuYWJsZWQKIEJVR1dLNjg0NjkgU0tJUCA6IGNzczMvZmlsdGVycyA9IFBBU1MK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXNub3dsZW9wYXJkL1NraXBw ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZAppbmRleCA3 ZTkxMzEwLi5iZTIyYTA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25v d2xlb3BhcmQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3Bh cmQvU2tpcHBlZApAQCAtMTgzLDUgKzE4MywxMiBAQCBtZWRpYS9tZWRpYS1mdWxsc2NyZWVuLWlu bGluZS5odG1sCiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXBsYXktcHJvZ3Jlc3MuaHRtbAogaHR0 cC90ZXN0cy9tZWRpYS92aWRlby1sb2FkLXR3aWNlLmh0bWwKIAorIyBSZWdyZXNzaW9uIGluIHBl cmZvcm1hbmNlCisjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDE0 MQorZmFzdC9yZWdpb25zL3JlZ2lvbi1zdHlsZS1ibG9jay1iYWNrZ3JvdW5kLWNvbG9yLmh0bWwK K2Zhc3QvcmVnaW9ucy9yZWdpb24tc3R5bGUtYmxvY2stYmFja2dyb3VuZC1jb2xvcjIuaHRtbAor ZmFzdC9yZWdpb25zL3JlZ2lvbi1zdHlsZS1pbWFnZS1iYWNrZ3JvdW5kLWNvbG9yLmh0bWwKK2Zh c3QvcmVnaW9ucy9yZWdpb24tc3R5bGUtaW5saW5lLWJhY2tncm91bmQtY29sb3IuaHRtbAorCiAj IEhpRFBJIHRlc3RzIGhhdmUgbG93ZXItbGV2ZWwgcGxhdGZvcm0gZGVwZW5kZW5jaWVzIG9uIE1h YwogZmFzdC9oaWRwaQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFhOTUxM2EuLjMxOGI5M2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAxMS0xMi0xMiAgTWlobmVhIE92aWRlbmllICA8bWlobmVhQGFk b2JlLmNvbT4KKworICAgICAgICBbQ1NTUmVnaW9uc11SZXZlcnQgUmVuZGVyT2JqZWN0OjpzdHls ZSgpIHRvIGl0cyBzdGF0ZSBiZWZvcmUgcmVnaW9uIHN0eWxpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MzE1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFya2VkIHRlc3RzIGZvciByZWdpb24gc3R5 bGluZyBiYWNrZ3JvdW5kLWNvbG9yIGFzIHNraXBwZWQuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnN0eWxlKToK KwogMjAxMS0xMi0xMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICBTaGFyZSBjb2RlIHRoYXQgY2hlY2tzIGZvciBtYXRjaGluZyBzZXRzIG9mIHRyYW5z Zm9ybSBvcGVyYXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5k ZXggZTUxZDFkMi4uNGVlYmY2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaApAQCAtMTAzNSw5ICsxMDM1LDcgQEAgaW5saW5lIGJvb2wgUmVuZGVyT2JqZWN0OjpwcmVz ZXJ2ZXNOZXdsaW5lKCkgY29uc3QKIAogaW5saW5lIFJlbmRlclN0eWxlKiBSZW5kZXJPYmplY3Q6 OnN0eWxlKCkgY29uc3QKIHsKLSAgICBpZiAoIWluUmVuZGVyRmxvd1RocmVhZCgpKQotICAgICAg ICByZXR1cm4gbV9zdHlsZS5nZXQoKTsKLSAgICByZXR1cm4gc3R5bGVJblJlZ2lvbigpOworICAg IHJldHVybiBtX3N0eWxlLmdldCgpOwogfQogCiBpbmxpbmUgdm9pZCBtYWtlTWF0cml4UmVuZGVy YWJsZShUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbWF0cml4LCBib29sIGhhczNEUmVuZGVyaW5nKQo= 118852 2011-12-12 14:43:02 -0800 2011-12-12 16:41:52 -0800 Patch for landing bug-74315-20111212144301.patch text/plain 2737 mihnea U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY0YzRjOGEyMzJhZjVh ZDRkNDg0ZTIyOGM3MTZiZGUwNmMwYTQ3Ni4uN2M2Y2EwMGJiYjk0OWU1YTU5Yjk0OGRlYTM3MzY1 MWExNTk0ZGIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTEyLTEyICBNaWhu ZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1NSZWdpb25zXVJl dmVydCBSZW5kZXJPYmplY3Q6OnN0eWxlKCkgdG8gaXRzIHN0YXRlIGJlZm9yZSByZWdpb24gc3R5 bGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQz MTUKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpzdHls ZSk6CisKIDIwMTEtMTEtMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZW1vdmUgcGxhdGZvcm0vYXVkaW8vZmZ0dwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5oCmluZGV4IGU1MWQxZDI4YTc0NzQ3MjhmM2ExNTQ3Mjc5MjMxNTJjODI4ZTY3 YTguLjRlZWJmNmZiNDVkZDJkZjQ4NjRmNTllOTE5MjkwMmU2NDBiNjkzMjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTEwMzUsOSArMTAzNSw3IEBAIGlubGlu ZSBib29sIFJlbmRlck9iamVjdDo6cHJlc2VydmVzTmV3bGluZSgpIGNvbnN0CiAKIGlubGluZSBS ZW5kZXJTdHlsZSogUmVuZGVyT2JqZWN0OjpzdHlsZSgpIGNvbnN0CiB7Ci0gICAgaWYgKCFpblJl bmRlckZsb3dUaHJlYWQoKSkKLSAgICAgICAgcmV0dXJuIG1fc3R5bGUuZ2V0KCk7Ci0gICAgcmV0 dXJuIHN0eWxlSW5SZWdpb24oKTsKKyAgICByZXR1cm4gbV9zdHlsZS5nZXQoKTsKIH0KIAogaW5s aW5lIHZvaWQgbWFrZU1hdHJpeFJlbmRlcmFibGUoVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1hdHJp eCwgYm9vbCBoYXMzRFJlbmRlcmluZykKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1YmRkN2JiZWJjNDhhMzQzNGNlMjcxZmEy NTJjMjEzNjNiMjJlMWIzLi5mM2QyM2QwN2EwMzBlMmFjZWU5MWZkNzY3MTZkMzVjMmM4YTJlOWI5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMTItMTIgIE1paG5lYSBPdmlkZW5pZSAgPG1p aG5lYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTU1JlZ2lvbnNdUmV2ZXJ0IFJlbmRlck9iamVj dDo6c3R5bGUoKSB0byBpdHMgc3RhdGUgYmVmb3JlIHJlZ2lvbiBzdHlsaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDMxNQorCisgICAgICAgIFJl dmlld2VkIGJ5IFRvbnkgQ2hhbmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtc25vd2xlb3Bh cmQvU2tpcHBlZDoKKwogMjAxMS0xMi0xMiAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29t PgogCiAgICAgICAgIERGRyBHZXRCeVZhbCBDU0UgaW5jb3JyZWN0bHkgYXNzdW1lcyB0aGF0IGEg bm9uLW1hdGNoaW5nIFB1dEJ5VmFsIGNhbm5vdCBjbG9iYmVyCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMtc25vd2xlb3BhcmQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkCmluZGV4IDdlOTEzMTBhZTc4MDE5NTRhMTAyZjJj NzhmOGEyZTRkZGJlODJlMDAuLmJlMjJhMDY1MjJlNGVjZTllNDJjM2M0NWY5NGZlNzczYjc1NmRi NmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lw cGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy1zbm93bGVvcGFyZC9Ta2lwcGVkCkBA IC0xODMsNSArMTgzLDEyIEBAIG1lZGlhL21lZGlhLWZ1bGxzY3JlZW4taW5saW5lLmh0bWwKIGh0 dHAvdGVzdHMvbWVkaWEvdmlkZW8tcGxheS1wcm9ncmVzcy5odG1sCiBodHRwL3Rlc3RzL21lZGlh L3ZpZGVvLWxvYWQtdHdpY2UuaHRtbAogCisjIFJlZ3Jlc3Npb24gaW4gcGVyZm9ybWFuY2UKKyMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MTQxCitmYXN0L3JlZ2lv bnMvcmVnaW9uLXN0eWxlLWJsb2NrLWJhY2tncm91bmQtY29sb3IuaHRtbAorZmFzdC9yZWdpb25z L3JlZ2lvbi1zdHlsZS1ibG9jay1iYWNrZ3JvdW5kLWNvbG9yMi5odG1sCitmYXN0L3JlZ2lvbnMv cmVnaW9uLXN0eWxlLWltYWdlLWJhY2tncm91bmQtY29sb3IuaHRtbAorZmFzdC9yZWdpb25zL3Jl Z2lvbi1zdHlsZS1pbmxpbmUtYmFja2dyb3VuZC1jb2xvci5odG1sCisKICMgSGlEUEkgdGVzdHMg aGF2ZSBsb3dlci1sZXZlbCBwbGF0Zm9ybSBkZXBlbmRlbmNpZXMgb24gTWFjCiBmYXN0L2hpZHBp Cg==