← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebKit/gtk/webkit/webkitprivate.h

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-10-13 13:39:02 UTC
  • mfrom: (1.6.1 upstream) (4.4.9 maverick)
  • Revision ID: james.westby@ubuntu.com-20101013133902-ytzn2sqa7y41hosl
Tags: 1.2.5-0ubuntu0.10.04.1
https://launchpad.net/bugs/660075
* SECURITY UPDATE: Rebuilt new stable release 1.2.5 for lucid to fix
  multiple security issues. (LP: #660075)
   - CVE-2010-1386, CVE-2010-1392, CVE-2010-1405, CVE-2010-1407
   - CVE-2010-1412, CVE-2010-1416, CVE-2010-1417, CVE-2010-1418
   - CVE-2010-1419, CVE-2010-1421, CVE-2010-1422, CVE-2010-1501
   - CVE-2010-1664, CVE-2010-1665, CVE-2010-1758, CVE-2010-1759
   - CVE-2010-1760, CVE-2010-1761, CVE-2010-1762, CVE-2010-1767
   - CVE-2010-1770, CVE-2010-1771, CVE-2010-1772, CVE-2010-1773
   - CVE-2010-1774, CVE-2010-1780, CVE-2010-1781, CVE-2010-1782
   - CVE-2010-1783, CVE-2010-1784, CVE-2010-1785, CVE-2010-1786
   - CVE-2010-1787, CVE-2010-1788, CVE-2010-1790, CVE-2010-1792
   - CVE-2010-1793, CVE-2010-1807, CVE-2010-1812, CVE-2010-1814
   - CVE-2010-1815, CVE-2010-2264, CVE-2010-2647, CVE-2010-2648
   - CVE-2010-3113, CVE-2010-3114, CVE-2010-3115, CVE-2010-3116
   - CVE-2010-3248, CVE-2010-3257, CVE-2010-3259
* debian/patches/ubuntu-gir-version.patch: removed for lucid
* debian/control: add gir-repository-dev back to build-depends for lucid

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebKit/gtk/webkit/webkitprivate.h
2
2
 * Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
3
3
 * Copyright (C) 2008 Jan Michael C. Alonzo
4
4
 * Copyright (C) 2008 Collabora Ltd.
 
5
 * Copyright (C) 2010 Igalia S.L.
5
6
 *
6
7
 * This library is free software; you can redistribute it and/or
7
8
 * modify it under the terms of the GNU Library General Public
47
48
#include "ArchiveResource.h"
48
49
#include "BackForwardList.h"
49
50
#include "CString.h"
 
51
#include "DataObjectGtk.h"
50
52
#include <enchant.h>
51
53
#include "GOwnPtr.h"
52
54
#include "Geolocation.h"
53
55
#include "HistoryItem.h"
54
56
#include "Settings.h"
55
57
#include "Page.h"
 
58
#include "PlatformString.h"
56
59
#include "Frame.h"
57
60
#include "InspectorClientGtk.h"
58
61
#include "FrameLoaderClient.h"
149
152
        char* mainResourceIdentifier;
150
153
        GHashTable* subResources;
151
154
        char* tooltipText;
 
155
 
 
156
        HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
152
157
    };
153
158
 
154
159
    #define WEBKIT_WEB_FRAME_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
209
214
    WebKitWebResource*
210
215
    webkit_web_resource_new_with_core_resource(PassRefPtr<WebCore::ArchiveResource>);
211
216
 
 
217
    WebCore::String
 
218
    webkitUserAgent();
 
219
 
212
220
    void
213
221
    webkit_web_resource_init_with_core_resource(WebKitWebResource*, PassRefPtr<WebCore::ArchiveResource>);
214
222
 
374
382
    webkit_web_frame_layout(WebKitWebFrame* frame);
375
383
}
376
384
 
377
 
namespace WTF {
378
 
    template <> void freeOwnedGPtr<SoupMessage>(SoupMessage*);
379
 
    template <> void freeOwnedGPtr<WebKitNetworkRequest>(WebKitNetworkRequest*);
380
 
    template <> void freeOwnedGPtr<WebKitNetworkResponse>(WebKitNetworkResponse*);
381
 
    template <> void freeOwnedGPtr<WebKitWebResource>(WebKitWebResource*);
382
 
}
383
 
 
384
385
#endif