The likely useless ImplDoTiledRendering() is used in vcl only

So move it to a locale include file in vcl. Now <vcl/window.hxx> does
not need to include <config_features.h>.

As such it is questionable whether what ImplDoTiledRendering()
currently does makes any sense; de facto it now just means that we are
on iOS. We have comphelper::LibreOfficeKit::isActive() which probably
is what should be used to test whether tiled rendering is used. At
least in the cases where LibreOfficeKit's "unstable" API is used for
tasks that involve rendering of tiles. Hmm, that sounds like a
circular argument.

Change-Id: I52c984aec7510526c5294579966345b8340c8642
This commit is contained in:
Tor Lillqvist
2015-12-15 18:22:34 +02:00
parent b716be0c06
commit 2f9ac73b80
3 changed files with 19 additions and 18 deletions

View File

@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_WINDOW_HXX
#define INCLUDED_VCL_WINDOW_HXX
#include <config_features.h>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
@@ -439,23 +438,6 @@ enum class GetDlgWindowType
const char* ImplDbgCheckWindow( const void* pObj );
#endif
inline bool ImplDoTiledRendering()
{
#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
// We do tiled rendering only for iOS at the moment, actually, but
// let's see what happens if we assume it for Android, too.
// (That comment doesn't match what the code does, does it?)
return true;
#else
// We need some way to know globally if this process will use
// tiled rendering or not. Or should this be a per-window setting?
// Or what?
return false;
#endif
}
namespace vcl { class Window; }
namespace vcl { class Cursor; }
class Dialog;

View File

@@ -19,6 +19,8 @@
#include <tbunosearchcontrollers.hxx>
#include <config_features.h>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>

View File

@@ -22,6 +22,8 @@
#include <sal/config.h>
#include <config_features.h>
#include <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx>
#include <list>
@@ -411,6 +413,21 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
sal_uInt16 nCode, MouseEventModifiers nMode );
void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight );
inline bool ImplDoTiledRendering()
{
#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID)
// We do tiled rendering only for iOS at the moment, actually, but
// let's see what happens if we assume it for Android, too.
// (That comment doesn't match what the code does, does it?)
return true;
#else
// We need some way to know globally if this process will use
// tiled rendering or not. Or should this be a per-window setting?
// Or what?
return false;
#endif
}
#endif // INCLUDED_VCL_INC_WINDOW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */