RESOLVED FIXED 108707
Remove duplicate code in RenderBoxModelObject::computedCSSPadding*
https://bugs.webkit.org/show_bug.cgi?id=108707
Summary Remove duplicate code in RenderBoxModelObject::computedCSSPadding*
Emil A Eklund
Reported 2013-02-01 15:19:17 PST
The computedCSSPaddingTop/Bottom/... methods in RenderBoxModelObject all do pretty much exactly the same thing yet share no code.
Attachments
Patch (7.18 KB, patch)
2013-02-01 15:20 PST, Emil A Eklund
eric: review+
Emil A Eklund
Comment 1 2013-02-01 15:20:15 PST
Levi Weintraub
Comment 2 2013-02-01 15:31:20 PST
Comment on attachment 186160 [details] Patch Hallelujah!
WebKit Review Bot
Comment 3 2013-02-01 17:11:37 PST
Comment on attachment 186160 [details] Patch Clearing flags on attachment: 186160 Committed r141669: <http://trac.webkit.org/changeset/141669>
WebKit Review Bot
Comment 4 2013-02-01 17:11:40 PST
All reviewed patches have been landed. Closing bug.
Jessie Berlin
Comment 5 2013-02-01 17:22:56 PST
(In reply to comment #3) > (From update of attachment 186160 [details]) > Clearing flags on attachment: 186160 > > Committed r141669: <http://trac.webkit.org/changeset/141669> This broke the Windows build: http://build.webkit.org/builders/Apple%20Win%20Debug%20%28Build%29/builds/61773/steps/compile-webkit/logs/stdio 7>LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/LTCG' specification 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingTop(void)const " (?computedCSSPaddingTop@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingBottom(void)const " (?computedCSSPaddingBottom@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingLeft(void)const " (?computedCSSPaddingLeft@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingRight(void)const " (?computedCSSPaddingRight@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingBefore(void)const " (?computedCSSPaddingBefore@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingAfter(void)const " (?computedCSSPaddingAfter@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj) 7>WebCore.lib(RenderSVGAllInOne.obj) : error LNK2005: "public: class WebCore::LayoutUnit __thiscall WebCore::RenderBoxModelObject::computedCSSPaddingStart(void)const " (?computedCSSPaddingStart@RenderBoxModelObject@WebCore@@QBE?AVLayoutUnit@2@XZ) already defined in WebCore.lib(RenderingAllInOne.obj)
WebKit Review Bot
Comment 6 2013-02-01 17:23:37 PST
Re-opened since this is blocked by bug 108728
Emil A Eklund
Comment 7 2013-02-01 17:42:17 PST
Thanks for rolling it out. Probably just needs to force a rebuild (or revalidation of the all in one file). Will try to figure out a way to commit in a way that doesn't break windows.
Eric Seidel (no email)
Comment 8 2013-02-01 21:21:19 PST
Comment on attachment 186160 [details] Patch Wow.
Eric Seidel (no email)
Comment 9 2013-02-01 21:21:49 PST
Oh, sorry, I guess you didn't need another r+.
Emil A Eklund
Comment 10 2013-02-04 09:46:48 PST
Note You need to log in before you can comment on or make changes to this bug.