Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> | 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> |
| 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. | 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1343 return HitTestCanvasResult::create(String(), nullptr); | 1343 return HitTestCanvasResult::create(String(), nullptr); |
| 1344 } | 1344 } |
| 1345 | 1345 |
| 1346 String HTMLCanvasElement::getIdFromControl(const Element* element) { | 1346 String HTMLCanvasElement::getIdFromControl(const Element* element) { |
| 1347 if (m_context) | 1347 if (m_context) |
| 1348 return m_context->getIdFromControl(element); | 1348 return m_context->getIdFromControl(element); |
| 1349 return String(); | 1349 return String(); |
| 1350 } | 1350 } |
| 1351 | 1351 |
| 1352 bool HTMLCanvasElement::createSurfaceLayer() { | 1352 bool HTMLCanvasElement::createSurfaceLayer() { |
| 1353 DCHECK(!m_surfaceLayerBridge); | |
|
Justin Novosad
2016/11/02 20:00:11
I think this DCHECK should stay. It was probably
xlai (Olivia)
2016/11/02 20:07:50
Done.
| |
| 1354 mojom::blink::OffscreenCanvasSurfacePtr service; | 1353 mojom::blink::OffscreenCanvasSurfacePtr service; |
| 1355 Platform::current()->interfaceProvider()->getInterface( | 1354 Platform::current()->interfaceProvider()->getInterface( |
| 1356 mojo::GetProxy(&service)); | 1355 mojo::GetProxy(&service)); |
| 1357 m_surfaceLayerBridge = | 1356 m_surfaceLayerBridge = |
| 1358 wrapUnique(new CanvasSurfaceLayerBridge(std::move(service))); | 1357 wrapUnique(new CanvasSurfaceLayerBridge(std::move(service))); |
| 1359 return m_surfaceLayerBridge->createSurfaceLayer(this->width(), | 1358 return m_surfaceLayerBridge->createSurfaceLayer(this->width(), |
| 1360 this->height()); | 1359 this->height()); |
| 1361 } | 1360 } |
| 1362 | 1361 |
| 1363 } // namespace blink | 1362 } // namespace blink |
| OLD | NEW |