summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-10-03 15:28:52 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-10-04 01:26:02 +0200
commitdced897eecc5d2227b4d546cd573875bd69de667 (patch)
tree5eb0d5481a83584b699b8409a78d5b003bf1a6ef
parent0d43d20a7d5940c33029f8662ba03b81ec646ead (diff)
move opengl and skia cairotextrender.cxx to their dirs
Change-Id: I67a87db644dc6fd7d69d615f7b4c388c3a1d97f6
-rw-r--r--solenv/clang-format/blacklist6
-rw-r--r--vcl/Library_vclplug_gen.mk4
-rw-r--r--vcl/inc/opengl/x11/cairotextrender.hxx (renamed from vcl/unx/generic/gdi/openglx11cairotextrender.hxx)2
-rw-r--r--vcl/inc/skia/x11/cairotextrender.hxx (renamed from vcl/unx/generic/gdi/skiax11cairotextrender.hxx)2
-rw-r--r--vcl/inc/unx/x11/x11cairotextrender.hxx (renamed from vcl/unx/generic/gdi/x11cairotextrender.hxx)0
-rw-r--r--vcl/opengl/x11/cairotextrender.cxx (renamed from vcl/unx/generic/gdi/openglx11cairotextrender.cxx)2
-rw-r--r--vcl/skia/x11/cairotextrender.cxx (renamed from vcl/unx/generic/gdi/skiax11cairotextrender.cxx)4
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx6
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.cxx2
9 files changed, 15 insertions, 13 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 8dae6b74e154..51bbb87ce0d8 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17482,6 +17482,7 @@ vcl/inc/unx/screensaverinhibitor.hxx
vcl/inc/unx/sm.hxx
vcl/inc/unx/svsys.h
vcl/inc/unx/wmadaptor.hxx
+vcl/inc/unx/x11/x11cairotextrender.hxx
vcl/inc/unx/x11/x11gdiimpl.h
vcl/inc/unx/x11/x11sys.hxx
vcl/inc/unx/x11/xlimits.hxx
@@ -17650,6 +17651,8 @@ vcl/opengl/texture.cxx
vcl/opengl/win/WinDeviceInfo.cxx
vcl/opengl/win/blocklist_parser.cxx
vcl/opengl/win/gdiimpl.cxx
+vcl/opengl/x11/cairotextrender.cxx
+vcl/opengl/x11/cairotextrender.hxx
vcl/opengl/x11/X11DeviceInfo.cxx
vcl/opengl/x11/gdiimpl.cxx
vcl/opengl/x11/salvd.cxx
@@ -18119,14 +18122,11 @@ vcl/unx/generic/gdi/font.cxx
vcl/unx/generic/gdi/gdiimpl.cxx
vcl/unx/generic/gdi/gdiimpl.hxx
vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
-vcl/unx/generic/gdi/openglx11cairotextrender.cxx
-vcl/unx/generic/gdi/openglx11cairotextrender.hxx
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi.cxx
vcl/unx/generic/gdi/salgdi2.cxx
vcl/unx/generic/gdi/salvd.cxx
vcl/unx/generic/gdi/x11cairotextrender.cxx
-vcl/unx/generic/gdi/x11cairotextrender.hxx
vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/glyphs/freetype_glyphcache.cxx
vcl/unx/generic/glyphs/glyphcache.cxx
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index f0fb9d39c259..54751adec6c4 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/gdi/cairo_xlib_cairo \
vcl/unx/generic/gdi/x11cairotextrender \
vcl/unx/generic/gdi/gdiimpl \
- vcl/unx/generic/gdi/openglx11cairotextrender \
vcl/unx/generic/gdi/salbmp \
vcl/unx/generic/gdi/salgdi2 \
vcl/unx/generic/gdi/font \
@@ -105,10 +104,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/window/salobj \
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
+ vcl/opengl/x11/cairotextrender \
vcl/opengl/x11/gdiimpl \
vcl/opengl/x11/salvd \
+ vcl/skia/x11/cairotextrender \
vcl/skia/x11/gdiimpl \
- vcl/unx/generic/gdi/skiax11cairotextrender \
vcl/skia/x11/salvd \
))
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/inc/opengl/x11/cairotextrender.hxx
index 46a11cba5a0e..c515b90da732 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/inc/opengl/x11/cairotextrender.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX
#define INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX
-#include "x11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
class OpenGLX11CairoTextRender : public X11CairoTextRender
{
diff --git a/vcl/unx/generic/gdi/skiax11cairotextrender.hxx b/vcl/inc/skia/x11/cairotextrender.hxx
index e46ac36ba54a..fe904327fdfa 100644
--- a/vcl/unx/generic/gdi/skiax11cairotextrender.hxx
+++ b/vcl/inc/skia/x11/cairotextrender.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_SKIAX11CAIROTEXTRENDER_HXX
#define INCLUDED_VCL_UNX_GENERIC_GDI_SKIAX11CAIROTEXTRENDER_HXX
-#include "x11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
class SkiaX11CairoTextRender : public X11CairoTextRender
{
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/inc/unx/x11/x11cairotextrender.hxx
index 4b90586edf12..4b90586edf12 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/inc/unx/x11/x11cairotextrender.hxx
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/opengl/x11/cairotextrender.cxx
index 436120b8b0c6..2b90de4e2fb5 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/opengl/x11/cairotextrender.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "openglx11cairotextrender.hxx"
+#include <opengl/x11/cairotextrender.hxx>
#include <opengl/gdiimpl.hxx>
#include <salbmp.hxx>
diff --git a/vcl/unx/generic/gdi/skiax11cairotextrender.cxx b/vcl/skia/x11/cairotextrender.cxx
index 4af382592f7b..7c2402b2c869 100644
--- a/vcl/unx/generic/gdi/skiax11cairotextrender.cxx
+++ b/vcl/skia/x11/cairotextrender.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "skiax11cairotextrender.hxx"
+#include <skia/x11/cairotextrender.hxx>
#include <salbmp.hxx>
#include <vcl/salbtype.hxx>
@@ -38,6 +38,7 @@ cairo_t* SkiaX11CairoTextRender::getCairoContext()
if (!surface)
return nullptr;
cairo_t* cr = cairo_create(surface);
+ // TODO
cairo_surface_destroy(surface);
return cr;
}
@@ -80,6 +81,7 @@ void SkiaX11CairoTextRender::releaseCairoContext(cairo_t* cr)
// pImpl->PreDraw();
// pImpl->DrawAlphaTexture( aTexture, aRect, true, true );
// pImpl->PostDraw();
+ // abort();
cairo_destroy(cr);
}
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 680a1f6a57b8..3649a0b4c219 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -59,9 +59,9 @@
#include "gdiimpl.hxx"
#include <opengl/x11/gdiimpl.hxx>
#include <skia/x11/gdiimpl.hxx>
-#include "x11cairotextrender.hxx"
-#include "openglx11cairotextrender.hxx"
-#include "skiax11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
+#include <opengl/x11/cairotextrender.hxx>
+#include <skia/x11/cairotextrender.hxx>
#include <unx/printergfx.hxx>
#include <unx/x11/xrender_peer.hxx>
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 88d5b49a1823..496d6952aec0 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "x11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
#include <unx/saldisp.hxx>
#include <unx/salvd.h>
#include <unx/glyphcache.hxx>