| Index: Source/WebCore/page/Frame.cpp
|
| diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
|
| index bab5fbbb07d2c2c0cc4db66e6d54f38d3c145b44..4f8aa756259e44d5fc707606608c09cd8e55c3ad 100644
|
| --- a/Source/WebCore/page/Frame.cpp
|
| +++ b/Source/WebCore/page/Frame.cpp
|
| @@ -109,10 +109,6 @@
|
| #include "SVGDocumentExtensions.h"
|
| #endif
|
|
|
| -#if USE(TILED_BACKING_STORE)
|
| -#include "TiledBackingStore.h"
|
| -#endif
|
| -
|
| using namespace std;
|
|
|
| namespace WebCore {
|
| @@ -175,12 +171,7 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
|
| XMLNames::init();
|
| WebKitFontFamilyNames::init();
|
|
|
| - if (!ownerElement) {
|
| -#if USE(TILED_BACKING_STORE)
|
| - // Top level frame only for now.
|
| - setTiledBackingStoreEnabled(page->settings()->tiledBackingStoreEnabled());
|
| -#endif
|
| - } else {
|
| + if (ownerElement) {
|
| page->incrementSubframeCount();
|
| ownerElement->setContentFrame(this);
|
| }
|
| @@ -270,11 +261,6 @@ void Frame::setView(PassRefPtr<FrameView> view)
|
| // Since this part may be getting reused as a result of being
|
| // pulled from the back/forward cache, reset this flag.
|
| loader()->resetMultipleFormSubmissionProtection();
|
| -
|
| -#if USE(TILED_BACKING_STORE)
|
| - if (m_view && tiledBackingStore())
|
| - m_view->setPaintsEntireContents(true);
|
| -#endif
|
| }
|
|
|
| void Frame::setDocument(PassRefPtr<Document> newDoc)
|
| @@ -814,68 +800,6 @@ void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor
|
| view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);
|
| }
|
|
|
| -#if USE(TILED_BACKING_STORE)
|
| -void Frame::setTiledBackingStoreEnabled(bool enabled)
|
| -{
|
| - if (!enabled) {
|
| - m_tiledBackingStore.clear();
|
| - return;
|
| - }
|
| - if (m_tiledBackingStore)
|
| - return;
|
| - m_tiledBackingStore = adoptPtr(new TiledBackingStore(this));
|
| - m_tiledBackingStore->setCommitTileUpdatesOnIdleEventLoop(true);
|
| - if (m_view)
|
| - m_view->setPaintsEntireContents(true);
|
| -}
|
| -
|
| -void Frame::tiledBackingStorePaintBegin()
|
| -{
|
| - if (!m_view)
|
| - return;
|
| - m_view->updateLayoutAndStyleIfNeededRecursive();
|
| - m_view->flushDeferredRepaints();
|
| -}
|
| -
|
| -void Frame::tiledBackingStorePaint(GraphicsContext* context, const IntRect& rect)
|
| -{
|
| - if (!m_view)
|
| - return;
|
| - m_view->paintContents(context, rect);
|
| -}
|
| -
|
| -void Frame::tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea)
|
| -{
|
| - if (!m_page || !m_view)
|
| - return;
|
| - unsigned size = paintedArea.size();
|
| - // Request repaint from the system
|
| - for (unsigned n = 0; n < size; ++n)
|
| - m_page->chrome()->invalidateContentsAndRootView(m_view->contentsToRootView(paintedArea[n]), false);
|
| -}
|
| -
|
| -IntRect Frame::tiledBackingStoreContentsRect()
|
| -{
|
| - if (!m_view)
|
| - return IntRect();
|
| - return IntRect(IntPoint(), m_view->contentsSize());
|
| -}
|
| -
|
| -IntRect Frame::tiledBackingStoreVisibleRect()
|
| -{
|
| - if (!m_page)
|
| - return IntRect();
|
| - return m_page->chrome()->client()->visibleRectForTiledBackingStore();
|
| -}
|
| -
|
| -Color Frame::tiledBackingStoreBackgroundColor() const
|
| -{
|
| - if (!m_view)
|
| - return Color();
|
| - return m_view->baseBackgroundColor();
|
| -}
|
| -#endif
|
| -
|
| String Frame::layerTreeAsText(LayerTreeFlags flags) const
|
| {
|
| #if USE(ACCELERATED_COMPOSITING)
|
|
|