Code clean up, http://b/issue?id=2724743

Change Widget:screenWidth() to Widget:textWrapWidth()
as the text wrap width may be different than the
screen width after pinch zoom.

Change AndroidWebHistoryBridge's m_screenWidthScale
to m_textWrapScale to reflect its meaning.

Remove unused screenWidth/screenHeight in PlatformBridge.

Merge two restore methods to one. There is a matching
CL in framework/base.

Only setUseFixedLayout if layout width is different
than screen width.

Change from Node* to Ref<Node> to avoid a crash.
Fix http://b/issue?id=2660396

1 files changed, 4 insertions, 4 deletions

diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h
index 893d137..b320c4a 100644
--- a/WebCore/history/android/AndroidWebHistoryBridge.h
+++ b/WebCore/history/android/AndroidWebHistoryBridge.h
@@ -36,23 +36,23 @@ class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> {
 public:
     AndroidWebHistoryBridge(HistoryItem* item)
         : m_scale(0)
-        , m_screenWidthScale(0)
+        , m_textWrapScale(0)
         , m_active(false)
         , m_historyItem(item) { }
     virtual ~AndroidWebHistoryBridge() { }
     virtual void updateHistoryItem(HistoryItem* item) = 0;
 
     void setScale(int s) { m_scale = s; }
-    void setScreenWidthScale(int s) { m_screenWidthScale = s; }
+    void setTextWrapScale(int s) { m_textWrapScale = s; }
     int scale() const { return m_scale; }
-    int screenWidthScale() const { return m_screenWidthScale; }
+    int textWrapScale() const { return m_textWrapScale; }
     void detachHistoryItem() { m_historyItem = 0; }
     HistoryItem* historyItem() const { return m_historyItem; }
     void setActive() { m_active = true; }
 
 protected:
     int m_scale;
-    int m_screenWidthScale;
+    int m_textWrapScale;
     bool m_active;
     HistoryItem* m_historyItem;
 };