Diff
Modified: trunk/Source/WebCore/ChangeLog (165042 => 165043)
--- trunk/Source/WebCore/ChangeLog 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebCore/ChangeLog 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,3 +1,28 @@
+2014-03-04 Hyowon Kim <[email protected]>
+
+ Move EvasGLContext and EvasGLSurface files into the efl common directory.
+ https://bugs.webkit.org/show_bug.cgi?id=129603
+
+ Reviewed by Gyuyoung Kim.
+
+ EFL port will use EvasGLContext and EvasGLSurface files in both WK1 and WK2.
+
+ No new tests, just refactorings.
+
+ * PlatformEfl.cmake:
+ * platform/graphics/efl/EvasGLContext.cpp: Renamed from Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp.
+ (WebKit::EvasGLContext::EvasGLContext):
+ (WebKit::EvasGLContext::~EvasGLContext):
+ * platform/graphics/efl/EvasGLContext.h: Renamed from Source/WebKit2/UIProcess/API/efl/EvasGLContext.h.
+ (WebKit::EvasGLContext::create):
+ (WebKit::EvasGLContext::context):
+ * platform/graphics/efl/EvasGLSurface.cpp: Renamed from Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp.
+ (WebKit::EvasGLSurface::EvasGLSurface):
+ (WebKit::EvasGLSurface::~EvasGLSurface):
+ * platform/graphics/efl/EvasGLSurface.h: Renamed from Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h.
+ (WebKit::EvasGLSurface::create):
+ (WebKit::EvasGLSurface::surface):
+
2014-03-03 Martin Robinson <[email protected]>
Fix the GTK+ CMake build
Modified: trunk/Source/WebCore/PlatformEfl.cmake (165042 => 165043)
--- trunk/Source/WebCore/PlatformEfl.cmake 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-03-04 08:26:28 UTC (rev 165043)
@@ -306,6 +306,8 @@
list(APPEND WebCore_SOURCES
platform/graphics/cairo/DrawingBufferCairo.cpp
+ platform/graphics/efl/EvasGLContext.cpp
+ platform/graphics/efl/EvasGLSurface.cpp
platform/graphics/efl/GraphicsContext3DEfl.cpp
platform/graphics/efl/GraphicsContext3DPrivate.cpp
Copied: trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp (from rev 165042, trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp) (0 => 165043)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp 2014-03-04 08:26:28 UTC (rev 165043)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 "EvasGLContext.h"
+
+namespace WebKit {
+
+EvasGLContext::EvasGLContext(Evas_GL* evasGL, Evas_GL_Context* passContext)
+ : m_evasGL(evasGL)
+ , m_context(passContext)
+{
+ ASSERT(evasGL);
+ ASSERT(passContext);
+}
+
+EvasGLContext::~EvasGLContext()
+{
+ evas_gl_context_destroy(m_evasGL, m_context);
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h (from rev 165042, trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h) (0 => 165043)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h 2014-03-04 08:26:28 UTC (rev 165043)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 EvasGLContext_h
+#define EvasGLContext_h
+
+#include <Evas_GL.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebKit {
+
+class EvasGLContext {
+public:
+ static PassOwnPtr<EvasGLContext> create(Evas_GL* evasGL)
+ {
+ ASSERT(evasGL);
+ Evas_GL_Context* context = evas_gl_context_create(evasGL, 0);
+ if (!context)
+ return nullptr;
+
+ // Ownership of context is passed to EvasGLContext.
+ return adoptPtr(new EvasGLContext(evasGL, context));
+ }
+ ~EvasGLContext();
+
+ Evas_GL_Context* context() { return m_context; }
+
+private:
+ EvasGLContext(Evas_GL*, Evas_GL_Context* passContext);
+
+ Evas_GL* m_evasGL;
+ Evas_GL_Context* m_context;
+};
+
+} // namespace WebKit
+
+#endif // EvasGLContext_h
Copied: trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp (from rev 165042, trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp) (0 => 165043)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp 2014-03-04 08:26:28 UTC (rev 165043)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 "EvasGLSurface.h"
+
+namespace WebKit {
+
+EvasGLSurface::EvasGLSurface(Evas_GL* evasGL, Evas_GL_Surface* passSurface)
+ : m_evasGL(evasGL)
+ , m_surface(passSurface)
+{
+ ASSERT(evasGL);
+ ASSERT(passSurface);
+}
+
+EvasGLSurface::~EvasGLSurface()
+{
+ evas_gl_surface_destroy(m_evasGL, m_surface);
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h (from rev 165042, trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h) (0 => 165043)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h 2014-03-04 08:26:28 UTC (rev 165043)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
+ *
+ * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 EvasGLSurface_h
+#define EvasGLSurface_h
+
+#include "IntSize.h"
+
+#include <Evas_GL.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebKit {
+
+class EvasGLSurface {
+public:
+ static PassOwnPtr<EvasGLSurface> create(Evas_GL* evasGL, Evas_GL_Config* cfg, const WebCore::IntSize& size)
+ {
+ ASSERT(evasGL);
+ ASSERT(cfg);
+
+ Evas_GL_Surface* surface = 0;
+
+ // Ensure that the surface is created with valid size.
+ if (size.width() && size.height())
+ surface = evas_gl_surface_create(evasGL, cfg, size.width(), size.height());
+
+ if (!surface)
+ return nullptr;
+
+ // Ownership of surface is passed to EvasGLSurface.
+ return adoptPtr(new EvasGLSurface(evasGL, surface));
+ }
+ ~EvasGLSurface();
+
+ Evas_GL_Surface* surface() { return m_surface; }
+
+private:
+ EvasGLSurface(Evas_GL*, Evas_GL_Surface* passSurface);
+
+ Evas_GL* m_evasGL;
+ Evas_GL_Surface* m_surface;
+};
+
+} // namespace WebKit
+
+#endif // EvasGLSurface_h
Modified: trunk/Source/WebKit2/ChangeLog (165042 => 165043)
--- trunk/Source/WebKit2/ChangeLog 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,3 +1,12 @@
+2014-03-04 Hyowon Kim <[email protected]>
+
+ Move EvasGLContext and EvasGLSurface files into the efl common directory.
+ https://bugs.webkit.org/show_bug.cgi?id=129603
+
+ Reviewed by Gyuyoung Kim.
+
+ * PlatformEfl.cmake: Update for removed files.
+
2014-03-03 Benjamin Poulain <[email protected]>
[iOS][WK2] WebPage::updateVisibleContentRects can set the position directly instead of using programmatic scrolling
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (165042 => 165043)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-03-04 08:26:28 UTC (rev 165043)
@@ -70,8 +70,6 @@
UIProcess/API/cpp/efl/WKEinaSharedString.cpp
- UIProcess/API/efl/EvasGLContext.cpp
- UIProcess/API/efl/EvasGLSurface.cpp
UIProcess/API/efl/EwkView.cpp
UIProcess/API/efl/GestureRecognizer.cpp
UIProcess/API/efl/SnapshotImageGL.cpp
@@ -203,6 +201,7 @@
list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/efl"
"${WEBCORE_DIR}/platform/graphics/cairo"
+ "${WEBCORE_DIR}/platform/graphics/efl"
"${WEBCORE_DIR}/platform/graphics/opentype"
"${WEBCORE_DIR}/platform/network/soup"
"${WEBCORE_DIR}/platform/text/enchant"
Deleted: trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp (165042 => 165043)
--- trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 "EvasGLContext.h"
-
-namespace WebKit {
-
-EvasGLContext::EvasGLContext(Evas_GL* evasGL, Evas_GL_Context* passContext)
- : m_evasGL(evasGL)
- , m_context(passContext)
-{
- ASSERT(evasGL);
- ASSERT(passContext);
-}
-
-EvasGLContext::~EvasGLContext()
-{
- evas_gl_context_destroy(m_evasGL, m_context);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h (165042 => 165043)
--- trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 EvasGLContext_h
-#define EvasGLContext_h
-
-#include <Evas_GL.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-
-class EvasGLContext {
-public:
- static PassOwnPtr<EvasGLContext> create(Evas_GL* evasGL)
- {
- ASSERT(evasGL);
- Evas_GL_Context* context = evas_gl_context_create(evasGL, 0);
- if (!context)
- return nullptr;
-
- // Ownership of context is passed to EvasGLContext.
- return adoptPtr(new EvasGLContext(evasGL, context));
- }
- ~EvasGLContext();
-
- Evas_GL_Context* context() { return m_context; }
-
-private:
- EvasGLContext(Evas_GL* evasGL, Evas_GL_Context* passContext);
-
- Evas_GL* m_evasGL;
- Evas_GL_Context* m_context;
-};
-
-} // namespace WebKit
-
-#endif // EvasGLContext_h
Deleted: trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp (165042 => 165043)
--- trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 "EvasGLSurface.h"
-
-namespace WebKit {
-
-EvasGLSurface::EvasGLSurface(Evas_GL* evasGL, Evas_GL_Surface* passSurface)
- : m_evasGL(evasGL)
- , m_surface(passSurface)
-{
- ASSERT(evasGL);
- ASSERT(passSurface);
-}
-
-EvasGLSurface::~EvasGLSurface()
-{
- evas_gl_surface_destroy(m_evasGL, m_surface);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h (165042 => 165043)
--- trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h 2014-03-04 07:36:02 UTC (rev 165042)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h 2014-03-04 08:26:28 UTC (rev 165043)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 Intel Corporation. All rights reserved.
- *
- * 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 EvasGLSurface_h
-#define EvasGLSurface_h
-
-#include <Evas_GL.h>
-#include <WebCore/IntSize.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-
-class EvasGLSurface {
-public:
- static PassOwnPtr<EvasGLSurface> create(Evas_GL* evasGL, Evas_GL_Config* cfg, const WebCore::IntSize& size)
- {
- ASSERT(evasGL);
- ASSERT(cfg);
-
- Evas_GL_Surface* surface = 0;
-
- // Ensure that the surface is created with valid size.
- if (size.width() && size.height())
- surface = evas_gl_surface_create(evasGL, cfg, size.width(), size.height());
-
- if (!surface)
- return nullptr;
-
- // Ownership of surface is passed to EvasGLSurface.
- return adoptPtr(new EvasGLSurface(evasGL, surface));
- }
- ~EvasGLSurface();
-
- Evas_GL_Surface* surface() { return m_surface; }
-
-private:
- EvasGLSurface(Evas_GL* evasGL, Evas_GL_Surface* passSurface);
-
- Evas_GL* m_evasGL;
- Evas_GL_Surface* m_surface;
-};
-
-} // namespace WebKit
-
-#endif // EvasGLSurface_h
