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

Side by Side Diff: webkit/glue/webframe_impl.cc

Issue 43058: Reverting 11396. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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 | « no previous file | webkit/tools/layout_tests/test_lists/tests_fixable.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 #if defined(OS_MACOSX) 1453 #if defined(OS_MACOSX)
1454 CGContextRef context = canvas->getTopPlatformDevice().GetBitmapContext(); 1454 CGContextRef context = canvas->getTopPlatformDevice().GetBitmapContext();
1455 GraphicsContext gc(context); 1455 GraphicsContext gc(context);
1456 #else 1456 #else
1457 PlatformContextSkia context(canvas); 1457 PlatformContextSkia context(canvas);
1458 1458
1459 // PlatformGraphicsContext is actually a pointer to PlatformContextSkia 1459 // PlatformGraphicsContext is actually a pointer to PlatformContextSkia
1460 GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context)); 1460 GraphicsContext gc(reinterpret_cast<PlatformGraphicsContext*>(&context));
1461 #endif 1461 #endif
1462 if (frame_->document() && frameview()) { 1462 if (frame_->document() && frameview()) {
1463 // TODO(eroman): See http://crbug.com/8630
1464 // gc.clip(dirty_rect);
1465 frameview()->paint(&gc, dirty_rect); 1463 frameview()->paint(&gc, dirty_rect);
1466 frame_->page()->inspectorController()->drawNodeHighlight(gc); 1464 frame_->page()->inspectorController()->drawNodeHighlight(gc);
1467 } else { 1465 } else {
1468 gc.fillRect(dirty_rect, Color::white); 1466 gc.fillRect(dirty_rect, Color::white);
1469 } 1467 }
1470 } 1468 }
1471 } 1469 }
1472 1470
1473 bool WebFrameImpl::CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image, 1471 bool WebFrameImpl::CaptureImage(scoped_ptr<skia::BitmapPlatformDevice>* image,
1474 bool scroll_to_zero) { 1472 bool scroll_to_zero) {
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
1847 return password_listeners_.get(input_element); 1845 return password_listeners_.get(input_element);
1848 } 1846 }
1849 1847
1850 void WebFrameImpl::ClearPasswordListeners() { 1848 void WebFrameImpl::ClearPasswordListeners() {
1851 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); 1849 for (PasswordListenerMap::iterator iter = password_listeners_.begin();
1852 iter != password_listeners_.end(); ++iter) { 1850 iter != password_listeners_.end(); ++iter) {
1853 delete iter->second; 1851 delete iter->second;
1854 } 1852 }
1855 password_listeners_.clear(); 1853 password_listeners_.clear();
1856 } 1854 }
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/layout_tests/test_lists/tests_fixable.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698