diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebCore/dom/Document.h | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebCore/dom/Document.h')
| -rw-r--r-- | Source/WebCore/dom/Document.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h index 017eb8c85..c6767f864 100644 --- a/Source/WebCore/dom/Document.h +++ b/Source/WebCore/dom/Document.h @@ -153,7 +153,7 @@ class SVGDocumentExtensions; class TransformSource; #endif -#if ENABLE(DASHBOARD_SUPPORT) +#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION) struct DashboardRegionValue; #endif @@ -794,8 +794,7 @@ public: TRANSITIONEND_LISTENER = 0x800, BEFORELOAD_LISTENER = 0x1000, TOUCH_LISTENER = 0x2000, - SCROLL_LISTENER = 0x4000, - REGIONLAYOUTUPDATE_LISTENER = 0x8000 + SCROLL_LISTENER = 0x4000 }; bool hasListenerType(ListenerType listenerType) const { return (m_listenerTypes & listenerType); } @@ -1019,7 +1018,7 @@ public: void setFrameElementsShouldIgnoreScrolling(bool ignore) { m_frameElementsShouldIgnoreScrolling = ignore; } bool frameElementsShouldIgnoreScrolling() const { return m_frameElementsShouldIgnoreScrolling; } -#if ENABLE(DASHBOARD_SUPPORT) +#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION) void setDashboardRegionsDirty(bool f) { m_dashboardRegionsDirty = f; } bool dashboardRegionsDirty() const { return m_dashboardRegionsDirty; } bool hasDashboardRegions () const { return m_hasDashboardRegions; } @@ -1448,7 +1447,7 @@ private: OwnPtr<SVGDocumentExtensions> m_svgExtensions; #endif -#if ENABLE(DASHBOARD_SUPPORT) +#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION) Vector<DashboardRegionValue> m_dashboardRegions; bool m_hasDashboardRegions; bool m_dashboardRegionsDirty; |