aw: Avoid using std::max for compile
On x64, the call is confusing the compiler about deducing the template
type. Off-by-one is not a big deal here, so using same calculation as
bytes.
BUG=
TBR=hush
Review URL: https://codereview.chromium.org/269893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268114 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index 7db9816..b8613b79 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -171,11 +171,10 @@
policy.bytes_limit =
(policy.bytes_limit / kMemoryAllocationStep + 1) * kMemoryAllocationStep;
- size_t tiles = std::max(width * height * kTileMultiplier / g_tile_area, 1u);
+ size_t tiles = width * height * kTileMultiplier / g_tile_area;
// Round up to a multiple of kTileAllocationStep. The minimum number of tiles
// is also kTileAllocationStep.
- tiles = (tiles + kTileAllocationStep - 1) / kTileAllocationStep *
- kTileAllocationStep;
+ tiles = (tiles / kTileAllocationStep + 1) * kTileAllocationStep;
policy.num_resources_limit = tiles;
return policy;
}
