Changeset 161606 in webkit


Ignore:
Timestamp:
Jan 9, 2014 5:18:18 PM (10 years ago)
Author:
timothy_horton@apple.com
Message:

Upstream iOS changes after r161530
https://bugs.webkit.org/show_bug.cgi?id=126728

Reviewed by Dean Jackson.

  • UIProcess/API/ios/WKContentView.mm:

(-[WKContentView setViewportSize:]):
(-[WKContentView didFinishScrollTo:]):
(-[WKContentView didScrollTo:]):
Adopt the new approach.

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r161577 r161606  
     12014-01-09  Tim Horton  <timothy_horton@apple.com>
     2
     3        Upstream iOS changes after r161530
     4        https://bugs.webkit.org/show_bug.cgi?id=126728
     5
     6        Reviewed by Dean Jackson.
     7
     8        * UIProcess/API/ios/WKContentView.mm:
     9        (-[WKContentView setViewportSize:]):
     10        (-[WKContentView didFinishScrollTo:]):
     11        (-[WKContentView didScrollTo:]):
     12        Adopt the new approach.
     13
    1142014-01-09  Brian Burg  <bburg@apple.com>
    215
  • trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

    r161296 r161606  
    139139{
    140140    _page->setFixedLayoutSize(IntSize(size));
    141     _page->viewExposedRectChanged(FloatRect(_page->viewExposedRect().location(), FloatSize(size)), WebPageProxy::ClipsToExposedRect::Clip);
     141    _page->drawingArea()->setExposedRect(FloatRect(_page->drawingArea()->exposedRect().location(), FloatSize(size)));
    142142}
    143143
     
    145145{
    146146    _page->didFinishScrolling(contentOffset);
    147     _page->viewExposedRectChanged(FloatRect(FloatPoint(contentOffset), _page->fixedLayoutSize()), WebPageProxy::ClipsToExposedRect::Clip);
     147    _page->drawingArea()->setExposedRect(FloatRect(FloatPoint(contentOffset), _page->fixedLayoutSize()));
    148148}
    149149
    150150- (void)didScrollTo:(CGPoint)contentOffset
    151151{
    152     _page->viewExposedRectChanged(FloatRect(FloatPoint(contentOffset), _page->fixedLayoutSize()), WebPageProxy::ClipsToExposedRect::Clip);
     152    _page->drawingArea()->setExposedRect(FloatRect(FloatPoint(contentOffset), _page->fixedLayoutSize()));
    153153}
    154154
Note: See TracChangeset for help on using the changeset viewer.