30868 – FrameLoaderClient::objectContentType often has copied code

Bug 30868 - FrameLoaderClient::objectContentType often has copied code

Summary: FrameLoaderClient::objectContentType often has copied code

Status:	RESOLVED FIXED

Alias:	None

Product:	WebKit
Classification:	Unclassified
Component:	Page Loading (show other bugs)
Version:	528+ (Nightly build)
Hardware:	PC All

Importance:	P2 Normal
Assignee:	Nobody

URL:
Keywords:

Depends on:
Blocks:

Reported:	2009-10-28 09:39 PDT by Joe Mason
Modified:	2009-10-28 15:08 PDT (History)
CC List:	3 users (show)

See Also:

Attachments
Move shared code to FrameLoader::defaultObjectContentType (10.78 KB, patch) 2009-10-28 09:43 PDT, Joe Mason	no flags	Details \| Formatted Diff \| Diff
same patch, with build fix for gtk (10.78 KB, patch) 2009-10-28 09:50 PDT, Joe Mason	no flags	Details \| Formatted Diff \| Diff
build fix for windows (427 bytes, patch) 2009-10-28 11:29 PDT, Joe Mason	no flags	Details \| Formatted Diff \| Diff
build fix for mac (697 bytes, patch) 2009-10-28 11:51 PDT, Joe Mason	no flags	Details \| Formatted Diff \| Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Joe Mason 2009-10-28 09:39:26 PDT

The gtk and windows ports implement FrameLoaderClient::objectContentType using the exact same code, except for different variable names and comments.  (The qt port uses almost the same code except that it checks for several more cases.  The mac port is very different, with lots of Obj-C'isms.  The wx and haiku ports don't implement it at all.)

It would be good to move this shared code to a utility function, such as defaultObjectContentType.  Ports could choose to implement objectContentType either by calling the utility function or doing their own processing.

Comment 1 Joe Mason 2009-10-28 09:43:40 PDT

Created attachment 42037 [details]
Move shared code to FrameLoader::defaultObjectContentType

This patch moves the shared code to FrameLoader::defaultObjectContentType.  The haiku and wx ports could now implement objectContentType by calling this function, but I didn't do that because I wanted to make sure I didn't make any functional changes.

Comment 2 Joe Mason 2009-10-28 09:50:46 PDT

Created attachment 42038 [details]
same patch, with build fix for gtk

Comment 3 Adam Treat 2009-10-28 09:58:42 PDT

Please make sure to watch the buildbots like a hawk when this patch lands.

Comment 4 George Staikos 2009-10-28 11:12:53 PDT

Committed revision 50225.

Comment 5 Joe Mason 2009-10-28 11:29:09 PDT

Created attachment 42044 [details]
build fix for windows

Comment 6 Joe Mason 2009-10-28 11:51:36 PDT

Created attachment 42045 [details]
build fix for mac

Comment 7 Eric Seidel (no email) 2009-10-28 15:00:53 PDT

Are these fixes still needed?  If so, please attach them as a single patch with one ChangeLog.  Otherwise please clear the review flags as this bug is closed.

Comment 8 Eric Seidel (no email) 2009-10-28 15:08:22 PDT

Thank you George!