diff --git a/WebKitBrowser/Amazon.config b/WebKitBrowser/Amazon.config
index 97d554d9..cec748a6 100644
--- a/WebKitBrowser/Amazon.config
+++ b/WebKitBrowser/Amazon.config
@@ -214,16 +214,14 @@ ans(javascriptsettings)
 map_append(${configuration} javascript ${javascriptsettings})
 
 map()
-if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_AMAZON_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/Apps.config b/WebKitBrowser/Apps.config
index 65657921..11a14b2e 100644
--- a/WebKitBrowser/Apps.config
+++ b/WebKitBrowser/Apps.config
@@ -90,16 +90,14 @@ ans(javascriptsettings)
 map_append(${configuration} javascript ${javascriptsettings})
 
 map()
-if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_APPS_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt
index 9add6444..00e7d70d 100644
--- a/WebKitBrowser/CMakeLists.txt
+++ b/WebKitBrowser/CMakeLists.txt
@@ -73,7 +73,7 @@ set(PLUGIN_WEBKITBROWSER_PERSISTENTPATHPOSTFIX "" CACHE STRING "Specify callsign
 set(PLUGIN_WEBKITBROWSER_PTSOFFSET "0" CACHE STRING "Set ptsoffset for webkit")
 set(PLUGIN_WEBKITBROWSER_USE_EXACT_PATHS "false" CACHE STRING "Use paths specified in configuration options without further modifying them")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT "300" CACHE STRING "WebkitBrower Memory Pressure Webprocess Limit")
-set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT "1000" CACHE STRING "WebkitBrower Memory Pressure Webprocess GPU Limit")
+set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT "" CACHE STRING "WebkitBrower Memory Pressure Webprocess GPU Limit")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE "" CACHE STRING "WebkitBrower Memory Pressure Webprocess GPU File")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL "1" CACHE STRING "WebkitBrower Memory Pressure Webprocess Poll Interval")
 set(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_NETWORKPROCESS_SETTINGS_LIMIT "100" CACHE STRING "WebkitBrower Memory Pressure Networkprocess Limit")
diff --git a/WebKitBrowser/HtmlApp.config b/WebKitBrowser/HtmlApp.config
index eb7b5ffb..32f2f30f 100644
--- a/WebKitBrowser/HtmlApp.config
+++ b/WebKitBrowser/HtmlApp.config
@@ -100,16 +100,14 @@ ans(configuration)
 map_append(${configuration} root ${rootobject})
 
 map()
-if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_HTML_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/JSPP.config b/WebKitBrowser/JSPP.config
index 92f59a73..7dabed8c 100644
--- a/WebKitBrowser/JSPP.config
+++ b/WebKitBrowser/JSPP.config
@@ -136,16 +136,14 @@ ans(configuration)
 map_append(${configuration} root ${rootobject})
 
 map()
-if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_JSPP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/LightningApp.config b/WebKitBrowser/LightningApp.config
index 701597bc..4ba244ed 100644
--- a/WebKitBrowser/LightningApp.config
+++ b/WebKitBrowser/LightningApp.config
@@ -100,16 +100,14 @@ ans(configuration)
 map_append(${configuration} root ${rootobject})
 
 map()
-if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_LIGHTNING_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/ResidentApp.config b/WebKitBrowser/ResidentApp.config
index 39bf5bd3..311ec11f 100644
--- a/WebKitBrowser/ResidentApp.config
+++ b/WebKitBrowser/ResidentApp.config
@@ -97,16 +97,14 @@ ans(configuration)
 map_append(${configuration} root ${rootobject})
 
 map()
-if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_RESIDENT_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/SearchAndDiscoveryApp.config b/WebKitBrowser/SearchAndDiscoveryApp.config
index 25a2d528..2fd06efb 100644
--- a/WebKitBrowser/SearchAndDiscoveryApp.config
+++ b/WebKitBrowser/SearchAndDiscoveryApp.config
@@ -94,16 +94,14 @@ ans(configuration)
 map_append(${configuration} root ${rootobject})
 
 map()
-if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_SEARCH_AND_DISCOVERY_APP_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/UX.config b/WebKitBrowser/UX.config
index 41d7d7d8..298b2130 100644
--- a/WebKitBrowser/UX.config
+++ b/WebKitBrowser/UX.config
@@ -93,16 +93,14 @@ ans(javascriptsettings)
 map_append(${configuration} javascript ${javascriptsettings})
 
 map()
-if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_UX_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/WebKitBrowser.config b/WebKitBrowser/WebKitBrowser.config
index 2d294dfb..27f5ab9e 100644
--- a/WebKitBrowser/WebKitBrowser.config
+++ b/WebKitBrowser/WebKitBrowser.config
@@ -127,16 +127,14 @@ ans(javascriptsettings)
 map_append(${configuration} javascript ${javascriptsettings})
 
 map()
-if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_WEBKITBROWSER_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
diff --git a/WebKitBrowser/YouTube.config b/WebKitBrowser/YouTube.config
index 73937cb2..aea8c4ef 100644
--- a/WebKitBrowser/YouTube.config
+++ b/WebKitBrowser/YouTube.config
@@ -109,16 +109,14 @@ ans(javascriptsettings)
 map_append(${configuration} javascript ${javascriptsettings})
 
 map()
-if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT OR PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE OR PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
+if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT OR (PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE) OR PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)
     key(webprocesssettings)
     map()
 if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT)
         kv(limit ${PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_LIMIT})
 endif()
-if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT)
+if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT AND PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpulimit ${PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_LIMIT})
-endif()
-if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE)
         kv(gpufile ${PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_GPU_FILE})
 endif()
 if(PLUGIN_YOUTUBE_MEMORYPRESSURE_WEBPROCESS_SETTINGS_POLLINTERVAL)