Changeset 51628 in webkit


Ignore:
Timestamp:
Dec 3, 2009 3:52:29 AM (14 years ago)
Author:
benm@google.com
Message:

[Android] Upstream WebCore/history/android: Require some platform specific state attached to HistoryItem.
​https://bugs.webkit.org/show_bug.cgi?id=31913

Reviewed by Brady Eidson.

Android stores information such as the zoom scale factor and bridge back to the Java counterpart with HistoryItem.

No new tests required as this is Android specific code.

  • history/HistoryItem.h: Add Android specific member data to HistoryItem.
  • history/android: Added.
  • history/android/AndroidWebHistoryBridge.h: Added.
  • history/android/HistoryItemAndroid.cpp: Added, provides implementation for Android specific member functions in HistoryItem.

(WebCore::HistoryItem::bridge): Added.
(WebCore::HistoryItem::setBridge): Added.

Location:
trunk/WebCore
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r51627 r51628  
     12009-12-03  Ben Murdoch  <benm@google.com>
     2
     3        Reviewed by Brady Eidson.
     4
     5        [Android] Upstream WebCore/history/android: Require some platform specific state attached to HistoryItem.
     6        https://bugs.webkit.org/show_bug.cgi?id=31913
     7
     8        Android stores information such as the zoom scale factor and bridge back to the Java counterpart with HistoryItem.
     9
     10        No new tests required as this is Android specific code.
     11
     12        * history/HistoryItem.h: Add Android specific member data to HistoryItem.
     13        * history/android: Added.
     14        * history/android/AndroidWebHistoryBridge.h: Added.
     15        * history/android/HistoryItemAndroid.cpp: Added, provides implementation for Android specific member functions in HistoryItem.
     16        (WebCore::HistoryItem::bridge): Added.
     17        (WebCore::HistoryItem::setBridge): Added.
     18
    1192009-12-03  Oliver Hunt  <oliver@apple.com>
    220

  • trunk/WebCore/history/HistoryItem.h

    r50625 r51628  
    4343#endif
    4444
     45#if PLATFORM(ANDROID)
     46#include "AndroidWebHistoryBridge.h"
     47#endif
     48
    4549namespace WebCore {
    4650
    … …  
    176180#endif
    177181
     182#if PLATFORM(ANDROID)
     183    void setBridge(AndroidWebHistoryBridge* bridge);
     184    AndroidWebHistoryBridge* bridge() const;
     185#endif
     186
    178187#ifndef NDEBUG
    179188    int showTree() const;
    … …  
    244253    QVariant m_userData;
    245254#endif
     255
     256#if PLATFORM(ANDROID)
     257    RefPtr<AndroidWebHistoryBridge> m_bridge;
     258#endif
     259
    246260}; //class HistoryItem
    247261
Note: See TracChangeset for help on using the changeset viewer.