Title: [128211] trunk/Source/WebKit/blackberry
- Revision
- 128211
- Author
- [email protected]
- Date
- 2012-09-11 11:32:49 -0700 (Tue, 11 Sep 2012)
Log Message
[BlackBerry] Fix history navigation for error pages.
https://bugs.webkit.org/show_bug.cgi?id=96410
Reviewed by Rob Buis.
Fix how history navigation handles restoring view state when navigating between error pages.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::FrameLoaderClientBlackBerry):
(WebCore::FrameLoaderClientBlackBerry::saveViewStateToItem):
(WebCore::FrameLoaderClientBlackBerry::restoreViewState):
* WebCoreSupport/FrameLoaderClientBlackBerry.h:
(FrameLoaderClientBlackBerry):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128210 => 128211)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 18:31:11 UTC (rev 128210)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 18:32:49 UTC (rev 128211)
@@ -1,3 +1,19 @@
+2012-09-11 Konrad Piascik <[email protected]>
+
+ [BlackBerry] Fix history navigation for error pages.
+ https://bugs.webkit.org/show_bug.cgi?id=96410
+
+ Reviewed by Rob Buis.
+
+ Fix how history navigation handles restoring view state when navigating between error pages.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::FrameLoaderClientBlackBerry):
+ (WebCore::FrameLoaderClientBlackBerry::saveViewStateToItem):
+ (WebCore::FrameLoaderClientBlackBerry::restoreViewState):
+ * WebCoreSupport/FrameLoaderClientBlackBerry.h:
+ (FrameLoaderClientBlackBerry):
+
2012-09-11 Jinwoo Song <[email protected]>
Deploy StringBuilder::appendNumber() and StringBuilder::appendLiteral() in more places
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (128210 => 128211)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-11 18:31:11 UTC (rev 128210)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-09-11 18:32:49 UTC (rev 128211)
@@ -109,7 +109,6 @@
, m_hasSentResponseToPlugin(false)
, m_cancelLoadOnNextData(false)
, m_wasProvisionalLoadTriggeredByUserGesture(true) // To avoid affecting the first load.
- , m_shouldRestoreViewState(true)
{
}
@@ -1027,8 +1026,7 @@
ASSERT(item);
HistoryItemViewState& viewState = item->viewState();
- m_shouldRestoreViewState = viewState.shouldSaveViewState;
- if (m_shouldRestoreViewState) {
+ if (viewState.shouldSaveViewState) {
viewState.orientation = m_webPagePrivate->mainFrame()->orientation();
viewState.isZoomToFitScale = m_webPagePrivate->currentScale() == m_webPagePrivate->zoomToFitScale();
viewState.scale = m_webPagePrivate->currentScale();
@@ -1041,8 +1039,6 @@
void FrameLoaderClientBlackBerry::restoreViewState()
{
- if (!m_shouldRestoreViewState)
- return;
if (!isMainFrame())
return;
@@ -1052,6 +1048,9 @@
if (!currentItem)
return;
+ HistoryItemViewState& viewState = currentItem->viewState();
+ if (!viewState.shouldSaveViewState)
+ return;
// WebPagePrivate is messing up FrameView::wasScrolledByUser() by sending
// scroll events that look like they were user generated all the time.
//
@@ -1070,7 +1069,6 @@
// We need to reset this variable after the view state has been restored.
m_webPagePrivate->m_didRestoreFromPageCache = false;
- HistoryItemViewState& viewState = currentItem->viewState();
// Restore the meta first.
m_webPagePrivate->m_minimumScale = viewState.minimumScale;
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h (128210 => 128211)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h 2012-09-11 18:31:11 UTC (rev 128210)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h 2012-09-11 18:32:49 UTC (rev 128211)
@@ -219,8 +219,6 @@
bool m_cancelLoadOnNextData;
bool m_wasProvisionalLoadTriggeredByUserGesture;
-
- bool m_shouldRestoreViewState;
};
} // WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
