Delete code used to invert web content for high-contrast mode.

content/renderer/render_widget.cc

 // Copyright (c) 2012 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 "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 15 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "third_party/skia/include/effects/SkTableColorFilter.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #if defined(OS_POSIX)
@@ skipping 53 matching lines @@
       input_method_is_active_(false),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       can_compose_inline_(true),
       popup_type_(popup_type),
       pending_window_rect_count_(0),
       suppress_next_char_events_(false),
       is_accelerated_compositing_active_(false),
       animation_update_pending_(false),
       invalidation_task_posted_(false),
       screen_info_(screen_info),
-      device_scale_factor_(1),
-      invert_(false) {
+      device_scale_factor_(1) {
   if (!swapped_out)
     RenderProcess::current()->AddRefProcess();
   DCHECK(RenderThread::Get());
   has_disable_gpu_vsync_switch_ = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableGpuVsync);
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
   device_scale_factor_ = std::max(1, screen_info.verticalDPI / kStandardDPI);
 #endif
 }
 
@@ skipping 110 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_HandleInputEvent, OnHandleInputEvent)
     IPC_MESSAGE_HANDLER(ViewMsg_MouseCaptureLost, OnMouseCaptureLost)
     IPC_MESSAGE_HANDLER(ViewMsg_SetFocus, OnSetFocus)
     IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive)
     IPC_MESSAGE_HANDLER(ViewMsg_ImeSetComposition, OnImeSetComposition)
     IPC_MESSAGE_HANDLER(ViewMsg_ImeConfirmComposition, OnImeConfirmComposition)
     IPC_MESSAGE_HANDLER(ViewMsg_PaintAtSize, OnMsgPaintAtSize)
     IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnMsgRepaint)
     IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
     IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
-    IPC_MESSAGE_HANDLER(ViewMsg_InvertWebContent, OnInvertWebContent)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool RenderWidget::Send(IPC::Message* message) {
   // Don't send any messages after the browser has told us to close, and filter
   // most outgoing messages while swapped out.
   if ((is_swapped_out_ &&
        !content::SwappedOutMessages::CanSendWhileSwappedOut(message)) ||
@@ skipping 371 matching lines @@
                              const gfx::Point& canvas_origin,
                              skia::PlatformCanvas* canvas) {
   TRACE_EVENT2("renderer", "PaintRect",
                "width", rect.width(), "height", rect.height());
   canvas->save();
 
   // Bring the canvas into the coordinate system of the paint rect.
   canvas->translate(static_cast<SkScalar>(-canvas_origin.x()),
                     static_cast<SkScalar>(-canvas_origin.y()));
 
-  if (invert_) {
-    // Draw everything to a temporary bitmap and then apply an
-    // inverting color map to the result. This is balanced by an extra
-    // call to canvas->restore(), below.
-    DCHECK(invert_paint_.get());
-    SkRect bounds(gfx::RectToSkRect(rect));
-    canvas->saveLayer(&bounds, invert_paint_.get());
-  }
-
   // If there is a custom background, tile it.
   if (!background_.empty()) {
     SkPaint paint;
     SkShader* shader = SkShader::CreateBitmapShader(background_,
                                                     SkShader::kRepeat_TileMode,
                                                     SkShader::kRepeat_TileMode);
     paint.setShader(shader)->unref();
 
     // Use kSrc_Mode to handle background_ transparency properly.
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
@@ skipping 37 matching lines @@
     optimized_instance->Paint(webkit_glue::ToWebCanvas(canvas),
                               optimized_copy_location, rect);
   } else {
     // Normal painting case.
     webwidget_->paint(webkit_glue::ToWebCanvas(canvas), rect);
 
     // Flush to underlying bitmap.  TODO(darin): is this needed?
     skia::GetTopDevice(*canvas)->accessBitmap(false);
   }
 
-  if (invert_)
-    canvas->restore();
-
   PaintDebugBorder(rect, canvas);
   canvas->restore();
 }
 
 void RenderWidget::PaintDebugBorder(const gfx::Rect& rect,
                                     skia::PlatformCanvas* canvas) {
   static bool kPaintBorder =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kShowPaintRects);
   if (!kPaintBorder)
     return;
@@ skipping 774 matching lines @@
     didInvalidateRect(repaint_rect);
   }
 }
 
 void RenderWidget::OnSetTextDirection(WebTextDirection direction) {
   if (!webwidget_)
     return;
   webwidget_->setTextDirection(direction);
 }
 
-void RenderWidget::OnInvertWebContent(bool invert) {
-  if (invert_ == invert)
-    return;
-
-  invert_ = invert;
-
-  if (invert_ && !invert_paint_.get()) {
-    // Gamma-aware color inversion: each source pixel value x is normally
-    // displayed on a computer monitor with a gamma correction x^gamma,
-    // where gamma is typically in the range 1.8...2.2. By approximating
-    // gamma as exactly 2, the formula to invert one value is sqrt(1 - x^2).
-    uint8_t table[256];
-    for (unsigned int i = 0; i < 256; i++) {
-      double value = i / 255.0;
-      value = sqrt(1 - (value * value));
-      table[i] = static_cast<uint8_t>(255 * value);
-    }
-
-    // Create a Skia Paint with this inverting color map.
-    invert_paint_.reset(new SkPaint());
-    invert_paint_->setStyle(SkPaint::kFill_Style);
-    invert_paint_->setColor(SK_ColorBLACK);
-    SkColorFilter* filter = SkTableColorFilter::CreateARGB(
-        NULL, table, table, table);
-    invert_paint_->setColorFilter(filter);
-    filter->unref();
-  }
-
-  OnMsgRepaint(size_);
-}
-
 webkit::ppapi::PluginInstance* RenderWidget::GetBitmapForOptimizedPluginPaint(
     const gfx::Rect& paint_bounds,
     TransportDIB** dib,
     gfx::Rect* location,
     gfx::Rect* clip) {
   // Bare RenderWidgets don't support optimized plugin painting.
   return NULL;
 }
 
 gfx::Point RenderWidget::GetScrollOffset() {
@@ skipping 207 matching lines @@
   }
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }