Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[BlackBerry] UpdateViewport uses wrong size for frameView
https://bugs.webkit.org/show_bug.cgi?id=95138

Patch by Andy Chen <andchen@rim.com> on 2012-08-28
Reviewed by Antonio Gomes.
Internally reviewed by Jakob Petsovits.

Use actual visible size instead of screen size when updating viewport size,
otherwise, frameView size would be too big.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::updateViewportSize):

Canonical link: https://commits.webkit.org/113048@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@126871 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
andchen authored and webkit-commit-queue committed Aug 28, 2012
1 parent d0b19ca commit b19131d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Source/WebKit/blackberry/Api/WebPage.cpp
Expand Up @@ -1567,10 +1567,11 @@ void WebPagePrivate::updateViewportSize(bool setFixedReportedSize, bool sendResi
if (!m_backingStore)
return;
ASSERT(m_mainFrame->view());
IntSize visibleSize = actualVisibleSize();
if (setFixedReportedSize)
m_mainFrame->view()->setFixedReportedSize(actualVisibleSize());
m_mainFrame->view()->setFixedReportedSize(visibleSize);

IntRect frameRect = IntRect(scrollPosition(), viewportSize());
IntRect frameRect = IntRect(scrollPosition(), visibleSize);
if (frameRect != m_mainFrame->view()->frameRect()) {
m_mainFrame->view()->setFrameRect(frameRect);
m_mainFrame->view()->adjustViewSize();
Expand Down
14 changes: 14 additions & 0 deletions Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,17 @@
2012-08-28 Andy Chen <andchen@rim.com>

[BlackBerry] UpdateViewport uses wrong size for frameView
https://bugs.webkit.org/show_bug.cgi?id=95138

Reviewed by Antonio Gomes.
Internally reviewed by Jakob Petsovits.

Use actual visible size instead of screen size when updating viewport size,
otherwise, frameView size would be too big.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::updateViewportSize):

2012-08-28 Andy Chen <andchen@rim.com>

[BlackBerry] Pseudo class "active" is broken
Expand Down

0 comments on commit b19131d

Please sign in to comment.