Diff
Modified: trunk/Source/WebCore/ChangeLog (237167 => 237168)
--- trunk/Source/WebCore/ChangeLog 2018-10-16 01:12:59 UTC (rev 237167)
+++ trunk/Source/WebCore/ChangeLog 2018-10-16 01:15:27 UTC (rev 237168)
@@ -1,3 +1,16 @@
+2018-10-15 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r237162.
+ https://bugs.webkit.org/show_bug.cgi?id=190612
+
+ Broke Windows build (Requested by dolmstead on #webkit).
+
+ Reverted changeset:
+
+ "Add stub implementation for accessibility objects"
+ https://bugs.webkit.org/show_bug.cgi?id=190608
+ https://trac.webkit.org/changeset/237162
+
2018-10-15 Said Abou-Hallawa <sabouhall...@apple.com>
[CG] Adopt CG SPI for non-even cornered rounded rects
Modified: trunk/Source/WebCore/SourcesWPE.txt (237167 => 237168)
--- trunk/Source/WebCore/SourcesWPE.txt 2018-10-16 01:12:59 UTC (rev 237167)
+++ trunk/Source/WebCore/SourcesWPE.txt 2018-10-16 01:15:27 UTC (rev 237168)
@@ -21,6 +21,9 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
// THE POSSIBILITY OF SUCH DAMAGE.
+accessibility/wpe/AXObjectCacheWPE.cpp
+accessibility/wpe/AccessibilityObjectWPE.cpp
+
editing/wpe/EditorWPE.cpp
loader/soup/ResourceLoaderSoup.cpp
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (237167 => 237168)
--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2018-10-16 01:12:59 UTC (rev 237167)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2018-10-16 01:15:27 UTC (rev 237168)
@@ -106,10 +106,6 @@
#include "MediaControlElements.h"
#endif
-#if !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
-#include "NotImplemented.h"
-#endif
-
#if COMPILER(MSVC)
// See https://msdn.microsoft.com/en-us/library/1wea5zwe.aspx
#pragma warning(disable: 4701)
@@ -3038,45 +3034,6 @@
return AXTextInserted;
}
#endif
-
-#if !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
-
-void AXObjectCache::detachWrapper(AccessibilityObject*, AccessibilityDetachmentType)
-{
- notImplemented();
-}
-
-void AXObjectCache::attachWrapper(AccessibilityObject*)
-{
- notImplemented();
-}
-
-void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification)
-{
- notImplemented();
-}
-
-void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
-{
- notImplemented();
-}
-
-void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent)
-{
- notImplemented();
-}
-
-void AXObjectCache::platformHandleFocusedUIElementChanged(Node*, Node*)
-{
- notImplemented();
-}
-
-void AXObjectCache::handleScrolledToAnchor(const Node*)
-{
- notImplemented();
-}
-
-#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (237167 => 237168)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-10-16 01:12:59 UTC (rev 237167)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2018-10-16 01:15:27 UTC (rev 237168)
@@ -83,10 +83,6 @@
#include <wtf/text/WTFString.h>
#include <wtf/unicode/CharacterNames.h>
-#if HAVE(ACCESSIBILITY) && !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
-#include "NotImplemented.h"
-#endif
-
namespace WebCore {
using namespace HTMLNames;
@@ -3629,20 +3625,4 @@
child->setIsIgnoredFromParentData(result);
}
-#if HAVE(ACCESSIBILITY) && !(PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN))
-
-bool AccessibilityObject::accessibilityIgnoreAttachment() const
-{
- notImplemented();
- return false;
-}
-
-AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
-{
- notImplemented();
- return AccessibilityObjectInclusion::DefaultBehavior;
-}
-
-#endif
-
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (237167 => 237168)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2018-10-16 01:12:59 UTC (rev 237167)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2018-10-16 01:15:27 UTC (rev 237168)
@@ -67,8 +67,10 @@
#elif PLATFORM(GTK)
typedef struct _AtkObject AtkObject;
typedef struct _AtkObject AccessibilityObjectWrapper;
+#elif PLATFORM(WPE)
+class AccessibilityObjectWrapper : public RefCounted<AccessibilityObjectWrapper> { };
#else
-class AccessibilityObjectWrapper : public RefCounted<AccessibilityObjectWrapper> { };
+class AccessibilityObjectWrapper;
#endif
namespace WebCore {
@@ -1195,7 +1197,7 @@
COMPtr<AccessibilityObjectWrapper> m_wrapper;
#elif PLATFORM(GTK)
AtkObject* m_wrapper { nullptr };
-#else
+#elif PLATFORM(WPE)
RefPtr<AccessibilityObjectWrapper> m_wrapper;
#endif
};
Added: trunk/Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp (0 => 237168)
--- trunk/Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp (rev 0)
+++ trunk/Source/WebCore/accessibility/wpe/AXObjectCacheWPE.cpp 2018-10-16 01:15:27 UTC (rev 237168)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2017 Igalia, S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "AXObjectCache.h"
+
+#if HAVE(ACCESSIBILITY)
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+void AXObjectCache::detachWrapper(AccessibilityObject*, AccessibilityDetachmentType)
+{
+ notImplemented();
+}
+
+void AXObjectCache::attachWrapper(AccessibilityObject*)
+{
+ notImplemented();
+}
+
+void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification)
+{
+ notImplemented();
+}
+
+void AXObjectCache::nodeTextChangePlatformNotification(AccessibilityObject*, AXTextChange, unsigned, const String&)
+{
+ notImplemented();
+}
+
+void AXObjectCache::frameLoadingEventPlatformNotification(AccessibilityObject*, AXLoadingEvent)
+{
+ notImplemented();
+}
+
+void AXObjectCache::platformHandleFocusedUIElementChanged(Node*, Node*)
+{
+ notImplemented();
+}
+
+void AXObjectCache::handleScrolledToAnchor(const Node*)
+{
+ notImplemented();
+}
+
+} // namespace WebCore
+
+#endif // HAVE(ACCESSIBILITY)
Added: trunk/Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp (0 => 237168)
--- trunk/Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp (rev 0)
+++ trunk/Source/WebCore/accessibility/wpe/AccessibilityObjectWPE.cpp 2018-10-16 01:15:27 UTC (rev 237168)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2017 Igalia, S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "AXObjectCache.h"
+
+#if HAVE(ACCESSIBILITY)
+
+#include "NotImplemented.h"
+
+namespace WebCore {
+
+bool AccessibilityObject::accessibilityIgnoreAttachment() const
+{
+ notImplemented();
+ return false;
+}
+
+AccessibilityObjectInclusion AccessibilityObject::accessibilityPlatformIncludesObject() const
+{
+ notImplemented();
+ return AccessibilityObjectInclusion::DefaultBehavior;
+}
+
+} // namespace WebCore
+
+#endif // HAVE(ACCESSIBILITY)
