Created attachment 52040 [details] Amendement for the Content-Disposition fix... Based on the discussion in comments #39-42 in bug #36395, this patch amends the factored out function of the Content-Disposition fix to be more generic...
Attachment 52040 [details] did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 52041 [details] Amendment to the Content-Disposition fix II... Fixed style check failures and updated ChangeLog comments.
Comment on attachment 52041 [details] Amendment to the Content-Disposition fix II... r+ Thanks!
Comment on attachment 52041 [details] Amendment to the Content-Disposition fix II... Rejecting patch 52041 from commit-queue. Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Last 500 characters of output: Users/eseidel/Projects/CommitQueue/WebCore/page/XSSAuditor.cpp -o /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/XSSAuditor.o ** BUILD FAILED ** The following build commands failed: WebCore: Distributed-CompileC /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/i386/Document.o /Users/eseidel/Projects/CommitQueue/WebCore/dom/Document.cpp normal i386 c++ com.apple.compilers.gcc.4_2 (1 failure) Full output: http://webkit-commit-queue.appspot.com/results/1608274
(In reply to comment #4) > (From update of attachment 52041 [details]) > Rejecting patch 52041 from commit-queue. This is the reason for the build issue: In file included from /Users/eseidel/Projects/CommitQueue/WebCore/dom/Document.cpp:81: /Users/eseidel/Projects/CommitQueue/WebCore/platform/network/HTTPParsers.h:45: error: conflicting declaration ‘None’ /Users/eseidel/Projects/CommitQueue/WebCore/page/SpatialNavigation.h:87: error: ‘WebCore::None’ has a previous declaration as ‘WebCore::RectsAlignment WebCore::None’ The two enum values - None - conflict
Created attachment 52735 [details] Amendment to the Content-Disposition fix III... Prefixed all the ContentDispositionType enums with "ContentDisposition" to avoid namespace conflicts which can cause compile errors...
Comment on attachment 52735 [details] Amendment to the Content-Disposition fix III... LGTM :)
Committed r57208: <http://trac.webkit.org/changeset/57208>
Revision r57208 cherry-picked into qtwebkit-2.0 with commit 50d5e029b4a6aa5dc7c39160b275bd7c1d78540c