|« First Last »| « Prev Next »    No search results available
Bug 70541 - There are two WebFrameLoadDelegatePrivate categories on NSObject
: There are two WebFrameLoadDelegatePrivate categories on NSObject
Status: RESOLVED FIXED
: WebKit
WebKit Misc.
: 528+ (Nightly build)
: Macintosh Mac OS X 10.6
: P2 Normal
Assigned To:
:
:
:
:
  Show dependency tree / graph
 
Reported: 2011-10-20 13:35 PST by
Modified: 2011-10-20 16:33 PST (History)

Attachments
proposed patch (1.89 KB, patch)
2011-10-20 14:08 PST, Ian Henderson 		ddkilzer: review+
ddkilzer: commit‑queue-
Review Patch | Details | Formatted Diff | Diff
proposed patch (1.88 KB, patch)
2011-10-20 14:14 PST, Ian Henderson 		no flags Review Patch | Details | Formatted Diff | Diff
Hide 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 From 2011-10-20 13:35:43 PST 
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 From 2011-10-20 14:08:36 PST ------- 
Created an attachment (id=111847) [details]
proposed patch
------- Comment #2 From 2011-10-20 14:12:56 PST ------- 
(From update of attachment 111847 [details])
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 From 2011-10-20 14:13:00 PST ------- 
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 From 2011-10-20 14:13:47 PST ------- 
(From update of attachment 111847 [details])
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 From 2011-10-20 14:14:12 PST ------- 
Created an attachment (id=111848) [details]
proposed patch
------- Comment #6 From 2011-10-20 14:15:31 PST ------- 
(From update of attachment 111848 [details])
r=me
------- Comment #7 From 2011-10-20 14:15:54 PST ------- 
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 From 2011-10-20 16:33:20 PST ------- 
(From update of attachment 111848 [details])
Clearing flags on attachment: 111848

Committed r98038: <http://trac.webkit.org/changeset/98038>
------- Comment #9 From 2011-10-20 16:33:24 PST ------- 
All reviewed patches have been landed.  Closing bug.
|« First Last »| « Prev Next »    No search results available