Remove PlatformWidget references

Source/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)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 955 matching lines @@
 
 bool FrameView::hasCompositedContent() const
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView())
         return renderView->compositor()->inCompositingMode();
 #endif
     return false;
 }
 
-bool FrameView::hasCompositedContentIncludingDescendants() const
-{
-#if USE(ACCELERATED_COMPOSITING)
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
-        RenderView* renderView = frame->contentRenderer();
-        RenderLayerCompositor* compositor = renderView ? renderView->compositor() : 0;
-        if (compositor) {
-            if (compositor->inCompositingMode())
-                return true;
-
-            if (!RenderLayerCompositor::allowsIndependentlyCompositedFrames(this))
-                break;
-        }
-    }
-#endif
-    return false;
-}
-
 bool FrameView::hasCompositingAncestor() const
 {
 #if USE(ACCELERATED_COMPOSITING)
     for (Frame* frame = m_frame->tree()->parent(); frame; frame = frame->tree()->parent()) {
         if (FrameView* view = frame->view()) {
             if (view->hasCompositedContent())
                 return true;
         }
     }
 #endif
@@ skipping 469 matching lines @@
             setMediaType("print");
     } else {
         if (!m_mediaTypeWhenNotPrinting.isNull())
             setMediaType(m_mediaTypeWhenNotPrinting);
         m_mediaTypeWhenNotPrinting = String();
     }
 }
 
 bool FrameView::useSlowRepaints(bool considerOverlap) const
 {
-    bool mustBeSlow = m_slowRepaintObjectCount > 0 || (platformWidget() && hasViewportConstrainedObjects());
+    bool mustBeSlow = m_slowRepaintObjectCount > 0;
 
-    // FIXME: WidgetMac.mm makes the assumption that useSlowRepaints ==
-    // m_contentIsOpaque, so don't take the fast path for composited layers
-    // if they are a platform widget in order to get painting correctness
-    // for transparent layers. See the comment in WidgetMac::paint.
-    if (contentsInCompositedLayer() && !platformWidget())
+    if (contentsInCompositedLayer())
         return mustBeSlow;
 
 #if PLATFORM(CHROMIUM)
     // The chromium compositor does not support scrolling a non-composited frame within a composited page through
     // the fast scrolling path, so force slow scrolling in that case.
     if (m_frame->ownerElement() && !hasCompositedContent() && m_frame->page() && m_frame->page()->mainFrame()->view()->hasCompositedContent())
         return true;
 #endif
 
     bool isOverlapped = m_isOverlapped && considerOverlap;
@@ skipping 65 matching lines @@
     }
 }
 
 void FrameView::addViewportConstrainedObject(RenderObject* object)
 {
     if (!m_viewportConstrainedObjects)
         m_viewportConstrainedObjects = adoptPtr(new ViewportConstrainedObjectSet);
 
     if (!m_viewportConstrainedObjects->contains(object)) {
         m_viewportConstrainedObjects->add(object);
-        if (platformWidget())
-            updateCanBlitOnScrollRecursively();
 
         if (Page* page = m_frame->page()) {
             if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
                 scrollingCoordinator->frameViewFixedObjectsDidChange(this);
         }
     }
 }
 
 void FrameView::removeViewportConstrainedObject(RenderObject* object)
 {
@@ skipping 156 matching lines @@
 }
 
 // Note that this gets called at painting time.
 void FrameView::setIsOverlapped(bool isOverlapped)
 {
     if (isOverlapped == m_isOverlapped)
         return;
 
     m_isOverlapped = isOverlapped;
     updateCanBlitOnScrollRecursively();
-    
-#if USE(ACCELERATED_COMPOSITING)
-    if (hasCompositedContentIncludingDescendants()) {
-        // Overlap can affect compositing tests, so if it changes, we need to trigger
-        // a layer update in the parent document.
-        if (Frame* parentFrame = m_frame->tree()->parent()) {
-            if (RenderView* parentView = parentFrame->contentRenderer()) {
-                RenderLayerCompositor* compositor = parentView->compositor();
-                compositor->setCompositingLayersNeedRebuild();
-                compositor->scheduleCompositingLayerUpdate();
-            }
-        }
-
-        if (RenderLayerCompositor::allowsIndependentlyCompositedFrames(this)) {
-            // We also need to trigger reevaluation for this and all descendant frames,
-            // since a frame uses compositing if any ancestor is compositing.
-            for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext(m_frame.get())) {
-                if (RenderView* view = frame->contentRenderer()) {
-                    RenderLayerCompositor* compositor = view->compositor();
-                    compositor->setCompositingLayersNeedRebuild();
-                    compositor->scheduleCompositingLayerUpdate();
-                }
-            }
-        }
-    }
-#endif
 }
 
 bool FrameView::isOverlappedIncludingAncestors() const
 {
     if (isOverlapped())
         return true;
 
     if (FrameView* parentView = parentFrameView()) {
         if (parentView->isOverlapped())
             return true;
@@ skipping 154 matching lines @@
         return;
 
     ViewportConstrainedObjectSet::const_iterator end = m_viewportConstrainedObjects->end();
     for (ViewportConstrainedObjectSet::const_iterator it = m_viewportConstrainedObjects->begin(); it != end; ++it) {
         RenderObject* renderer = *it;
         renderer->setNeedsLayout(true);
     }
 }
 
 
-void FrameView::scrollPositionChangedViaPlatformWidget()
-{
-    repaintFixedElementsAfterScrolling();
-    updateFixedElementsAfterScrolling();
-    scrollPositionChanged();
-}
-
 void FrameView::scrollPositionChanged()
 {
     frame()->eventHandler()->sendScrollEvent();
     frame()->eventHandler()->dispatchFakeMouseMoveEventSoon();
 
 #if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor()->frameViewDidScroll();
     }
@@ skipping 1403 matching lines @@
         paintControlTints();
 }
 
 void FrameView::paintControlTints()
 {
     if (needsLayout())
         layout();
     PlatformGraphicsContext* const noContext = 0;
     GraphicsContext context(noContext);
     context.setUpdatingControlTints(true);
-    if (platformWidget())
-        paintContents(&context, visibleContentRect());
-    else
-        paint(&context, frameRect());
+    paint(&context, frameRect());
 }
 
 bool FrameView::wasScrolledByUser() const
 {
     return m_wasScrolledByUser;
 }
 
 void FrameView::setWasScrolledByUser(bool wasScrolledByUser)
 {
     if (m_inProgrammaticScroll)
@@ skipping 575 matching lines @@
             scrollPositionChanged();
             frame()->loader()->client()->didChangeScrollOffset();
         }
         return true;
     }
 
     // We don't allow mouse wheeling to happen in a ScrollView that has had its scrollbars explicitly disabled.
     if (!canHaveScrollbars())
         return false;
 
-#if !PLATFORM(WX)
-    if (platformWidget())
-        return false;
-#endif
-
 #if ENABLE(THREADED_SCROLLING)
     if (Page* page = m_frame->page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
             if (scrollingCoordinator->coordinatesScrollingForFrameView(this))
                 return scrollingCoordinator->handleWheelEvent(this, wheelEvent);
         }
     }
 #endif
 
     return ScrollableArea::handleWheelEvent(wheelEvent);
@@ skipping 37 matching lines @@
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (TiledBacking* tiledBacking = this->tiledBacking())
         tiledBacking->setScrollingPerformanceLoggingEnabled(flag);
 #else
     UNUSED_PARAM(flag);
 #endif
 }
 
 } // namespace WebCore