| OLD | NEW |
| 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 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1487 #endif | 1487 #endif |
| 1488 frameview()->paint(&gc, IntRect(0, 0, frameview()->width(), | 1488 frameview()->paint(&gc, IntRect(0, 0, frameview()->width(), |
| 1489 frameview()->height())); | 1489 frameview()->height())); |
| 1490 #if defined(OS_MACOSX) | 1490 #if defined(OS_MACOSX) |
| 1491 canvas.endPlatformPaint(); | 1491 canvas.endPlatformPaint(); |
| 1492 #endif | 1492 #endif |
| 1493 | 1493 |
| 1494 skia::BitmapPlatformDevice& device = | 1494 skia::BitmapPlatformDevice& device = |
| 1495 static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice()); | 1495 static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice()); |
| 1496 | 1496 |
| 1497 #if defined(OS_WIN) | |
| 1498 device.fixupAlphaBeforeCompositing(); | |
| 1499 #endif | |
| 1500 | |
| 1501 image->reset(new skia::BitmapPlatformDevice(device)); | 1497 image->reset(new skia::BitmapPlatformDevice(device)); |
| 1502 return true; | 1498 return true; |
| 1503 } | 1499 } |
| 1504 | 1500 |
| 1505 bool WebFrameImpl::IsLoading() { | 1501 bool WebFrameImpl::IsLoading() { |
| 1506 // I'm assuming this does what we want. | 1502 // I'm assuming this does what we want. |
| 1507 return frame_->loader()->isLoading(); | 1503 return frame_->loader()->isLoading(); |
| 1508 } | 1504 } |
| 1509 | 1505 |
| 1510 void WebFrameImpl::Closing() { | 1506 void WebFrameImpl::Closing() { |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1845 return password_listeners_.get(input_element); | 1841 return password_listeners_.get(input_element); |
| 1846 } | 1842 } |
| 1847 | 1843 |
| 1848 void WebFrameImpl::ClearPasswordListeners() { | 1844 void WebFrameImpl::ClearPasswordListeners() { |
| 1849 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); | 1845 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); |
| 1850 iter != password_listeners_.end(); ++iter) { | 1846 iter != password_listeners_.end(); ++iter) { |
| 1851 delete iter->second; | 1847 delete iter->second; |
| 1852 } | 1848 } |
| 1853 password_listeners_.clear(); | 1849 password_listeners_.clear(); |
| 1854 } | 1850 } |
| OLD | NEW |