Changeset 145396 in webkit


Ignore:
Timestamp:
Mar 11, 2013 1:40:50 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Set the documentViewportRect and viewport size.
https://bugs.webkit.org/show_bug.cgi?id=112056

Patch by Genevieve Mak <gmak@rim.com> on 2013-03-11
Reviewed by Rob Buis.

Internally reviewed by Mike Fenton and Jakob Petsovits.
PR #278490

  • WebKitSupport/InRegionScrollableArea.cpp:

(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):

Location:
trunk/Source/WebKit/blackberry
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/blackberry/ChangeLog

    r145365 r145396  
     12013-03-11  Genevieve Mak  <gmak@rim.com>
     2
     3        [BlackBerry] Set the documentViewportRect and viewport size.
     4        https://bugs.webkit.org/show_bug.cgi?id=112056
     5
     6        Reviewed by Rob Buis.
     7
     8        Internally reviewed by Mike Fenton and Jakob Petsovits.
     9        PR #278490
     10
     11        * WebKitSupport/InRegionScrollableArea.cpp:
     12        (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
     13
    1142013-03-11  Alberto Garcia  <agarcia@igalia.com>
    215
  • trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp

    r143295 r145396  
    8282        m_scrollPosition = m_webPage->mapToTransformed(view->scrollPosition());
    8383        m_contentsSize = m_webPage->mapToTransformed(view->contentsSize());
    84         m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect()).size();
     84        m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect(false /*includeScrollbars*/)).size();
     85        m_documentViewportRect = view->frameRect();
    8586
    8687        m_scrollsHorizontally = view->contentsWidth() > view->visibleWidth();
     
    105106        m_scrollPosition = m_webPage->mapToTransformed(scrollableArea->scrollPosition());
    106107        m_contentsSize = m_webPage->mapToTransformed(scrollableArea->contentsSize());
    107         m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect()).size();
     108        m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(false /*includeScrollbars*/)).size();
     109        m_documentViewportRect = enclosingIntRect(box->absoluteClippedOverflowRect());
    108110
    109111        m_scrollsHorizontally = box->scrollWidth() != box->clientWidth();
Note: See TracChangeset for help on using the changeset viewer.