Diff
Modified: trunk/Source/WebCore/ChangeLog (165245 => 165246)
--- trunk/Source/WebCore/ChangeLog 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebCore/ChangeLog 2014-03-07 05:06:04 UTC (rev 165246)
@@ -1,3 +1,19 @@
+2014-03-06 Hyowon Kim <[email protected]>
+
+ [EFL] Move EvasGL classes from WebKit to WebCore namespace.
+ https://bugs.webkit.org/show_bug.cgi?id=129797
+
+ Reviewed by Gyuyoung Kim.
+
+ Though EvasGLContext and EvasGLSurface files were moved from WebKit2/UIProcess/API/efl/
+ to WebCore/platform/graphics/efl/, they are still in WebKit namespace.
+ Patch for namespace changes.
+
+ * platform/graphics/efl/EvasGLContext.cpp:
+ * platform/graphics/efl/EvasGLContext.h:
+ * platform/graphics/efl/EvasGLSurface.cpp:
+ * platform/graphics/efl/EvasGLSurface.h:
+
2014-03-06 Brian Burg <[email protected]>
CodeGeneratorJS.pm doesn't need to add spaces between consecutive closing template brackets
Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp (165245 => 165246)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.cpp 2014-03-07 05:06:04 UTC (rev 165246)
@@ -26,7 +26,7 @@
#include "config.h"
#include "EvasGLContext.h"
-namespace WebKit {
+namespace WebCore {
EvasGLContext::EvasGLContext(Evas_GL* evasGL, Evas_GL_Context* passContext)
: m_evasGL(evasGL)
@@ -41,4 +41,4 @@
evas_gl_context_destroy(m_evasGL, m_context);
}
-} // namespace WebKit
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h (165245 => 165246)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h 2014-03-07 05:06:04 UTC (rev 165246)
@@ -29,7 +29,7 @@
#include <Evas_GL.h>
#include <wtf/PassOwnPtr.h>
-namespace WebKit {
+namespace WebCore {
class EvasGLContext {
public:
@@ -54,6 +54,6 @@
Evas_GL_Context* m_context;
};
-} // namespace WebKit
+} // namespace WebCore
#endif // EvasGLContext_h
Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp (165245 => 165246)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.cpp 2014-03-07 05:06:04 UTC (rev 165246)
@@ -26,7 +26,7 @@
#include "config.h"
#include "EvasGLSurface.h"
-namespace WebKit {
+namespace WebCore {
EvasGLSurface::EvasGLSurface(Evas_GL* evasGL, Evas_GL_Surface* passSurface)
: m_evasGL(evasGL)
@@ -41,4 +41,4 @@
evas_gl_surface_destroy(m_evasGL, m_surface);
}
-} // namespace WebKit
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h (165245 => 165246)
--- trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h 2014-03-07 05:06:04 UTC (rev 165246)
@@ -31,7 +31,7 @@
#include <Evas_GL.h>
#include <wtf/PassOwnPtr.h>
-namespace WebKit {
+namespace WebCore {
class EvasGLSurface {
public:
@@ -63,6 +63,6 @@
Evas_GL_Surface* m_surface;
};
-} // namespace WebKit
+} // namespace WebCore
#endif // EvasGLSurface_h
Modified: trunk/Source/WebKit2/ChangeLog (165245 => 165246)
--- trunk/Source/WebKit2/ChangeLog 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-07 05:06:04 UTC (rev 165246)
@@ -1,3 +1,12 @@
+2014-03-06 Hyowon Kim <[email protected]>
+
+ [EFL] Move EvasGL classes from WebKit to WebCore namespace.
+ https://bugs.webkit.org/show_bug.cgi?id=129797
+
+ Reviewed by Gyuyoung Kim.
+
+ * UIProcess/API/efl/EwkView.h: namespace changes for EvasGLContext/Surface.
+
2014-03-06 Simon Fraser <[email protected]>
Remove one more setCustomFixedPositionRect() that I missed.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h (165245 => 165246)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2014-03-07 04:21:53 UTC (rev 165245)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h 2014-03-07 05:06:04 UTC (rev 165246)
@@ -250,8 +250,8 @@
RefPtr<EwkContext> m_context;
RefPtr<EwkPageGroup> m_pageGroup;
OwnPtr<Evas_GL> m_evasGL;
- OwnPtr<WebKit::EvasGLContext> m_evasGLContext;
- OwnPtr<WebKit::EvasGLSurface> m_evasGLSurface;
+ OwnPtr<WebCore::EvasGLContext> m_evasGLContext;
+ OwnPtr<WebCore::EvasGLSurface> m_evasGLSurface;
bool m_pendingSurfaceResize;
WebCore::TransformationMatrix m_userViewportTransform;