Attachment 341098 Details for Bug 185908 – patch

[patch] patch

simulator-memory-size-2.patch (text/plain), 4.50 KB, created by Antti Koivisto on 2018-05-23 09:43:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-05-23 09:43:09 PDT

Size: 4.50 KB

patch

obsolete

>Index: Source/bmalloc/ChangeLog
>===================================================================
>--- Source/bmalloc/ChangeLog	(revision 232107)
>+++ Source/bmalloc/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2018-05-23  Antti Koivisto  <antti@apple.com>
>+
>+        Increase the simulated memory size on PLATFORM(IOS_SIMULATOR) from 512MB to 1024MB
>+        https://bugs.webkit.org/show_bug.cgi?id=185908
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We don't support 512MB devices anymore. This will make the simulator behave more
>+        like a real device.
>+
>+        * bmalloc/AvailableMemory.cpp:
>+        (bmalloc::memorySizeAccordingToKernel):
>+
>+        Factor to a function.
>+        Don't use availableMemoryGuess for the simulator value as it is not a guess.
>+
>+        (bmalloc::computeAvailableMemory):
>+
>+        Apply the same adjustments to the simulated value too.
>+
> 2018-05-22  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r232052.
>Index: Source/bmalloc/bmalloc/AvailableMemory.cpp
>===================================================================
>--- Source/bmalloc/bmalloc/AvailableMemory.cpp	(revision 231847)
>+++ Source/bmalloc/bmalloc/AvailableMemory.cpp	(working copy)
>@@ -47,12 +47,14 @@ namespace bmalloc {
> 
> static const size_t availableMemoryGuess = 512 * bmalloc::MB;
> 
>-static size_t computeAvailableMemory()
>+#if BOS(DARWIN)
>+static size_t memorySizeAccordingToKernel()
> {
> #if BPLATFORM(IOS_SIMULATOR)
>-    // Pretend we have 512MB of memory to make cache sizes behave like on device.
>-    return availableMemoryGuess;
>-#elif BOS(DARWIN)
>+    BUNUSED_PARAM(availableMemoryGuess);
>+    // Pretend we have 1024MB of memory to make cache sizes behave like on device.
>+    return 1024 * bmalloc::MB;
>+#else
>     host_basic_info_data_t hostInfo;
> 
>     mach_port_t host = mach_host_self();
>@@ -61,11 +63,19 @@ static size_t computeAvailableMemory()
>     mach_port_deallocate(mach_task_self(), host);
>     if (r != KERN_SUCCESS)
>         return availableMemoryGuess;
>-    
>+
>     if (hostInfo.max_mem > std::numeric_limits<size_t>::max())
>         return std::numeric_limits<size_t>::max();
> 
>-    size_t sizeAccordingToKernel = static_cast<size_t>(hostInfo.max_mem);
>+    return static_cast<size_t>(hostInfo.max_mem);
>+#endif
>+}
>+#endif
>+
>+static size_t computeAvailableMemory()
>+{
>+#if BOS(DARWIN)
>+    size_t sizeAccordingToKernel = memorySizeAccordingToKernel();
> #if BPLATFORM(IOS)
>     sizeAccordingToKernel = std::min(sizeAccordingToKernel, 840 * bmalloc::MB);
> #endif
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 232113)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-05-23  Antti Koivisto  <antti@apple.com>
>+
>+        Increase the simulated memory size on PLATFORM(IOS_SIMULATOR) from 512MB to 1024MB
>+        https://bugs.webkit.org/show_bug.cgi?id=185908
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios-simulator/fast/canvas/canvas-crash-expected.txt:
>+        * platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt:
>+
> 2018-05-23  Antti Koivisto  <antti@apple.com>
> 
>         Page keeps reloading when viewing photos in google drive (due to too high canvas memory limits)
>Index: LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt
>===================================================================
>--- LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt	(revision 232113)
>+++ LayoutTests/platform/ios-simulator/fast/canvas/canvas-crash-expected.txt	(working copy)
>@@ -1,3 +1,3 @@
>-CONSOLE MESSAGE: line 15: Total canvas memory use exceeds the maximum limit (256 MB).
>+CONSOLE MESSAGE: line 15: Total canvas memory use exceeds the maximum limit (448 MB).
> CONSOLE MESSAGE: line 16: TypeError: null is not an object (evaluating 'ctx.putImageData')
> 
>Index: LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt
>===================================================================
>--- LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt	(revision 232113)
>+++ LayoutTests/platform/ios-simulator/fast/canvas/canvas-skia-excessive-size-expected.txt	(working copy)
>@@ -1,4 +1,4 @@
>-CONSOLE MESSAGE: line 20: Total canvas memory use exceeds the maximum limit (256 MB).
>+CONSOLE MESSAGE: line 20: Total canvas memory use exceeds the maximum limit (448 MB).
> This test checks to see if the browser survives the attempted creation of an excessively large canvas.
> 
> Canvas 2d context = null!

Actions: View | Formatted Diff | Diff

Attachments on bug 185908: 341080 | 341098