Title: [90511] branches/chromium/782/Source/WebKit/chromium
Revision
90511
Author
[email protected]
Date
2011-07-06 16:21:56 -0700 (Wed, 06 Jul 2011)

Log Message

Merge 90185 - 2011-06-30  John Bates  <[email protected]>

        Reviewed by James Robinson.

        Chromium bug: Compositing on a lost context causes latch deadlocks.
        The cause of deadlock was that a setLatch command is added to the lost
        compositor GL context, and a waitLatch would never complete on a child context.
        This change checks whether the compositor context is in error state before
        doing the compositing.
        https://bugs.webkit.org/show_bug.cgi?id=63681

        * src/WebViewImpl.cpp:
        (WebKit::WebViewImpl::composite):

[email protected]
BUG=87996
Review URL: http://codereview.chromium.org/7316012

Modified Paths

Diff

Modified: branches/chromium/782/Source/WebKit/chromium/ChangeLog (90510 => 90511)


--- branches/chromium/782/Source/WebKit/chromium/ChangeLog	2011-07-06 23:14:35 UTC (rev 90510)
+++ branches/chromium/782/Source/WebKit/chromium/ChangeLog	2011-07-06 23:21:56 UTC (rev 90511)
@@ -1,3 +1,559 @@
+2011-06-30  John Bates  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        Chromium bug: Compositing on a lost context causes latch deadlocks.
+        The cause of deadlock was that a setLatch command is added to the lost
+        compositor GL context, and a waitLatch would never complete on a child context.
+        This change checks whether the compositor context is in error state before
+        doing the compositing.
+        https://bugs.webkit.org/show_bug.cgi?id=63681
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::composite):
+
+2011-06-30  Cary Clark  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        Use Skia if Skia on Mac Chrome is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=62999
+
+        * WebKit.gyp:
+        If building for Skia, exclude CG files.
+        If not, exclude Skia files.
+
+        * features.gypi:
+        Enable Skia on Chromium Mac if so instructed by the gyp define.
+        Allow Skia to be hardware accelerated on the Mac.
+
+        * public/WebCommon.h:
+        If Skia is defined on the Mac, define it in the WebXXX
+        interfaces as well.
+
+2011-06-30  Sreeram Ramachandran  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        Suppress modal _javascript_/HTML dialogs during unload events
+        https://bugs.webkit.org/show_bug.cgi?id=56397
+
+        Implementation of the new shouldRunModalDialogDuringPageDismissal() API
+        to block alerts during unload handlers. Logs such events to the console
+        and updates histograms.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::shouldRunModalDialogDuringPageDismissal):
+        * src/ChromeClientImpl.h:
+
+2011-06-30  Anders Carlsson  <[email protected]>
+
+        Reviewed by Dan Bernstein.
+
+        More ScrollableArea scaffolding
+        https://bugs.webkit.org/show_bug.cgi?id=63678
+
+        Add an enclosingScrollableArea stub.
+
+        * src/WebScrollbarImpl.cpp:
+        (WebKit::WebScrollbarImpl::enclosingScrollableArea):
+        * src/WebScrollbarImpl.h:
+
+2011-06-28  Hans Wennborg  <[email protected]>
+
+        Reviewed by Tony Chang.
+
+        IndexedDB: Prepare for running layout tests with LevelDB
+        https://bugs.webkit.org/show_bug.cgi?id=63593
+
+        WebIDBFactory should decide what DefaultBackingStore means.
+        Also fix handling of layout test and incognito mode properly.
+
+        * src/WebIDBFactoryImpl.cpp:
+        (WebKit::WebIDBFactoryImpl::open):
+
+2011-06-30  Alexander Pavlov  <[email protected]>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Autofill suggestions appear in upper left corner after input change
+        https://bugs.webkit.org/show_bug.cgi?id=63702
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::screenToWindow): Implemented.
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::refreshAutoFillPopup): Pass screen (not window) coordinates into setWindowRect().
+
+2011-06-30  Kentaro Hara  <[email protected]>
+
+        Reviewed by Kent Tamura.
+
+        Change the label of an HTML5 file chooser button to "Choose Files"
+        https://bugs.webkit.org/show_bug.cgi?id=49245
+
+        We should notify capability of multiple files to users.
+
+        Test: fast/forms/input-file-label.html
+
+        * DEPS:
+        * public/WebLocalizedString.h: Depends on chromium_rev>=91051.
+        * src/LocalizedStrings.cpp:
+        (WebCore::fileButtonChooseMultipleFilesLabel): Returns a "Choose Files" label.
+
+2011-06-29  James Hawkins  <[email protected]>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Fix a crash on when executeCommand(copy) is called on a null node.
+        https://bugs.webkit.org/show_bug.cgi?id=63626
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::pluginContainerFromNode):
+
+2011-06-29  Andrey Kosyakov  <[email protected]>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: backend needs to provide system-unique object ids, so these remain unique across navigation
+        https://bugs.webkit.org/show_bug.cgi?id=62894
+
+        * public/WebDevToolsAgent.h:
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::setAgentProcessIdentifier):
+        * src/WebDevToolsAgentImpl.h:
+
+2011-06-28  Ilya Sherman  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        form.autocomplete="off" does not work
+        https://bugs.webkit.org/show_bug.cgi?id=35823
+
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::autofill): Update callsite.
+        * src/WebFormElement.cpp:
+        (WebKit::WebFormElement::autoComplete): Update callsite.
+        * src/WebInputElement.cpp:
+        (WebKit::WebInputElement::autoComplete): Update callsite.
+        * src/WebPasswordFormUtils.cpp:
+        (WebKit::findPasswordFormFields): Update callsite.
+
+2011-06-28  Ryosuke Niwa  <[email protected]>
+
+        Rolled DEPS.
+
+        * DEPS:
+
+2011-06-28  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r89968.
+        http://trac.webkit.org/changeset/89968
+        https://bugs.webkit.org/show_bug.cgi?id=63581
+
+        Broke chromium windows compile (Requested by jamesr on
+        #webkit).
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebCommon.h:
+
+2011-06-28  Cary Clark  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        Use Skia if Skia on Mac Chrome is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=62999
+
+        * WebKit.gyp:
+        If building for Skia, exclude CG files.
+        If not, exclude Skia files.
+
+        * features.gypi:
+        Enable Skia on Chromium Mac if so instructed by the gyp define.
+        Allow Skia to be hardware accelerated on the Mac.
+
+        * public/WebCommon.h:
+        If Skia is defined on the Mac, define it in the WebXXX
+        interfaces as well.
+
+2011-06-28  Ryosuke Niwa  <[email protected]>
+
+        Rolled DEPS.
+
+        * DEPS:
+
+2011-06-27  James Hawkins  <[email protected]>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Pass an optional WebNode that is the node receiving the context menu action.
+        https://bugs.webkit.org/show_bug.cgi?id=63503
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::pluginContainerFromNode):
+        (WebKit::WebFrameImpl::executeCommand):
+        (WebKit::WebFrameImpl::printBegin):
+        * src/WebFrameImpl.h:
+
+2011-06-27  Ryosuke Niwa  <[email protected]>
+
+        Rolled DEPS.
+
+        * DEPS:
+
+2011-06-27  Jay Civelli  <[email protected]>
+
+        Reviewed by Darin Fisher.
+
+        Adding binary part support to MHTML.
+        https://bugs.webkit.org/show_bug.cgi?id=63310
+
+        * public/WebPageSerializer.h:
+        * src/WebPageSerializer.cpp:
+        (WebKit::WebPageSerializer::serializeToMHTML):
+        (WebKit::WebPageSerializer::serializeToMHTMLUsingBinaryEncoding):
+
+2011-05-17  Nat Duca  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [chromium] Implement CCLayerTreeHost and CCLayerTreeHostImpl portions of threaded compositor
+        https://bugs.webkit.org/show_bug.cgi?id=58408
+
+        Redirect invalidates and scheduling into compositor when in
+        threaded compositing mode. Add stress tests for CCLayerTreeHost.
+
+        * WebKit.gypi:
+        * public/WebWidget.h:
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::animate):
+        * src/WebPopupMenuImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::animate):
+        (WebKit::WebViewImpl::paint):
+        (WebKit::WebViewImpl::animateAndLayout):
+        (WebKit::WebViewImpl::updateLayers):
+        (WebKit::WebViewImpl::composite):
+        (WebKit::WebViewImpl::setRootLayerNeedsDisplay):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        (WebKit::WebViewImpl::doComposite):
+        (WebKit::WebViewImpl::createLayerTreeHostContext3D):
+        (WebKit::WebViewImpl::reallocateRenderer):
+        (WebKit::WebViewImpl::updateLayerRendererSettings):
+        (WebKit::WebViewImpl::updateLayerRendererViewport):
+        * src/WebViewImpl.h:
+        * tests/CCLayerTreeHostTest.cpp: Added.
+        (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
+        (WTF::CCLayerTreeHostTest::animateAndLayout):
+        (WTF::CCLayerTreeHostTest::beginCommitOnCCThread):
+        (WTF::CCLayerTreeHostTest::beginCommitOnMainThread):
+        (WTF::CCLayerTreeHostTest::commitOnCCThread):
+        (WTF::CCLayerTreeHostTest::commitCompleteOnCCThread):
+        (WTF::CCLayerTreeHostTest::commitCompleteOnMainThread):
+        (WTF::CCLayerTreeHostTest::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTest::updateLayers):
+        (WTF::CCLayerTreeHostTest::onBeginTest):
+        (WTF::CCLayerTreeHostTest::doEndTest):
+        (WTF::CCLayerTreeHostTest::onEndTest):
+        (WTF::CCLayerTreeHostTest::runTest):
+        (WTF::CCLayerTreeHostTest::testTimeout):
+        (WTF::MockLayerTreeHostClient::MockLayerTreeHostClient):
+        (WTF::MockLayerTreeHostClient::createLayerTreeHostContext3D):
+        (WTF::MockLayerTreeHostClient::animateAndLayout):
+        (WTF::MockLayerTreeHostClient::updateLayers):
+        (WTF::MockLayerTreeHostCommitter::create):
+        (WTF::MockLayerTreeHostCommitter::commit):
+        (WTF::MockLayerTreeHostCommitter::MockLayerTreeHostCommitter):
+        (WTF::MockLayerTreeHostImpl::create):
+        (WTF::MockLayerTreeHostImpl::beginCommit):
+        (WTF::MockLayerTreeHostImpl::commitComplete):
+        (WTF::MockLayerTreeHostImpl::drawLayersAndPresent):
+        (WTF::MockLayerTreeHostImpl::MockLayerTreeHostImpl):
+        (WTF::MockLayerTreeHostImplProxy::create):
+        (WTF::MockLayerTreeHostImplProxy::createLayerTreeHostImpl):
+        (WTF::MockLayerTreeHostImplProxy::MockLayerTreeHostImplProxy):
+        (WTF::MockLayerTreeHost::MockLayerTreeHost):
+        (WTF::MockLayerTreeHost::createLayerTreeHostImplProxy):
+        (WTF::MockLayerTreeHost::updateLayers):
+        (WTF::MockLayerTreeHost::createLayerTreeHostCommitter):
+        (WTF::MockLayerTreeHost::beginCommit):
+        (WTF::MockLayerTreeHost::commitComplete):
+        (WTF::CCLayerTreeHostTest::doBeginTest):
+        (WTF::CCLayerTreeHostTest::endTest):
+        (WTF::CCLayerTreeHostTestShortlived1::CCLayerTreeHostTestShortlived1):
+        (WTF::CCLayerTreeHostTestShortlived1::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived1::afterTest):
+        (WTF::TEST_F):
+        (WTF::CCLayerTreeHostTestShortlived2::CCLayerTreeHostTestShortlived2):
+        (WTF::CCLayerTreeHostTestShortlived2::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived2::afterTest):
+        (WTF::CCLayerTreeHostTestShortlived3::CCLayerTreeHostTestShortlived3):
+        (WTF::CCLayerTreeHostTestShortlived3::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived3::afterTest):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::CCLayerTreeHostTestCommitingWithContinuousRedraw):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::beginTest):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::commitCompleteOnCCThread):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::CCLayerTreeHostTestSetNeedsCommit1):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::CCLayerTreeHostTestSetNeedsCommit2):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::CCLayerTreeHostTestSetNeedsRedraw):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::afterTest):
+        * tests/CCThreadTest.cpp:
+        (WebCore::TEST):
+
+2011-06-27  Yuta Kitamura  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] Add useHixie76WebSocketProtocol to WebSettings
+        https://bugs.webkit.org/show_bug.cgi?id=63424
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setHixie76WebSocketProtocolEnabled):
+        * src/WebSettingsImpl.h:
+
+2011-06-26  Adam Barth  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Remove WebSecurityOrigin::grantUniversalAccess
+        https://bugs.webkit.org/show_bug.cgi?id=63415
+
+        This function has no callers and is downright dangerous.
+
+        * public/WebSecurityOrigin.h:
+        * src/WebSecurityOrigin.cpp:
+
+2011-06-26  Adam Barth  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Remove code behind WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
+        https://bugs.webkit.org/show_bug.cgi?id=63402
+
+        These old APIs are no longer needed.
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        * src/WebFrameImpl.h:
+
+2011-06-25  Adam Barth  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] Update WebKit for WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
+        https://bugs.webkit.org/show_bug.cgi?id=63394
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchWillPerformClientRedirect):
+
+2011-06-25  Adam Barth  <[email protected]>
+
+        Roll Chromium DEPS.
+
+        * DEPS:
+
+2011-06-25  Adam Barth  <[email protected]>
+
+        Unreviewed build fix.  Remove ifdefs around these two functions because
+        we're not planning to move them.  This patch makes WebFrameImpl.h
+        consistent with WebFrame.h so we can build with the new API
+        configuration.
+
+        * src/WebFrameImpl.h:
+
+2011-06-24  Nat Duca  <[email protected]>
+
+        Unreviewed, rolling out r89694.
+        http://trac.webkit.org/changeset/89694
+        https://bugs.webkit.org/show_bug.cgi?id=58408
+
+        Test shell still not ready for animate changes.
+
+        * WebKit.gypi:
+        * public/WebWidget.h:
+        (WebKit::WebWidget::animate):
+        (WebKit::WebWidget::composite):
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::animate):
+        * src/WebPopupMenuImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize):
+        (WebKit::WebViewImpl::animate):
+        (WebKit::WebViewImpl::paint):
+        (WebKit::WebViewImpl::composite):
+        (WebKit::WebViewImpl::fullFramePluginZoomLevelChanged):
+        (WebKit::WebView::zoomLevelToZoomFactor):
+        (WebKit::WebViewImpl::setRootLayerNeedsDisplay):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        (WebKit::WebViewImpl::doComposite):
+        (WebKit::WebViewImpl::reallocateRenderer):
+        (WebKit::WebViewImpl::updateLayerRendererViewport):
+        (WebKit::WebViewImpl::graphicsContext3D):
+        * src/WebViewImpl.h:
+        * tests/CCLayerTreeHostTest.cpp: Removed.
+        * tests/CCThreadTest.cpp:
+        (WebCore::TEST):
+
+2011-05-17  Nat Duca  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [chromium] Implement CCLayerTreeHost and CCLayerTreeHostImpl portions of threaded compositor
+        https://bugs.webkit.org/show_bug.cgi?id=58408
+
+        Redirect invalidates and scheduling into compositor when in
+        threaded compositing mode. Add stress tests for CCLayerTreeHost.
+
+        * WebKit.gypi:
+        * public/WebWidget.h:
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::animate):
+        * src/WebPopupMenuImpl.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::animate):
+        (WebKit::WebViewImpl::paint):
+        (WebKit::WebViewImpl::animateAndLayout):
+        (WebKit::WebViewImpl::updateLayers):
+        (WebKit::WebViewImpl::composite):
+        (WebKit::WebViewImpl::setRootLayerNeedsDisplay):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        (WebKit::WebViewImpl::doComposite):
+        (WebKit::WebViewImpl::createLayerTreeHostContext3D):
+        (WebKit::WebViewImpl::reallocateRenderer):
+        (WebKit::WebViewImpl::updateLayerRendererSettings):
+        (WebKit::WebViewImpl::updateLayerRendererViewport):
+        * src/WebViewImpl.h:
+        * tests/CCLayerTreeHostTest.cpp: Added.
+        (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
+        (WTF::CCLayerTreeHostTest::animateAndLayout):
+        (WTF::CCLayerTreeHostTest::beginCommitOnCCThread):
+        (WTF::CCLayerTreeHostTest::beginCommitOnMainThread):
+        (WTF::CCLayerTreeHostTest::commitOnCCThread):
+        (WTF::CCLayerTreeHostTest::commitCompleteOnCCThread):
+        (WTF::CCLayerTreeHostTest::commitCompleteOnMainThread):
+        (WTF::CCLayerTreeHostTest::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTest::updateLayers):
+        (WTF::CCLayerTreeHostTest::onBeginTest):
+        (WTF::CCLayerTreeHostTest::doEndTest):
+        (WTF::CCLayerTreeHostTest::onEndTest):
+        (WTF::CCLayerTreeHostTest::runTest):
+        (WTF::CCLayerTreeHostTest::testTimeout):
+        (WTF::MockLayerTreeHostClient::MockLayerTreeHostClient):
+        (WTF::MockLayerTreeHostClient::createLayerTreeHostContext3D):
+        (WTF::MockLayerTreeHostClient::animateAndLayout):
+        (WTF::MockLayerTreeHostClient::updateLayers):
+        (WTF::MockLayerTreeHostCommitter::create):
+        (WTF::MockLayerTreeHostCommitter::commit):
+        (WTF::MockLayerTreeHostCommitter::MockLayerTreeHostCommitter):
+        (WTF::MockLayerTreeHostImpl::create):
+        (WTF::MockLayerTreeHostImpl::beginCommit):
+        (WTF::MockLayerTreeHostImpl::commitComplete):
+        (WTF::MockLayerTreeHostImpl::drawLayersAndPresent):
+        (WTF::MockLayerTreeHostImpl::MockLayerTreeHostImpl):
+        (WTF::MockLayerTreeHostImplProxy::create):
+        (WTF::MockLayerTreeHostImplProxy::createLayerTreeHostImpl):
+        (WTF::MockLayerTreeHostImplProxy::MockLayerTreeHostImplProxy):
+        (WTF::MockLayerTreeHost::MockLayerTreeHost):
+        (WTF::MockLayerTreeHost::createLayerTreeHostImplProxy):
+        (WTF::MockLayerTreeHost::updateLayers):
+        (WTF::MockLayerTreeHost::createLayerTreeHostCommitter):
+        (WTF::MockLayerTreeHost::beginCommit):
+        (WTF::MockLayerTreeHost::commitComplete):
+        (WTF::CCLayerTreeHostTest::doBeginTest):
+        (WTF::CCLayerTreeHostTest::endTest):
+        (WTF::CCLayerTreeHostTestShortlived1::CCLayerTreeHostTestShortlived1):
+        (WTF::CCLayerTreeHostTestShortlived1::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived1::afterTest):
+        (WTF::TEST_F):
+        (WTF::CCLayerTreeHostTestShortlived2::CCLayerTreeHostTestShortlived2):
+        (WTF::CCLayerTreeHostTestShortlived2::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived2::afterTest):
+        (WTF::CCLayerTreeHostTestShortlived3::CCLayerTreeHostTestShortlived3):
+        (WTF::CCLayerTreeHostTestShortlived3::beginTest):
+        (WTF::CCLayerTreeHostTestShortlived3::afterTest):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::CCLayerTreeHostTestCommitingWithContinuousRedraw):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::beginTest):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::commitCompleteOnCCThread):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestCommitingWithContinuousRedraw::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::CCLayerTreeHostTestSetNeedsCommit1):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit1::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::CCLayerTreeHostTestSetNeedsCommit2):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsCommit2::afterTest):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::CCLayerTreeHostTestSetNeedsRedraw):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::beginTest):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::drawLayersAndPresentOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::commitOnCCThread):
+        (WTF::CCLayerTreeHostTestSetNeedsRedraw::afterTest):
+        * tests/CCThreadTest.cpp:
+        (WebCore::TEST):
+
+2011-06-24  Chris Rogers  <[email protected]>
+
+        Reviewed by Kenneth Russell.
+
+        Enable Web Audio for Chromium Win
+        https://bugs.webkit.org/show_bug.cgi?id=63338
+
+        * features.gypi:
+
+2011-06-24  Dominic Cooney  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Convert shadow DOM-related tests to use window.internals
+        https://bugs.webkit.org/show_bug.cgi?id=61671
+
+        Remove shadow DOM-related methods from Chromium API. These are not
+        required any more.
+
+        * public/WebElement.h:
+        * src/WebElement.cpp:
+
+2011-06-24  Vsevolod Vlasov  <[email protected]>
+
+        Reviewed by Darin Fisher.
+
+        Web Inspector: [Chromium] Successfully prefetched page shows up as an error in console
+        https://bugs.webkit.org/show_bug.cgi?id=62396
+
+        * public/WebURLError.h:
+        (WebKit::WebURLError::WebURLError):
+        * src/WebURLError.cpp:
+        (WebKit::WebURLError::operator=):
+        (WebKit::WebURLError::operator ResourceError):
+
+2011-06-23  Yury Semikhatsky  <[email protected]>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Web Inspector: provide context menu item for enabling native worker inspection
+        https://bugs.webkit.org/show_bug.cgi?id=63258
+
+        * src/js/DevTools.js:
+        ():
+
 2011-06-23  John Bates  <[email protected]>
 
         Reviewed by James Robinson.

Modified: branches/chromium/782/Source/WebKit/chromium/src/WebViewImpl.cpp (90510 => 90511)


--- branches/chromium/782/Source/WebKit/chromium/src/WebViewImpl.cpp	2011-07-06 23:14:35 UTC (rev 90510)
+++ branches/chromium/782/Source/WebKit/chromium/src/WebViewImpl.cpp	2011-07-06 23:21:56 UTC (rev 90511)
@@ -1144,15 +1144,19 @@
         m_recreatingGraphicsContext = false;
         return;
     }
-    doComposite();
 
-    // Finish if requested.
-    if (finish)
-        m_layerRenderer->finish();
+    // Do not composite if the compositor context is already lost.
+    if (!m_layerRenderer->isCompositorContextLost()) {
+        doComposite();
 
-    // Put result onscreen.
-    m_layerRenderer->present();
+        // Finish if requested.
+        if (finish)
+            m_layerRenderer->finish();
 
+        // Put result onscreen.
+        m_layerRenderer->present();
+    }
+
     if (m_layerRenderer->isCompositorContextLost()) {
         // Trying to recover the context right here will not work if GPU process
         // died. This is because GpuChannelHost::OnErrorMessage will only be
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to