diff options
| -rw-r--r-- | src/core/browser_accessibility_qt.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index 4b8e947c0..5a1de8f38 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -144,6 +144,8 @@ BrowserAccessibilityQt::~BrowserAccessibilityQt() { if (interface) interface->destroy(); +<<<<<<< HEAD +======= } bool BrowserAccessibilityQt::isReady() const @@ -151,6 +153,7 @@ bool BrowserAccessibilityQt::isReady() const // FIXME: This is just a workaround, remove this when the commented out assert in // BrowserAccessibilityManager::GetFromID(int32_t id) gets fixed. return manager()->GetFromID(node()->id()) != nullptr; +>>>>>>> v6.5.4-lts } BrowserAccessibilityInterface::BrowserAccessibilityInterface(BrowserAccessibilityQt *chromiumInterface) |