<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[212521] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/212521">212521</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2017-02-16 20:07:12 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove even more EFL from WebCore
https://bugs.webkit.org/show_bug.cgi?id=168485
Reviewed by Alex Christensen.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleGetAttributes):
(atkRole):
* css/StyleRule.cpp:
(WebCore::StyleRuleBase::copy):
* platform/ContextMenuItem.h:
* platform/graphics/OpenGLESShims.h:
* platform/graphics/PlatformDisplay.cpp:
(WebCore::PlatformDisplay::createPlatformDisplay):
* platform/graphics/PlatformDisplay.h:
* platform/graphics/cairo/ImageBufferCairo.cpp:
* platform/graphics/freetype/SimpleFontDataFreeType.cpp:
(WebCore::Font::platformInit):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setContentsToImage):
* platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:
* platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
* platform/network/soup/ResourceErrorSoup.cpp:
(WebCore::ResourceError::timeoutError):
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::SoupNetworkSession::setProxySettingsFromEnvironment): Deleted.
* platform/network/soup/SoupNetworkSession.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformContextMenuItemh">trunk/Source/WebCore/platform/ContextMenuItem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsOpenGLESShimsh">trunk/Source/WebCore/platform/graphics/OpenGLESShims.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp">trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsPlatformDisplayh">trunk/Source/WebCore/platform/graphics/PlatformDisplay.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeSimpleFontDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayerh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceErrorSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2017-02-16 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ Remove even more EFL from WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=168485
+
+ Reviewed by Alex Christensen.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetAttributes):
+ (atkRole):
+ * css/StyleRule.cpp:
+ (WebCore::StyleRuleBase::copy):
+ * platform/ContextMenuItem.h:
+ * platform/graphics/OpenGLESShims.h:
+ * platform/graphics/PlatformDisplay.cpp:
+ (WebCore::PlatformDisplay::createPlatformDisplay):
+ * platform/graphics/PlatformDisplay.h:
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
+ (WebCore::Font::platformInit):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::setContentsToImage):
+ * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp:
+ * platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h:
+ * platform/network/soup/ResourceErrorSoup.cpp:
+ (WebCore::ResourceError::timeoutError):
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::setProxySettingsFromEnvironment): Deleted.
+ * platform/network/soup/SoupNetworkSession.h:
+
</ins><span class="cx"> 2017-02-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Chromium-specific code to call FrameLoaderClient::redirectDataToPlugin(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -357,8 +357,6 @@
</span><span class="cx"> AtkAttributeSet* attributeSet = nullptr;
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> attributeSet = addToAtkAttributeSet(attributeSet, "toolkit", "WebKitGtk");
</span><del>-#elif PLATFORM(EFL)
- attributeSet = addToAtkAttributeSet(attributeSet, "toolkit", "WebKitEfl");
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* coreObject = core(object);
</span><span class="lines">@@ -532,8 +530,6 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> // ATK_ROLE_COLOR_CHOOSER is defined as a dialog (i.e. it's what appears when you push the button).
</span><span class="cx"> return ATK_ROLE_PUSH_BUTTON;
</span><del>-#elif PLATFORM(EFL)
- return ATK_ROLE_COLOR_CHOOSER;
</del><span class="cx"> #endif
</span><span class="cx"> case ListRole:
</span><span class="cx"> return ATK_ROLE_LIST;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -146,8 +146,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> CRASH();
</span><del>- // HACK: EFL won't build without this (old GCC with crappy -Werror=return-type)
- return Ref<StyleRuleBase>(*static_cast<StyleRuleBase*>(nullptr));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSRule> StyleRuleBase::createCSSOMWrapper(CSSStyleSheet* parentSheet, CSSRule* parentRule) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContextMenuItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContextMenuItem.h (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContextMenuItem.h 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/ContextMenuItem.h 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -56,11 +56,7 @@
</span><span class="cx"> ContextMenuItemTagPaste,
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> ContextMenuItemTagDelete,
</span><del>-#endif
-#if PLATFORM(GTK) || PLATFORM (EFL)
</del><span class="cx"> ContextMenuItemTagSelectAll,
</span><del>-#endif
-#if PLATFORM(GTK)
</del><span class="cx"> ContextMenuItemTagInputMethods,
</span><span class="cx"> ContextMenuItemTagUnicode,
</span><span class="cx"> ContextMenuItemTagUnicodeInsertLRMMark,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsOpenGLESShimsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/OpenGLESShims.h (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef OpenGLESShims_h
</span><span class="cx"> #define OpenGLESShims_h
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN)
</del><ins>+#if PLATFORM(GTK) || PLATFORM(WIN)
</ins><span class="cx"> #define glBindFramebufferEXT glBindFramebuffer
</span><span class="cx"> #define glFramebufferTexture2DEXT glFramebufferTexture2D
</span><span class="cx"> #define glBindRenderbufferEXT glBindRenderbuffer
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -54,10 +54,6 @@
</span><span class="cx"> #include <gdk/gdkwayland.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL) && defined(HAVE_ECORE_X)
-#include <Ecore_X.h>
-#endif
-
</del><span class="cx"> #if USE(EGL)
</span><span class="cx"> #include <EGL/egl.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -82,8 +78,6 @@
</span><span class="cx"> return std::make_unique<PlatformDisplayWayland>(gdk_wayland_display_get_wl_display(display));
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
- return std::make_unique<PlatformDisplayX11>(static_cast<Display*>(ecore_x_display_get()));
</del><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> return std::make_unique<PlatformDisplayWin>();
</span><span class="cx"> #endif
</span><span class="lines">@@ -154,7 +148,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
</del><ins>+#if USE(EGL) || USE(GLX)
</ins><span class="cx"> GLContext* PlatformDisplay::sharingGLContext()
</span><span class="cx"> {
</span><span class="cx"> if (!m_sharingGLContext)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsPlatformDisplayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.h (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.h 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx">
</span><del>-#if !PLATFORM(EFL) && (USE(EGL) || USE(GLX))
- // FIXME: This should not have any platform ifdef, but EFL has its own EGLContext class
- // instead of using the GLContext common API.
</del><ins>+#if USE(EGL) || USE(GLX)
</ins><span class="cx"> GLContext* sharingGLContext();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK) && !PLATFORM(EFL)
</del><ins>+#if !PLATFORM(GTK)
</ins><span class="cx"> static cairo_status_t writeFunction(void* output, const unsigned char* data, unsigned int length)
</span><span class="cx"> {
</span><span class="cx"> if (!reinterpret_cast<Vector<unsigned char>*>(output)->tryAppend(data, length))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeSimpleFontDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -89,12 +89,8 @@
</span><span class="cx"> m_fontMetrics.setDescent(descent);
</span><span class="cx"> m_fontMetrics.setCapHeight(capHeight);
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- m_fontMetrics.setLineSpacing(ascent + descent + lineGap);
-#else
</del><span class="cx"> // Match CoreGraphics metrics.
</span><span class="cx"> m_fontMetrics.setLineSpacing(lroundf(ascent) + lroundf(descent) + lroundf(lineGap));
</span><del>-#endif
</del><span class="cx"> m_fontMetrics.setLineGap(lineGap);
</span><span class="cx">
</span><span class="cx"> cairo_text_extents_t textExtents;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> , m_audioSourceProvider(std::make_unique<AudioSourceProviderGStreamer>())
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-#if USE(GLIB) && !PLATFORM(EFL)
</del><ins>+#if USE(GLIB)
</ins><span class="cx"> m_readyTimerHandler.setPriority(G_PRIORITY_DEFAULT_IDLE);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> if (image) {
</span><span class="cx"> // Make the decision about whether the image has changed.
</span><span class="cx"> // This code makes the assumption that pointer equality on a NativeImagePtr is a valid way to tell if the image is changed.
</span><del>- // This assumption is true in Qt, GTK and EFL.
</del><ins>+ // This assumption is true for the GTK+ port.
</ins><span class="cx"> NativeImagePtr newNativeImagePtr = image->nativeImageForCurrentFrame();
</span><span class="cx"> if (!newNativeImagePtr)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextureMapperGC3DPlatformLayer.h"
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx">
</span><span class="cx"> #if USE(OPENGL_ES_2)
</span><span class="cx"> #include <GLES2/gl2.h>
</span><span class="lines">@@ -128,4 +128,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
</del><ins>+#endif // USE(TEXTURE_MAPPER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGC3DPlatformLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGC3DPlatformLayer.h 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
</del><ins>+#if USE(TEXTURE_MAPPER)
</ins><span class="cx">
</span><span class="cx"> #include "GraphicsContext3D.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="lines">@@ -61,4 +61,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // USE(TEXTURE_MAPPER) && !PLATFORM(EFL)
</del><ins>+#endif // USE(TEXTURE_MAPPER)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceErrorSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx">
</span><span class="cx"> ResourceError ResourceError::timeoutError(const URL& failingURL)
</span><span class="cx"> {
</span><del>- // FIXME: This should probably either be integrated into Errors(Gtk/EFL).h or the
- // networking errors from those files should be moved here.
</del><ins>+ // FIXME: This should probably either be integrated into ErrorsGtk.h or the
+ // networking errors from that file should be moved here.
</ins><span class="cx">
</span><span class="cx"> // Use the same value as in NSURLError.h
</span><span class="cx"> static const int timeoutError = -1001;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -255,28 +255,6 @@
</span><span class="cx"> soup_session_abort(m_soupSession.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-// FIXME: This function should not exist at all and we don't want to accidentally use it in other ports.
-// The correct way to set proxy settings from the environment is to use a GProxyResolver that does so.
-// It also lacks the rather important https_proxy and ftp_proxy variables, and the uppercase versions of
-// all four variables, all of which you almost surely want to be respected if you're setting http_proxy,
-// and all of which would be supported via the default proxy resolver in non-GNOME/Ubuntu environments
-// (at least, I think that's right). Additionally, it is incorrect for WebKit to respect this environment
-// variable when running in a GNOME or Ubuntu environment, where GNOME proxy configuration should be
-// respected instead. The only reason to retain this function is to not alter the incorrect behavior for EFL.
-void SoupNetworkSession::setProxySettingsFromEnvironment()
-{
- const char* httpProxy = getenv("http_proxy");
- if (!httpProxy)
- return;
-
- gProxySettings.defaultProxyURL = httpProxy;
- const char* httpProxyExceptions = getenv("no_proxy");
- if (httpProxyExceptions)
- gProxySettings.ignoreHosts.reset(g_strsplit(httpProxyExceptions, ",", -1));
-}
-#endif
-
</del><span class="cx"> void SoupNetworkSession::setProxySettings(const SoupNetworkProxySettings& settings)
</span><span class="cx"> {
</span><span class="cx"> gProxySettings = settings;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (212520 => 212521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-02-17 03:50:12 UTC (rev 212520)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2017-02-17 04:07:12 UTC (rev 212521)
</span><span class="lines">@@ -58,9 +58,6 @@
</span><span class="cx">
</span><span class="cx"> static void clearOldSoupCache(const String& cacheDirectory);
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- static void setProxySettingsFromEnvironment();
-#endif
</del><span class="cx"> static void setProxySettings(const SoupNetworkProxySettings&);
</span><span class="cx"> void setupProxy();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>