Changeset 56301 in webkit


Ignore:
Timestamp:
Mar 20, 2010 2:04:37 AM (14 years ago)
Author:
Joseph Pecoraro
Message:

2010-03-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by David Kilzer.

Assertion failure in media/video-controls-with-mutation-event-handler.html
https://bugs.webkit.org/show_bug.cgi?id=36376

Test: media/video-controls-with-mutation-event-handler.html

Break early (when not attached) in the defaultEventHandler before the
slider is completely set up.

  • rendering/MediaControlElements.cpp: (WebCore::MediaControlTimelineElement::defaultEventHandler): (WebCore::MediaControlVolumeSliderElement::defaultEventHandler):
  • rendering/RenderMedia.cpp: (WebCore::RenderMedia::createVolumeSlider):
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r56297 r56301  
     12010-03-20  Joseph Pecoraro  <joepeck@webkit.org>
     2
     3        Reviewed by David Kilzer.
     4
     5        Assertion failure in media/video-controls-with-mutation-event-handler.html
     6        https://bugs.webkit.org/show_bug.cgi?id=36376
     7
     8        Test: media/video-controls-with-mutation-event-handler.html
     9
     10        Break early (when not attached) in the defaultEventHandler before the
     11        slider is completely set up.
     12
     13        * rendering/MediaControlElements.cpp:
     14        (WebCore::MediaControlTimelineElement::defaultEventHandler):
     15        (WebCore::MediaControlVolumeSliderElement::defaultEventHandler):
     16        * rendering/RenderMedia.cpp:
     17        (WebCore::RenderMedia::createVolumeSlider):
     18
    1192010-03-19  Shinichiro Hamaji  <hamaji@chromium.org>
    220
  • trunk/WebCore/rendering/MediaControlElements.cpp

    r54326 r56301  
    616616        return;
    617617
     618    if (!attached())
     619        return;
     620
    618621    if (event->type() == eventNames().mousedownEvent)
    619622        m_mediaElement->beginScrubbing();
     
    659662    // Left button is 0. Rejects mouse events not from left button.
    660663    if (event->isMouseEvent() && static_cast<MouseEvent*>(event)->button())
     664        return;
     665
     666    if (!attached())
    661667        return;
    662668
  • trunk/WebCore/rendering/RenderMedia.cpp

    r56250 r56301  
    264264    ASSERT(!m_volumeSlider);
    265265    m_volumeSlider = new MediaControlVolumeSliderElement(document(), mediaElement());
     266    m_volumeSlider->setAttribute(precisionAttr, "float");
    266267    m_volumeSlider->setAttribute(maxAttr, "1");
    267     m_volumeSlider->setAttribute(precisionAttr, "float");
    268268    m_volumeSlider->setAttribute(valueAttr, String::number(mediaElement()->volume()));
    269269    m_volumeSlider->attachToParent(m_volumeSliderContainer.get());
Note: See TracChangeset for help on using the changeset viewer.