Title: [111814] trunk/Source
- Revision
- 111814
- Author
- charles....@torchmobile.com.cn
- Date
- 2012-03-22 19:42:10 -0700 (Thu, 22 Mar 2012)
Log Message
[BlackBerry] Need to store the meta info of a page in the ViewState of the history
https://bugs.webkit.org/show_bug.cgi?id=82000
Reviewed by Rob Buis.
Internally reviewed by George Staikos.
Source/WebCore:
No new tests, BlackBerry porting doesn't build yet upstreaming.
* history/blackberry/HistoryItemViewState.h:
(WebCore::HistoryItemViewState::HistoryItemViewState):
(HistoryItemViewState):
Source/WebKit/blackberry:
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::saveViewStateToItem):
(WebCore::FrameLoaderClientBlackBerry::restoreViewState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111813 => 111814)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 02:38:05 UTC (rev 111813)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 02:42:10 UTC (rev 111814)
@@ -1,3 +1,18 @@
+2012-03-22 Charles Wei <charles....@torchmobile.com.cn>
+
+ [BlackBerry] Need to store the meta info of a page in the ViewState of the history
+ https://bugs.webkit.org/show_bug.cgi?id=82000
+
+ Reviewed by Rob Buis.
+
+ Internally reviewed by George Staikos.
+
+ No new tests, BlackBerry porting doesn't build yet upstreaming.
+
+ * history/blackberry/HistoryItemViewState.h:
+ (WebCore::HistoryItemViewState::HistoryItemViewState):
+ (HistoryItemViewState):
+
2012-03-22 Adam Klein <ad...@chromium.org>
[v8] wrapSlow methods should ref underlying object before creating wrapper
Modified: trunk/Source/WebCore/history/blackberry/HistoryItemViewState.h (111813 => 111814)
--- trunk/Source/WebCore/history/blackberry/HistoryItemViewState.h 2012-03-23 02:38:05 UTC (rev 111813)
+++ trunk/Source/WebCore/history/blackberry/HistoryItemViewState.h 2012-03-23 02:42:10 UTC (rev 111814)
@@ -28,6 +28,9 @@
HistoryItemViewState()
: orientation(0)
, scale(1)
+ , minimumScale(-1.0)
+ , maximumScale(-1.0)
+ , isUserScalable(true)
, isZoomToFitScale(false)
, shouldReflowBlock(false)
, shouldSaveViewState(true)
@@ -36,6 +39,9 @@
int orientation;
double scale;
+ double minimumScale;
+ double maximumScale;
+ bool isUserScalable;
bool isZoomToFitScale;
bool shouldReflowBlock;
bool shouldSaveViewState;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (111813 => 111814)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-23 02:38:05 UTC (rev 111813)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-23 02:42:10 UTC (rev 111814)
@@ -1,3 +1,16 @@
+2012-03-22 Charles Wei <charles....@torchmobile.com.cn>
+
+ [BlackBerry] Need to store the meta info of a page in the ViewState of the history
+ https://bugs.webkit.org/show_bug.cgi?id=82000
+
+ Reviewed by Rob Buis.
+
+ Internally reviewed by George Staikos.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::saveViewStateToItem):
+ (WebCore::FrameLoaderClientBlackBerry::restoreViewState):
+
2012-03-22 Jonathan Dong <jonathan.d...@torchmobile.com.cn>
[BlackBerry] add interface clearCredentials() and clearNeverRememberSites()
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (111813 => 111814)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-03-23 02:38:05 UTC (rev 111813)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-03-23 02:42:10 UTC (rev 111814)
@@ -988,6 +988,9 @@
viewState.isZoomToFitScale = m_webPagePrivate->currentScale() == m_webPagePrivate->zoomToFitScale();
viewState.scale = m_webPagePrivate->currentScale();
viewState.shouldReflowBlock = m_webPagePrivate->m_shouldReflowBlock;
+ viewState.minimumScale = m_webPagePrivate->m_minimumScale;
+ viewState.maximumScale = m_webPagePrivate->m_maximumScale;
+ viewState.isUserScalable = m_webPagePrivate->m_userScalable;
}
}
@@ -1022,6 +1025,10 @@
m_webPagePrivate->m_didRestoreFromPageCache = false;
HistoryItemViewState& viewState = currentItem->viewState();
+ // Restore the meta first.
+ m_webPagePrivate->m_minimumScale = viewState.minimumScale;
+ m_webPagePrivate->m_maximumScale = viewState.maximumScale;
+ m_webPagePrivate->m_userScalable = viewState.isUserScalable;
// Also, try to keep the users zoom if any.
double scale = viewState.scale;
bool shouldReflowBlock = viewState.shouldReflowBlock;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
