Bug 61612 – Clean up CSSPrimitiveValue::computeLength*

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Luke Macpherson]

Clean up CSSPrimitiveValue::computeLength*

[Luke Macpherson]

Created attachment 95312 [details]
Patch

[Luke Macpherson]

I anticipate abstracting out the type information in these functions will allow the removal of duplicated code in CSSStyleSelector and CSSStyleApplyProperty. Also note that this could also be done with overloading based on return type, at the expense of having per-type prototypes in the header file.

[Eric Seidel (no email)]

Comment on attachment 95312 [details]
Patch

I'm confused.  Why have the generic implementation if we have type specific ones for each of the types we use.

[Luke Macpherson]

Hi Eric, I'm not sure if I understand you. There is no generic implementation of computeLength, just type specific implementations. All I'm doing is moving that type information out of the function name and into a type parameter.

I think that's a good thing on it's own merits, but the advantage becomes that I can then have a templated class:

template <typename T>
class Foo {
    virtual void bar() {
       CSSPrimitiveValue v = ...;
       T baz = v.computeLength<typename T>(...);
    }
}

This is handy for eliminating code that would otherwise require separate implementations of Foo for each type.

[Luke Macpherson]

Ping.

[Eric Seidel (no email)]

Comment on attachment 95312 [details]
Patch

OK.

[WebKit Review Bot]

Comment on attachment 95312 [details]
Patch

Rejecting attachment 95312 [details] from commit-queue.

Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2

Last 500 characters of output:
92 (offset -37 lines).
Hunk #21 succeeded at 5819 (offset -37 lines).
Hunk #22 succeeded at 5843 (offset -37 lines).
1 out of 22 hunks FAILED -- saving rejects to file Source/WebCore/css/CSSStyleSelector.cpp.rej
patching file Source/WebCore/css/MediaQueryEvaluator.cpp
patching file Source/WebCore/css/SVGCSSStyleSelector.cpp
Hunk #1 succeeded at 572 (offset 2 lines).

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1

Full output: http://queues.webkit.org/results/8823509

[Luke Macpherson]

Created attachment 96704 [details]
Patch

[Luke Macpherson]

Fixed merge conflicts.

[WebKit Review Bot]

Comment on attachment 96704 [details]
Patch

Clearing flags on attachment: 96704

Committed r88553: <http://trac.webkit.org/changeset/88553>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.