| OLD | NEW |
| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 } | 164 } |
| 165 | 165 |
| 166 DCHECK_EQ(!canvas(), | 166 DCHECK_EQ(!canvas(), |
| 167 !!destinationSecurityOrigin); // Must have one or the other | 167 !!destinationSecurityOrigin); // Must have one or the other |
| 168 bool taintOrigin = imageSource->wouldTaintOrigin( | 168 bool taintOrigin = imageSource->wouldTaintOrigin( |
| 169 destinationSecurityOrigin ? destinationSecurityOrigin | 169 destinationSecurityOrigin ? destinationSecurityOrigin |
| 170 : canvas()->getSecurityOrigin()); | 170 : canvas()->getSecurityOrigin()); |
| 171 | 171 |
| 172 if (hasURL) { | 172 if (hasURL) { |
| 173 if (taintOrigin) | 173 if (taintOrigin) |
| 174 m_dirtyURLs.add(sourceURL.getString()); | 174 m_dirtyURLs.insert(sourceURL.getString()); |
| 175 else | 175 else |
| 176 m_cleanURLs.add(sourceURL.getString()); | 176 m_cleanURLs.insert(sourceURL.getString()); |
| 177 } | 177 } |
| 178 return taintOrigin; | 178 return taintOrigin; |
| 179 } | 179 } |
| 180 | 180 |
| 181 DEFINE_TRACE(CanvasRenderingContext) { | 181 DEFINE_TRACE(CanvasRenderingContext) { |
| 182 visitor->trace(m_canvas); | 182 visitor->trace(m_canvas); |
| 183 visitor->trace(m_offscreenCanvas); | 183 visitor->trace(m_offscreenCanvas); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } // namespace blink | 186 } // namespace blink |
| OLD | NEW |