Title: [148041] trunk/Source/WebKit/blackberry
- Revision
- 148041
- Author
- [email protected]
- Date
- 2013-04-09 13:06:14 -0700 (Tue, 09 Apr 2013)
Log Message
[BlackBerry] Main page is rendered at wrong large scale after back from any zooming article at read.thestar.com
https://bugs.webkit.org/show_bug.cgi?id=114296
Patch by Jacky Jiang <[email protected]>.
Reviewed by Rob Buis.
PR: 308655
We were relying on the load state Committed to reset m_userPerformedManualZoom
and m_userPerformedManualScroll; however, the main resources of the
articles on read.thestar.com were preloaded and the WebPage didn't get
any load state change callbacks when going back to the main page from
the articles. Therefore, m_userPerformedManualZoom had never been reset
in this case and we picked up the wrong scale when restoring the main page.
Rset m_userPerformedManualScroll and m_userPerformedManualScroll when
we are going back or forward.
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPage::goBackOrForward):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (148040 => 148041)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-09 19:56:19 UTC (rev 148040)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-04-09 20:06:14 UTC (rev 148041)
@@ -3036,6 +3036,8 @@
bool WebPage::goBackOrForward(int delta)
{
if (d->m_page->canGoBackOrForward(delta)) {
+ d->m_userPerformedManualZoom = false;
+ d->m_userPerformedManualScroll = false;
d->m_backingStore->d->suspendScreenUpdates();
d->m_page->goBackOrForward(delta);
d->m_backingStore->d->resumeScreenUpdates(BackingStore::None);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (148040 => 148041)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-09 19:56:19 UTC (rev 148040)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-09 20:06:14 UTC (rev 148041)
@@ -1,3 +1,23 @@
+2013-04-09 Jacky Jiang <[email protected]>
+
+ [BlackBerry] Main page is rendered at wrong large scale after back from any zooming article at read.thestar.com
+ https://bugs.webkit.org/show_bug.cgi?id=114296
+
+ Reviewed by Rob Buis.
+
+ PR: 308655
+ We were relying on the load state Committed to reset m_userPerformedManualZoom
+ and m_userPerformedManualScroll; however, the main resources of the
+ articles on read.thestar.com were preloaded and the WebPage didn't get
+ any load state change callbacks when going back to the main page from
+ the articles. Therefore, m_userPerformedManualZoom had never been reset
+ in this case and we picked up the wrong scale when restoring the main page.
+ Rset m_userPerformedManualScroll and m_userPerformedManualScroll when
+ we are going back or forward.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPage::goBackOrForward):
+
2013-04-09 Alberto Garcia <[email protected]>
[BlackBerry] InputHandler: fix calls to HTMLInputElement methods
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
