Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 45 matching lines @@
 #endif
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 double FrameView::sCurrentPaintTimeStamp = 0.0;
 
 struct ScheduledEvent {
     RefPtr<Event> m_event;
-    RefPtr<Node> m_eventTarget;
+    RefPtr<EventTargetNode> m_eventTarget;
 };
 
 FrameView::FrameView(Frame* frame)
     : m_refCount(1)
     , m_frame(frame)
     , m_vmode(ScrollbarAuto)
     , m_hmode(ScrollbarAuto)
     , m_slowRepaintObjectCount(0)
     , m_layoutTimer(this, &FrameView::layoutTimerFired)
     , m_layoutRoot(0)
@@ skipping 290 matching lines @@
     m_viewportRenderer = o;
 }
 
 #if USE(ACCELERATED_COMPOSITING)
 void FrameView::updateCompositingLayers(CompositingUpdate updateType)
 {
     RenderView* view = m_frame->contentRenderer();
     if (!view || !view->usesCompositing())
         return;
 
-    if (updateType == ForcedCompositingUpdate)
+    if (updateType == ForcedUpdate)
         view->compositor()->setCompositingLayersNeedUpdate();
     
     view->compositor()->updateCompositingLayers();
 }
 
 void FrameView::setNeedsOneShotDrawingSynchronization()
 {
     Page* page = frame() ? frame()->page() : 0;
     if (page)
         page->chrome()->client()->setNeedsOneShotDrawingSynchronization();
@@ skipping 539 matching lines @@
 bool FrameView::shouldUpdateWhileOffscreen() const
 {
     return m_shouldUpdateWhileOffscreen;
 }
 
 void FrameView::setShouldUpdateWhileOffscreen(bool shouldUpdateWhileOffscreen)
 {
     m_shouldUpdateWhileOffscreen = shouldUpdateWhileOffscreen;
 }
 
-void FrameView::scheduleEvent(PassRefPtr<Event> event, PassRefPtr<Node> eventTarget)
+void FrameView::scheduleEvent(PassRefPtr<Event> event, PassRefPtr<EventTargetNode> eventTarget)
 {
     if (!m_enqueueEvents) {
         ExceptionCode ec = 0;
         eventTarget->dispatchEvent(event, ec);
         return;
     }
 
     ScheduledEvent* scheduledEvent = new ScheduledEvent;
     scheduledEvent->m_event = event;
     scheduledEvent->m_eventTarget = eventTarget;
@@ skipping 77 matching lines @@
     
     bool horizontalOverflowChanged = (m_horizontalOverflow != horizontalOverflow);
     bool verticalOverflowChanged = (m_verticalOverflow != verticalOverflow);
     
     if (horizontalOverflowChanged || verticalOverflowChanged) {
         m_horizontalOverflow = horizontalOverflow;
         m_verticalOverflow = verticalOverflow;
         
         scheduleEvent(OverflowEvent::create(horizontalOverflowChanged, horizontalOverflow,
             verticalOverflowChanged, verticalOverflow),
-            m_viewportRenderer->element());
+            EventTargetNodeCast(m_viewportRenderer->element()));
     }
     
 }
 
 void FrameView::dispatchScheduledEvents()
 {
     if (m_scheduledEvents.isEmpty())
         return;
 
     Vector<ScheduledEvent*> scheduledEventsCopy = m_scheduledEvents;
@@ skipping 286 matching lines @@
         IntRect dirtyRect(0, (int)floorf(oldTop), root->docWidth(), (int)ceilf(oldBottom - oldTop));
         root->layer()->paint(&context, dirtyRect);
         *newBottom = root->bestTruncatedAt();
         if (*newBottom == 0)
             *newBottom = oldBottom;
     } else
         *newBottom = oldBottom;
 }
 
 } // namespace WebCore