Created attachment 139656 [details] Patch <rdar://problem/10422318>
Attachment 139656 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit2/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Source/WebCore/loader/MainResourceLoader.cpp:497: Declaration has space between type name and * in WebFilterEvaluator *filter [whitespace/declaration] [3] Source/WebCore/loader/MainResourceLoader.cpp:513: Declaration has space between type name and * in WebFilterEvaluator *filter [whitespace/declaration] [3] Source/WebKit/mac/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 5 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 139656 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139656&action=review > Source/WebCore/ChangeLog:21 > + * platform/mac/WebCoreSystemInterface.h: > + * platform/mac/WebCoreSystemInterface.mm: You also need to update headers and binaries in WebKitLibraries. > Source/WebCore/loader/MainResourceLoader.cpp:501 > + if (wkFilterWasBlocked(filter)) > + didFinishLoading(0); I don't think that this is right. DidFinishLoading is called when network layer finishes, not when you want to cancel a ResourceHandle. > Source/WebCore/loader/MainResourceLoader.cpp:502 > + wkFilterRelease(filter); I don't understand why the filter needs to be released here. > Source/WebCore/loader/MainResourceLoader.cpp:517 > + didReceiveData(data, length, -1, false); DidReceiveData can do anything, including getting MainResourceLoader indirectly deleted. You need to at least protect the loader with a RefPtr. > Source/WebCore/loader/MainResourceLoader.h:38 > +#include "WebCoreSystemInterface.h" No need to include, a forward declaration would work better.
Comment on attachment 139656 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139656&action=review > Source/WebCore/loader/MainResourceLoader.cpp:516 > + if (data) Also, can data be zero here?
Created attachment 139705 [details] Patch
Comment on attachment 139705 [details] Patch r=me
Attachment 139705 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/loader/MainResourceLoader.cpp:531: Declaration has space between type name and * in WebFilterEvaluator *filter [whitespace/declaration] [3] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style.
Committed r115765: <http://trac.webkit.org/changeset/115765>