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 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1159 return std::make_pair(nullptr, String()); | 1159 return std::make_pair(nullptr, String()); |
1160 } | 1160 } |
1161 | 1161 |
1162 String HTMLCanvasElement::getIdFromControl(const Element* element) | 1162 String HTMLCanvasElement::getIdFromControl(const Element* element) |
1163 { | 1163 { |
1164 if (m_context) | 1164 if (m_context) |
1165 return m_context->getIdFromControl(element); | 1165 return m_context->getIdFromControl(element); |
1166 return String(); | 1166 return String(); |
1167 } | 1167 } |
1168 | 1168 |
1169 void HTMLCanvasElement::createSurfaceLayerBridge() | 1169 bool HTMLCanvasElement::createSurfaceLayer() |
1170 { | 1170 { |
| 1171 DCHECK(!m_surfaceLayerBridge); |
1171 m_surfaceLayerBridge = adoptPtr(new CanvasSurfaceLayerBridge()); | 1172 m_surfaceLayerBridge = adoptPtr(new CanvasSurfaceLayerBridge()); |
| 1173 return m_surfaceLayerBridge->createSurfaceLayer(this->width(), this->height(
)); |
1172 } | 1174 } |
1173 | 1175 |
1174 } // namespace blink | 1176 } // namespace blink |
OLD | NEW |