Diff
Modified: trunk/Source/WebCore/ChangeLog (147866 => 147867)
--- trunk/Source/WebCore/ChangeLog 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Source/WebCore/ChangeLog 2013-04-07 16:42:28 UTC (rev 147867)
@@ -1,3 +1,16 @@
+2013-04-07 Ed Bartosh <[email protected]>
+
+ [EFL] --minimal build fails with error: WebCore::FrameSelection::notifyAccessibilityForSelectionChange()
+ https://bugs.webkit.org/show_bug.cgi?id=114089
+
+ Reviewed by Chris Fleizach.
+
+ Wrapped accessibility related code in #if HAVE(ACCESSIBILITY)
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::setSelection):
+ * editing/FrameSelection.h:
+ (WebCore):
+
2013-04-06 Benjamin Poulain <[email protected]>
Get rid of skia
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (147866 => 147867)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-04-07 16:42:28 UTC (rev 147867)
@@ -338,8 +338,9 @@
revealSelection(alignment, RevealExtent);
}
-
+#if HAVE(ACCESSIBILITY)
notifyAccessibilityForSelectionChange();
+#endif
m_frame->document()->enqueueDocumentEvent(Event::create(eventNames().selectionchangeEvent, false, false));
}
Modified: trunk/Source/WebCore/editing/FrameSelection.h (147866 => 147867)
--- trunk/Source/WebCore/editing/FrameSelection.h 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2013-04-07 16:42:28 UTC (rev 147867)
@@ -278,8 +278,10 @@
VisiblePosition modifyMovingBackward(TextGranularity);
LayoutUnit lineDirectionPointForBlockDirectionNavigation(EPositionType);
-
+
+#if HAVE(ACCESSIBILITY)
void notifyAccessibilityForSelectionChange();
+#endif
void focusedOrActiveStateChanged();
@@ -330,10 +332,12 @@
}
#if !(PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL))
+#if HAVE(ACCESSIBILITY)
inline void FrameSelection::notifyAccessibilityForSelectionChange()
{
}
#endif
+#endif
} // namespace WebCore
Modified: trunk/Tools/ChangeLog (147866 => 147867)
--- trunk/Tools/ChangeLog 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Tools/ChangeLog 2013-04-07 16:42:28 UTC (rev 147867)
@@ -1,3 +1,18 @@
+2013-04-07 Ed Bartosh <[email protected]>
+
+ [EFL] -minimal build fails with error: WebCore::FrameSelection::notifyAccessibilityForSelectionChange()
+ https://bugs.webkit.org/show_bug.cgi?id=114089
+
+ Reviewed by Chris Fleizach.
+
+ Wrapped accessibility related code in #if HAVE(ACCESSIBILITY)
+ * DumpRenderTree/AccessibilityController.cpp:
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::DumpRenderTreeChrome):
+ * DumpRenderTree/efl/DumpRenderTreeChrome.h:
+ (DumpRenderTreeChrome):
+
2013-04-06 Laszlo Gombos <[email protected]>
Build fix after r147857, remove remaining USE(JSC) guards.
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.cpp (147866 => 147867)
--- trunk/Tools/DumpRenderTree/AccessibilityController.cpp 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.cpp 2013-04-07 16:42:28 UTC (rev 147867)
@@ -24,6 +24,9 @@
*/
#include "config.h"
+
+#if HAVE(ACCESSIBILITY)
+
#include "AccessibilityController.h"
#include "AccessibilityUIElement.h"
@@ -162,3 +165,4 @@
setLogScrollingStartEvents(false);
setLogAccessibilityEvents(false);
}
+#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (147866 => 147867)
--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2013-04-07 16:42:28 UTC (rev 147867)
@@ -24,6 +24,9 @@
*/
#include "config.h"
+
+#if HAVE(ACCESSIBILITY)
+
#include "AccessibilityUIElement.h"
#include <_javascript_Core/JSObjectRef.h>
@@ -1346,3 +1349,4 @@
static JSClassRef accessibilityUIElementClass = JSClassCreate(&classDefinition);
return accessibilityUIElementClass;
}
+#endif
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (147866 => 147867)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2013-04-07 16:42:28 UTC (rev 147867)
@@ -74,7 +74,9 @@
, m_mainFrame(0)
, m_evas(evas)
, m_gcController(adoptPtr(new GCController))
+#if HAVE(ACCESSIBILITY)
, m_axController(adoptPtr(new AccessibilityController))
+#endif
{
}
@@ -863,7 +865,9 @@
browser->m_extraViews.append(newView);
}
+#if HAVE(ACCESSIBILITY)
AccessibilityController* DumpRenderTreeChrome::accessibilityController() const
{
return m_axController.get();
}
+#endif
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h (147866 => 147867)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2013-04-07 03:52:05 UTC (rev 147866)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2013-04-07 16:42:28 UTC (rev 147867)
@@ -68,12 +68,13 @@
Evas_Object* createView() const;
bool initialize();
+#if HAVE(ACCESSIBILITY)
AccessibilityController* accessibilityController() const;
-
+ OwnPtr<AccessibilityController> m_axController;
+#endif
Evas_Object* m_mainFrame;
Evas_Object* m_mainView;
Evas* m_evas;
- OwnPtr<AccessibilityController> m_axController;
OwnPtr<GCController> m_gcController;
Vector<Evas_Object*> m_extraViews;
static HashMap<unsigned long, CString> m_dumpAssignedUrls;
