Commit e90c1f7c authored by Michael Spang's avatar Michael Spang Committed by Commit Bot

ui: Remove some cruft related to cairo rendering

This is dead code as cairo is no longer used.

No functional change.

Change-Id: I7d7f207d604de8c8f9bbf1098b7ecb1f91fa5685
Reviewed-on: https://chromium-review.googlesource.com/755656Reviewed-by: default avatardanakj <danakj@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515042}
parent ef10f866
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/linux/pangocairo/pangocairo.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//device/vr/features/features.gni") import("//device/vr/features/features.gni")
import("//testing/test.gni") import("//testing/test.gni")
...@@ -219,7 +218,6 @@ component("gfx") { ...@@ -219,7 +218,6 @@ component("gfx") {
"skia_paint_util.cc", "skia_paint_util.cc",
"skia_paint_util.h", "skia_paint_util.h",
] ]
deps += [ "//build/config/linux/pangocairo:features" ]
} }
configs += [ configs += [
...@@ -387,10 +385,6 @@ component("gfx") { ...@@ -387,10 +385,6 @@ component("gfx") {
sources -= [ "path_x11.cc" ] sources -= [ "path_x11.cc" ]
} }
if (use_pangocairo) {
configs += [ "//build/config/linux/pangocairo" ]
}
if (is_fuchsia) { if (is_fuchsia) {
sources += [ sources += [
"font_fallback_fuchsia.cc", "font_fallback_fuchsia.cc",
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "base/i18n/rtl.h" #include "base/i18n/rtl.h"
#include "base/logging.h" #include "base/logging.h"
#include "build/config/linux/pangocairo/features.h"
#include "cc/paint/paint_flags.h" #include "cc/paint/paint_flags.h"
#include "cc/paint/paint_shader.h" #include "cc/paint/paint_shader.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
...@@ -36,13 +35,6 @@ Canvas::Canvas(const Size& size, float image_scale, bool is_opaque) ...@@ -36,13 +35,6 @@ Canvas::Canvas(const Size& size, float image_scale, bool is_opaque)
Size pixel_size = ScaleToCeiledSize(size, image_scale); Size pixel_size = ScaleToCeiledSize(size, image_scale);
canvas_ = CreateOwnedCanvas(pixel_size, is_opaque); canvas_ = CreateOwnedCanvas(pixel_size, is_opaque);
#if !BUILDFLAG(USE_PANGOCAIRO)
// skia::PlatformCanvas instances are initialized to 0 by Cairo, but
// uninitialized on other platforms.
if (!is_opaque)
canvas_->clear(SkColorSetARGB(0, 0, 0, 0));
#endif
SkScalar scale_scalar = SkFloatToScalar(image_scale); SkScalar scale_scalar = SkFloatToScalar(image_scale);
canvas_->scale(scale_scalar, scale_scalar); canvas_->scale(scale_scalar, scale_scalar);
} }
......
...@@ -91,8 +91,6 @@ struct NSView; ...@@ -91,8 +91,6 @@ struct NSView;
class NSWindow; class NSWindow;
class NSTextField; class NSTextField;
#endif // __OBJC__ #endif // __OBJC__
#elif defined(OS_POSIX)
typedef struct _cairo cairo_t;
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment