Bug 70541 – There are two WebFrameLoadDelegatePrivate categories on NSObject

Bug 70541 - There are two WebFrameLoadDelegatePrivate categories on NSObject


Summary:	There are two WebFrameLoadDelegatePrivate categories on NSObject

Status:	RESOLVED FIXED

Product:	WebKit
Classification:	Unclassified
Component:	WebKit Misc.
Version:	528+ (Nightly build)
Platform:	Macintosh Mac OS X 10.6

Importance:	P2 Normal
Assigned To:	Nobody

URL:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Reported:	2011-10-20 13:35 PDT by Ian Henderson
Modified:	2011-10-20 16:33 PDT (History)
CC List:	1 user (show)

See Also:

Attachments
proposed patch (1.89 KB, patch) 2011-10-20 14:08 PDT, Ian Henderson	ddkilzer: review+ ddkilzer: commit‑queue-	Details \| Formatted Diff \| Diff
proposed patch (1.88 KB, patch) 2011-10-20 14:14 PDT, Ian Henderson	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 Ian Henderson 2011-10-20 13:35:43 PDT

Attempting to include both <WebView/WebViewPrivate.h> and <WebView/WebFrameLoadDelegatePrivate.h> yields an error about duplicate categories.  The two headers have conflicting definitions of NSObject (WebFrameLoadDelegatePrivate).

Comment 1 Ian Henderson 2011-10-20 14:08:36 PDT

Created attachment 111847 [details]
proposed patch

Comment 2 David Kilzer (:ddkilzer) 2011-10-20 14:12:56 PDT

Comment on attachment 111847 [details]
proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=111847&action=review

r=me with those changes.

> Source/WebKit/mac/WebView/WebViewPrivate.h:703
> -@interface NSObject (WebFrameLoadDelegatePrivate)
> +@interface NSObject (WebViewPrivateFrameLoadDelegate)

I think this should have "Private" at the end:  WebViewFrameLoadDelegatePrivate.

Comment 3 WebKit Review Bot 2011-10-20 14:13:00 PDT

Attachment 111847 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/mac/ChangeLog', u'Source/Web..." exit_code: 1

Source/WebKit/mac/WebView/WebViewPrivate.h:703:  Extra space before ( in function call  [whitespace/parens] [4]
Source/WebKit/mac/WebView/WebViewPrivate.h:721:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 2 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.

Comment 4 David Kilzer (:ddkilzer) 2011-10-20 14:13:47 PDT

Comment on attachment 111847 [details]
proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=111847&action=review

>> Source/WebKit/mac/WebView/WebViewPrivate.h:721
>> -@interface NSObject (WebResourceLoadDelegatePrivate)
>> +@interface NSObject (WebViewPrivateResourceLoadDelegate)
> 
> Extra space before ( in function call  [whitespace/parens] [4]

This should have "Private" at the end as well:  WebViewResourceLoadDelegatePrivate.

Comment 5 Ian Henderson 2011-10-20 14:14:12 PDT

Created attachment 111848 [details]
proposed patch

Comment 6 David Kilzer (:ddkilzer) 2011-10-20 14:15:31 PDT

Comment on attachment 111848 [details]
proposed patch

r=me

Comment 7 WebKit Review Bot 2011-10-20 14:15:54 PDT

Attachment 111848 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/mac/ChangeLog', u'Source/Web..." exit_code: 1

Source/WebKit/mac/WebView/WebViewPrivate.h:703:  Extra space before ( in function call  [whitespace/parens] [4]
Source/WebKit/mac/WebView/WebViewPrivate.h:721:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 2 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.

Comment 8 WebKit Review Bot 2011-10-20 16:33:20 PDT

Comment on attachment 111848 [details]
proposed patch

Clearing flags on attachment: 111848

Committed r98038: <http://trac.webkit.org/changeset/98038>

Comment 9 WebKit Review Bot 2011-10-20 16:33:24 PDT

All reviewed patches have been landed.  Closing bug.