Bug 36827

Summary:

[Qt] Patch to amend the Content-Disposition fix [36395]

Product:

WebKit

Reporter:

Dawit A. <adawit>

Component:

WebKit Qt

Assignee:

Nobody <webkit-unassigned>

Status:

CLOSED FIXED

Severity:

Enhancement

CC:

beidson, commit-queue, hausmann, kenneth, webkit.review.bot

Priority:

Keywords:

Version:

528+ (Nightly build)

Hardware:

All

OS:

All

Bug Depends on:

Bug Blocks:

35784

Attachments:

Description	Flags
Amendement for the Content-Disposition fix...	none
Amendment to the Content-Disposition fix II...	beidson: review+, commit-queue: commit-queue-
Amendment to the Content-Disposition fix III...	hausmann: review+

Dawit A.

Reported 2010-03-30 08:16:23 PDT

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...

Attachments
Amendement for the Content-Disposition fix... (6.09 KB, patch) 2010-03-30 08:16 PDT, Dawit A.	no flags	Details Formatted Diff Diff
Amendment to the Content-Disposition fix II... (6.34 KB, patch) 2010-03-30 08:30 PDT, Dawit A.	beidson: review+ commit-queue: commit-queue-	Details Formatted Diff Diff
Amendment to the Content-Disposition fix III... (6.55 KB, patch) 2010-04-07 07:07 PDT, Dawit A.	hausmann: review+	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

WebKit Review Bot

Comment 1 2010-03-30 08:21:27 PDT

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.

Dawit A.

Comment 2 2010-03-30 08:30:34 PDT

Created attachment 52041 [details] Amendment to the Content-Disposition fix II... Fixed style check failures and updated ChangeLog comments.

Brady Eidson

Comment 3 2010-03-30 09:59:56 PDT

Comment on attachment 52041 [details] Amendment to the Content-Disposition fix II... r+ Thanks!

WebKit Commit Bot

Comment 4 2010-04-07 00:09:10 PDT

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

Simon Hausmann

Comment 5 2010-04-07 02:03:26 PDT

(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

Dawit A.

Comment 6 2010-04-07 07:07:51 PDT

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...

Simon Hausmann

Comment 7 2010-04-07 07:12:30 PDT

Comment on attachment 52735 [details] Amendment to the Content-Disposition fix III... LGTM :)

Simon Hausmann

Comment 8 2010-04-07 07:15:02 PDT

Committed r57208: <http://trac.webkit.org/changeset/57208>

Simon Hausmann

Comment 9 2010-04-07 07:41:51 PDT

Revision r57208 cherry-picked into qtwebkit-2.0 with commit 50d5e029b4a6aa5dc7c39160b275bd7c1d78540c

Note You need to log in before you can comment on or make changes to this bug.