Diff
Modified: trunk/Source/WebCore/ChangeLog (212483 => 212484)
--- trunk/Source/WebCore/ChangeLog 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 00:20:47 UTC (rev 212484)
@@ -1,3 +1,102 @@
+2017-02-16 Anders Carlsson <[email protected]>
+
+ Remove EFL from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=168477
+
+ Reviewed by Brian Burg.
+
+ * accessibility/AccessibilityList.cpp:
+ (WebCore::AccessibilityList::childHasPseudoVisibleListItemMarkers):
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::canSetValueAttribute):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::AccessibilityObject):
+ (WebCore::AccessibilityObject::textIteratorBehaviorForTextRange):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/AccessibilityTableColumn.cpp:
+ (WebCore::AccessibilityTableColumn::computeAccessibilityIsIgnored):
+ * accessibility/AccessibilityTableHeaderContainer.cpp:
+ (WebCore::AccessibilityTableHeaderContainer::computeAccessibilityIsIgnored):
+ * crypto/CryptoKey.cpp:
+ * crypto/keys/CryptoKeyRSA.h:
+ * dom/Document.cpp:
+ (WebCore::Document::implicitClose):
+ * editing/Editor.cpp:
+ (WebCore::Editor::performCutOrCopy):
+ (WebCore::Editor::copyImage):
+ * editing/Editor.h:
+ * editing/FrameSelection.h:
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::requiresAcceleratedCompositingForWebGL):
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::port):
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+ * loader/icon/IconDatabase.cpp:
+ (WebCore::IconDatabase::performURLImport):
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::contextMenuItemSelected):
+ (WebCore::ContextMenuController::populate):
+ (WebCore::ContextMenuController::checkOrEnableIfNeeded):
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::eventInvertsTabsToLinksClientCallResult):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ * platform/ContextMenuItem.h:
+ * platform/Cursor.h:
+ * platform/DragData.h:
+ * platform/DragImage.h:
+ * platform/FileSystem.h:
+ * platform/LocalizedStrings.h:
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::initializeSupportedImageMIMETypesForEncoding):
+ * platform/NotImplemented.h:
+ * platform/Pasteboard.h:
+ * platform/PlatformKeyboardEvent.h:
+ * platform/PlatformMouseEvent.h:
+ * platform/PlatformSpeechSynthesizer.h:
+ * platform/PlatformWheelEvent.h:
+ * platform/Widget.h:
+ * platform/graphics/ANGLEWebKitBridge.h:
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/Icon.h:
+ * platform/graphics/Image.h:
+ (WebCore::Image::getEvasObject): Deleted.
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/opengl/Extensions3DOpenGL.cpp:
+ (WebCore::Extensions3DOpenGL::createVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::deleteVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::isVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::bindVertexArrayOES):
+ (WebCore::Extensions3DOpenGL::supportsExtension):
+ * platform/graphics/opengl/Extensions3DOpenGL.h:
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::createForCurrentGLContext):
+ (WebCore::GraphicsContext3D::reshape):
+ (WebCore::GraphicsContext3D::createVertexArray):
+ (WebCore::GraphicsContext3D::deleteVertexArray):
+ (WebCore::GraphicsContext3D::isVertexArray):
+ (WebCore::GraphicsContext3D::bindVertexArray):
+ * platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
+ * platform/network/NetworkStateNotifier.h:
+ * platform/posix/FileSystemPOSIX.cpp:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::ensureRootLayer):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::previousOffsetForBackwardDeletion):
+ * xml/XSLStyleSheetLibxslt.cpp:
+ * xml/XSLTExtensions.cpp:
+ * xml/XSLTProcessorLibxslt.cpp:
+ * xml/XSLTUnicodeSort.cpp:
+
2017-02-16 Zalan Bujtas <[email protected]>
Simple line layout: Add forced line layout info to coverage print.
Modified: trunk/Source/WebCore/accessibility/AccessibilityList.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityList.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityList.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -118,7 +118,7 @@
// Platforms which expose rendered text content through the parent element will treat
// those renderers as "ignored" objects.
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
String text = axObj->textUnderElement();
return !text.isEmpty() && !text.containsOnlyWhitespace();
#else
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -2075,7 +2075,7 @@
if (isProgressIndicator() || isSlider())
return true;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// In ATK, input types which support aria-readonly are treated as having a
// settable value if the user can modify the widget's value or its state.
if (supportsARIAReadOnly() || isRadioButton())
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -86,7 +86,7 @@
, m_haveChildren(false)
, m_role(UnknownRole)
, m_lastKnownIsIgnoredValue(DefaultBehavior)
-#if PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#if PLATFORM(GTK)
, m_wrapper(nullptr)
#endif
{
@@ -2917,7 +2917,7 @@
{
TextIteratorBehavior behavior = TextIteratorIgnoresStyleVisibility;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// We need to emit replaced elements for GTK, and present
// them with the 'object replacement character' (0xFFFC).
behavior = static_cast<TextIteratorBehavior>(behavior | TextIteratorEmitsObjectReplacementCharacters);
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -63,7 +63,7 @@
typedef WebAccessibilityObjectWrapper AccessibilityObjectWrapper;
-#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#elif PLATFORM(GTK)
typedef struct _AtkObject AtkObject;
typedef struct _AtkObject AccessibilityObjectWrapper;
#else
@@ -1014,7 +1014,7 @@
bool isHidden() const { return isARIAHidden() || isDOMHidden(); }
#if HAVE(ACCESSIBILITY)
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
AccessibilityObjectWrapper* wrapper() const;
void setWrapper(AccessibilityObjectWrapper*);
#else
@@ -1093,7 +1093,7 @@
void ariaElementsFromAttribute(AccessibilityChildrenVector&, const QualifiedName&) const;
-#if (PLATFORM(GTK) || PLATFORM(EFL)) && HAVE(ACCESSIBILITY)
+#if PLATFORM(GTK) && HAVE(ACCESSIBILITY)
bool allowsTextRanges() const;
unsigned getLengthForTextRange() const;
#else
@@ -1105,7 +1105,7 @@
RetainPtr<WebAccessibilityObjectWrapper> m_wrapper;
#elif PLATFORM(WIN)
COMPtr<AccessibilityObjectWrapper> m_wrapper;
-#elif PLATFORM(GTK) || (PLATFORM(EFL) && HAVE(ACCESSIBILITY))
+#elif PLATFORM(GTK)
AtkObject* m_wrapper;
#endif
};
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -2695,7 +2695,7 @@
// In ATK, there is a distinction between generic text block elements and other
// generic containers; AX API does not make this distinction.
if (is<RenderTableCell>(m_renderer))
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
return DivRole;
#else
return GroupRole;
@@ -2793,7 +2793,7 @@
return GroupRole;
if (m_renderer->isRenderBlockFlow()) {
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// For ATK, GroupRole maps to ATK_ROLE_PANEL. Panels are most commonly found (and hence
// expected) in UI elements; not text blocks.
return m_renderer->isAnonymousBlock() ? DivRole : GroupRole;
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -180,7 +180,7 @@
if (!m_parent)
return true;
-#if PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(IOS) || PLATFORM(GTK)
return true;
#endif
Modified: trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp (212483 => 212484)
--- trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -58,7 +58,7 @@
if (!m_parent)
return true;
-#if PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(IOS) || PLATFORM(GTK)
return true;
#endif
Modified: trunk/Source/WebCore/crypto/CryptoKey.cpp (212483 => 212484)
--- trunk/Source/WebCore/crypto/CryptoKey.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/crypto/CryptoKey.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -68,7 +68,7 @@
return result;
}
-#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
+#if !OS(DARWIN) || PLATFORM(GTK)
Vector<uint8_t> CryptoKey::randomData(size_t size)
{
Vector<uint8_t> result(size);
Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h (212483 => 212484)
--- trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyRSA.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -31,12 +31,12 @@
#if ENABLE(SUBTLE_CRYPTO)
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
typedef struct _CCRSACryptor *CCRSACryptorRef;
typedef CCRSACryptorRef PlatformRSAKey;
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
typedef struct _PlatformRSAKeyGnuTLS PlatformRSAKeyGnuTLS;
typedef PlatformRSAKeyGnuTLS *PlatformRSAKey;
#endif
Modified: trunk/Source/WebCore/dom/Document.cpp (212483 => 212484)
--- trunk/Source/WebCore/dom/Document.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -2722,7 +2722,7 @@
m_processingLoadEvent = false;
-#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
if (f && hasLivingRenderTree() && AXObjectCache::accessibilityEnabled()) {
// The AX cache may have been cleared at this point, but we need to make sure it contains an
// AX object to send the notification to. getOrCreate will make sure that an valid AX object
Modified: trunk/Source/WebCore/editing/Editor.cpp (212483 => 212484)
--- trunk/Source/WebCore/editing/Editor.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/editing/Editor.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -1246,13 +1246,13 @@
imageElement = imageElementFromImageDocument(document());
if (imageElement) {
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *imageElement, document().url(), document().title());
#else
Pasteboard::createForCopyAndPaste()->writeImage(*imageElement, document().url(), document().title());
#endif
} else {
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
@@ -1364,7 +1364,7 @@
if (url.isEmpty())
url = ""
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
writeImageToPasteboard(*Pasteboard::createForCopyAndPaste(), *element, url, result.altDisplayString());
#else
Pasteboard::createForCopyAndPaste()->writeImage(*element, url, result.altDisplayString());
Modified: trunk/Source/WebCore/editing/Editor.h (212483 => 212484)
--- trunk/Source/WebCore/editing/Editor.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/editing/Editor.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -464,7 +464,7 @@
WEBCORE_EXPORT void replaceSelectionWithAttributedString(NSAttributedString *, MailBlockquoteHandling = MailBlockquoteHandling::RespectBlockquote);
#endif
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
WEBCORE_EXPORT void writeSelectionToPasteboard(Pasteboard&);
WEBCORE_EXPORT void writeImageToPasteboard(Pasteboard&, Element& imageElement, const URL&, const String& title);
#endif
Modified: trunk/Source/WebCore/editing/FrameSelection.h (212483 => 212484)
--- trunk/Source/WebCore/editing/FrameSelection.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -369,7 +369,7 @@
m_typingStyle = style;
}
-#if !(PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(EFL))
+#if !(PLATFORM(COCOA) || PLATFORM(GTK))
#if HAVE(ACCESSIBILITY)
inline void FrameSelection::notifyAccessibilityForSelectionChange(const AXTextStateChangeIntent&)
{
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (212483 => 212484)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -235,7 +235,7 @@
#if ENABLE(WEBGL)
static bool requiresAcceleratedCompositingForWebGL()
{
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
return false;
#else
return true;
Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (212483 => 212484)
--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -271,8 +271,6 @@
{
#if PLATFORM(GTK)
return ASCIILiteral("gtk");
-#elif PLATFORM(EFL)
- return ASCIILiteral("efl");
#else
return ASCIILiteral("unknown");
#endif
Modified: trunk/Source/WebCore/loader/HistoryController.cpp (212483 => 212484)
--- trunk/Source/WebCore/loader/HistoryController.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -154,7 +154,7 @@
// through to the client.
m_frame.loader().client().restoreViewState();
-#if !PLATFORM(IOS) && !PLATFORM(EFL)
+#if !PLATFORM(IOS)
// Don't restore scroll point on iOS as FrameLoaderClient::restoreViewState() does that.
if (view && !view->wasScrolledByUser()) {
Page* page = m_frame.page();
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (212483 => 212484)
--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -71,7 +71,7 @@
static bool checkIntegrityOnOpen = false;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
// We are not interested in icons that have been unused for more than
// 30 days, delete them even if they have not been explicitly released.
static const int notUsedIconExpirationTime = 60*60*24*30;
@@ -1184,7 +1184,7 @@
{
ASSERT_ICON_SYNC_THREAD();
-# if PLATFORM(GTK) || PLATFORM(EFL)
+# if PLATFORM(GTK)
// Do not import icons not used in the last 30 days. They will be automatically pruned later if nobody retains them.
// Note that IconInfo.stamp is only set when the icon data is retrieved from the server (and thus is not updated whether
// we use it or not). This code works anyway because the IconDatabase downloads icons again if they are older than 4 days,
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (212483 => 212484)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -249,7 +249,7 @@
// For now, call into the client. This is temporary!
frame->editor().copyImage(m_context.hitTestResult());
break;
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
case ContextMenuItemTagCopyImageUrlToClipboard:
frame->editor().copyURL(m_context.hitTestResult().absoluteImageURL(), m_context.hitTestResult().textContent());
break;
@@ -351,7 +351,7 @@
insertUnicodeCharacter(zeroWidthNonJoiner, *frame);
break;
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
case ContextMenuItemTagSelectAll:
frame->editor().command("SelectAll").execute();
break;
@@ -749,7 +749,7 @@
contextMenuItemTagDownloadImageToDisk());
ContextMenuItem CopyImageItem(ActionType, ContextMenuItemTagCopyImageToClipboard,
contextMenuItemTagCopyImageToClipboard());
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
ContextMenuItem CopyImageUrlItem(ActionType, ContextMenuItemTagCopyImageUrlToClipboard,
contextMenuItemTagCopyImageUrlToClipboard());
#endif
@@ -803,11 +803,11 @@
#if PLATFORM(GTK)
ContextMenuItem DeleteItem(ActionType, ContextMenuItemTagDelete, contextMenuItemTagDelete());
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
ContextMenuItem SelectAllItem(ActionType, ContextMenuItemTagSelectAll, contextMenuItemTagSelectAll());
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#if PLATFORM(GTK) || PLATFORM(WIN)
ContextMenuItem ShareMenuItem;
#else
ContextMenuItem ShareMenuItem(SubmenuType, ContextMenuItemTagShareMenu, emptyString());
@@ -854,7 +854,7 @@
appendItem(DownloadImageItem, m_contextMenu.get());
if (imageURL.isLocalFile() || m_context.hitTestResult().image())
appendItem(CopyImageItem, m_contextMenu.get());
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
appendItem(CopyImageUrlItem, m_contextMenu.get());
#endif
}
@@ -1041,7 +1041,7 @@
appendItem(DeleteItem, m_contextMenu.get());
appendItem(*separatorItem(), m_contextMenu.get());
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
appendItem(SelectAllItem, m_contextMenu.get());
#endif
@@ -1212,7 +1212,7 @@
shouldEnable = true;
break;
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
case ContextMenuItemTagSelectAll:
shouldEnable = true;
break;
@@ -1327,7 +1327,7 @@
case ContextMenuItemTagCopyLinkToClipboard:
case ContextMenuItemTagOpenImageInNewWindow:
case ContextMenuItemTagCopyImageToClipboard:
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
case ContextMenuItemTagCopyImageUrlToClipboard:
#endif
break;
Modified: trunk/Source/WebCore/page/DragController.cpp (212483 => 212484)
--- trunk/Source/WebCore/page/DragController.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -839,7 +839,7 @@
if (enclosingTextFormControl(src.selection().selection().start()))
dataTransfer.pasteboard().writePlainText(src.editor().selectedTextForDataTransfer(), Pasteboard::CannotSmartReplace);
else {
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (212483 => 212484)
--- trunk/Source/WebCore/page/EventHandler.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -3680,7 +3680,7 @@
bool EventHandler::eventInvertsTabsToLinksClientCallResult(KeyboardEvent& event)
{
-#if PLATFORM(COCOA) || PLATFORM(EFL)
+#if PLATFORM(COCOA)
return isKeyboardOptionTab(event);
#else
UNUSED_PARAM(event);
Modified: trunk/Source/WebCore/page/FrameView.cpp (212483 => 212484)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -1533,7 +1533,7 @@
m_layoutCount++;
-#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK)
if (AXObjectCache* cache = root->document().existingAXObjectCache())
cache->postNotification(root, AXObjectCache::AXLayoutComplete);
#endif
Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (212483 => 212484)
--- trunk/Source/WebCore/platform/ContextMenuItem.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -43,7 +43,7 @@
ContextMenuItemTagOpenImageInNewWindow,
ContextMenuItemTagDownloadImageToDisk,
ContextMenuItemTagCopyImageToClipboard,
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
ContextMenuItemTagCopyImageUrlToClipboard,
#endif
ContextMenuItemTagOpenFrameInNewWindow,
Modified: trunk/Source/WebCore/platform/Cursor.h (212483 => 212484)
--- trunk/Source/WebCore/platform/Cursor.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/Cursor.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -74,8 +74,6 @@
using PlatformCursor = NSCursor *;
#elif PLATFORM(GTK)
using PlatformCursor = GRefPtr<GdkCursor>;
-#elif PLATFORM(EFL)
-using PlatformCursor = const char*;
#endif
class Cursor {
Modified: trunk/Source/WebCore/platform/DragData.h (212483 => 212484)
--- trunk/Source/WebCore/platform/DragData.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/DragData.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -53,7 +53,7 @@
class SelectionData;
}
typedef WebCore::SelectionData* DragDataRef;
-#elif PLATFORM(EFL) || PLATFORM(IOS)
+#elif PLATFORM(IOS)
typedef void* DragDataRef;
#endif
Modified: trunk/Source/WebCore/platform/DragImage.h (212483 => 212484)
--- trunk/Source/WebCore/platform/DragImage.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/DragImage.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -63,8 +63,6 @@
typedef HBITMAP DragImageRef;
#elif PLATFORM(GTK)
typedef RefPtr<cairo_surface_t> DragImageRef;
-#elif PLATFORM(EFL)
-typedef void* DragImageRef;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebCore/platform/FileSystem.h (212483 => 212484)
--- trunk/Source/WebCore/platform/FileSystem.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/FileSystem.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -64,8 +64,6 @@
// PlatformModule
#if OS(WINDOWS)
typedef HMODULE PlatformModule;
-#elif PLATFORM(EFL)
-typedef Eina_Module* PlatformModule;
#elif USE(GLIB)
typedef GModule* PlatformModule;
#elif USE(CF)
@@ -98,7 +96,7 @@
#endif
// PlatformFileHandle
-#if USE(GLIB) && !PLATFORM(EFL) && !PLATFORM(WIN)
+#if USE(GLIB) && !PLATFORM(WIN)
typedef GFileIOStream* PlatformFileHandle;
const PlatformFileHandle invalidPlatformFileHandle = 0;
#elif OS(WINDOWS)
Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (212483 => 212484)
--- trunk/Source/WebCore/platform/LocalizedStrings.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -54,7 +54,7 @@
String contextMenuItemTagOpenImageInNewWindow();
String contextMenuItemTagDownloadImageToDisk();
String contextMenuItemTagCopyImageToClipboard();
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
String contextMenuItemTagCopyImageUrlToClipboard();
#endif
String contextMenuItemTagOpenFrameInNewWindow();
@@ -80,7 +80,7 @@
String contextMenuItemTagUnicodeInsertZWJMark();
String contextMenuItemTagUnicodeInsertZWNJMark();
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
String contextMenuItemTagSelectAll();
#endif
String contextMenuItemTagNoGuessesFound();
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -269,9 +269,6 @@
supportedImageMIMETypesForEncoding->add("image/tiff");
supportedImageMIMETypesForEncoding->add("image/bmp");
supportedImageMIMETypesForEncoding->add("image/ico");
-#elif PLATFORM(EFL)
- supportedImageMIMETypesForEncoding->add("image/png");
- supportedImageMIMETypesForEncoding->add("image/jpeg");
#elif USE(CAIRO)
supportedImageMIMETypesForEncoding->add("image/png");
#endif
Modified: trunk/Source/WebCore/platform/NotImplemented.h (212483 => 212484)
--- trunk/Source/WebCore/platform/NotImplemented.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/NotImplemented.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -28,7 +28,7 @@
#include <wtf/Assertions.h>
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
#define suppressNotImplementedWarning() getenv("DISABLE_NI_WARNING")
#else
#define suppressNotImplementedWarning() false
Modified: trunk/Source/WebCore/platform/Pasteboard.h (212483 => 212484)
--- trunk/Source/WebCore/platform/Pasteboard.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -62,7 +62,7 @@
// For writing to the pasteboard. Generally sorted with the richest formats on top.
struct PasteboardWebContent {
-#if !(PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(WIN))
+#if !(PLATFORM(GTK) || PLATFORM(WIN))
WEBCORE_EXPORT PasteboardWebContent();
WEBCORE_EXPORT ~PasteboardWebContent();
bool canSmartCopyOrDelete;
@@ -99,10 +99,10 @@
#if PLATFORM(MAC)
RefPtr<SharedBuffer> dataInWebArchiveFormat;
#endif
-#if !(PLATFORM(EFL) || PLATFORM(WIN))
+#if !PLATFORM(WIN)
PasteboardURL url;
#endif
-#if !(PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(WIN))
+#if !(PLATFORM(GTK) || PLATFORM(WIN))
RefPtr<SharedBuffer> resourceData;
String resourceMIMEType;
#endif
@@ -114,7 +114,7 @@
public:
virtual ~PasteboardWebContentReader() { }
-#if !(PLATFORM(EFL) || PLATFORM(GTK) || PLATFORM(WIN))
+#if !(PLATFORM(GTK) || PLATFORM(WIN))
virtual bool readWebArchive(SharedBuffer*) = 0;
virtual bool readFilenames(const Vector<String>&) = 0;
virtual bool readHTML(const String&) = 0;
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (212483 => 212484)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -45,11 +45,6 @@
#include "CompositionResults.h"
#endif
-#if PLATFORM(EFL)
-typedef struct _Evas_Event_Key_Down Evas_Event_Key_Down;
-typedef struct _Evas_Event_Key_Up Evas_Event_Key_Up;
-#endif
-
namespace WebCore {
class PlatformKeyboardEvent : public PlatformEvent {
@@ -169,11 +164,6 @@
static bool modifiersContainCapsLock(unsigned);
#endif
-#if PLATFORM(EFL)
- explicit PlatformKeyboardEvent(const Evas_Event_Key_Down*);
- explicit PlatformKeyboardEvent(const Evas_Event_Key_Up*);
-#endif
-
protected:
String m_text;
String m_unmodifiedText;
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (212483 => 212484)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -35,12 +35,6 @@
typedef struct _GdkEventMotion GdkEventMotion;
#endif
-#if PLATFORM(EFL)
-typedef struct _Evas_Event_Mouse_Down Evas_Event_Mouse_Down;
-typedef struct _Evas_Event_Mouse_Up Evas_Event_Mouse_Up;
-typedef struct _Evas_Event_Mouse_Move Evas_Event_Mouse_Move;
-#endif
-
namespace WebCore {
const double ForceAtClick = 1;
@@ -103,13 +97,6 @@
void setClickCount(int count) { m_clickCount = count; }
#endif
-#if PLATFORM(EFL)
- void setClickCount(unsigned int);
- PlatformMouseEvent(const Evas_Event_Mouse_Down*, IntPoint);
- PlatformMouseEvent(const Evas_Event_Mouse_Up*, IntPoint);
- PlatformMouseEvent(const Evas_Event_Mouse_Move*, IntPoint);
-#endif
-
#if PLATFORM(MAC)
int eventNumber() const { return m_eventNumber; }
int menuTypeForEvent() const { return m_menuTypeForEvent; }
Modified: trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h (212483 => 212484)
--- trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -36,14 +36,8 @@
OBJC_CLASS WebSpeechSynthesisWrapper;
#endif
-#if PLATFORM(EFL)
namespace WebCore {
-class PlatformSpeechSynthesisProviderEfl;
-}
-#endif
-namespace WebCore {
-
enum SpeechBoundary {
SpeechWordBoundary,
SpeechSentenceBoundary
@@ -92,9 +86,6 @@
#if PLATFORM(COCOA)
RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
#endif
-#if PLATFORM(EFL)
- std::unique_ptr<PlatformSpeechSynthesisProviderEfl> m_platformSpeechWrapper;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/PlatformWheelEvent.h (212483 => 212484)
--- trunk/Source/WebCore/platform/PlatformWheelEvent.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/PlatformWheelEvent.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -34,10 +34,6 @@
typedef struct _GdkEventScroll GdkEventScroll;
#endif
-#if PLATFORM(EFL)
-typedef struct _Evas_Event_Mouse_Wheel Evas_Event_Mouse_Wheel;
-#endif
-
namespace WebCore {
// The ScrollByPixelWheelEvent is a fine-grained event that specifies the precise number of pixels to scroll.
@@ -123,10 +119,6 @@
explicit PlatformWheelEvent(GdkEventScroll*);
#endif
-#if PLATFORM(EFL)
- explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
-#endif
-
#if PLATFORM(COCOA)
bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
void setHasPreciseScrollingDeltas(bool hasPreciseScrollingDeltas) { m_hasPreciseScrollingDeltas = hasPreciseScrollingDeltas; }
Modified: trunk/Source/WebCore/platform/Widget.h (212483 => 212484)
--- trunk/Source/WebCore/platform/Widget.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/Widget.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -61,10 +61,6 @@
typedef GtkWidget* PlatformWidget;
#endif
-#if PLATFORM(EFL)
-typedef Evas_Object* PlatformWidget;
-#endif
-
typedef PlatformWidget PlatformPageClient;
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -36,7 +36,7 @@
#include <OpenGL/gl.h>
#elif PLATFORM(WIN)
#include "OpenGLESShims.h"
-#elif PLATFORM(GTK) || PLATFORM(EFL)
+#elif PLATFORM(GTK)
#if USE(OPENGL_ES_2)
#include <GLES2/gl2.h>
#else
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -116,10 +116,6 @@
GdkPixbuf* getGdkPixbuf() override;
#endif
-#if PLATFORM(EFL)
- Evas_Object* getEvasObject(Evas*) override;
-#endif
-
WEBCORE_EXPORT NativeImagePtr nativeImage(const GraphicsContext* = nullptr) override;
NativeImagePtr nativeImageForCurrentFrame(const GraphicsContext* = nullptr) override;
#if USE(CG)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -60,7 +60,7 @@
#include <wtf/RetainPtr.h>
OBJC_CLASS CALayer;
OBJC_CLASS WebGLLayer;
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN_CAIRO)
+#elif PLATFORM(GTK) || PLATFORM(WIN_CAIRO)
typedef unsigned int GLuint;
#endif
@@ -1120,7 +1120,7 @@
GC3Dboolean isVertexArray(Platform3DObject);
void bindVertexArray(Platform3DObject);
-#if PLATFORM(GTK) || PLATFORM(EFL) || USE(CAIRO)
+#if PLATFORM(GTK) || USE(CAIRO)
void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
int canvasWidth, int canvasHeight, PlatformContextCairo* context);
#elif USE(CG)
@@ -1293,9 +1293,6 @@
bool reshapeFBOs(const IntSize&);
void resolveMultisamplingIfNecessary(const IntRect& = IntRect());
void attachDepthAndStencilBufferIfNeeded(GLuint internalDepthStencilFormat, int width, int height);
-#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
- void createGraphicsSurfaces(const IntSize&);
-#endif
int m_currentWidth, m_currentHeight;
@@ -1370,7 +1367,7 @@
std::unique_ptr<ShaderNameHash> nameHashMapForShaders;
-#if ((PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)) && USE(OPENGL_ES_2))
+#if ((PLATFORM(GTK) || PLATFORM(WIN)) && USE(OPENGL_ES_2))
friend class Extensions3DOpenGLES;
std::unique_ptr<Extensions3DOpenGLES> m_extensions;
#else
@@ -1419,7 +1416,7 @@
// Errors raised by synthesizeGLError().
ListHashSet<GC3Denum> m_syntheticErrors;
-#if USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
+#if USE(TEXTURE_MAPPER)
friend class TextureMapperGC3DPlatformLayer;
std::unique_ptr<TextureMapperGC3DPlatformLayer> m_texmapLayer;
#else
Modified: trunk/Source/WebCore/platform/graphics/Icon.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/Icon.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/Icon.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -78,8 +78,6 @@
#elif PLATFORM(GTK)
Icon();
GdkPixbuf* m_icon;
-#elif PLATFORM(EFL)
- Icon();
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/Image.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/Image.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -163,10 +163,6 @@
virtual GdkPixbuf* getGdkPixbuf() { return nullptr; }
#endif
-#if PLATFORM(EFL)
- virtual Evas_Object* getEvasObject(Evas*) { return nullptr; }
-#endif
-
virtual void drawPattern(GraphicsContext&, const FloatRect& destRect, const FloatRect& srcRect, const AffineTransform& patternTransform,
const FloatPoint& phase, const FloatSize& spacing, CompositeOperator, BlendMode = BlendModeNormal);
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -146,9 +146,6 @@
explicit IntPoint(const D2D1_POINT_2F&); // Don't do this implicitly, since it's lossy.
operator D2D1_POINT_2F() const;
operator D2D1_POINT_2U() const;
-#elif PLATFORM(EFL)
- explicit IntPoint(const Evas_Point&);
- operator Evas_Point() const;
#endif
private:
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -181,9 +181,6 @@
IntRect(const D2D1_RECT_U&);
operator D2D1_RECT_F() const;
operator D2D1_RECT_U() const;
-#elif PLATFORM(EFL)
- explicit IntRect(const Eina_Rectangle&);
- operator Eina_Rectangle() const;
#endif
#if USE(CAIRO)
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -35,7 +35,7 @@
#include <OpenGLES/ES2/glext.h>
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#elif PLATFORM(GTK) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
@@ -83,7 +83,7 @@
{
m_context->makeContextCurrent();
GLuint array = 0;
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
if (isVertexArrayObjectSupported())
glGenVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -98,7 +98,7 @@
return;
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
if (isVertexArrayObjectSupported())
glDeleteVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -112,7 +112,7 @@
return GL_FALSE;
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
if (isVertexArrayObjectSupported())
return glIsVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -124,7 +124,7 @@
void Extensions3DOpenGL::bindVertexArrayOES(Platform3DObject array)
{
m_context->makeContextCurrent();
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
if (isVertexArrayObjectSupported())
glBindVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
@@ -195,7 +195,7 @@
// GL_OES_vertex_array_object
if (name == "GL_OES_vertex_array_object") {
-#if (PLATFORM(GTK) || PLATFORM(EFL))
+#if (PLATFORM(GTK))
return m_availableExtensions.contains("GL_ARB_vertex_array_object");
#elif PLATFORM(IOS)
return m_availableExtensions.contains("GL_OES_vertex_array_object");
@@ -300,7 +300,7 @@
return String(reinterpret_cast<const char*>(::glGetString(GL_EXTENSIONS)));
}
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
bool Extensions3DOpenGL::isVertexArrayObjectSupported()
{
static const bool supportsVertexArrayObject = supports("GL_OES_vertex_array_object");
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -62,7 +62,7 @@
String getExtensions() override;
private:
-#if (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
bool isVertexArrayObjectSupported();
#endif
};
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -45,7 +45,7 @@
#include <OpenGL/gl.h>
#include <OpenGL/gl3.h>
#undef GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#elif PLATFORM(GTK) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -58,7 +58,7 @@
#include <OpenGL/gl.h>
#include <OpenGL/gl3.h>
#undef GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#elif PLATFORM(GTK) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -72,7 +72,7 @@
#include <OpenGL/gl3.h>
#include <OpenGL/gl3ext.h>
#undef GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#elif PLATFORM(GTK) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
#endif
@@ -133,7 +133,7 @@
RefPtr<GraphicsContext3D> GraphicsContext3D::createForCurrentGLContext()
{
auto context = adoptRef(*new GraphicsContext3D({ }, 0, GraphicsContext3D::RenderToCurrentGLContext));
-#if USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
+#if USE(TEXTURE_MAPPER)
if (!context->m_texmapLayer)
return nullptr;
#else
@@ -306,11 +306,6 @@
markContextChanged();
-#if PLATFORM(EFL) && USE(GRAPHICS_SURFACE)
- ::glFlush(); // Make sure all GL calls have been committed before resizing.
- createGraphicsSurfaces(IntSize(width, height));
-#endif
-
m_currentWidth = width;
m_currentHeight = height;
@@ -1421,7 +1416,7 @@
{
makeContextCurrent();
GLuint array = 0;
-#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
glGenVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
glGenVertexArraysAPPLE(1, &array);
@@ -1435,7 +1430,7 @@
return;
makeContextCurrent();
-#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
glDeleteVertexArrays(1, &array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
glDeleteVertexArraysAPPLE(1, &array);
@@ -1448,7 +1443,7 @@
return GL_FALSE;
makeContextCurrent();
-#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
return glIsVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
return glIsVertexArrayAPPLE(array);
@@ -1459,7 +1454,7 @@
void GraphicsContext3D::bindVertexArray(Platform3DObject array)
{
makeContextCurrent();
-#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS))
+#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(IOS))
glBindVertexArray(array);
#elif defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object
glBindVertexArrayAPPLE(array);
Modified: trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -36,7 +36,7 @@
#include <OpenGLES/ES2/gl.h>
#elif PLATFORM(MAC)
#include <OpenGL/gl.h>
-#elif PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
+#elif PLATFORM(GTK) || PLATFORM(WIN)
#include "OpenGLShims.h"
#endif
Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (212483 => 212484)
--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2017-02-17 00:20:47 UTC (rev 212484)
@@ -56,7 +56,7 @@
WTF_MAKE_NONCOPYABLE(NetworkStateNotifier); WTF_MAKE_FAST_ALLOCATED;
public:
NetworkStateNotifier();
-#if PLATFORM(EFL) || PLATFORM(IOS)
+#if PLATFORM(IOS)
~NetworkStateNotifier();
#endif
void addNetworkStateChangeListener(std::function<void (bool isOnLine)>);
@@ -88,13 +88,6 @@
HANDLE m_waitHandle;
OVERLAPPED m_overlapped;
-#elif PLATFORM(EFL)
- void networkInterfaceChanged();
- static Eina_Bool readSocketCallback(void* userData, Ecore_Fd_Handler*);
-
- int m_netlinkSocket;
- Ecore_Fd_Handler* m_fdHandler;
-
#elif PLATFORM(IOS)
void registerObserverIfNecessary() const;
friend void setOnLine(const NetworkStateNotifier*, bool);
@@ -105,7 +98,7 @@
#endif
};
-#if !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(EFL)
+#if !PLATFORM(COCOA) && !PLATFORM(WIN)
inline NetworkStateNotifier::NetworkStateNotifier()
: m_isOnLine(true)
Modified: trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp (212483 => 212484)
--- trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -328,7 +328,7 @@
return entries;
}
-#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
+#if !OS(DARWIN) || PLATFORM(GTK)
String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
{
char buffer[PATH_MAX];
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (212483 => 212484)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -3329,7 +3329,7 @@
m_rootContentLayer->setSize(FloatSize(overflowRect.maxX(), overflowRect.maxY()));
m_rootContentLayer->setPosition(FloatPoint());
-#if PLATFORM(IOS) || PLATFORM(EFL)
+#if PLATFORM(IOS)
// Page scale is applied above this on iOS, so we'll just say that our root layer applies it.
Frame& frame = m_renderView.frameView().frame();
if (frame.isMainFrame())
Modified: trunk/Source/WebCore/rendering/RenderText.cpp (212483 => 212484)
--- trunk/Source/WebCore/rendering/RenderText.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -1508,7 +1508,7 @@
return result;
}
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
const UChar hangulChoseongStart = 0x1100;
const UChar hangulChoseongEnd = 0x115F;
@@ -1555,7 +1555,7 @@
// FIXME: Seems like this fancier case could be used on all platforms now, no
// need for the #else case below.
-#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
+#if PLATFORM(COCOA) || PLATFORM(GTK)
bool sawRegionalIndicator = false;
bool sawEmojiGroupCandidate = false;
bool sawEmojiFitzpatrickModifier = false;
Modified: trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp (212483 => 212484)
--- trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/xml/XSLStyleSheetLibxslt.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -36,11 +36,11 @@
#include <libxml/uri.h>
#include <libxslt/xsltutils.h>
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
#include "SoftLinking.h"
#endif
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
SOFT_LINK_LIBRARY(libxslt)
SOFT_LINK(libxslt, xsltIsBlank, int, (xmlChar *str), (str))
SOFT_LINK(libxslt, xsltGetNsProp, xmlChar *, (xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace), (node, name, nameSpace))
Modified: trunk/Source/WebCore/xml/XSLTExtensions.cpp (212483 => 212484)
--- trunk/Source/WebCore/xml/XSLTExtensions.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/xml/XSLTExtensions.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -35,11 +35,11 @@
#include <libxslt/extensions.h>
#include <libxslt/extra.h>
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
#include "SoftLinking.h"
#endif
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
SOFT_LINK_LIBRARY(libxslt)
SOFT_LINK(libxslt, xsltRegisterExtFunction, int, (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function), (ctxt, name, URI, function))
SOFT_LINK(libxslt, xsltFunctionNodeSet, void, (xmlXPathParserContextPtr ctxt, int nargs), (ctxt, nargs))
Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (212483 => 212484)
--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -48,7 +48,7 @@
#include <wtf/text/StringBuffer.h>
#include <wtf/unicode/UTF8.h>
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
#include "SoftLinking.h"
SOFT_LINK_LIBRARY(libxslt);
Modified: trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp (212483 => 212484)
--- trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2017-02-17 00:08:38 UTC (rev 212483)
+++ trunk/Source/WebCore/xml/XSLTUnicodeSort.cpp 2017-02-17 00:20:47 UTC (rev 212484)
@@ -37,11 +37,11 @@
#include <wtf/Vector.h>
#include <wtf/unicode/Collator.h>
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
#include "SoftLinking.h"
#endif
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
+#if OS(DARWIN) && !PLATFORM(GTK)
SOFT_LINK_LIBRARY(libxslt)
SOFT_LINK(libxslt, xsltComputeSortResult, xmlXPathObjectPtr*, (xsltTransformContextPtr ctxt, xmlNodePtr sort), (ctxt, sort))
