[CSSRegions]Revert RenderObject::style() to its state before region styling

• Component: CSS
• Status: RESOLVED FIXED

[Mihnea Ovidenie]

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.

[Mihnea Ovidenie]

Created attachment 118834 [details]
Patch

[Tony Chang]

thanks!

[WebKit Review Bot]

Attachment 118834 [details] 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.

[Mihnea Ovidenie]

Created attachment 118852 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 118852 [details]
Patch for landing

Rejecting attachment 118852 [details] 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

[Tony Chang]

Committed r102641: <http://trac.webkit.org/changeset/102641>