Bug 123269 - [WinCairo] Compile fixes.
Summary: [WinCairo] Compile fixes.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-24 06:59 PDT by peavo
Modified: 2013-10-25 04:47 PDT (History)
3 users (show)

See Also:


Attachments
Patch (7.19 KB, patch)
2013-10-24 07:07 PDT, peavo
no flags Details | Formatted Diff | Diff
Patch (2.90 KB, patch)
2013-10-25 01:11 PDT, peavo
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description peavo 2013-10-24 06:59:30 PDT
The WinCairo build needs a couple of compile fixes.

The WebCore\platform\network\CertificateInfo class has been removed, the Curl implementation should also be removed, as it no longer compiles.

The BitmapImage draw member has gotten an extra parameter, the WinCairo implementation needs to update.
Comment 1 peavo 2013-10-24 07:07:49 PDT
Created attachment 215062 [details]
Patch
Comment 2 Peter Gal 2013-10-24 07:14:15 PDT
(In reply to comment #1)
> Created an attachment (id=215062) [details]
> Patch

For the removal of the CertificateInfo there is already an r+/cq+ patch: https://bugs.webkit.org/show_bug.cgi?id=123246
Comment 3 Brent Fulgham 2013-10-24 09:03:29 PDT
Comment on attachment 215062 [details]
Patch

Looks like we have a conflict with Alex's patch from yesterday. Can you rebase this patch with his update? I think that will just give you the ImageCairoWin fixes.
Comment 4 peavo 2013-10-25 01:11:45 PDT
Created attachment 215147 [details]
Patch
Comment 5 peavo 2013-10-25 01:12:48 PDT
(In reply to comment #3)
> (From update of attachment 215062 [details])
> Looks like we have a conflict with Alex's patch from yesterday. Can you rebase this patch with his update? I think that will just give you the ImageCairoWin fixes.

Rebased :)
Comment 6 Csaba Osztrogonác 2013-10-25 04:23:33 PDT
Comment on attachment 215147 [details]
Patch

rs=me
Comment 7 WebKit Commit Bot 2013-10-25 04:47:25 PDT
Comment on attachment 215147 [details]
Patch

Clearing flags on attachment: 215147

Committed r158001: <http://trac.webkit.org/changeset/158001>
Comment 8 WebKit Commit Bot 2013-10-25 04:47:27 PDT
All reviewed patches have been landed.  Closing bug.