Remove PlatformWidget references

Source/WebCore/rendering/RenderLayerCompositor.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1611 matching lines @@
     updateLayerForHeader(m_layerForHeader);
     updateLayerForFooter(m_layerForFooter);
 #endif
 }
 
 bool RenderLayerCompositor::has3DContent() const
 {
     return layerHas3DContent(rootRenderLayer());
 }
 
-bool RenderLayerCompositor::allowsIndependentlyCompositedFrames(const FrameView* view)
-{
-#if PLATFORM(MAC)
-    // frames are only independently composited in Mac pre-WebKit2.
-    return view->platformWidget();
-#else
-    UNUSED_PARAM(view);
-#endif
-    return false;
-}
-
 bool RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame() const
 {
     // Parent document content needs to be able to render on top of a composited frame, so correct behavior
     // is to have the parent document become composited too. However, this can cause problems on platforms that
     // use native views for frames (like Mac), so disable that behavior on those platforms for now.
     HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement();
-    RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
 
     // If we are the top-level frame, don't propagate.
-    if (!ownerElement)
-        return false;
-
-    if (!allowsIndependentlyCompositedFrames(m_renderView->frameView()))
-        return true;
-
-    if (!renderer || !renderer->isRenderPart())
-        return false;
-
-    // On Mac, only propagate compositing if the frame is overlapped in the parent
-    // document, or the parent is already compositing, or the main frame is scaled.
-    Page* page = this->page();
-    if (page && page->pageScaleFactor() != 1)
-        return true;
-    
-    RenderPart* frameRenderer = toRenderPart(renderer);
-    if (frameRenderer->widget()) {
-        ASSERT(frameRenderer->widget()->isFrameView());
-        FrameView* view = toFrameView(frameRenderer->widget());
-        if (view->isOverlappedIncludingAncestors() || view->hasCompositingAncestor())
-            return true;
-    }
-
-    return false;
+    return ownerElement;
 }
 
 bool RenderLayerCompositor::needsToBeComposited(const RenderLayer* layer, RenderLayer::ViewportConstrainedNotCompositedReason* viewportConstrainedNotCompositedReason) const
 {
     if (!canBeComposited(layer))
         return false;
 
     return requiresCompositingLayer(layer, viewportConstrainedNotCompositedReason) || layer->mustCompositeForIndirectReasons() || (inCompositingMode() && layer->isRootLayer());
 }
 
@@ skipping 552 matching lines @@
 {
     return layer->hasNegativeZOrderList();
 }
 
 bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const
 {
     // This applies when the application UI handles scrolling, in which case RenderLayerCompositor doesn't need to manage it.
     if (m_renderView->frameView()->delegatesScrolling())
         return false;
 
-    // We need to handle our own scrolling if we're:
-    return !m_renderView->frameView()->platformWidget() // viewless (i.e. non-Mac, or Mac in WebKit2)
-        || attachment == RootLayerAttachedViaEnclosingFrame; // a composited frame on Mac
+    return true;
 }
 
 static void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const IntRect& clip)
 {
     if (!scrollbar)
         return;
 
     context.save();
     const IntRect& scrollbarRect = scrollbar->frameRect();
     context.translate(-scrollbarRect.x(), -scrollbarRect.y());
@@ skipping 103 matching lines @@
 }
 
 bool RenderLayerCompositor::keepLayersPixelAligned() const
 {
     // When scaling, attempt to align compositing layers to pixel boundaries.
     return true;
 }
 
 static bool shouldCompositeOverflowControls(FrameView* view)
 {
-    if (view->platformWidget())
-        return false;
-
     if (Page* page = view->frame()->page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
             if (scrollingCoordinator->coordinatesScrollingForFrameView(view))
                 return true;
     }
 
 #if !PLATFORM(CHROMIUM)
     if (!view->hasOverlayScrollbars())
         return false;
 #endif
@@ skipping 770 matching lines @@
     info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea");
     info.addMember(m_layerForHeader, "layerForHeader");
     info.addMember(m_layerForFooter, "layerForFooter");
 #endif
     info.addMember(m_layerUpdater, "layerUpdater");
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)