Title: [120996] branches/chromium/1180
Revision
120996
Author
[email protected]
Date
2012-06-21 19:40:40 -0700 (Thu, 21 Jun 2012)

Log Message

Merge 120629 - [chromium/mac] Unbreak smooth scrolling.
https://bugs.webkit.org/show_bug.cgi?id=89327

Reviewed by Dimitri Glazkov.

Broken by Sam in r115589 / r115591.

Source/WebCore:

* platform/mac/ScrollAnimatorMac.mm:
(WebCore::scrollAnimationEnabledForSystem):

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
(TestWebKitAPI::InjectedBundleController::platformInitialize):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):


[email protected]
Review URL: https://chromiumcodereview.appspot.com/10633026

Modified Paths

Diff

Modified: branches/chromium/1180/Source/WebCore/ChangeLog (120995 => 120996)


--- branches/chromium/1180/Source/WebCore/ChangeLog	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Source/WebCore/ChangeLog	2012-06-22 02:40:40 UTC (rev 120996)
@@ -1,107 +1,3 @@
-2012-06-18  James Robinson  <[email protected]>
-
-        [chromium] REGRESSION(r120346) ContentLayerPainter should clear rect to be painted
-        https://bugs.webkit.org/show_bug.cgi?id=89376
-
-        Reviewed by Adrienne Walker.
-
-        In r120346, a refactor moved a clearRect()/clip() call from ContentLayerPainter - which all
-        ContentLayerChromiums use - out to OpaqueRectTrackingContentLayerDelegate - which all GraphicsLayerChromium
-        backed layers use, but which callers using WebContentLayer directly do not use. This meant that the canvas
-        wasn't cleared/clipped as WebContentLayerClient.h claimed it would be. This moves the clear and the clip
-        into CanvasLayerTextureUpdater which all paths use, including layers that don't use the ContentLayerPainter.
-
-        * platform/graphics/chromium/ContentLayerChromium.cpp:
-        (WebCore::ContentLayerPainter::paint):
-        * platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp:
-        (WebCore::OpaqueRectTrackingContentLayerDelegate::paintContents):
-
-2012-06-18  Igor Oliveira  <[email protected]>
-
-        Unreviewed, rolling out r120119.
-        http://trac.webkit.org/changeset/120119
-
-        Multiple regressions on ClusterFuzz
-
-        * page/animation/AnimationBase.cpp:
-        (WebCore::AnimationBase::updateStateMachine):
-        * page/animation/AnimationController.cpp:
-        (WebCore::AnimationControllerPrivate::updateAnimations):
-        (WebCore::AnimationControllerPrivate::pauseAnimationAtTime):
-        (WebCore::AnimationControllerPrivate::pauseTransitionAtTime):
-        (WebCore::AnimationController::cancelAnimations):
-        (WebCore::AnimationController::updateAnimations):
-        * page/animation/ImplicitAnimation.cpp:
-        (WebCore::ImplicitAnimation::pauseAnimation):
-        (WebCore::ImplicitAnimation::sendTransitionEvent):
-        * page/animation/KeyframeAnimation.cpp:
-        (WebCore::KeyframeAnimation::KeyframeAnimation):
-        (WebCore::KeyframeAnimation::pauseAnimation):
-        (WebCore::KeyframeAnimation::endAnimation):
-        (WebCore::KeyframeAnimation::sendAnimationEvent):
-        * rendering/RenderBlock.cpp:
-        (WebCore::RenderBlock::updateFirstLetterStyle):
-        (WebCore::RenderBlock::createFirstLetterRenderer):
-        * rendering/RenderInline.cpp:
-        (WebCore::RenderInline::clippedOverflowRectForRepaint):
-        * rendering/RenderObject.cpp:
-        * rendering/RenderObject.h:
-        (RenderObject):
-
-2012-06-18  Ryosuke Niwa  <[email protected]>
-
-        REGRESSION(r118414): some pages on concursolutions.com doesn't show up
-        https://bugs.webkit.org/show_bug.cgi?id=89399
-
-        Reviewed by Adam Barth.
-
-        The bug was caused by insertAdjacentHTML's not passing context element to createFragmentForInnerOuterHTML.
-
-        Test: fast/html/adjacent-html-context-element.html
-
-        * html/HTMLElement.cpp:
-        (WebCore::HTMLElement::insertAdjacentHTML):
-
-2012-06-18  Zhenyao Mo  <[email protected]>
-
-        Fix framebuffer-object-attachment.html failures
-        https://bugs.webkit.org/show_bug.cgi?id=89387
-
-        Reviewed by Kenneth Russell.
-
-        * html/canvas/WebGLFramebuffer.cpp: fix detachment behavior with depth/stencil/depth_stencil conflicts
-        (WebCore::WebGLFramebuffer::setAttachmentForBoundFramebuffer):
-        (WebCore::WebGLFramebuffer::removeAttachmentFromBoundFramebuffer):
-        * html/canvas/WebGLFramebuffer.h:
-        (WebGLFramebuffer):
-        * html/canvas/WebGLRenderingContext.cpp:
-        (WebCore):
-        (WebCore::WebGLRenderingContext::framebufferRenderbuffer): move logic to WebGLFramebuffer
-        (WebCore::WebGLRenderingContext::framebufferTexture2D): Ditto.
-        (WebCore::WebGLRenderingContext::getParameter): Correct the wrong assumption that it's always checking the drawingbuffer's DEPTH_BITS/STENCIL_BITS
-        * html/canvas/WebGLRenderingContext.h:
-        (WebGLRenderingContext):
-
-2012-06-18  Ian Vollick  <[email protected]>
-
-        [chromium] Ensure that skipping frames during an accelerated animation doesn't cause starvation
-        https://bugs.webkit.org/show_bug.cgi?id=87766
-
-        Reviewed by James Robinson.
-
-        Unit tests:
-            CCLayerTreeHostTestCheckerboardDoesNotStarveDraws.runMultiThread
-            CCSchedulerStateMachineTest.TestFailedDrawsWillEventuallyForceADrawAfterTheNextCommit
-
-        * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
-        (WebCore::CCSchedulerStateMachine::CCSchedulerStateMachine):
-        (WebCore::CCSchedulerStateMachine::updateState):
-        (WebCore::CCSchedulerStateMachine::didDrawIfPossibleCompleted):
-        (WebCore::CCSchedulerStateMachine::setMaximumNumberOfFailedDrawsBeforeDrawIsForced):
-        (WebCore):
-        * platform/graphics/chromium/cc/CCSchedulerStateMachine.h:
-        (CCSchedulerStateMachine):
-
 2012-06-18  Nico Weber  <[email protected]>
 
         [chromium/mac] Unbreak smooth scrolling.
@@ -1598,6 +1494,56 @@
         (WebCore::CSPSourceList::parsePort):
             Moved the `:` assertion here from parseSource.
 
+2012-06-16  Zeev Lieber  <[email protected]>
+
+        [Chromium] Compositor should avoid drawing quads when cached textures are available and contents unchanged
+        https://bugs.webkit.org/show_bug.cgi?id=88482
+
+        Reviewed by Adrienne Walker.
+
+        Post-processing CCRenderPassList after it's been generated and
+        removing all render surface quads for which there are
+        cached textures, and whose content didn't change. Added a new
+        flag to CCLayerImpl to differentiate surface property change and
+        layer property change.
+
+        The changes are covered by new unit tests that check that
+        the removal algorithm functions propertly. No rendering
+        behaviour change, so no new layout tests.
+
+        * platform/graphics/chromium/cc/CCDamageTracker.cpp:
+        (WebCore::layerNeedsToRedrawOntoItsTargetSurface):
+        (WebCore):
+        (WebCore::CCDamageTracker::extendDamageForLayer):
+        (WebCore::CCDamageTracker::extendDamageForRenderSurface):
+        * platform/graphics/chromium/cc/CCLayerImpl.cpp:
+        (WebCore::CCLayerImpl::CCLayerImpl):
+        (WebCore::CCLayerImpl::layerSurfacePropertyChanged):
+        (WebCore):
+        (WebCore::CCLayerImpl::resetAllChangeTrackingForSubtree):
+        (WebCore::CCLayerImpl::setOpacity):
+        (WebCore::CCLayerImpl::setTransform):
+        * platform/graphics/chromium/cc/CCLayerImpl.h:
+        (CCLayerImpl):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::calculateRenderPasses):
+        (WebCore::CCLayerTreeHostImpl::removeRenderPassesRecursive):
+        (WebCore):
+        (WebCore::CCLayerTreeHostImpl::removePassesWithCachedTextures):
+        (WebCore::CCLayerTreeHostImpl::prepareToDraw):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+        (FrameData):
+        (CCLayerTreeHostImpl):
+        * platform/graphics/chromium/cc/CCRenderPass.h:
+        (CCRenderPass):
+        * platform/graphics/chromium/cc/CCRenderSurface.cpp:
+        (WebCore::CCRenderSurface::prepareContentsTexture):
+        (WebCore::CCRenderSurface::hasCachedContentsTexture):
+        (WebCore):
+        (WebCore::CCRenderSurface::contentsChanged):
+        * platform/graphics/chromium/cc/CCRenderSurface.h:
+        (CCRenderSurface):
+
 2012-06-16  Xianzhu Wang  <[email protected]>
 
         [Chromium] Move chromium/public/linuxish/WebFontRendering.h out of linuxish directory

Modified: branches/chromium/1180/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (120995 => 120996)


--- branches/chromium/1180/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-06-22 02:40:40 UTC (rev 120996)
@@ -635,7 +635,7 @@
 
 static bool scrollAnimationEnabledForSystem()
 {
-#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION)
+#if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION) || PLATFORM(CHROMIUM)
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimationEnabled"];
 #else
     return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimationEnabled"];

Modified: branches/chromium/1180/Tools/ChangeLog (120995 => 120996)


--- branches/chromium/1180/Tools/ChangeLog	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Tools/ChangeLog	2012-06-22 02:40:40 UTC (rev 120996)
@@ -1,3 +1,161 @@
+2012-06-18  Nico Weber  <[email protected]>
+
+        [chromium/mac] Unbreak smooth scrolling.
+        https://bugs.webkit.org/show_bug.cgi?id=89327
+
+        Reviewed by Dimitri Glazkov.
+
+        Broken by Sam in r115589 / r115591.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetDefaultsToConsistentValues):
+        * TestWebKitAPI/mac/InjectedBundleControllerMac.mm:
+        (TestWebKitAPI::InjectedBundleController::platformInitialize):
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+
+2012-06-18  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r120541, r120547, and r120548.
+        http://trac.webkit.org/changeset/120541
+        http://trac.webkit.org/changeset/120547
+        http://trac.webkit.org/changeset/120548
+        https://bugs.webkit.org/show_bug.cgi?id=89383
+
+        This approach doesn't work for WebKit2 (Requested by abarth on
+        #webkit).
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (setBackingScaleFactorCallback):
+        (LayoutTestController::staticFunctions):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController):
+        * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/win/LayoutTestControllerWin.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
+        (LayoutTestController::setBackingScaleFactor):
+        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didReceiveMessage):
+        (WTR::InjectedBundle::postSetBackingScaleFactor):
+        (WTR):
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        (InjectedBundle):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::setBackingScaleFactor):
+        (WTR):
+        (WTR::LayoutTestController::callSetBackingScaleFactorCallback):
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
+        (LayoutTestController):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
+
+2012-06-18  Zan Dobersek  <[email protected]>
+
+        REGRESSION(r120546): It made 3 webkitpy tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=89332
+
+        Reviewed by Adam Barth.
+
+        Update the BaselineOptimizer unittest after r120546.
+
+        * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
+        (BaselineOptimizerTest.test_no_add_mac_future):
+        (BaselineOptimizerTest.test_mac_future):
+        (BaselineOptimizerTest.test_complex_shadowing):
+
+2012-06-18  Dirk Pranke  <[email protected]>
+
+        new-run-webkit-tests output gets confused when logging
+        https://bugs.webkit.org/show_bug.cgi?id=63793
+
+        Reviewed by Adam Barth.
+
+        Ship all of the log messages generated in the worker back
+        to the manager; this allows the messages to be properly
+        serialized to stderr and for the meter to flush its output correctly.
+
+        Note however that this will likely result in messages to be
+        logged out of order between workers; I'm not sure that there's
+        an easy way to fix this short of buffering a potentially
+        unbounded amount of data. It might be better to just log through
+        stderr unless we're in 'metering' mode, but it's also worth
+        noting that we already get messages out of order through stderr
+        on Windows.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.handle_done):
+        (Manager.handle_finished_test):
+        (Manager._log_messages):
+        * Scripts/webkitpy/layout_tests/controllers/worker.py:
+        (Worker.__init__):
+        (Worker._set_up_logging):
+        (Worker.run):
+        (Worker._run_test):
+        (Worker.cleanup):
+        (Worker.run_single_test):
+        (_WorkerLogHandler):
+        (_WorkerLogHandler.__init__):
+        (_WorkerLogHandler.emit):
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.write):
+        (MeteredStream.writeln):
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer.writeln):
+
+2012-06-18  Zan Dobersek  <[email protected]>
+
+        [garden-o-matic] Builder names without underscores cause incorrect BuildSelector behavior
+        https://bugs.webkit.org/show_bug.cgi?id=89362
+
+        Reviewed by Simon Fraser.
+
+        Replace white spaces, braces and dots in the builder name with underscores. This
+        way the JQuery tabs will be properly matched with the according container.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
+
+2012-06-18  Dirk Pranke  <[email protected]>
+
+        nrwt: metered output doesn't handle ^C cleanly
+        https://bugs.webkit.org/show_bug.cgi?id=89249
+
+        Reviewed by Tony Chang.
+
+        If you ctrl-c a running nrwt (w/o --verbose), then all but
+        two characters of the last update are erased, and then we print
+        "interrupted, exiting" as an update, which itself then gets
+        erased. Fix this so that we flush the meter (making the last
+        update persistent, so that we print the ^C for a visual clue),
+        print the interrupt message, and move on ...
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests):
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.flush):
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer._write):
+        (Printer):
+        (Printer.flush):
+
+2012-06-18  Xianzhu Wang  <[email protected]>
+
+        [Chromium] Change back "linuxish" to "linux" and include WebFontRendering.cpp on Android
+        https://bugs.webkit.org/show_bug.cgi?id=89228
+
+        Reviewed by Tony Chang.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        * DumpRenderTree/chromium/TestShellAndroid.cpp:
+
 2012-06-18  Mario Sanchez Prada  <[email protected]>
 
         [GTK] Get rid of DumpRenderTreeSupportGtk::{in|de}crementAccessibilityValue

Modified: branches/chromium/1180/Tools/DumpRenderTree/mac/DumpRenderTree.mm (120995 => 120996)


--- branches/chromium/1180/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-06-22 02:40:40 UTC (rev 120996)
@@ -590,7 +590,7 @@
 #endif
 
 
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
     [defaults setBool:NO forKey:@"NSScrollAnimationEnabled"];
 #else
     [defaults setBool:NO forKey:@"AppleScrollAnimationEnabled"];

Modified: branches/chromium/1180/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm (120995 => 120996)


--- branches/chromium/1180/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Tools/TestWebKitAPI/mac/InjectedBundleControllerMac.mm	2012-06-22 02:40:40 UTC (rev 120996)
@@ -40,7 +40,7 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
                           [NSNumber numberWithInteger:4],   @"AppleAntiAliasingThreshold",
                           [NSNumber numberWithInteger:0],   @"AppleFontSmoothing",
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
                           [NSNumber numberWithBool:NO],     @"NSScrollAnimationEnabled",
 #else
                           [NSNumber numberWithBool:NO],     @"AppleScrollAnimationEnabled",

Modified: branches/chromium/1180/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (120995 => 120996)


--- branches/chromium/1180/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm	2012-06-22 02:39:22 UTC (rev 120995)
+++ branches/chromium/1180/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm	2012-06-22 02:40:40 UTC (rev 120996)
@@ -34,7 +34,7 @@
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithInteger:4],   @"AppleAntiAliasingThreshold",
         [NSNumber numberWithInteger:0],   @"AppleFontSmoothing",
-#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) && !PLATFORM(CHROMIUM)
         [NSNumber numberWithBool:NO],     @"NSScrollAnimationEnabled",
 #else
         [NSNumber numberWithBool:NO],     @"AppleScrollAnimationEnabled",
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to