70541 2011-10-20 13:35:43 -0700 There are two WebFrameLoadDelegatePrivate categories on NSObject 2011-10-20 16:33:24 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED P2 Normal --- 0 ian webkit-unassigned webkit.review.bot oldest_to_newest 487836 0 ian 2011-10-20 13:35:43 -0700 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). 487870 1 111847 ian 2011-10-20 14:08:36 -0700 Created attachment 111847 proposed patch 487875 2 111847 ddkilzer 2011-10-20 14:12:56 -0700 Comment on attachment 111847 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. 487876 3 webkit.review.bot 2011-10-20 14:13:00 -0700 Attachment 111847 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. 487877 4 111847 ddkilzer 2011-10-20 14:13:47 -0700 Comment on attachment 111847 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. 487878 5 111848 ian 2011-10-20 14:14:12 -0700 Created attachment 111848 proposed patch 487879 6 111848 ddkilzer 2011-10-20 14:15:31 -0700 Comment on attachment 111848 proposed patch r=me 487880 7 webkit.review.bot 2011-10-20 14:15:54 -0700 Attachment 111848 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. 487984 8 111848 webkit.review.bot 2011-10-20 16:33:20 -0700 Comment on attachment 111848 proposed patch Clearing flags on attachment: 111848 Committed r98038: <http://trac.webkit.org/changeset/98038> 487986 9 webkit.review.bot 2011-10-20 16:33:24 -0700 All reviewed patches have been landed. Closing bug. 111847 2011-10-20 14:08:36 -0700 2011-10-20 14:14:12 -0700 proposed patch 70541-1.patch text/plain 1932 ian SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4MDIwKQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMjAg IElhbiBIZW5kZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA1NDEKKyAgICAgICAgVGhlcmUgYXJlIHR3byBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUgY2F0ZWdvcmllcyBvbiBOU09iamVjdAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJW aWV3UHJpdmF0ZS5oOiBSZW5hbWUgdGhlIHByaXZhdGUgZGVsZWdhdGUgY2F0ZWdvcmllcyBpbgor ICAgICAgICBXZWJWaWV3UHJpdmF0ZS5oIHdpdGggYSAiV2ViVmlld1ByaXZhdGUiIHByZWZpeCB0 byBhdm9pZCBjb2xsaXNpb24uCisKIDIwMTEtMTAtMTkgIEJldGggRGFraW4gIDxiZGFraW5AYXBw bGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03MDM5NgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUu aAkocmV2aXNpb24gOTgwMTkpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQ cml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTcwMCw3ICs3MDAsNyBAQCBAaW50ZXJmYWNlIFdl YlZpZXcgKFdlYlZpZXdQcml2YXRlTm9kZXNGCiAtIChKU1ZhbHVlUmVmKV9ub2Rlc0Zyb21SZWN0 OihKU0NvbnRleHRSZWYpY29udGV4dCBmb3JEb2N1bWVudDooSlNWYWx1ZVJlZil2YWx1ZSB4Oihp bnQpeCAgeTooaW50KXkgdG9wOih1bnNpZ25lZCl0b3AgcmlnaHQ6KHVuc2lnbmVkKXJpZ2h0IGJv dHRvbToodW5zaWduZWQpYm90dG9tIGxlZnQ6KHVuc2lnbmVkKWxlZnQgaWdub3JlQ2xpcHBpbmc6 KEJPT0wpaWdub3JlQ2xpcHBpbmc7CiBAZW5kCiAKLUBpbnRlcmZhY2UgTlNPYmplY3QgKFdlYkZy YW1lTG9hZERlbGVnYXRlUHJpdmF0ZSkKK0BpbnRlcmZhY2UgTlNPYmplY3QgKFdlYlZpZXdQcml2 YXRlRnJhbWVMb2FkRGVsZWdhdGUpCiAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIg ZGlkRmlyc3RMYXlvdXRJbkZyYW1lOihXZWJGcmFtZSAqKWZyYW1lOwogCiAvLyBkaWRGaW5pc2hE b2N1bWVudExvYWRGb3JGcmFtZSBpcyBzZW50IHdoZW4gdGhlIGRvY3VtZW50IGhhcyBmaW5pc2hl ZCBsb2FkaW5nLCB0aG91Z2ggbm90IG5lY2Vzc2FyaWx5IGFsbApAQCAtNzE4LDcgKzcxOCw3IEBA IEBpbnRlcmZhY2UgTlNPYmplY3QgKFdlYkZyYW1lTG9hZERlbGVnYXQKIAogQGVuZAogCi1AaW50 ZXJmYWNlIE5TT2JqZWN0IChXZWJSZXNvdXJjZUxvYWREZWxlZ2F0ZVByaXZhdGUpCitAaW50ZXJm YWNlIE5TT2JqZWN0IChXZWJWaWV3UHJpdmF0ZVJlc291cmNlTG9hZERlbGVnYXRlKQogLy8gQWRk cmVzc2VzIDxyZGFyOi8vcHJvYmxlbS81MDA4OTI1PiAtIFNQSSBmb3Igbm93CiAtIChOU0NhY2hl ZFVSTFJlc3BvbnNlICopd2ViVmlldzooV2ViVmlldyAqKXNlbmRlciByZXNvdXJjZTooaWQpaWRl bnRpZmllciB3aWxsQ2FjaGVSZXNwb25zZTooTlNDYWNoZWRVUkxSZXNwb25zZSAqKXJlc3BvbnNl IGZyb21EYXRhU291cmNlOihXZWJEYXRhU291cmNlICopZGF0YVNvdXJjZTsKIEBlbmQK 111848 2011-10-20 14:14:12 -0700 2011-10-20 16:33:20 -0700 proposed patch 70541-2.patch text/plain 1925 ian SW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4MDIwKQorKysgU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMjAg IElhbiBIZW5kZXJzb24gIDxpYW5oQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA1NDEKKyAgICAgICAgVGhlcmUgYXJlIHR3byBX ZWJGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUgY2F0ZWdvcmllcyBvbiBOU09iamVjdAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJW aWV3UHJpdmF0ZS5oOiBSZW5hbWUgdGhlIHByaXZhdGUgZGVsZWdhdGUgY2F0ZWdvcmllcyBpbgor ICAgICAgICBXZWJWaWV3UHJpdmF0ZS5oIHdpdGggYSAiV2ViVmlldyIgcHJlZml4IHRvIGF2b2lk IGNvbGxpc2lvbi4KKwogMjAxMS0xMC0xOSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMzk2 CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCShyZXZp c2lvbiA5ODAxOSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUu aAkod29ya2luZyBjb3B5KQpAQCAtNzAwLDcgKzcwMCw3IEBAIEBpbnRlcmZhY2UgV2ViVmlldyAo V2ViVmlld1ByaXZhdGVOb2Rlc0YKIC0gKEpTVmFsdWVSZWYpX25vZGVzRnJvbVJlY3Q6KEpTQ29u dGV4dFJlZiljb250ZXh0IGZvckRvY3VtZW50OihKU1ZhbHVlUmVmKXZhbHVlIHg6KGludCl4ICB5 OihpbnQpeSB0b3A6KHVuc2lnbmVkKXRvcCByaWdodDoodW5zaWduZWQpcmlnaHQgYm90dG9tOih1 bnNpZ25lZClib3R0b20gbGVmdDoodW5zaWduZWQpbGVmdCBpZ25vcmVDbGlwcGluZzooQk9PTClp Z25vcmVDbGlwcGluZzsKIEBlbmQKIAotQGludGVyZmFjZSBOU09iamVjdCAoV2ViRnJhbWVMb2Fk RGVsZWdhdGVQcml2YXRlKQorQGludGVyZmFjZSBOU09iamVjdCAoV2ViVmlld0ZyYW1lTG9hZERl bGVnYXRlUHJpdmF0ZSkKIC0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXNlbmRlciBkaWRGaXJz dExheW91dEluRnJhbWU6KFdlYkZyYW1lICopZnJhbWU7CiAKIC8vIGRpZEZpbmlzaERvY3VtZW50 TG9hZEZvckZyYW1lIGlzIHNlbnQgd2hlbiB0aGUgZG9jdW1lbnQgaGFzIGZpbmlzaGVkIGxvYWRp bmcsIHRob3VnaCBub3QgbmVjZXNzYXJpbHkgYWxsCkBAIC03MTgsNyArNzE4LDcgQEAgQGludGVy ZmFjZSBOU09iamVjdCAoV2ViRnJhbWVMb2FkRGVsZWdhdAogCiBAZW5kCiAKLUBpbnRlcmZhY2Ug TlNPYmplY3QgKFdlYlJlc291cmNlTG9hZERlbGVnYXRlUHJpdmF0ZSkKK0BpbnRlcmZhY2UgTlNP YmplY3QgKFdlYlZpZXdSZXNvdXJjZUxvYWREZWxlZ2F0ZVByaXZhdGUpCiAvLyBBZGRyZXNzZXMg PHJkYXI6Ly9wcm9ibGVtLzUwMDg5MjU+IC0gU1BJIGZvciBub3cKIC0gKE5TQ2FjaGVkVVJMUmVz cG9uc2UgKil3ZWJWaWV3OihXZWJWaWV3ICopc2VuZGVyIHJlc291cmNlOihpZClpZGVudGlmaWVy IHdpbGxDYWNoZVJlc3BvbnNlOihOU0NhY2hlZFVSTFJlc3BvbnNlICopcmVzcG9uc2UgZnJvbURh dGFTb3VyY2U6KFdlYkRhdGFTb3VyY2UgKilkYXRhU291cmNlOwogQGVuZAo=