<!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>[55919] trunk/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/55919">55919</a></dd>
<dt>Author</dt> <dd>jpetsovits@rim.com</dd>
<dt>Date</dt> <dd>2010-03-12 11:11:28 -0800 (Fri, 12 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-12  Jakob Petsovits  &lt;jpetsovits@rim.com&gt;

        Reviewed by Dirk Schulze.

        [OpenVG] Add a SurfaceOpenVG constructor for EGL client buffer surfaces
        https://bugs.webkit.org/show_bug.cgi?id=35538

        SurfaceOpenVG can now not only encapsulate pbuffer
        and window surfaces but also VGImage-based ones.

        * platform/graphics/openvg/EGLDisplayOpenVG.cpp:
        (WebCore::EGLDisplayOpenVG::createPbufferFromClientBuffer):
        * platform/graphics/openvg/EGLDisplayOpenVG.h:
        * platform/graphics/openvg/SurfaceOpenVG.cpp:
        (WebCore::SurfaceOpenVG::SurfaceOpenVG):
        * platform/graphics/openvg/SurfaceOpenVG.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsopenvgEGLDisplayOpenVGcpp">trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsopenvgEGLDisplayOpenVGh">trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.h</a></li>
<li><a href="#trunkWebCoreplatformgraphicsopenvgSurfaceOpenVGcpp">trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicsopenvgSurfaceOpenVGh">trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55918 => 55919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-12 19:06:01 UTC (rev 55918)
+++ trunk/WebCore/ChangeLog        2010-03-12 19:11:28 UTC (rev 55919)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2010-03-12  Jakob Petsovits  &lt;jpetsovits@rim.com&gt;
+
+        Reviewed by Dirk Schulze.
+
+        [OpenVG] Add a SurfaceOpenVG constructor for EGL client buffer surfaces
+        https://bugs.webkit.org/show_bug.cgi?id=35538
+
+        SurfaceOpenVG can now not only encapsulate pbuffer
+        and window surfaces but also VGImage-based ones.
+
+        * platform/graphics/openvg/EGLDisplayOpenVG.cpp:
+        (WebCore::EGLDisplayOpenVG::createPbufferFromClientBuffer):
+        * platform/graphics/openvg/EGLDisplayOpenVG.h:
+        * platform/graphics/openvg/SurfaceOpenVG.cpp:
+        (WebCore::SurfaceOpenVG::SurfaceOpenVG):
+        * platform/graphics/openvg/SurfaceOpenVG.h:
+
</ins><span class="cx"> 2010-03-12  Alpha Lam  &lt;hclam@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Eric Carlson.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsopenvgEGLDisplayOpenVGcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.cpp (55918 => 55919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.cpp        2010-03-12 19:06:01 UTC (rev 55918)
+++ trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.cpp        2010-03-12 19:11:28 UTC (rev 55919)
</span><span class="lines">@@ -263,6 +263,30 @@
</span><span class="cx">     return surface;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+EGLSurface EGLDisplayOpenVG::createPbufferFromClientBuffer(
+    EGLClientBuffer clientBuffer, EGLenum bufferType, const EGLConfig&amp; config, EGLint* errorCode)
+{
+    EGLSurface surface = eglCreatePbufferFromClientBuffer(m_display,
+        bufferType, clientBuffer, config, 0 /* attribList */);
+
+    if (errorCode)
+        *errorCode = eglGetError();
+    else
+        ASSERT_EGL_NO_ERROR();
+
+    if (surface == EGL_NO_SURFACE)
+        return EGL_NO_SURFACE;
+
+    EGLint surfaceConfigId;
+    EGLBoolean success = eglGetConfigAttrib(m_display, config, EGL_CONFIG_ID, &amp;surfaceConfigId);
+    ASSERT(success == EGL_TRUE);
+    ASSERT(surfaceConfigId != EGL_BAD_ATTRIBUTE);
+
+    ASSERT(!m_surfaceConfigIds.contains(surface));
+    m_surfaceConfigIds.set(surface, surfaceConfigId);
+    return surface;
+}
+
</ins><span class="cx"> EGLSurface EGLDisplayOpenVG::surfaceForWindow(EGLNativeWindowType wId, const EGLConfig&amp; config)
</span><span class="cx"> {
</span><span class="cx">     if (m_windowSurfaces.contains(wId))
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsopenvgEGLDisplayOpenVGh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.h (55918 => 55919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.h        2010-03-12 19:06:01 UTC (rev 55918)
+++ trunk/WebCore/platform/graphics/openvg/EGLDisplayOpenVG.h        2010-03-12 19:11:28 UTC (rev 55919)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx">      * If no surface could be created and errorCode is zero, this method
</span><span class="cx">      * will trigger an assertion by itself. */
</span><span class="cx">     EGLSurface createPbufferSurface(const IntSize&amp;, const EGLConfig&amp;, EGLint* errorCode = 0);
</span><ins>+    EGLSurface createPbufferFromClientBuffer(EGLClientBuffer, EGLenum bufferType, const EGLConfig&amp;, EGLint* errorCode = 0);
</ins><span class="cx"> 
</span><span class="cx">     EGLSurface surfaceForWindow(EGLNativeWindowType, const EGLConfig&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsopenvgSurfaceOpenVGcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.cpp (55918 => 55919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.cpp        2010-03-12 19:06:01 UTC (rev 55918)
+++ trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.cpp        2010-03-12 19:11:28 UTC (rev 55919)
</span><span class="lines">@@ -64,6 +64,25 @@
</span><span class="cx">     EGLDisplayOpenVG::registerPlatformSurface(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+SurfaceOpenVG::SurfaceOpenVG(EGLClientBuffer buffer, EGLenum bufferType, const EGLDisplay&amp; display, EGLConfig* confPtr, EGLint* errorCode)
+    : m_activePainter(0)
+    , m_eglDisplay(display)
+    , m_eglSurface(EGL_NO_SURFACE)
+    , m_eglContext(EGL_NO_CONTEXT)
+{
+    ASSERT(m_eglDisplay != EGL_NO_DISPLAY);
+
+    EGLDisplayOpenVG* displayManager = EGLDisplayOpenVG::forDisplay(m_eglDisplay);
+    EGLConfig config = confPtr ? (*confPtr) : displayManager-&gt;defaultPbufferConfig();
+    m_eglSurface = displayManager-&gt;createPbufferFromClientBuffer(buffer, bufferType, config, errorCode);
+
+    if (m_eglSurface == EGL_NO_SURFACE)
+        return;
+
+    m_eglContext = displayManager-&gt;contextForSurface(m_eglSurface);
+    EGLDisplayOpenVG::registerPlatformSurface(this);
+}
+
</ins><span class="cx"> SurfaceOpenVG::SurfaceOpenVG(EGLNativeWindowType window, const EGLDisplay&amp; display, EGLConfig* confPtr)
</span><span class="cx">     : m_activePainter(0)
</span><span class="cx">     , m_eglDisplay(display)
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsopenvgSurfaceOpenVGh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.h (55918 => 55919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.h        2010-03-12 19:06:01 UTC (rev 55918)
+++ trunk/WebCore/platform/graphics/openvg/SurfaceOpenVG.h        2010-03-12 19:11:28 UTC (rev 55919)
</span><span class="lines">@@ -67,6 +67,26 @@
</span><span class="cx">     SurfaceOpenVG(const IntSize&amp; size, const EGLDisplay&amp; display, EGLConfig* config = 0, EGLint* errorCode = 0);
</span><span class="cx"> 
</span><span class="cx">     /**
</span><ins>+     * Create a new EGL pbuffer surface that will be bound to the given
+     * client buffer (read: VGImage), with the specified config on the
+     * given display. If config is not specified, the display's default
+     * pbuffer config is used.
+     *
+     * After the surface is created, you will only be able to access the
+     * client buffer image if the surface is not current. The recommended way
+     * to ensure this is to call surface-&gt;sharedSurface()-&gt;makeCurrent() if you
+     * simply want to access the image's pixel contents, or if you intend to
+     * draw the image directly, making the draw target surface current.
+     *
+     * This constructor will trigger an assertion if creation of the surface
+     * fails, unless you pledge to manually process the error code by passing
+     * a non-zero pointer as errorCode parameter. The error code returned by
+     * eglGetError() will be written to that variable.
+     */
+    SurfaceOpenVG(EGLClientBuffer buffer, EGLenum bufferType,
+        const EGLDisplay&amp; display, EGLConfig* config = 0, EGLint* errorCode = 0);
+
+    /**
</ins><span class="cx">      * Create a new EGL window surface with the specified native window handle
</span><span class="cx">      * and config on the given display. If config is not specified, the
</span><span class="cx">      * display's default window config is used.
</span></span></pre>
</div>
</div>

</body>
</html>