diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/InspectorDOMStorageResource.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/InspectorDOMStorageResource.h')
| -rw-r--r-- | Source/WebCore/inspector/InspectorDOMStorageResource.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/inspector/InspectorDOMStorageResource.h b/Source/WebCore/inspector/InspectorDOMStorageResource.h index 9ad5b91..eb75113 100644 --- a/Source/WebCore/inspector/InspectorDOMStorageResource.h +++ b/Source/WebCore/inspector/InspectorDOMStorageResource.h @@ -66,7 +66,7 @@ namespace WebCore { virtual bool operator==(const EventListener& listener); bool isSameHostAndType(Frame*, bool isLocalStorage) const; - long id() const { return m_id; } + int id() const { return m_id; } Storage* domStorage() const { return m_domStorage.get(); } private: @@ -77,10 +77,10 @@ namespace WebCore { bool m_isLocalStorage; RefPtr<Frame> m_frame; InspectorFrontend::DOMStorage* m_frontend; - long m_id; + int m_id; bool m_reportingChangesToFrontend; - static long s_nextUnusedId; + static int s_nextUnusedId; }; } // namespace WebCore |