Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: chrome/renderer/render_widget.cc

Issue 147121: Update WebKit to 45111 and Skia to 239 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/views/tabs/tab_strip.cc ('k') | skia/config/SkUserConfig.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/render_widget.h" 5 #include "chrome/renderer/render_widget.h"
6 6
7 #include "base/gfx/point.h" 7 #include "base/gfx/point.h"
8 #include "base/gfx/size.h" 8 #include "base/gfx/size.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 canvas->translate(static_cast<SkScalar>(-rect.x()), 321 canvas->translate(static_cast<SkScalar>(-rect.x()),
322 static_cast<SkScalar>(-rect.y())); 322 static_cast<SkScalar>(-rect.y()));
323 323
324 // If there is a custom background, tile it. 324 // If there is a custom background, tile it.
325 if (!background_.empty()) { 325 if (!background_.empty()) {
326 SkPaint paint; 326 SkPaint paint;
327 SkShader* shader = SkShader::CreateBitmapShader(background_, 327 SkShader* shader = SkShader::CreateBitmapShader(background_,
328 SkShader::kRepeat_TileMode, 328 SkShader::kRepeat_TileMode,
329 SkShader::kRepeat_TileMode); 329 SkShader::kRepeat_TileMode);
330 paint.setShader(shader)->unref(); 330 paint.setShader(shader)->unref();
331 paint.setPorterDuffXfermode(SkPorterDuff::kSrcOver_Mode); 331 paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
332 canvas->drawPaint(paint); 332 canvas->drawPaint(paint);
333 } 333 }
334 334
335 webwidget_->Paint(canvas, rect); 335 webwidget_->Paint(canvas, rect);
336 336
337 // Flush to underlying bitmap. TODO(darin): is this needed? 337 // Flush to underlying bitmap. TODO(darin): is this needed?
338 canvas->getTopPlatformDevice().accessBitmap(false); 338 canvas->getTopPlatformDevice().accessBitmap(false);
339 } 339 }
340 340
341 void RenderWidget::DoDeferredPaint() { 341 void RenderWidget::DoDeferredPaint() {
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 if (i == plugin_window_moves_.size()) 846 if (i == plugin_window_moves_.size())
847 plugin_window_moves_.push_back(move); 847 plugin_window_moves_.push_back(move);
848 } 848 }
849 849
850 WebScreenInfo RenderWidget::GetScreenInfo(WebWidget* webwidget) { 850 WebScreenInfo RenderWidget::GetScreenInfo(WebWidget* webwidget) {
851 WebScreenInfo results; 851 WebScreenInfo results;
852 RenderThread::current()->Send( 852 RenderThread::current()->Send(
853 new ViewHostMsg_GetScreenInfo(host_window_, &results)); 853 new ViewHostMsg_GetScreenInfo(host_window_, &results));
854 return results; 854 return results;
855 } 855 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/tab_strip.cc ('k') | skia/config/SkUserConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698