[Webkit-unassigned] [Bug 26148] Unfork RenderThemeChromium{Win, Linux}.{h, cc}

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Thu Jun 4 12:38:12 PDT 2009


https://bugs.webkit.org/show_bug.cgi?id=26148





------- Comment #5 from ajwong at chromium.org  2009-06-04 12:38 PDT -------
(In reply to comment #4)
> No file outside of RenderThemeChromiumLinux knows that it's called
> RenderThemeChromiumLinux.  So you can rename the class inside the file w/o
> anyone notcing.  When you make Windows depend on it, it will have a strange
> header name for a bit, but fixing that name is a much smaller diff than
> changing the class name.  moving the file at the same time as you're changing
> the class internals makes it hard to tell from the diff if its' correct.
> 

The file that I was having problems with is actually webkit.gyp in the chromium
tree.  There needs to be a point where it can list both
RenderThemeChromiumSkia.cpp and RenderThemeChromiumLinux.cpp.

I agree with the diffing issue if someone updates RenderThemeChromiumLinux
during the migration.

Now that I've gotten further into the merging, I actually don't think I can
remove RenderThemeChromiumLinux.cpp completely.  At the very least, it needs to
contain the RenderTheme* renderTheme() factory function since that cannot be
colocated in the RenderThemeChromiumSkia.cpp file.

How about this:
  1) Create a blank RenderThemeChromiumSkia.cpp and .h file to make gyp happy.
  2) Extract a RenderThemeChromiumSkia out of RenderThemeChromiumLinux, but
leave it in the linux file for sane diffing.  (I've already got most things
done locally, so I know which functions need to go where).
  3) Move RenderThemeChromiumSkia into it's file.  This should be a pure move
at this point because all the style and factoring issues would have been
hammered out in #2
  4) Clean up RenderThemeChromiumWin.

will upload a patch with empty files shorty.


-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.



More information about the webkit-unassigned mailing list