<!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>[165589] 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/165589">165589</a></dd>
<dt>Author</dt> <dd>jaepark@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-13 18:55:05 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove remaining Nix port related files
https://bugs.webkit.org/show_bug.cgi?id=130179
Reviewed by Csaba Osztrogonác.
GLContextFromCurrentEGL was added in <a href="http://trac.webkit.org/projects/webkit/changeset/155360">r155360</a> as a part of nix
upstreaming. As Nix port is removed from the source tree, these files
are in no use.
* platform/graphics/egl/GLContextFromCurrentEGL.cpp: Removed.
* platform/graphics/egl/GLContextFromCurrentEGL.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicseglGLContextFromCurrentEGLcpp">trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseglGLContextFromCurrentEGLh">trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165588 => 165589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 01:51:45 UTC (rev 165588)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 01:55:05 UTC (rev 165589)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-12 Jae Hyun Park <jaepark@webkit.org>
+
+ Remove remaining Nix port related files
+ https://bugs.webkit.org/show_bug.cgi?id=130179
+
+ Reviewed by Csaba Osztrogonác.
+
+ GLContextFromCurrentEGL was added in r155360 as a part of nix
+ upstreaming. As Nix port is removed from the source tree, these files
+ are in no use.
+
+ * platform/graphics/egl/GLContextFromCurrentEGL.cpp: Removed.
+ * platform/graphics/egl/GLContextFromCurrentEGL.h: Removed.
+
</ins><span class="cx"> 2014-03-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r160806): Incorrect cascade order of prefixed and non-prefixed variants of
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseglGLContextFromCurrentEGLcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.cpp (165588 => 165589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.cpp 2014-03-14 01:51:45 UTC (rev 165588)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.cpp 2014-03-14 01:55:05 UTC (rev 165589)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GLContextFromCurrentEGL.h"
-
-#include "OpenGLShims.h"
-
-namespace WebCore {
-
-PassOwnPtr<GLContextFromCurrentEGL> GLContextFromCurrentEGL::createFromCurrentGLContext()
-{
- if (!initialize())
- return nullptr;
- return adoptPtr(new GLContextFromCurrentEGL());
-}
-
-GLContextFromCurrentEGL::GLContextFromCurrentEGL()
- : m_display(eglGetCurrentDisplay())
- , m_surface(eglGetCurrentSurface(EGL_DRAW))
- , m_context(eglGetCurrentContext())
-{
-}
-
-bool GLContextFromCurrentEGL::makeContextCurrent()
-{
- GLContext::makeContextCurrent();
- return eglMakeCurrent(m_display, m_surface, m_surface, m_context);
-}
-
-bool GLContextFromCurrentEGL::initialize()
-{
- static bool initialized = false;
- static bool success = true;
- if (!initialized) {
- success = initializeOpenGLShims();
- initialized = true;
- }
- return success;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseglGLContextFromCurrentEGLh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.h (165588 => 165589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.h 2014-03-14 01:51:45 UTC (rev 165588)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextFromCurrentEGL.h 2014-03-14 01:55:05 UTC (rev 165589)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012-2013 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GLContextFromCurrentEGL_h
-#define GLContextFromCurrentEGL_h
-
-#include "GLContext.h"
-#include <EGL/egl.h>
-
-namespace WebCore {
-
-class GLContextFromCurrentEGL : public GLContext {
- WTF_MAKE_NONCOPYABLE(GLContextFromCurrentEGL);
-public:
- static PassOwnPtr<GLContextFromCurrentEGL> createFromCurrentGLContext();
-
- virtual bool makeContextCurrent() override;
-
- virtual void swapBuffers() override { }
- virtual IntSize defaultFrameBufferSize() override { return IntSize(); }
- virtual cairo_device_t* cairoDevice() override { return 0; }
-
- virtual bool canRenderToDefaultFramebuffer() override { return false; }
-
- virtual PlatformGraphicsContext3D platformContext() override { return this; }
- virtual void waitNative() override { }
-
-private:
- static bool initialize();
-
- GLContextFromCurrentEGL();
-
- EGLDisplay m_display;
- EGLSurface m_surface;
- EGLContext m_context;
-};
-
-} // namespace WebCore
-
-#endif // GLContextFromCurrentEGL_h
</del></span></pre>
</div>
</div>
</body>
</html>