projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
compositor
/
image_transport_factory.cc
diff --git
a/src/content/browser/compositor/image_transport_factory.cc
b/src/content/browser/compositor/image_transport_factory.cc
index
70ffc9c
..
0827acb
100644
(file)
--- a/
src/content/browser/compositor/image_transport_factory.cc
+++ b/
src/content/browser/compositor/image_transport_factory.cc
@@
-7,7
+7,6
@@
#include "base/command_line.h"
#include "content/browser/compositor/gpu_process_transport_factory.h"
#include "content/browser/compositor/no_transport_image_transport_factory.h"
#include "base/command_line.h"
#include "content/browser/compositor/gpu_process_transport_factory.h"
#include "content/browser/compositor/no_transport_image_transport_factory.h"
-#include "content/common/host_shared_bitmap_manager.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_switches.h"
#include "ui/gl/gl_implementation.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_switches.h"
#include "ui/gl/gl_implementation.h"
@@
-18,6
+17,12
@@
namespace {
ImageTransportFactory* g_factory = NULL;
bool g_initialized_for_unit_tests = false;
static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
ImageTransportFactory* g_factory = NULL;
bool g_initialized_for_unit_tests = false;
static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
+
+void SetFactory(ImageTransportFactory* factory) {
+ g_factory = factory;
+ ui::ContextFactory::SetInstance(factory->GetContextFactory());
+}
+
}
// static
}
// static
@@
-25,9
+30,7
@@
void ImageTransportFactory::Initialize() {
DCHECK(!g_factory || g_initialized_for_unit_tests);
if (g_initialized_for_unit_tests)
return;
DCHECK(!g_factory || g_initialized_for_unit_tests);
if (g_initialized_for_unit_tests)
return;
- g_factory = new GpuProcessTransportFactory;
- ui::ContextFactory::SetInstance(g_factory->AsContextFactory());
- ui::Compositor::SetSharedBitmapManager(HostSharedBitmapManager::current());
+ SetFactory(new GpuProcessTransportFactory);
}
void ImageTransportFactory::InitializeForUnitTests(
}
void ImageTransportFactory::InitializeForUnitTests(
@@
-40,8
+43,7
@@
void ImageTransportFactory::InitializeForUnitTests(
if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
- g_factory = new NoTransportImageTransportFactory(test_factory.Pass());
- ui::ContextFactory::SetInstance(g_factory->AsContextFactory());
+ SetFactory(new NoTransportImageTransportFactory(test_factory.Pass()));
}
// static
}
// static