Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

Issue 2810073002: Blink Rename follow-up: URLs --big-rename--> _ur_ls --this-fix--> _urls. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 } 218 }
219 219
220 bool CanvasRenderingContext::WouldTaintOrigin( 220 bool CanvasRenderingContext::WouldTaintOrigin(
221 CanvasImageSource* image_source, 221 CanvasImageSource* image_source,
222 SecurityOrigin* destination_security_origin) { 222 SecurityOrigin* destination_security_origin) {
223 const KURL& source_url = image_source->SourceURL(); 223 const KURL& source_url = image_source->SourceURL();
224 bool has_url = (source_url.IsValid() && !source_url.IsAboutBlankURL()); 224 bool has_url = (source_url.IsValid() && !source_url.IsAboutBlankURL());
225 225
226 if (has_url) { 226 if (has_url) {
227 if (source_url.ProtocolIsData() || 227 if (source_url.ProtocolIsData() ||
228 clean_ur_ls_.Contains(source_url.GetString())) 228 clean_urls_.Contains(source_url.GetString()))
229 return false; 229 return false;
230 if (dirty_ur_ls_.Contains(source_url.GetString())) 230 if (dirty_urls_.Contains(source_url.GetString()))
231 return true; 231 return true;
232 } 232 }
233 233
234 DCHECK_EQ(!canvas(), 234 DCHECK_EQ(!canvas(),
235 !!destination_security_origin); // Must have one or the other 235 !!destination_security_origin); // Must have one or the other
236 bool taint_origin = image_source->WouldTaintOrigin( 236 bool taint_origin = image_source->WouldTaintOrigin(
237 destination_security_origin ? destination_security_origin 237 destination_security_origin ? destination_security_origin
238 : canvas()->GetSecurityOrigin()); 238 : canvas()->GetSecurityOrigin());
239 239
240 if (has_url) { 240 if (has_url) {
241 if (taint_origin) 241 if (taint_origin)
242 dirty_ur_ls_.insert(source_url.GetString()); 242 dirty_urls_.insert(source_url.GetString());
243 else 243 else
244 clean_ur_ls_.insert(source_url.GetString()); 244 clean_urls_.insert(source_url.GetString());
245 } 245 }
246 return taint_origin; 246 return taint_origin;
247 } 247 }
248 248
249 DEFINE_TRACE(CanvasRenderingContext) { 249 DEFINE_TRACE(CanvasRenderingContext) {
250 visitor->Trace(canvas_); 250 visitor->Trace(canvas_);
251 visitor->Trace(offscreen_canvas_); 251 visitor->Trace(offscreen_canvas_);
252 } 252 }
253 253
254 } // namespace blink 254 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698