← Back to branch summary

~justinmcp/oxide/mediahub-fixes-1.9

« back to all changes in this revision

Viewing changes to patches/add-limit-max-decoded-image-bytes-switch.patch

  • Committer: Chris Coulson
  • Date: 2015-07-16 10:09:46 UTC
  • mfrom: (640.1.329 canary)
  • Revision ID: chris.coulson@canonical.com-20150716100946-k9707yx7xquf14ks
Bump Chromium rev to 45.0.2454.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/add-limit-max-decoded-image-bytes-switch.patch
23
23
 #include "base/metrics/sparse_histogram.h"
24
24
 #include "base/process/process_metrics.h"
25
25
 #include "base/rand_util.h"
26
 
@@ -52,16 +53,17 @@
 
26
@@ -54,16 +55,17 @@
27
27
 #include "content/child/web_discardable_memory_impl.h"
28
28
 #include "content/child/web_memory_dump_provider_adapter.h"
29
29
 #include "content/child/web_process_memory_dump_impl.h"
41
41
 #include "third_party/WebKit/public/platform/WebData.h"
42
42
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
43
43
 #include "third_party/WebKit/public/platform/WebMemoryDumpProvider.h"
44
 
@@ -1327,33 +1329,34 @@ bool BlinkPlatformImpl::memoryAllocatorW
 
44
@@ -1281,33 +1283,34 @@ bool BlinkPlatformImpl::memoryAllocatorW
45
45
 }
46
46
 
47
47
 blink::WebDiscardableMemory*
74
74
-#endif
75
75
 }
76
76
 
77
 
 void BlinkPlatformImpl::SuspendSharedTimer() {
78
 
   ++shared_timer_suspended_;
 
77
 uint32_t BlinkPlatformImpl::getUniqueIdForProcess() {
 
78
   // TODO(rickyz): Replace this with base::GetUniqueIdForProcess when that's
 
79
   // ready.
 
80
   return base::trace_event::TraceLog::GetInstance()->process_id();
79
81
 }
80
82
 
81
 
 void BlinkPlatformImpl::ResumeSharedTimer() {
82
 
   DCHECK_GT(shared_timer_suspended_, 0);
83
83
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
84
84
--- a/content/public/common/content_switches.cc
85
85
+++ b/content/public/common/content_switches.cc
86
 
@@ -573,16 +573,19 @@ const char kInProcessGPU[]              
 
86
@@ -560,16 +560,19 @@ const char kInProcessGPU[]              
87
87
 
88
88
 // Overrides the timeout, in seconds, that a child process waits for a
89
89
 // connection from the browser before killing itself.
106
106
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
107
107
--- a/content/public/common/content_switches.h
108
108
+++ b/content/public/common/content_switches.h
109
 
@@ -164,16 +164,17 @@ CONTENT_EXPORT extern const char kGpuSan
 
109
@@ -161,16 +161,17 @@ CONTENT_EXPORT extern const char kGpuSan
110
110
 CONTENT_EXPORT extern const char kGpuStartupDialog[];
111
111
 extern const char kGpuVendorID[];
112
112
 CONTENT_EXPORT extern const char kHostResolverRules[];