Diff
Modified: branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog (220596 => 220597)
--- branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/LayoutTests/ChangeLog 2017-08-11 16:53:36 UTC (rev 220597)
@@ -1,3 +1,7 @@
+2017-08-11 Jason Marcell <jmarc...@apple.com>
+
+ Revert r220588. rdar://problem/33843387
+
2017-08-11 Ryan Haddad <ryanhad...@apple.com>
Cherry-pick r220555.
Modified: branches/safari-604.1.38.1-branch/LayoutTests/accessibility/resources/svg-circle.svg (220596 => 220597)
--- branches/safari-604.1.38.1-branch/LayoutTests/accessibility/resources/svg-circle.svg 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/LayoutTests/accessibility/resources/svg-circle.svg 2017-08-11 16:53:36 UTC (rev 220597)
@@ -1,13 +1,6 @@
-<<<<<<< HEAD
<svg xmlns="http://www.w3.org/2000/svg">
<g>
<text style="float:right"></text>
-=======
-<svg viewBox="0 0 95 50"
- xmlns="http://www.w3.org/2000/svg">
- <g stroke="green" fill="white" stroke-width="5">
- <circle cx="25" cy="25" r="15"/>
->>>>>>> 44546a209fa... AX: crash at WebCore::AccessibilityObject::supportsARIALiveRegion() const + 24
<text>circle</text>
</g>
</svg>
\ No newline at end of file
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog (220596 => 220597)
--- branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/ChangeLog 2017-08-11 16:53:36 UTC (rev 220597)
@@ -1,5 +1,9 @@
2017-08-11 Jason Marcell <jmarc...@apple.com>
+ Revert r220588. rdar://problem/33843387
+
+2017-08-11 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r220551. rdar://problem/33594320
2017-08-10 Nan Wang <n_w...@apple.com>
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (220596 => 220597)
--- branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-08-11 16:53:36 UTC (rev 220597)
@@ -109,7 +109,6 @@
AccessibilityRenderObject::AccessibilityRenderObject(RenderObject* renderer)
: AccessibilityNodeObject(renderer->node())
, m_renderer(renderer)
- , m_weakPtrFactory(this)
{
#ifndef NDEBUG
m_renderer->setHasAXObject(true);
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.h (220596 => 220597)
--- branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.h 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilityRenderObject.h 2017-08-11 16:53:36 UTC (rev 220597)
@@ -31,7 +31,6 @@
#include "AccessibilityNodeObject.h"
#include "LayoutRect.h"
#include <wtf/Forward.h>
-#include <wtf/WeakPtr.h>
namespace WebCore {
@@ -199,8 +198,6 @@
AccessibilityRole roleValueForMSAA() const override;
String passwordFieldValue() const override;
-
- WeakPtr<AccessibilityRenderObject> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
protected:
explicit AccessibilityRenderObject(RenderObject*);
@@ -220,7 +217,6 @@
RenderObject* m_renderer;
private:
- WeakPtrFactory<AccessibilityRenderObject> m_weakPtrFactory;
bool isAccessibilityRenderObject() const final { return true; }
void ariaListboxSelectedChildren(AccessibilityChildrenVector&);
void ariaListboxVisibleChildren(AccessibilityChildrenVector&);
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.cpp (220596 => 220597)
--- branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.cpp 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.cpp 2017-08-11 16:53:36 UTC (rev 220597)
@@ -35,6 +35,7 @@
AccessibilitySVGRoot::AccessibilitySVGRoot(RenderObject* renderer)
: AccessibilitySVGElement(renderer)
+ , m_parent(nullptr)
{
}
@@ -46,14 +47,6 @@
{
return adoptRef(*new AccessibilitySVGRoot(renderer));
}
-
-void AccessibilitySVGRoot::setParent(AccessibilityRenderObject *parent)
-{
- if (parent)
- m_parent = parent->createWeakPtr();
- else
- m_parent = nullptr;
-}
AccessibilityObject* AccessibilitySVGRoot::parentObject() const
{
@@ -60,7 +53,7 @@
// If a parent was set because this is a remote SVG resource, use that
// but otherwise, we should rely on the standard render tree for the parent.
if (m_parent)
- return m_parent.get();
+ return m_parent;
return AccessibilitySVGElement::parentObject();
}
Modified: branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.h (220596 => 220597)
--- branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2017-08-11 16:47:14 UTC (rev 220596)
+++ branches/safari-604.1.38.1-branch/Source/WebCore/accessibility/AccessibilitySVGRoot.h 2017-08-11 16:53:36 UTC (rev 220597)
@@ -29,7 +29,6 @@
#pragma once
#include "AccessibilitySVGElement.h"
-#include <wtf/WeakPtr.h>
namespace WebCore {
@@ -38,7 +37,7 @@
static Ref<AccessibilitySVGRoot> create(RenderObject*);
virtual ~AccessibilitySVGRoot();
- void setParent(AccessibilityRenderObject*);
+ void setParent(AccessibilityObject* parent) { m_parent = parent; }
private:
explicit AccessibilitySVGRoot(RenderObject*);
@@ -46,7 +45,7 @@
AccessibilityObject* parentObject() const override;
bool isAccessibilitySVGRoot() const override { return true; }
- WeakPtr<AccessibilityRenderObject> m_parent;
+ AccessibilityObject* m_parent;
AccessibilityRole roleValue() const override { return GroupRole; }
};
