Fix build after merge.

* Timer API changes.
haiku · Nov 25, 2014 · 9cc33f5 · 9cc33f5
1 parent 892a3f9
commit 9cc33f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/WebCore/accessibility/AXObjectCache.h b/Source/WebCore/accessibility/AXObjectCache.h
@@ -271,7 +271,7 @@ bool isNodeAriaVisible(Node*);
 #if !HAVE(ACCESSIBILITY)
 inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return DefaultBehavior; }
 inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { }
-inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, (Timer::TimerFiredFunction) nullptr) { }
+//inline AXObjectCache::AXObjectCache(Document& document) : m_document(document), m_notificationPostTimer(this, (Timer::TimerFiredFunction) nullptr) { }
 inline AXObjectCache::~AXObjectCache() { }
 inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
 inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return nullptr; }

diff --git a/Source/WebKit/haiku/WebCoreSupport/AcceleratedCompositingContext.h b/Source/WebKit/haiku/WebCoreSupport/AcceleratedCompositingContext.h
@@ -53,13 +53,13 @@ class AcceleratedCompositingContext {
     void compositeLayers(BRect updateRect);
 
     bool flushPendingLayerChanges();
-    void syncLayers(Timer<AcceleratedCompositingContext>*);
+    void syncLayers(Timer*);
 
     BWebView* m_view;
     BRect m_updateRect;
 
     GraphicsLayer* m_rootLayer;
-    Timer<AcceleratedCompositingContext> m_syncTimer;
+    Timer m_syncTimer;
 
 #if USE(TEXTURE_MAPPER)
     std::unique_ptr<TextureMapper> m_textureMapper;