Title: [162837] trunk/Source
Revision
162837
Author
[email protected]
Date
2014-01-27 07:11:08 -0800 (Mon, 27 Jan 2014)

Log Message

Remove repaint throttling
https://bugs.webkit.org/show_bug.cgi?id=127681

Reviewed by Sam Weinig.

Nowadays we throttle layer flushes. This code is unnecessary.

* WebCore.exp.in:
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* dom/Element.cpp:
(WebCore::Element::classAttributeChanged):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::insertDictatedText):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::checkCompleted):
* page/EventHandler.cpp:
(WebCore::EventHandler::dispatchDragEvent):
(WebCore::EventHandler::dispatchMouseEvent):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::handleTextInputEvent):
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::flushCompositingStateForThisFrame):
(WebCore::FrameView::layout):
(WebCore::FrameView::repaintContentRectangle):
(WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
(WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
* page/FrameView.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::setSelection):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (162836 => 162837)


--- trunk/Source/WebCore/ChangeLog	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/ChangeLog	2014-01-27 15:11:08 UTC (rev 162837)
@@ -1,3 +1,38 @@
+2014-01-27  Antti Koivisto  <[email protected]>
+
+        Remove repaint throttling
+        https://bugs.webkit.org/show_bug.cgi?id=127681
+
+        Reviewed by Sam Weinig.
+
+        Nowadays we throttle layer flushes. This code is unnecessary.
+
+        * WebCore.exp.in:
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        * dom/Element.cpp:
+        (WebCore::Element::classAttributeChanged):
+        * editing/AlternativeTextController.cpp:
+        (WebCore::AlternativeTextController::insertDictatedText):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkCompleted):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchDragEvent):
+        (WebCore::EventHandler::dispatchMouseEvent):
+        (WebCore::EventHandler::keyEvent):
+        (WebCore::EventHandler::handleTextInputEvent):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::flushCompositingStateForThisFrame):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::repaintContentRectangle):
+        (WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
+        (WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
+        * page/FrameView.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::setSelection):
+
 2014-01-24  Eric Carlson  <[email protected]>
 
         Merge Chromium TextTrack cleanups

Modified: trunk/Source/WebCore/WebCore.exp.in (162836 => 162837)


--- trunk/Source/WebCore/WebCore.exp.in	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-01-27 15:11:08 UTC (rev 162837)
@@ -1276,7 +1276,6 @@
 __ZN7WebCore9FrameView20removeScrollableAreaEPNS_14ScrollableAreaE
 __ZN7WebCore9FrameView20resetTrackedRepaintsEv
 __ZN7WebCore9FrameView20setCanHaveScrollbarsEb
-__ZN7WebCore9FrameView21flushDeferredRepaintsEv
 __ZN7WebCore9FrameView22setBaseBackgroundColorERKNS_5ColorE
 __ZN7WebCore9FrameView23updateCanHaveScrollbarsEv
 __ZN7WebCore9FrameView24forceLayoutForPaginationERKNS_9FloatSizeES3_fNS_19AdjustViewSizeOrNotE

Modified: trunk/Source/WebCore/dom/Document.cpp (162836 => 162837)


--- trunk/Source/WebCore/dom/Document.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/dom/Document.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -1739,8 +1739,6 @@
         PostAttachCallbackDisabler disabler(*this);
         WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
 
-        frameView.beginDeferredRepaints();
-
         if (m_pendingStyleRecalcShouldForce)
             change = Style::Force;
 
@@ -1764,8 +1762,6 @@
         // Pseudo element removal and similar may only work with these flags still set. Reset them after the style recalc.
         if (m_styleResolver)
             m_styleSheetCollection.resetCSSFeatureFlags();
-
-        frameView.endDeferredRepaints();
     }
 
     // If we wanted to call implicitClose() during recalcStyle, do so now that we're finished.

Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (162836 => 162837)


--- trunk/Source/WebCore/editing/AlternativeTextController.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -689,7 +689,7 @@
         return false;
 
     if (FrameView* view = m_frame.view())
-        view->resetDeferredRepaintDelay();
+        view->disableLayerFlushThrottlingTemporarilyForInteraction();
 
     RefPtr<TextEvent> event = TextEvent::createForDictation(m_frame.document()->domWindow(), text, dictationAlternatives);
     event->setUnderlyingEvent(triggeringEvent);

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (162836 => 162837)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -798,9 +798,6 @@
     Ref<Frame> protect(m_frame);
     m_shouldCallCheckCompleted = false;
 
-    if (m_frame.view())
-        m_frame.view()->handleLoadCompleted();
-
     // Have we completed before?
     if (m_isComplete)
         return;
@@ -845,9 +842,6 @@
     completed();
     if (m_frame.page())
         checkLoadComplete();
-
-    if (m_frame.view())
-        m_frame.view()->handleLoadCompleted();
 }
 
 void FrameLoader::checkTimerFired(Timer<FrameLoader>&)

Modified: trunk/Source/WebCore/page/EventHandler.cpp (162836 => 162837)


--- trunk/Source/WebCore/page/EventHandler.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -2016,7 +2016,7 @@
     if (!view)
         return false;
 
-    view->resetDeferredRepaintDelay();
+    view->disableLayerFlushThrottlingTemporarilyForInteraction();
     RefPtr<MouseEvent> me = MouseEvent::create(eventType,
         true, true, event.timestamp(), m_frame.document()->defaultView(),
         0, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(),
@@ -2388,7 +2388,7 @@
 bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targetNode, bool /*cancelable*/, int clickCount, const PlatformMouseEvent& mouseEvent, bool setUnder)
 {
     if (FrameView* view = m_frame.view())
-        view->resetDeferredRepaintDelay();
+        view->disableLayerFlushThrottlingTemporarilyForInteraction();
 
     updateMouseEventTargetNode(targetNode, mouseEvent, setUnder);
 
@@ -2914,7 +2914,7 @@
     UserTypingGestureIndicator typingGestureIndicator(m_frame);
 
     if (FrameView* view = m_frame.view())
-        view->resetDeferredRepaintDelay();
+        view->disableLayerFlushThrottlingTemporarilyForInteraction();
 
     // FIXME (bug 68185): this call should be made at another abstraction layer
     m_frame.loader().resetMultipleFormSubmissionProtection();
@@ -3336,7 +3336,7 @@
         return false;
     
     if (FrameView* view = m_frame.view())
-        view->resetDeferredRepaintDelay();
+        view->disableLayerFlushThrottlingTemporarilyForInteraction();
 
     RefPtr<TextEvent> event = TextEvent::create(m_frame.document()->domWindow(), text, inputType);
     event->setUnderlyingEvent(underlyingEvent);

Modified: trunk/Source/WebCore/page/Frame.cpp (162836 => 162837)


--- trunk/Source/WebCore/page/Frame.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/page/Frame.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -956,7 +956,6 @@
     if (!m_view)
         return;
     m_view->updateLayoutAndStyleIfNeededRecursive();
-    m_view->flushDeferredRepaints();
 }
 
 void Frame::tiledBackingStorePaint(GraphicsContext* context, const IntRect& rect)

Modified: trunk/Source/WebCore/page/FrameView.cpp (162836 => 162837)


--- trunk/Source/WebCore/page/FrameView.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/page/FrameView.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -118,28 +118,6 @@
 
 double FrameView::sCurrentPaintTimeStamp = 0.0;
 
-
-// REPAINT_THROTTLING now chooses default values for throttling parameters.
-// Should be removed when applications start using runtime configuration.
-#if ENABLE(REPAINT_THROTTLING)
-// Normal delay
-double FrameView::s_normalDeferredRepaintDelay = 0.016;
-// Negative value would mean that first few repaints happen without a delay
-double FrameView::s_initialDeferredRepaintDelayDuringLoading = 0;
-// The delay grows on each repaint to this maximum value
-double FrameView::s_maxDeferredRepaintDelayDuringLoading = 2.5;
-// On each repaint the delay increses by this amount
-double FrameView::s_deferredRepaintDelayIncrementDuringLoading = 0.5;
-#else
-// FIXME: Repaint throttling could be good to have on all platform.
-// The balance between CPU use and repaint frequency will need some tuning for desktop.
-// More hooks may be needed to reset the delay on things like GIF and CSS animations.
-double FrameView::s_normalDeferredRepaintDelay = 0;
-double FrameView::s_initialDeferredRepaintDelayDuringLoading = 0;
-double FrameView::s_maxDeferredRepaintDelayDuringLoading = 0;
-double FrameView::s_deferredRepaintDelayIncrementDuringLoading = 0;
-#endif
-
 // The maximum number of updateEmbeddedObjects iterations that should be done before returning.
 static const unsigned maxUpdateEmbeddedObjectsIterations = 2;
 
@@ -198,7 +176,6 @@
     , m_wasScrolledByUser(false)
     , m_inProgrammaticScroll(false)
     , m_safeToPropagateScrollToParent(true)
-    , m_deferredRepaintTimer(this, &FrameView::deferredRepaintTimerFired)
     , m_isTrackingRepaints(false)
     , m_shouldUpdateWhileOffscreen(true)
     , m_exposedRect(FloatRect::infiniteRect())
@@ -285,11 +262,6 @@
     m_safeToPropagateScrollToParent = true;
     m_lastViewportSize = IntSize();
     m_lastZoomFactor = 1.0f;
-    m_deferringRepaints = 0;
-    m_repaintCount = 0;
-    m_repaintRects.clear();
-    m_deferredRepaintDelay = s_initialDeferredRepaintDelayDuringLoading;
-    m_deferredRepaintTimer.stop();
     m_isTrackingRepaints = false;
     m_trackedRepaintRects.clear();
     m_lastPaintTime = 0;
@@ -902,10 +874,6 @@
     if (needsLayout())
         return false;
 
-    // If we sync compositing layers and allow the repaint to be deferred, there is time for a
-    // visible flash to occur. Instead, stop the deferred repaint timer and repaint immediately.
-    flushDeferredRepaints();
-
 #if PLATFORM(IOS)
     if (TileCache* tileCache = this->tileCache())
         tileCache->doPendingRepaints();
@@ -1312,7 +1280,6 @@
         ASSERT(m_layoutPhase == InPreLayout);
         m_layoutPhase = InLayout;
 
-        beginDeferredRepaints();
         forceLayoutParentViewIfNeeded();
 
         ASSERT(m_layoutPhase == InLayout);
@@ -1332,7 +1299,6 @@
         if (document.textAutosizer()->processSubtree(root) && root->needsLayout())
             root->layout();
 #endif
-        endDeferredRepaints();
 
         ASSERT(m_layoutPhase == InLayout);
 
@@ -1356,14 +1322,11 @@
     m_needsFullRepaint = neededFullRepaint;
 
     // Now update the positions of all layers.
-    beginDeferredRepaints();
     if (m_needsFullRepaint)
         root->view().repaintRootContents();
 
     layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
 
-    endDeferredRepaints();
-
 #if USE(ACCELERATED_COMPOSITING)
     updateCompositingLayersAfterLayout();
 #endif
@@ -2159,32 +2122,6 @@
 
     addTrackedRepaintRect(r);
 
-    double delay = m_deferringRepaints ? 0 : adjustedDeferredRepaintDelay();
-    if ((m_deferringRepaints || m_deferredRepaintTimer.isActive() || delay) && !immediate) {
-        IntRect paintRect = r;
-        if (clipsRepaints() && !paintsEntireContents())
-            paintRect.intersect(visibleContentRect(LegacyIOSDocumentVisibleRect));
-        if (paintRect.isEmpty())
-            return;
-        if (m_repaintCount == cRepaintRectUnionThreshold) {
-            IntRect unionedRect;
-            for (unsigned i = 0; i < cRepaintRectUnionThreshold; ++i)
-                unionedRect.unite(pixelSnappedIntRect(m_repaintRects[i]));
-            m_repaintRects.clear();
-            m_repaintRects.append(unionedRect);
-        }
-        if (m_repaintCount < cRepaintRectUnionThreshold)
-            m_repaintRects.append(paintRect);
-        else
-            m_repaintRects[0].unite(paintRect);
-        m_repaintCount++;
-
-        if (!m_deferringRepaints)
-            startDeferredRepaintTimer(delay);
-
-        return;
-    }
-    
     if (!shouldUpdate(immediate))
         return;
 
@@ -2275,143 +2212,14 @@
 #endif
 }
 
-void FrameView::beginDeferredRepaints()
+void FrameView::disableLayerFlushThrottlingTemporarilyForInteraction()
 {
-    if (!frame().isMainFrame()) {
-        frame().mainFrame().view()->beginDeferredRepaints();
-        return;
-    }
-
-    m_deferringRepaints++;
-}
-
-void FrameView::endDeferredRepaints()
-{
-    if (!frame().isMainFrame()) {
-        frame().mainFrame().view()->endDeferredRepaints();
-        return;
-    }
-
-    ASSERT(m_deferringRepaints > 0);
-
-    if (--m_deferringRepaints)
-        return;
-
-    if (m_deferredRepaintTimer.isActive())
-        return;
-
-    if (double delay = adjustedDeferredRepaintDelay()) {
-        startDeferredRepaintTimer(delay);
-        return;
-    }
-    
-    doDeferredRepaints();
-}
-
-void FrameView::startDeferredRepaintTimer(double delay)
-{
-    if (m_deferredRepaintTimer.isActive())
-        return;
-
-    m_deferredRepaintTimer.startOneShot(delay);
-}
-
-void FrameView::handleLoadCompleted()
-{
-    // Once loading has completed, allow autoSize one last opportunity to
-    // reduce the size of the frame.
-    autoSizeIfEnabled();
-    if (shouldUseLoadTimeDeferredRepaintDelay())
-        return;
-    m_deferredRepaintDelay = s_normalDeferredRepaintDelay;
-    flushDeferredRepaints();
-}
-
-void FrameView::flushDeferredRepaints()
-{
-    if (!m_deferredRepaintTimer.isActive())
-        return;
-    m_deferredRepaintTimer.stop();
-    doDeferredRepaints();
-}
-
-void FrameView::doDeferredRepaints()
-{
-    ASSERT(!m_deferringRepaints);
-    if (!shouldUpdate()) {
-        m_repaintRects.clear();
-        m_repaintCount = 0;
-        return;
-    }
-    unsigned size = m_repaintRects.size();
-    for (unsigned i = 0; i < size; i++) {
-#if USE(TILED_BACKING_STORE)
-        if (frame().tiledBackingStore()) {
-            frame().tiledBackingStore()->invalidate(pixelSnappedIntRect(m_repaintRects[i]));
-            continue;
-        }
-#endif
-        ScrollView::repaintContentRectangle(pixelSnappedIntRect(m_repaintRects[i]), false);
-    }
-    m_repaintRects.clear();
-    m_repaintCount = 0;
-    
-    updateDeferredRepaintDelayAfterRepaint();
-}
-
-bool FrameView::shouldUseLoadTimeDeferredRepaintDelay() const
-{
-    // Don't defer after the initial load of the page has been completed.
-    if (frame().tree().top().loader().isComplete())
-        return false;
-    Document* document = frame().document();
-    if (!document)
-        return false;
-    if (document->parsing())
-        return true;
-    if (document->cachedResourceLoader()->requestCount())
-        return true;
-    return false;
-}
-
-void FrameView::updateDeferredRepaintDelayAfterRepaint()
-{
-    if (!shouldUseLoadTimeDeferredRepaintDelay()) {
-        m_deferredRepaintDelay = s_normalDeferredRepaintDelay;
-        return;
-    }
-    double incrementedRepaintDelay = m_deferredRepaintDelay + s_deferredRepaintDelayIncrementDuringLoading;
-    m_deferredRepaintDelay = std::min(incrementedRepaintDelay, s_maxDeferredRepaintDelayDuringLoading);
-}
-
-void FrameView::resetDeferredRepaintDelay()
-{
-    m_deferredRepaintDelay = 0;
-    if (m_deferredRepaintTimer.isActive()) {
-        m_deferredRepaintTimer.stop();
-        if (!m_deferringRepaints)
-            doDeferredRepaints();
-    }
 #if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = renderView())
         view->compositor().disableLayerFlushThrottlingTemporarilyForInteraction();
 #endif
 }
 
-double FrameView::adjustedDeferredRepaintDelay() const
-{
-    ASSERT(!m_deferringRepaints);
-    if (!m_deferredRepaintDelay)
-        return 0;
-    double timeSinceLastPaint = monotonicallyIncreasingTime() - m_lastPaintTime;
-    return std::max<double>(0, m_deferredRepaintDelay - timeSinceLastPaint);
-}
-    
-void FrameView::deferredRepaintTimerFired(Timer<FrameView>&)
-{
-    doDeferredRepaints();
-}
-
 void FrameView::updateLayerFlushThrottlingInAllFrames()
 {
 #if USE(ACCELERATED_COMPOSITING)
@@ -3822,10 +3630,6 @@
     for (unsigned i = 0; i < childViews.size(); ++i)
         childViews[i]->updateLayoutAndStyleIfNeededRecursive();
 
-    // updateLayoutAndStyleIfNeededRecursive is called when we need to make sure style and layout are up-to-date before
-    // painting, so we need to flush out any deferred repaints too.
-    flushDeferredRepaints();
-
     // When frame flattening is on, child frame can mark parent frame dirty. In such case, child frame
     // needs to call layout on parent frame recursively.
     // This assert ensures that parent frames are clean, when child frames finished updating layout and style.
@@ -4115,30 +3919,6 @@
     return parentPoint;
 }
 
-// Normal delay
-void FrameView::setRepaintThrottlingDeferredRepaintDelay(double p)
-{
-    s_normalDeferredRepaintDelay = p;
-}
-
-// Negative value would mean that first few repaints happen without a delay
-void FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(double p)
-{
-    s_initialDeferredRepaintDelayDuringLoading = p;
-}
-
-// The delay grows on each repaint to this maximum value
-void FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(double p)
-{
-    s_maxDeferredRepaintDelayDuringLoading = p;
-}
-
-// On each repaint the delay increases by this amount
-void FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p)
-{
-    s_deferredRepaintDelayIncrementDuringLoading = p;
-}
-
 void FrameView::setTracksRepaints(bool trackRepaints)
 {
     if (trackRepaints == m_isTrackingRepaints)

Modified: trunk/Source/WebCore/page/FrameView.h (162836 => 162837)


--- trunk/Source/WebCore/page/FrameView.h	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/page/FrameView.h	2014-01-27 15:11:08 UTC (rev 162837)
@@ -260,13 +260,7 @@
 
     bool fixedElementsLayoutRelativeToFrame() const;
 
-    void beginDeferredRepaints();
-    void endDeferredRepaints();
-    void handleLoadCompleted();
-    void flushDeferredRepaints();
-    void startDeferredRepaintTimer(double delay);
-    void resetDeferredRepaintDelay();
-
+    void disableLayerFlushThrottlingTemporarilyForInteraction();
     void updateLayerFlushThrottlingInAllFrames();
     void adjustTiledBackingCoverage();
     bool speculativeTilingEnabled() const { return m_speculativeTilingEnabled; }
@@ -360,15 +354,6 @@
     enum ScrollbarModesCalculationStrategy { RulesFromWebContentOnly, AnyRule };
     void calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy = AnyRule);
 
-    // Normal delay
-    static void setRepaintThrottlingDeferredRepaintDelay(double p);
-    // Negative value would mean that first few repaints happen without a delay
-    static void setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(double p);
-    // The delay grows on each repaint to this maximum value
-    static void setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(double p);
-    // On each repaint the delay increses by this amount
-    static void setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p);
-
     virtual IntPoint lastKnownMousePosition() const override;
     virtual bool isHandlingWheelEvent() const override;
     bool shouldSetCursor() const;
@@ -552,12 +537,6 @@
 
     virtual void notifyPageThatContentAreaWillPaint() const override;
 
-    bool shouldUseLoadTimeDeferredRepaintDelay() const;
-    void deferredRepaintTimerFired(Timer<FrameView>&);
-    void doDeferredRepaints();
-    void updateDeferredRepaintDelayAfterRepaint();
-    double adjustedDeferredRepaintDelay() const;
-
     void enableSpeculativeTilingIfNeeded();
     void speculativeTilingEnableTimerFired(Timer<FrameView>&);
 
@@ -637,11 +616,6 @@
     bool m_inProgrammaticScroll;
     bool m_safeToPropagateScrollToParent;
 
-    unsigned m_deferringRepaints;
-    unsigned m_repaintCount;
-    Vector<LayoutRect> m_repaintRects;
-    Timer<FrameView> m_deferredRepaintTimer;
-    double m_deferredRepaintDelay;
     double m_lastPaintTime;
 
     bool m_isTrackingRepaints; // Used for testing.
@@ -698,11 +672,6 @@
 
     LayoutMilestones m_milestonesPendingPaint;
 
-    static double s_normalDeferredRepaintDelay;
-    static double s_initialDeferredRepaintDelayDuringLoading;
-    static double s_maxDeferredRepaintDelayDuringLoading;
-    static double s_deferredRepaintDelayIncrementDuringLoading;
-
     static const unsigned visualCharacterThreshold = 200;
     static const unsigned visualPixelThreshold = 32 * 32;
 

Modified: trunk/Source/WebCore/rendering/RenderView.cpp (162836 => 162837)


--- trunk/Source/WebCore/rendering/RenderView.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebCore/rendering/RenderView.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -929,8 +929,6 @@
     if (blockRepaintMode == RepaintNothing)
         return;
 
-    frameView().beginDeferredRepaints();
-
     // Have any of the old selected objects changed compared to the new selection?
     for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i) {
         RenderObject* obj = i->key;
@@ -971,8 +969,6 @@
     SelectedBlockMap::iterator newBlocksEnd = newSelectedBlocks.end();
     for (SelectedBlockMap::iterator i = newSelectedBlocks.begin(); i != newBlocksEnd; ++i)
         i->value->repaint();
-
-    frameView().endDeferredRepaints();
 }
 
 void RenderView::getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const

Modified: trunk/Source/WebKit/efl/ewk/ewk_settings.cpp (162836 => 162837)


--- trunk/Source/WebKit/efl/ewk/ewk_settings.cpp	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebKit/efl/ewk/ewk_settings.cpp	2014-01-27 15:11:08 UTC (rev 162837)
@@ -319,10 +319,11 @@
 
 void ewk_settings_repaint_throttling_set(double deferredRepaintDelay, double initialDeferredRepaintDelayDuringLoading, double maxDeferredRepaintDelayDuringLoading, double deferredRepaintDelayIncrementDuringLoading)
 {
-    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelay(deferredRepaintDelay);
-    WebCore::FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(initialDeferredRepaintDelayDuringLoading);
-    WebCore::FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(maxDeferredRepaintDelayDuringLoading);
-    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(deferredRepaintDelayIncrementDuringLoading);
+    // FIXME: EFL should switch to layer flush throttling.
+    UNUSED_PARAM(deferredRepaintDelay);
+    UNUSED_PARAM(initialDeferredRepaintDelayDuringLoading);
+    UNUSED_PARAM(maxDeferredRepaintDelayDuringLoading);
+    UNUSED_PARAM(deferredRepaintDelayIncrementDuringLoading);
 }
 
 /**

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (162836 => 162837)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2014-01-27 15:05:44 UTC (rev 162836)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2014-01-27 15:11:08 UTC (rev 162837)
@@ -1420,13 +1420,6 @@
     if (_private->dataSource && [self _isTopHTMLView])
         [self _web_updateLayoutAndStyleIfNeededRecursive];
 
-#if PLATFORM(IOS)
-    if (Frame* coreFrame = core([self _frame])) {
-        if (FrameView* coreView = coreFrame->view())
-            coreView->flushDeferredRepaints();
-    }
-#endif
-
     [super viewWillDraw];
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to