From 91822e58598145f55f37f3bf50d81df9b81c5412 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 7 Aug 2014 19:19:22 +0200
Subject: [PATCH] <chromium> Add ifdefs to exclude ATL and accessibility from
the build
ATL currently isn't distributed with MSVS Express, only with the
Professional version. Chromium requires downloading the WDK iso for
express users just to be able to use the ATL version that was shipped
with it.
We can avoid the extra dependency for now by cutting off all the
accessibility code, which is currently the only part of the content
layer depending on ATL. We will use the Qt accessibility code anyway.
Change-Id: Iec25231250ccfc9405fdf342752733814888f348
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
chromium/build/common.gypi | 2 +-
chromium/content/app/content_main_runner.cc | 4 ++++
.../browser/accessibility/browser_accessibility_manager.cc | 4 ++++
.../browser/webui/content_web_ui_controller_factory.cc | 2 ++
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi
index 4c76aace6cf..05da9b5f48d 100644
--- a/chromium/build/common.gypi
+++ b/chromium/build/common.gypi
@@ -5081,7 +5081,7 @@
'_SECURE_ATL',
],
}],
- ['msvs_express', {
+ ['msvs_express and use_qt==0', {
'configurations': {
'x86_Base': {
'msvs_settings': {
diff --git a/chromium/content/app/content_main_runner.cc b/chromium/content/app/content_main_runner.cc
index 38bf1cb3260..5db69619305 100644
--- a/chromium/content/app/content_main_runner.cc
+++ b/chromium/content/app/content_main_runner.cc
@@ -77,7 +77,9 @@
#include <cstring>
#include "base/strings/string_number_conversions.h"
+#if !defined(TOOLKIT_QT)
#include "ui/base/win/atl_module.h"
+#endif
#include "ui/base/win/dpi_setup.h"
#include "ui/gfx/win/dpi.h"
#elif defined(OS_MACOSX)
@@ -481,7 +483,9 @@ class ContentMainRunnerImpl : public ContentMainRunner {
#if defined(OS_WIN)
RegisterInvalidParamHandler();
+#if !defined(TOOLKIT_QT)
ui::win::CreateATLModuleIfNeeded();
+#endif
sandbox_info_ = *params.sandbox_info;
#else // !OS_WIN
diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager.cc b/chromium/content/browser/accessibility/browser_accessibility_manager.cc
index 6bdce2d907a..85ddee46783 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility_manager.cc
@@ -45,7 +45,11 @@ ui::AXTreeUpdate MakeAXTreeUpdate(
}
BrowserAccessibility* BrowserAccessibilityFactory::Create() {
+#if !defined(TOOLKIT_QT)
return BrowserAccessibility::Create();
+#else
+ return 0;
+#endif
}
#if !defined(OS_MACOSX) && \
diff --git a/chromium/content/browser/webui/content_web_ui_controller_factory.cc b/chromium/content/browser/webui/content_web_ui_controller_factory.cc
index 485e95cd0c1..fd5c11830ae 100644
--- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc
+++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc
@@ -55,8 +55,10 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
return new IndexedDBInternalsUI(web_ui);
if (url.host() == kChromeUIMediaInternalsHost)
return new MediaInternalsUI(web_ui);
+#if !defined(TOOLKIT_QT)
if (url.host() == kChromeUIAccessibilityHost)
return new AccessibilityUI(web_ui);
+#endif
if (url.host() == kChromeUIServiceWorkerInternalsHost)
return new ServiceWorkerInternalsUI(web_ui);
#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
--
GitLab