summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/theme_resources.grd12
-rw-r--r--chrome/browser/chromeos/native_theme_chromeos.cc256
-rw-r--r--chrome/browser/chromeos/native_theme_chromeos.h39
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--chrome/renderer/render_view.cc5
5 files changed, 314 insertions, 0 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 85e5a60..a333eac 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -557,6 +557,18 @@
<include name="IDR_USER_IMAGE_CAPTURE" file="snapshot_wide.png" type="BINDATA" />
<include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BINDATA" />
<include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" />
+ <include name="IDR_SCROLL_BACKGROUND" file="chromeos_scroll_background.png" type="BINDATA" />
+ <include name="IDR_SCROLL_BACKGROUND_BORDER_UP" file="chromeos_scroll_background_border_up.png" type="BINDATA" />
+ <include name="IDR_SCROLL_BACKGROUND_BORDER_DOWN" file="chromeos_scroll_background_border_down.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_DOWN" file="chromeos_scroll_arrow_down.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_DOWN_H" file="chromeos_scroll_arrow_down_h.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_DOWN_P" file="chromeos_scroll_arrow_down_p.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_UP" file="chromeos_scroll_arrow_up.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_UP_H" file="chromeos_scroll_arrow_up_h.png" type="BINDATA" />
+ <include name="IDR_SCROLL_ARROW_UP_P" file="chromeos_scroll_arrow_up_p.png" type="BINDATA" />
+ <include name="IDR_SCROLL_THUMB" file="chromeos_scroll_thumb.png" type="BINDATA" />
+ <include name="IDR_SCROLL_THUMB_H" file="chromeos_scroll_thumb_h.png" type="BINDATA" />
+ <include name="IDR_SCROLL_THUMB_P" file="chromeos_scroll_thumb_p.png" type="BINDATA" />
</if>
</includes>
</release>
diff --git a/chrome/browser/chromeos/native_theme_chromeos.cc b/chrome/browser/chromeos/native_theme_chromeos.cc
new file mode 100644
index 0000000..b0c4661
--- /dev/null
+++ b/chrome/browser/chromeos/native_theme_chromeos.cc
@@ -0,0 +1,256 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/native_theme_chromeos.h"
+
+#include "app/resource_bundle.h"
+#include "base/logging.h"
+#include "gfx/insets.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
+#include "gfx/skbitmap_operations.h"
+#include "grit/theme_resources.h"
+#include "third_party/skia/include/core/SkShader.h"
+
+namespace {
+
+bool IntersectsClipRectInt(
+ skia::PlatformCanvas* canvas, int x, int y, int w, int h) {
+ SkRect clip;
+ return canvas->getClipBounds(&clip) &&
+ clip.intersect(SkIntToScalar(x), SkIntToScalar(y), SkIntToScalar(x + w),
+ SkIntToScalar(y + h));
+}
+
+void DrawBitmapInt(
+ skia::PlatformCanvas* canvas, const SkBitmap& bitmap,
+ int src_x, int src_y, int src_w, int src_h,
+ int dest_x, int dest_y, int dest_w, int dest_h) {
+ DLOG_ASSERT(src_x + src_w < std::numeric_limits<int16_t>::max() &&
+ src_y + src_h < std::numeric_limits<int16_t>::max());
+ if (src_w <= 0 || src_h <= 0 || dest_w <= 0 || dest_h <= 0) {
+ NOTREACHED() << "Attempting to draw bitmap to/from an empty rect!";
+ return;
+ }
+
+ if (!IntersectsClipRectInt(canvas, dest_x, dest_y, dest_w, dest_h))
+ return;
+
+ SkRect dest_rect = { SkIntToScalar(dest_x),
+ SkIntToScalar(dest_y),
+ SkIntToScalar(dest_x + dest_w),
+ SkIntToScalar(dest_y + dest_h) };
+
+ if (src_w == dest_w && src_h == dest_h) {
+ // Workaround for apparent bug in Skia that causes image to occasionally
+ // shift.
+ SkIRect src_rect = { src_x, src_y, src_x + src_w, src_y + src_h };
+ canvas->drawBitmapRect(bitmap, &src_rect, dest_rect);
+ return;
+ }
+
+ // Make a bitmap shader that contains the bitmap we want to draw. This is
+ // basically what SkCanvas.drawBitmap does internally, but it gives us
+ // more control over quality and will use the mipmap in the source image if
+ // it has one, whereas drawBitmap won't.
+ SkShader* shader = SkShader::CreateBitmapShader(bitmap,
+ SkShader::kRepeat_TileMode,
+ SkShader::kRepeat_TileMode);
+ SkMatrix shader_scale;
+ shader_scale.setScale(SkFloatToScalar(static_cast<float>(dest_w) / src_w),
+ SkFloatToScalar(static_cast<float>(dest_h) / src_h));
+ shader_scale.preTranslate(SkIntToScalar(-src_x), SkIntToScalar(-src_y));
+ shader_scale.postTranslate(SkIntToScalar(dest_x), SkIntToScalar(dest_y));
+ shader->setLocalMatrix(shader_scale);
+
+ // The rect will be filled by the bitmap.
+ SkPaint p;
+ p.setFilterBitmap(true);
+ p.setShader(shader);
+ shader->unref();
+ canvas->drawRect(dest_rect, p);
+}
+
+}
+
+/* static */
+gfx::NativeThemeLinux* gfx::NativeThemeLinux::instance() {
+ // The global NativeThemeChromeos instance.
+ static NativeThemeChromeos s_native_theme;
+ return &s_native_theme;
+}
+
+NativeThemeChromeos::NativeThemeChromeos() {
+}
+
+NativeThemeChromeos::~NativeThemeChromeos() {
+}
+
+gfx::Size NativeThemeChromeos::GetSize(Part part) const {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ int scrollbar_width = rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND)->width();
+ int width = 0, height = 0;
+ switch (part) {
+ case kScrollbarUpArrow:
+ width = scrollbar_width;
+ height = rb.GetBitmapNamed(IDR_SCROLL_ARROW_UP)->height();
+ break;
+ case kScrollbarDownArrow:
+ width = scrollbar_width;
+ height = rb.GetBitmapNamed(IDR_SCROLL_ARROW_DOWN)->height();
+ break;
+ case kScrollbarLeftArrow:
+ width = rb.GetBitmapNamed(IDR_SCROLL_ARROW_UP)->height();
+ height = scrollbar_width;
+ break;
+ case kScrollbarRightArrow:
+ width = rb.GetBitmapNamed(IDR_SCROLL_ARROW_DOWN)->height();
+ height = scrollbar_width;
+ break;
+ case kScrollbarHorizontalTrack:
+ width = 0;
+ height = scrollbar_width;
+ break;
+ case kScrollbarVerticalTrack:
+ width = scrollbar_width;
+ height = 0;
+ break;
+ case kScrollbarHorizontalThumb:
+ case kScrollbarVerticalThumb:
+ // allow thumb to be square but no shorter.
+ width = scrollbar_width;
+ height = scrollbar_width;
+ break;
+ }
+ return gfx::Size(width, height);
+}
+
+void NativeThemeChromeos::PaintTrack(skia::PlatformCanvas* canvas,
+ Part part, State state,
+ const ScrollbarTrackExtraParams& extra_params, const gfx::Rect& rect) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ if (part == kScrollbarVerticalTrack) {
+ SkBitmap* background =
+ rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND);
+ SkBitmap* border_up =
+ rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_UP);
+ SkBitmap* border_down =
+ rb.GetBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_DOWN);
+ // Draw track background.
+ DrawBitmapInt(
+ canvas, *background,
+ 0, 0, background->width(), 1,
+ rect.x(), rect.y(), rect.width(), rect.height());
+ // Draw up button lower border.
+ canvas->drawBitmap(*border_up, extra_params.track_x, extra_params.track_y);
+ // Draw down button upper border.
+ canvas->drawBitmap(
+ *border_down,
+ extra_params.track_x,
+ extra_params.track_y + extra_params.track_height - border_down->height()
+ );
+ } else {
+ SkBitmap* background =
+ GetHorizontalBitmapNamed(IDR_SCROLL_BACKGROUND);
+ SkBitmap* border_left =
+ GetHorizontalBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_UP);
+ SkBitmap* border_right =
+ GetHorizontalBitmapNamed(IDR_SCROLL_BACKGROUND_BORDER_DOWN);
+ // Draw track background.
+ DrawBitmapInt(
+ canvas, *background,
+ 0, 0, 1, background->height(),
+ rect.x(), rect.y(), rect.width(), rect.height());
+ // Draw left button right border.
+ canvas->drawBitmap(*border_left,extra_params.track_x, extra_params.track_y);
+ // Draw right button left border.
+ canvas->drawBitmap(
+ *border_right,
+ extra_params.track_x + extra_params.track_width - border_right->width(),
+ extra_params.track_y);
+ }
+}
+
+void NativeThemeChromeos::PaintThumb(skia::PlatformCanvas* canvas,
+ Part part, State state, const gfx::Rect& rect) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ int resource_id = IDR_SCROLL_THUMB;
+ if (state == kHover)
+ resource_id++;
+ else if (state == kPressed)
+ resource_id += 2;
+ if (part == kScrollbarVerticalThumb) {
+ SkBitmap* bitmap = rb.GetBitmapNamed(resource_id);
+ // Top
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 0, 1, bitmap->width(), 5,
+ rect.x(), rect.y(), rect.width(), 5);
+ // Middle
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 0, 7, bitmap->width(), 1,
+ rect.x(), rect.y() + 5, rect.width(), rect.height() - 10);
+ // Bottom
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 0, 8, bitmap->width(), 5,
+ rect.x(), rect.y() + rect.height() - 5, rect.width(), 5);
+ } else {
+ SkBitmap* bitmap = GetHorizontalBitmapNamed(resource_id);
+ // Left
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 1, 0, 5, bitmap->height(),
+ rect.x(), rect.y(), 5, rect.height());
+ // Middle
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 7, 0, 1, bitmap->height(),
+ rect.x() + 5, rect.y(), rect.width() - 10, rect.height());
+ // Right
+ DrawBitmapInt(
+ canvas, *bitmap,
+ 8, 0, 5, bitmap->height(),
+ rect.x() + rect.width() - 5, rect.y(), 5, rect.height());
+ }
+}
+
+void NativeThemeChromeos::PaintArrowButton(skia::PlatformCanvas* canvas,
+ const gfx::Rect& rect, Part part, State state) {
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ int resource_id =
+ (part == kScrollbarUpArrow || part == kScrollbarLeftArrow) ?
+ IDR_SCROLL_ARROW_UP : IDR_SCROLL_ARROW_DOWN;
+ if (state == kHover)
+ resource_id++;
+ else if (state == kPressed)
+ resource_id += 2;
+ SkBitmap* bitmap;
+ if (part == kScrollbarUpArrow || part == kScrollbarDownArrow)
+ bitmap = rb.GetBitmapNamed(resource_id);
+ else
+ bitmap = GetHorizontalBitmapNamed(resource_id);
+ canvas->drawBitmap(*bitmap, rect.x(), rect.y());
+}
+
+SkBitmap* NativeThemeChromeos::GetHorizontalBitmapNamed(int resource_id) {
+ SkImageMap::const_iterator found = horizontal_bitmaps_.find(resource_id);
+ if (found != horizontal_bitmaps_.end())
+ return found->second;
+
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ SkBitmap* vertical_bitmap = rb.GetBitmapNamed(resource_id);
+
+ if (vertical_bitmap) {
+ SkBitmap transposed_bitmap =
+ SkBitmapOperations::CreateTransposedBtmap(*vertical_bitmap);
+ SkBitmap* horizontal_bitmap = new SkBitmap(transposed_bitmap);
+
+ horizontal_bitmaps_[resource_id] = horizontal_bitmap;
+ return horizontal_bitmap;
+ }
+ return NULL;
+}
+
diff --git a/chrome/browser/chromeos/native_theme_chromeos.h b/chrome/browser/chromeos/native_theme_chromeos.h
new file mode 100644
index 0000000..d501f682e
--- /dev/null
+++ b/chrome/browser/chromeos/native_theme_chromeos.h
@@ -0,0 +1,39 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_NATIVE_THEME_CHROMEOS_H_
+#define CHROME_BROWSER_CHROMEOS_NATIVE_THEME_CHROMEOS_H_
+
+#include <map>
+#include "gfx/native_theme_linux.h"
+
+class SkBitmap;
+
+class NativeThemeChromeos : public gfx::NativeThemeLinux {
+ private:
+ friend class NativeThemeLinux;
+ NativeThemeChromeos();
+ virtual ~NativeThemeChromeos();
+
+ // Scrollbar painting overrides
+ virtual gfx::Size GetSize(Part part) const;
+ virtual void PaintTrack(skia::PlatformCanvas* canvas,
+ Part part, State state,
+ const ScrollbarTrackExtraParams& extra_params,
+ const gfx::Rect& rect);
+ virtual void PaintArrowButton(skia::PlatformCanvas* canvas,
+ const gfx::Rect& rect, Part direction, State state);
+ virtual void PaintThumb(skia::PlatformCanvas* canvas,
+ Part part, State state, const gfx::Rect& rect);
+ SkBitmap* GetHorizontalBitmapNamed(int resource_id);
+
+ // Cached images. The ResourceBundle caches all retrieved bitmaps and keeps
+ // ownership of the pointers.
+ typedef std::map<int, SkBitmap*> SkImageMap;
+ SkImageMap horizontal_bitmaps_;
+
+ DISALLOW_COPY_AND_ASSIGN(NativeThemeChromeos);
+};
+
+#endif // CHROME_BROWSER_CHROMEOS_NATIVE_THEME_CHROMEOS_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index bd284b7..d7c589d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -639,6 +639,8 @@
'browser/chromeos/low_battery_observer.h',
'browser/chromeos/native_dialog_window.cc',
'browser/chromeos/native_dialog_window.h',
+ 'browser/chromeos/native_theme_chromeos.cc',
+ 'browser/chromeos/native_theme_chromeos.h',
'browser/chromeos/network_list.cc',
'browser/chromeos/network_list.h',
'browser/chromeos/network_state_notifier.cc',
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 4d8a8b4..bfd4263 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -176,6 +176,7 @@
// * theming
#include "gfx/native_theme_win.h"
#elif defined(USE_X11)
+#include "gfx/native_theme_linux.h"
#include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
#elif defined(OS_MACOSX)
#include "skia/ext/skia_utils_mac.h"
@@ -4425,6 +4426,10 @@ void RenderView::OnSetRendererPrefs(const RendererPreferences& renderer_prefs) {
WebColorName name = WebKit::WebColorWebkitFocusRingColor;
WebKit::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1);
WebKit::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
+ gfx::NativeThemeLinux::instance()->SetScrollbarColors(
+ renderer_prefs.thumb_inactive_color,
+ renderer_prefs.thumb_active_color,
+ renderer_prefs.track_color);
if (webview()) {
webview()->setScrollbarColors(
generated by cgit v1.1 at 2025-03-10 07:05:47 +0000