commit c9fa27d146cd147c83c74dad3cd3eef989ae847b
author The Android Automerger <android-build@google.com> Tue Oct 15 06:00:36 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 15 06:00:36 2013 -0700
tree bc3e529fba39c589c07c1acbcb31fa5497711b8d
parent 8dc37564812e5651db9b65ad3394e8bbe1d2ee4e
parent 5390f884eb5349f62e0524b4277620f4ead7aa52

merge in klp-release history after reset to klp-dev

Source/core/rendering/FixedTableLayout.cpp

diff --git a/Source/core/rendering/FixedTableLayout.cpp b/Source/core/rendering/FixedTableLayout.cpp
index 74061f7..83fe0db 100644
--- a/Source/core/rendering/FixedTableLayout.cpp
+++ b/Source/core/rendering/FixedTableLayout.cpp
@@ -171,7 +171,7 @@
         // dirty bit on the cell so that we'll correctly mark its ancestors dirty
         // in case we later call setPreferredLogicalWidthsDirty(true) on it later.
         if (cell->preferredLogicalWidthsDirty())
-            cell->setPreferredLogicalWidthsDirty(false);
+            (void) cell->minPreferredLogicalWidth();
     }
 
     return usedWidth;

Source/web/WebViewImpl.cpp

diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 0750b8a..c1546ba 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -3061,7 +3061,7 @@
     ViewportArguments adjustedArguments = arguments;
     if (settingsImpl()->viewportMetaLayoutSizeQuirk() && adjustedArguments.type == ViewportArguments::ViewportMeta) {
         adjustedArguments.type = ViewportArguments::ViewportMetaLayoutSizeQuirk;
-        if (adjustedArguments.width >= 0 && adjustedArguments.width <= m_size.width)
+        if (adjustedArguments.width >= 0 && adjustedArguments.width <= 320)
             adjustedArguments.width = ViewportArguments::ValueDeviceWidth;
         if (adjustedArguments.height >= 0 && adjustedArguments.width <= m_size.height)
             adjustedArguments.height = ViewportArguments::ValueDeviceHeight;