| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2013 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of | 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of |
| 14 * its contributors may be used to endorse or promote products derived | 14 * its contributors may be used to endorse or promote products derived |
| 15 * from this software without specific prior written permission. | 15 * from this software without specific prior written permission. |
| 16 * | 16 * |
| 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY |
| 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY |
| 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/accessibility/AXSVGRoot.h" | 30 #include "platform/TaskSynchronizer.h" |
| 31 | 31 |
| 32 #include "heap/ThreadState.h" |
| 32 | 33 |
| 33 namespace WebCore { | 34 namespace WebCore { |
| 34 | 35 |
| 35 AXSVGRoot::AXSVGRoot(RenderObject* renderer) | 36 TaskSynchronizer::TaskSynchronizer() |
| 36 : AXRenderObject(renderer) | 37 : m_taskCompleted(false) |
| 37 , m_parent(0) | 38 #ifndef NDEBUG |
| 39 , m_hasCheckedForTermination(false) |
| 40 #endif |
| 38 { | 41 { |
| 39 } | 42 } |
| 40 | 43 |
| 41 AXSVGRoot::~AXSVGRoot() | 44 void TaskSynchronizer::waitForTaskCompletion() |
| 42 { | 45 { |
| 46 // Prevent the deadlock between park request by other threads and blocking |
| 47 // by m_synchronousCondition. |
| 48 ThreadState::SafePointScope scope(ThreadState::HeapPointersOnStack); |
| 49 m_synchronousMutex.lock(); |
| 50 while (!m_taskCompleted) |
| 51 m_synchronousCondition.wait(m_synchronousMutex); |
| 52 m_synchronousMutex.unlock(); |
| 43 } | 53 } |
| 44 | 54 |
| 45 PassRefPtr<AXSVGRoot> AXSVGRoot::create(RenderObject* renderer) | 55 void TaskSynchronizer::taskCompleted() |
| 46 { | 56 { |
| 47 return adoptRef(new AXSVGRoot(renderer)); | 57 m_synchronousMutex.lock(); |
| 58 m_taskCompleted = true; |
| 59 m_synchronousCondition.signal(); |
| 60 m_synchronousMutex.unlock(); |
| 48 } | 61 } |
| 49 | 62 |
| 50 AXObject* AXSVGRoot::parentObject() const | |
| 51 { | |
| 52 // If a parent was set because this is a remote SVG resource, use that | |
| 53 // but otherwise, we should rely on the standard render tree for the parent. | |
| 54 if (m_parent) | |
| 55 return m_parent; | |
| 56 | |
| 57 return AXRenderObject::parentObject(); | |
| 58 } | |
| 59 | |
| 60 | |
| 61 } // namespace WebCore | 63 } // namespace WebCore |
| OLD | NEW |