Changeset 76636 in webkit


Ignore:
Timestamp:
Jan 25, 2011 1:14:50 PM (13 years ago)
Author:
weinig@apple.com
Message:

2011-01-25 Sam Weinig <sam@webkit.org>

Reviewed by Anders Carlsson.

Pipe a timestamp down into the PlatformWheelEvent for the Mac.
https://bugs.webkit.org/show_bug.cgi?id=53111

  • platform/PlatformWheelEvent.h: (WebCore::PlatformWheelEvent::PlatformWheelEvent): (WebCore::PlatformWheelEvent::timestamp): Add timestamp member.
  • platform/mac/WheelEventMac.mm: (WebCore::PlatformWheelEvent::PlatformWheelEvent): Initialize the timestamp from the event.

2011-01-25 Anders Carlsson <andersca@apple.com>

Reviewed by Sam Weinig.

Don't inform the UI process about compositing changes when using the new drawing area
https://bugs.webkit.org/show_bug.cgi?id=53120

  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::changeAcceleratedCompositingMode): Return early if we're using the new drawing area.

(WebKit::WebPage::exitAcceleratedCompositingMode):
Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r76633 r76636  
     12011-01-25  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Pipe a timestamp down into the PlatformWheelEvent for the Mac.
     6        https://bugs.webkit.org/show_bug.cgi?id=53111
     7
     8        * platform/PlatformWheelEvent.h:
     9        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
     10        (WebCore::PlatformWheelEvent::timestamp):
     11        Add timestamp member.
     12
     13        * platform/mac/WheelEventMac.mm:
     14        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
     15        Initialize the timestamp from the event.
     16
    1172011-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
    218
  • trunk/Source/WebCore/platform/PlatformWheelEvent.h

    r76622 r76636  
    101101            , m_hasPreciseScrollingDeltas(false)
    102102            , m_phase(PlatformWheelEventPhaseNone)
     103            , m_timestamp(0)
    103104#endif
    104105        {
     
    154155        PlatformWheelEventPhase phase() const { return m_phase; }
    155156        bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
     157        double timestamp() const { return m_timestamp; }
    156158#endif
    157159
     
    191193        bool m_hasPreciseScrollingDeltas;
    192194        PlatformWheelEventPhase m_phase;
     195        double m_timestamp;
    193196#endif
    194197    };
  • trunk/Source/WebCore/platform/mac/WheelEventMac.mm

    r76622 r76636  
    6565    , m_metaKey([event modifierFlags] & NSCommandKeyMask)
    6666    , m_phase(phaseForEvent(event))
     67    , m_timestamp([event timestamp])
    6768{
    6869    BOOL continuous;
  • trunk/Source/WebKit2/ChangeLog

    r76634 r76636  
    1212        (WebKit::WebPage::exitAcceleratedCompositingMode):
    1313        Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
     14
     152011-01-25  Sam Weinig  <sam@webkit.org>
     16
     17        Reviewed by Anders Carlsson.
     18
     19        Pipe a timestamp down into the PlatformWheelEvent for the Mac.
     20        https://bugs.webkit.org/show_bug.cgi?id=53111
     21
     22        * Shared/WebEventConversion.cpp:
     23        (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
     24        Assign the timestamp.
    1425
    15262011-01-25  Sam Weinig  <sam@webkit.org>
  • trunk/Source/WebKit2/Shared/WebEventConversion.cpp

    r76622 r76636  
    114114        m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase());
    115115        m_hasPreciseScrollingDeltas = webEvent.hasPreciseScrollingDeltas();
     116        m_timestamp = webEvent.timestamp();
    116117#endif
    117118    }
Note: See TracChangeset for help on using the changeset viewer.