← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/history/HistoryItem.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/history/HistoryItem.h
28
28
 
29
29
#include "IntPoint.h"
30
30
#include "PlatformString.h"
 
31
#include "SerializedScriptValue.h"
31
32
#include <wtf/OwnPtr.h>
32
33
#include <wtf/PassOwnPtr.h>
33
34
 
42
43
#include <QDataStream>
43
44
#endif
44
45
 
 
46
#if PLATFORM(ANDROID)
 
47
#include "AndroidWebHistoryBridge.h"
 
48
#endif
 
49
 
45
50
namespace WebCore {
46
51
 
47
52
class CachedPage;
54
59
 
55
60
typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
56
61
 
57
 
extern void (*notifyHistoryItemChanged)();
 
62
extern void (*notifyHistoryItemChanged)(HistoryItem*);
58
63
 
59
64
enum VisitCountBehavior {
60
65
    IncreaseVisitCount,
128
133
    void setTitle(const String&);
129
134
    void setIsTargetItem(bool);
130
135
    
 
136
    void setStateObject(PassRefPtr<SerializedScriptValue> object);
 
137
    SerializedScriptValue* stateObject() const { return m_stateObject.get(); }
 
138
    void setDocument(Document* document);
 
139
    Document* document() const { return m_document; }
 
140
    void documentDetached(Document*);
 
141
    
131
142
    void setFormInfoFromRequest(const ResourceRequest&);
132
143
    void setFormData(PassRefPtr<FormData>);
133
144
    void setFormContentType(const String&);
175
186
    QDataStream& saveState(QDataStream& out, int version) const;
176
187
#endif
177
188
 
 
189
#if PLATFORM(ANDROID)
 
190
    void setBridge(AndroidWebHistoryBridge* bridge);
 
191
    AndroidWebHistoryBridge* bridge() const;
 
192
#endif
 
193
 
178
194
#ifndef NDEBUG
179
195
    int showTree() const;
180
196
    int showTreeWithIndent(unsigned indentLevel) const;
226
242
 
227
243
    OwnPtr<Vector<String> > m_redirectURLs;
228
244
 
 
245
    // Support for HTML5 History
 
246
    RefPtr<SerializedScriptValue> m_stateObject;
 
247
    Document* m_document;
 
248
    
229
249
    // info used to repost form data
230
250
    RefPtr<FormData> m_formData;
231
251
    String m_formContentType;
243
263
#if PLATFORM(QT)
244
264
    QVariant m_userData;
245
265
#endif
 
266
 
 
267
#if PLATFORM(ANDROID)
 
268
    RefPtr<AndroidWebHistoryBridge> m_bridge;
 
269
#endif
 
270
 
246
271
}; //class HistoryItem
247
272
 
248
273
} //namespace WebCore