Bug 47086 – Remove unused code from gtk2drawing.c

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Carlos Garcia Campos]

Created attachment 69633 [details]
Remove unused code

That file was copied from mozilla and contains a lot of code that is not used by WebKit. Most of that unused code is uncompatible with gtk3, so removing it will make easier porting to gtk3.

[Martin Robinson]

We plan to fork this code when the styling changes for GTK+ land (to make it WebKit-y). Depending on the timetable for the styling updates, it may make sense to just use #ifdefs instead of trying to keep this code up to date.

[Xan Lopez]

(In reply to comment #1)
> We plan to fork this code when the styling changes for GTK+ land (to make it WebKit-y). Depending on the timetable for the styling updates, it may make sense to just use #ifdefs instead of trying to keep this code up to date.

I suggested Carlos to fork it now, since keeping a single file that copes with both GTK+ 2 and the new drawing APIs already in GTK+ master would be an #ifdef nightmare.

[Martin Robinson]

We should probably just bite the bullet and start transitioning away from the Mozilla theme drawing code. The files already diverge from the original code and we can use C++ features to hide the differences between GTK+ 2 and GTK+ 3.

[Martin Robinson]

After discussing this with Xan via IRC, we decided that the right approach here was to start replacing the Mozilla code with our own rendering code in WebKit sooner, rather than later. I feel pretty confidant that we can maintain this. We'll also be able to start dealing with the GTK2/GTK3 compatibility issues using C++ sugar.

In the interest of keeping things building with GTK3, I think we can start by removing the unused code. This patch needs a ChangeLog though.

[Carlos Garcia Campos]

Yes, the idea was doing a plain port to gtk3 now, so that ephy/webkit can release for GNOME 2.91.0, further improvements or redesigns can be done on top of this.

[Carlos Garcia Campos]

Created attachment 69896 [details]
Updated patch to remove unused code

Updated patch including the ChangeLog entry

[Carlos Garcia Campos]

Created attachment 69948 [details]
New version of the patch

New version of the patch with the ChangeLog correctly formatted

[Martin Robinson]

Comment on attachment 69948 [details]
New version of the patch

Looks good!

[WebKit Commit Bot]

Comment on attachment 69948 [details]
New version of the patch

Clearing flags on attachment: 69948

Committed r69205: <http://trac.webkit.org/changeset/69205>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.