Title: [88430] branches/chromium/782/Source
Revision
88430
Author
[email protected]
Date
2011-06-08 23:47:15 -0700 (Wed, 08 Jun 2011)

Log Message

Merge 88429 - 2011-06-08  Justin Novosad  <[email protected]>

        Reviewed by James Robinson.

        [Chromium] Crash when closing a tab with accelerated 2d canvas
        https://bugs.webkit.org/show_bug.cgi?id=62324
        Upon graphics context destruction, it is important to signal skia
        to abandon all of its resource handles.  This prevents a crash caused
        by skia attempting to release resources that were in the destroyed
        graphics context.

        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
        (WebCore::SharedGraphicsContext3D::~SharedGraphicsContext3D):
2011-06-08  Justin Novosad  <[email protected]>

        Reviewed by James Robinson.

        [Chromium] Crash when closing a tab with accelerated 2d canvas
        https://bugs.webkit.org/show_bug.cgi?id=62324
        In GraphicsContext3DInternal::setContextLostCallback we are passing a
        non-refcounted ptr to a refcounted member. this can cause an access
        violation after the destruction of GraphicsContext3D.  Upon destruction
        a null callback is sent to setContextLostCallback, which is good
        except that it gets placed in a non-null adapter object.  This fix
        prevents the creation of the adapter when the callback is null, thus
        preventing a later crash.

        * src/GraphicsContext3DChromium.cpp:
        (WebCore::GraphicsContextLostCallbackAdapter::create):

[email protected]
BUG=85309
Review URL: http://codereview.chromium.org/7046071

Modified Paths

Diff

Modified: branches/chromium/782/Source/WebCore/ChangeLog (88429 => 88430)


--- branches/chromium/782/Source/WebCore/ChangeLog	2011-06-09 06:40:44 UTC (rev 88429)
+++ branches/chromium/782/Source/WebCore/ChangeLog	2011-06-09 06:47:15 UTC (rev 88430)
@@ -1,3 +1,239 @@
+2011-06-08  Justin Novosad  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [Chromium] Crash when closing a tab with accelerated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=62324
+        Upon graphics context destruction, it is important to signal skia
+        to abandon all of its resource handles.  This prevents a crash caused
+        by skia attempting to release resources that were in the destroyed
+        graphics context.
+
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+        (WebCore::SharedGraphicsContext3D::~SharedGraphicsContext3D):
+
+2011-06-08  James Robinson  <[email protected]>
+
+        Reviewed by Darin Fisher.
+
+        REGRESSION(88260): 10-50% performance regression across many page cyclers
+        https://bugs.webkit.org/show_bug.cgi?id=62349
+
+        r88260 fixed a font cache resource leak and lowered the inactive font cache threshold.  The latter caused a
+        significant performance regression across many chromium page cyclers, for example
+        http://build.chromium.org/f/chromium/perf/linux-release-webkit-latest/moz/report.html?history=50&rev=88279.
+
+        This restores the previous inactive font size thresholds to their previous values, but retains the font cleanup
+        logic.
+
+        * platform/graphics/FontCache.cpp:
+
+2011-06-08  Hayato Ito  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        A forward/backward tab traversal now visits focusable elements in a shadow root.
+        https://bugs.webkit.org/show_bug.cgi?id=61410
+
+        Test: fast/dom/shadow/tab-order-iframe-and-shadow.html
+
+        Like a iframe element, a shadow host becomes a scope of
+        tabindex. That means all descendant elements in a shadow root are
+        skipped if the host node of the shadow root is not focusable.
+
+        The patch doesn't affect HTMLInputElement and HTMLTextAreaElement,
+        which uses a shadow root and do extra works in their focus()
+        method.
+
+        A shadow root's <content> is not considered in this patch.
+        That will be addressed in a following patch.
+
+        * page/FocusController.cpp:
+        (WebCore::shadowRoot):
+        (WebCore::isTreeScopeOwner):
+        (WebCore::FocusController::deepFocusableNode):
+        (WebCore::FocusController::advanceFocusInDocumentOrder):
+        (WebCore::FocusController::findFocusableNodeAcrossTreeScope):
+        (WebCore::FocusController::findFocusableNode):
+        (WebCore::FocusController::nextFocusableNode):
+        (WebCore::FocusController::previousFocusableNode):
+        (WebCore::FocusController::ownerOfTreeScope):
+        * page/FocusController.h:
+
+2011-06-08  Hayato Ito  <[email protected]>
+
+        Reviewed by Hajime Morita.
+
+        Makes sure that document.activeElement won't be an element in shadow root.
+
+        https://bugs.webkit.org/show_bug.cgi?id=61413
+
+        Test: fast/dom/shadow/activeelement-should-be-shadowhost.html
+
+        * html/HTMLDocument.cpp:
+        (WebCore::focusedFrameOwnerElement):
+        (WebCore::HTMLDocument::activeElement):
+
+2011-06-08  Kent Tamura  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Allow drawing a slider thumb for any nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=62196
+
+        RenderObject::node() should provide various information which is
+        necessary for rendering. We don't need to refer the parent renderer.
+
+        * dom/Node.cpp:
+        (WebCore::Node::focusDe1egate): Added.
+        * dom/Node.h: Added a declaration.
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::toParentMediaElement):
+          Added an overload of toParentMediaElement() with Node* parameter.
+        * html/shadow/MediaControlElements.h:
+        (WebCore::toParentMediaElement): ditto.
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::isEnabledFormControl):
+          Returns the status of the host node.
+        (WebCore::SliderThumbElement::isReadOnlyFormControl): ditto.
+        (WebCore::SliderThumbElement::focusDe1egate):
+          Returns the host node so that RenderTheme::isFocused() returns true.
+        (WebCore::SliderThumbElement::detach): Style nit.
+        (WebCore::SliderThumbElement::hostInput):
+          Make it const because it is called by const functions.
+        * html/shadow/SliderThumbElement.h:
+          - Remove inDragMode()
+          - Update declarations
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintMediaSliderThumb):
+          Use Node::shadowAncestorNode() instead of RenderObject::parent() to
+          support deeper thumb nodes.
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::paintMediaSliderThumb): ditto.
+        (WebCore::paintMediaVolumeSliderThumb): Remove isSlider() check.
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::inDragMode):
+          SliderThumbElement::inDragMode() was removed, and Node::active() has
+          the same information.
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::paint): Remove isSlider() checks.
+        (WebCore::RenderTheme::isFocused): Apply Node::focusDelegate().
+        * rendering/RenderThemeChromiumLinux.cpp:
+        (WebCore::RenderThemeChromiumLinux::paintSliderThumb):
+          isPressed() is enough.
+        * rendering/RenderThemeChromiumWin.cpp:
+          isEnabled(), isFocused(), and isPressed() are enough.
+        (WebCore::RenderThemeChromiumWin::determineSliderThumbState):
+        (WebCore::RenderThemeChromiumWin::determineClassicState):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSliderThumb):
+          - Remove isSlider() check.
+          - Passing 'o' to udpateFooState functions is enough.
+          - isPressed() is enough.
+        * rendering/RenderThemeSafari.cpp:
+        (WebCore::RenderThemeSafari::paintSliderThumb):
+          We don't need special handling anymore.
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::determineSliderThumbState):
+          isEnabled(), isFocused(), and isPressed() are enough.
+
+2011-06-08  Adam Barth  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        constructTreeFromToken can re-enter parser, causing ASSERTs
+        https://bugs.webkit.org/show_bug.cgi?id=62160
+
+        This patch clears the HTMLToken before constructing the tree from the
+        token, putting the HTMLDocumentParser in a good state to be re-entered.
+
+        Tests: fast/parser/document-write-onload-nesting.html
+               fast/parser/document-write-onload-ordering.html
+
+        * html/parser/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::pumpTokenizer):
+        * html/parser/HTMLToken.h:
+        (WebCore::HTMLToken::isUninitialized):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::constructTreeFromToken):
+
+2011-06-08  Kent Tamura  <[email protected]>
+
+        Fix Qt build for r88405.
+        https://bugs.webkit.org/show_bug.cgi?id=62208
+
+        * platform/qt/RenderThemeQt.h:
+
+2011-06-08  Kent Tamura  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Change the argument of RenderTheme::adjustSliderThumbSize(): RenderObject* -> RenderStyle*
+        https://bugs.webkit.org/show_bug.cgi?id=62208
+
+        Change the argument type of RenderTheme::adjustSliderThumbSize() and
+        RenderMediaControls::adjustMediaSliderThumbSize() from RenderObject* to RenderStyle*.
+
+        Also, each of adjustSliderThumbStyle() overrides calls RenderTheme::
+        adjustSliderThumbStyle() for future changes.
+
+        No new tests. This is a refactoring and should not change any behavior.
+
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::RenderSliderThumb::layout): Passing RenderStyle* and remove a FIXME comment.
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::adjustSliderThumbStyle): ditto.
+        (WebCore::RenderThemeGtk::adjustMediaSliderThumbSize):
+        * platform/gtk/RenderThemeGtk.h:
+        * platform/gtk/RenderThemeGtk2.cpp:
+        (WebCore::RenderThemeGtk::adjustSliderThumbSize):
+        * platform/gtk/RenderThemeGtk3.cpp:
+        (WebCore::RenderThemeGtk::adjustSliderThumbSize):
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::adjustSliderThumbStyle): ditto.
+        (WebCore::RenderThemeQt::adjustSliderThumbSize):
+        * rendering/RenderMediaControls.cpp:
+        (WebCore::RenderMediaControls::adjustMediaSliderThumbSize):
+        * rendering/RenderMediaControls.h:
+        * rendering/RenderMediaControlsChromium.cpp:
+        (WebCore::RenderMediaControlsChromium::adjustMediaSliderThumbSize):
+        * rendering/RenderMediaControlsChromium.h:
+        * rendering/RenderSlider.cpp:
+        (WebCore::RenderSlider::layout): Passing RenderStyle* and remove a FIXME comment.
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::adjustSliderThumbStyle): Add a comment.
+        (WebCore::RenderTheme::adjustSliderThumbSize):
+        * rendering/RenderTheme.h:
+        * rendering/RenderThemeChromiumLinux.cpp:
+        (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
+        * rendering/RenderThemeChromiumLinux.h:
+        * rendering/RenderThemeChromiumMac.h:
+        * rendering/RenderThemeChromiumMac.mm:
+        (WebCore::RenderThemeChromiumMac::adjustMediaSliderThumbSize):
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::adjustSliderThumbSize):
+        * rendering/RenderThemeChromiumSkia.h:
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::RenderThemeChromiumWin::adjustSliderThumbSize):
+        * rendering/RenderThemeChromiumWin.h:
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
+        (WebCore::RenderThemeMac::adjustSliderThumbSize):
+        (WebCore::RenderThemeMac::adjustMediaSliderThumbSize):
+        * rendering/RenderThemeSafari.cpp:
+        (WebCore::RenderThemeSafari::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
+        (WebCore::RenderThemeSafari::adjustSliderThumbSize):
+        * rendering/RenderThemeSafari.h:
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::adjustSliderThumbSize):
+        * rendering/RenderThemeWin.h:
+        * rendering/RenderThemeWinCE.cpp:
+        (WebCore::RenderThemeWinCE::adjustSliderThumbSize):
+        * rendering/RenderThemeWinCE.h:
+
 2011-06-08  Brian Salomon  <[email protected]>
 
         Reviewed by James Robinson.

Modified: branches/chromium/782/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp (88429 => 88430)


--- branches/chromium/782/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp	2011-06-09 06:40:44 UTC (rev 88429)
+++ branches/chromium/782/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp	2011-06-09 06:47:15 UTC (rev 88430)
@@ -121,7 +121,10 @@
     m_context->deleteBuffer(m_quadVertices);
     allContexts()->remove(this);
 #if USE(SKIA)
-    GrSafeUnref(m_grContext);
+    if (m_grContext) {
+        m_grContext->contextDestroyed();
+        GrSafeUnref(m_grContext);
+    }
 #endif
 }
 

Modified: branches/chromium/782/Source/WebKit/chromium/ChangeLog (88429 => 88430)


--- branches/chromium/782/Source/WebKit/chromium/ChangeLog	2011-06-09 06:40:44 UTC (rev 88429)
+++ branches/chromium/782/Source/WebKit/chromium/ChangeLog	2011-06-09 06:47:15 UTC (rev 88430)
@@ -1,3 +1,333 @@
+2011-06-08  Justin Novosad  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [Chromium] Crash when closing a tab with accelerated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=62324
+        In GraphicsContext3DInternal::setContextLostCallback we are passing a
+        non-refcounted ptr to a refcounted member. this can cause an access
+        violation after the destruction of GraphicsContext3D.  Upon destruction
+        a null callback is sent to setContextLostCallback, which is good
+        except that it gets placed in a non-null adapter object.  This fix
+        prevents the creation of the adapter when the callback is null, thus
+        preventing a later crash.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContextLostCallbackAdapter::create):
+
+2011-06-08  James Robinson  <[email protected]>
+
+        Hopefully last change to features.gypi - set ENABLE_REGISTER_PROTOCOL_HANDLER based off of the the variable set
+        in chromium's common.gypi. Should green up the chromium linux tester on build.webkit.org.
+
+        * features.gypi:
+
+2011-06-08  James Robinson  <[email protected]>
+
+        Set ENABLE_REGISTER_PROTOCOL_HANDLER=1 for chromium. I didn't mean to turn that off...
+
+        * features.gypi:
+
+2011-06-08  James Robinson  <[email protected]>
+
+        [chromium] Update the chromium-within-WebKit revision to r88481
+        https://bugs.webkit.org/show_bug.cgi?id=62353
+
+        * DEPS:
+
+2011-06-08  Sailesh Agrawal  <[email protected]>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Add stubs to WebWidget
+        https://bugs.webkit.org/show_bug.cgi?id=62263
+
+        This change add stub implementations for all WebWidget functions. Having stub methods should make it easier to add new functions to the class without breaking Chromium.
+
+        * public/WebWidget.h:
+        (WebKit::WebWidget::close):
+        (WebKit::WebWidget::size):
+        (WebKit::WebWidget::resize):
+        (WebKit::WebWidget::animate):
+        (WebKit::WebWidget::layout):
+        (WebKit::WebWidget::paint):
+        (WebKit::WebWidget::composite):
+        (WebKit::WebWidget::themeChanged):
+        (WebKit::WebWidget::handleInputEvent):
+        (WebKit::WebWidget::mouseCaptureLost):
+        (WebKit::WebWidget::setFocus):
+        (WebKit::WebWidget::setComposition):
+        (WebKit::WebWidget::confirmComposition):
+        (WebKit::WebWidget::compositionRange):
+        (WebKit::WebWidget::textInputType):
+        (WebKit::WebWidget::caretOrSelectionBounds):
+        (WebKit::WebWidget::selectionRange):
+        (WebKit::WebWidget::caretOrSelectionRange):
+        (WebKit::WebWidget::setTextDirection):
+        (WebKit::WebWidget::isAcceleratedCompositingActive):
+
+2011-06-08  Tom Sepez  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        Add new permission callbacks for mixed content blocking.
+        https://bugs.webkit.org/show_bug.cgi?id=61946
+
+        * public/WebPermissionClient.h:
+        (WebKit::WebPermissionClient::allowDisplayingInsecureContent):
+        (WebKit::WebPermissionClient::allowRunningInsecureContent):
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::allowDisplayingInsecureContent):
+        (WebKit::FrameLoaderClientImpl::allowRunningInsecureContent):
+        * src/FrameLoaderClientImpl.h:
+
+2011-06-08  Ryosuke Niwa  <[email protected]>
+
+        Added new entries for skia/third_party/glu.
+
+        * DEPS:
+
+2011-06-08  Ryosuke Niwa  <[email protected]>
+
+        Rolled DEPS.
+
+        * DEPS:
+
+2011-06-08  Ryan Sleevi  <[email protected]>
+
+        Reviewed by Tony Chang.
+
+        Suppress C++0x compat warnings when compiling Chromium port with GCC 4.6
+
+        Compiling Chromium port under GCC 4.6 produces warnings about nullptr
+        https://bugs.webkit.org/show_bug.cgi?id=62242
+
+        * WebKit.gyp:
+
+2011-06-08  Greg Simon  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Control Indexeddb backends from LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=61000
+
+        * public/WebIDBFactory.h:
+        * src/AssertMatchingEnums.cpp:
+        * src/WebIDBFactoryImpl.cpp:
+        (WebKit::WebIDBFactory::setOverrideBackingStoreType):
+        (WebKit::WebIDBFactory::setTemporaryDatabaseFolder):
+        (WebKit::WebIDBFactoryImpl::open):
+
+2011-06-08  Dominic Mazzoni  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add a method to return the line breaks for any element with
+        multiline text content.
+        https://bugs.webkit.org/show_bug.cgi?id=62236
+
+        * public/WebAccessibilityObject.h:
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::lineBreaks):
+
+2011-06-08  Ilya Tikhonovsky  <[email protected]>
+
+        Unreviewed chromium build fix for r88332.
+
+        * src/WebRuntimeFeatures.cpp:
+
+2011-06-08  Hironori Bono  <[email protected]>
+
+        Reviewed by Brent Fulgham.
+
+        Add SpellCheck API
+        https://bugs.webkit.org/show_bug.cgi?id=59693
+
+        This change adds two SpellCheck API functions (addSpellcheckRange and
+        removeSpellcheckRange) and one attribute (spellcheckRange) discussed in
+        the public-webapps ML. This change is currently available only on Chromium.
+
+        * features.gypi:
+        * public/WebRuntimeFeatures.h:
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableSpellCheckAPI):
+        (WebKit::WebRuntimeFeatures::isSpellCheckAPIEnabled):
+
+2011-06-07  James Kozianski  <[email protected]>
+
+        [Chromium] Unreviewed. Disable SelectItemEvenFire that fails on
+        chromium canaries.
+
+        * tests/PopupMenuTest.cpp:
+        (WebKit::TEST_F):
+
+2011-06-07  Robert Kroeger  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        [chromium] Add a basic gesture recognizer to the Chromium platform
+        https://bugs.webkit.org/show_bug.cgi?id=54417
+
+        Added unit tests for the basic chromium platform gesture recognizer.
+
+        * tests/InnerGestureRecognizerTest.cpp: Added.
+        (WebCore::InspectableInnerGestureRecognizer::InspectableInnerGestureRecognizer):
+        (WebCore::InspectableInnerGestureRecognizer::signature):
+        (WebCore::InspectableInnerGestureRecognizer::firstTouchPosition):
+        (WebCore::InspectableInnerGestureRecognizer::setFirstTouchTime):
+        (WebCore::InspectableInnerGestureRecognizer::firstTouchTime):
+        (WebCore::InspectableInnerGestureRecognizer::setLastTouchTime):
+        (WebCore::InspectableInnerGestureRecognizer::lastTouchTime):
+        (WebCore::InspectableInnerGestureRecognizer::edgeFunction):
+        (WebCore::InspectableInnerGestureRecognizer::updateValues):
+        (WebCore::InspectableInnerGestureRecognizer::addEdgeFunction):
+        (WebCore::BuildablePlatformTouchPoint::setX):
+        (WebCore::BuildablePlatformTouchPoint::setY):
+        (WebCore::BuildablePlatformTouchPoint::BuildablePlatformTouchPoint):
+        (WebCore::TestGestureRecognizer::TestGestureRecognizer):
+        (WebCore::TestGestureRecognizer::SetUp):
+        (WebCore::TestGestureRecognizer::TearDown):
+        (WebCore::TEST_F):
+
+2011-06-07  Vangelis Kokkevis  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        Disable compositing for RTL pages in the RenderLayerCompositor rather
+        than later on in the WebViewImpl.
+        https://bugs.webkit.org/show_bug.cgi?id=62246
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::allowedCompositingTriggers):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::layout):
+        (WebKit::WebViewImpl::setRootGraphicsLayer):
+
+2011-06-07  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r88254, r88262, and r88268.
+        http://trac.webkit.org/changeset/88254
+        http://trac.webkit.org/changeset/88262
+        http://trac.webkit.org/changeset/88268
+        https://bugs.webkit.org/show_bug.cgi?id=62234
+
+        I fail at changing features.gypi (Requested by abarth on
+        #webkit).
+
+        * features.gypi:
+
+2011-06-07  Adam Barth  <[email protected]>
+
+        Reviewed by Tony Chang.
+
+        Fix "branding" issue in features.gypi
+        https://bugs.webkit.org/show_bug.cgi?id=62229
+
+        Apparently we need to move the conditional block further out of the
+        nesting in order to see the branding variable.  This patch also remove
+        the dummy branding variable I added to get the buildbot building again.
+
+        * features.gypi:
+
+2011-06-07  Adam Barth  <[email protected]>
+
+        Attempt to fix the cr-win build.
+
+        * features.gypi:
+
+2011-06-07  Adam Barth  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Synchronize features.gypi and features_override.gypi in preparation for removing features_override.gypi
+        https://bugs.webkit.org/show_bug.cgi?id=62135
+
+        After this patch is rolled into Chromium, we should be able to delete
+        features_override.gyp downstream.  Once we do that, we can simplify
+        this file somewhat by removing at least on level of nesting.
+
+        * features.gypi:
+
+2011-06-03  Yury Semikhatsky  <[email protected]>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Web Inspector: correctly handle disconnect from worker when script execution is paused
+        https://bugs.webkit.org/show_bug.cgi?id=62019
+
+        Dispatch disconnecFrontend message in debugger task mode to make sure
+        it is processed even if execution is paused.
+
+        * src/WebWorkerImpl.cpp:
+        (WebKit::WebWorkerImpl::detachDevTools):
+        (WebKit::WebWorkerImpl::dispatchDevToolsMessage):
+
+2011-06-07  Naoki Takano  <[email protected]>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Click event is not fired for a menulist <select>
+        https://bugs.webkit.org/show_bug.cgi?id=60563
+
+        * tests/PopupMenuTest.cpp:
+        (WebKit::TestPopupMenuClient::TestPopupMenuClient): Initialize m_node.
+        (WebKit::TestPopupMenuClient::valueChanged): To fire 'change' event, forward the event like RenderMenuList.
+        (WebKit::TestPopupMenuClient::itemIsEnabled): Change to return true or false according to disabled item or not.
+        (WebKit::TestPopupMenuClient::setDisabledIndex): Set disabled index to simulate disabled item.
+        (WebKit::TestPopupMenuClient::setFocusedNode): Set focused node to dispatch the event.
+        (WebKit::SelectPopupMenuTest::SelectPopupMenuTest): Add baseURL.
+        (WebKit::SelectPopupMenuTest::TearDown): Add UnregisterAllMockedURLs() call.
+        (WebKit::SelectPopupMenuTest::registerMockedURLLoad): To simulate html load, call RegisterMockedURL().
+        (WebKit::SelectPopupMenuTest::serveRequests): Call ServeAsynchronousMockedRequests().
+        (WebKit::SelectPopupMenuTest::loadFrame): Simulate load frame with url string.
+        (WebKit::TEST_F): Implement SelectItemEventFire, SelectItemKeyEvent, SelectItemRemoveSelectOnChange and SelectItemRemoveSelectOnChange.
+        * tests/data/select_event.html: Added for SelectItemEventFire and SelectItemKeyEvent.
+        * tests/data/select_event_remove_on_change.html: Added SelectItemRemoveSelectOnChange.
+        * tests/data/select_event_remove_on_click.html: Added SelectItemRemoveSelectOnChange.
+        * WebKit.gyp: Added PopupMenuTest.cpp. Because webkit_support dependency is added, we can't build PopupMenuTest.cpp with Chromium-win (shared) configuration.
+
+2011-06-06  Nico Weber  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [chromium] Make WebViewImpl's destructor virtual
+        https://bugs.webkit.org/show_bug.cgi?id=62155
+
+        This is _not_ to fix a real bug, just to make clang's
+        -Wdelete-non-virtual-dtor happy. As discussed at
+        http://codereview.chromium.org/7094005/, we prefer making leaf class
+        destructors virtual over making the leaf classes final.
+
+        * src/WebViewImpl.h:
+
+2011-06-06  Daniel Cheng  <[email protected]>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Delete dead clipboard code.
+        https://bugs.webkit.org/show_bug.cgi?id=62113
+
+        * src/WebDragData.cpp:
+
+2011-06-06  Nico Weber  <[email protected]>
+
+        Reviewed by James Robinson.
+
+        [chromium] Make WebURLRequestPrivateImpl's and WebURLResponsePrivateImpl's destructors virtual
+        https://bugs.webkit.org/show_bug.cgi?id=62148
+
+        This is _not_ to fix a real bug, just to make clang's
+        -Wdelete-non-virtual-dtor happy. As discussed at
+        http://codereview.chromium.org/7094005/, we prefer making leaf class
+        destructors virtual over making the leaf classes final.
+
+        * src/WebURLRequest.cpp:
+        (WebKit::WebURLRequestPrivateImpl::~WebURLRequestPrivateImpl):
+        * src/WebURLResponse.cpp:
+        (WebKit::WebURLResponsePrivateImpl::~WebURLResponsePrivateImpl):
+
 2011-06-06  Shishir Agrawal  <[email protected]>
 
         Reviewed by Tony Gentilcore.

Modified: branches/chromium/782/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (88429 => 88430)


--- branches/chromium/782/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp	2011-06-09 06:40:44 UTC (rev 88429)
+++ branches/chromium/782/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp	2011-06-09 06:47:15 UTC (rev 88430)
@@ -1174,7 +1174,7 @@
 
 PassOwnPtr<GraphicsContextLostCallbackAdapter> GraphicsContextLostCallbackAdapter::create(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
 {
-    return adoptPtr(new GraphicsContextLostCallbackAdapter(cb));
+    return adoptPtr(cb.get() ? new GraphicsContextLostCallbackAdapter(cb) : 0);
 }
 
 void GraphicsContext3DInternal::setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to