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 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1748 view->setScrollbarModes(WebCore::ScrollbarAuto, | 1748 view->setScrollbarModes(WebCore::ScrollbarAuto, |
1749 WebCore::ScrollbarAuto); | 1749 WebCore::ScrollbarAuto); |
1750 } | 1750 } |
1751 DCHECK_EQ(frame()->isFrameSet(), false); | 1751 DCHECK_EQ(frame()->isFrameSet(), false); |
1752 | 1752 |
1753 SetPrinting(printing, page_width_min, page_width_max); | 1753 SetPrinting(printing, page_width_min, page_width_max); |
1754 if (!printing) | 1754 if (!printing) |
1755 pages_.clear(); | 1755 pages_.clear(); |
1756 | 1756 |
1757 // The document width is well hidden. | 1757 // The document width is well hidden. |
1758 if (width) | 1758 if (width) { |
1759 *width = frame()->document()->renderer()->width(); | 1759 WebCore::RenderObject* obj = frame()->document()->renderer(); |
| 1760 *width = WebCore::RenderBox::toRenderBox(obj)->width(); |
| 1761 } |
1760 return true; | 1762 return true; |
1761 } | 1763 } |
1762 | 1764 |
1763 int WebFrameImpl::ComputePageRects(const gfx::Size& page_size_px) { | 1765 int WebFrameImpl::ComputePageRects(const gfx::Size& page_size_px) { |
1764 if (!printing_ || | 1766 if (!printing_ || |
1765 !frame() || | 1767 !frame() || |
1766 !frame()->document()) { | 1768 !frame()->document()) { |
1767 NOTREACHED(); | 1769 NOTREACHED(); |
1768 return 0; | 1770 return 0; |
1769 } | 1771 } |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1835 return password_listeners_.get(input_element); | 1837 return password_listeners_.get(input_element); |
1836 } | 1838 } |
1837 | 1839 |
1838 void WebFrameImpl::ClearPasswordListeners() { | 1840 void WebFrameImpl::ClearPasswordListeners() { |
1839 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); | 1841 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); |
1840 iter != password_listeners_.end(); ++iter) { | 1842 iter != password_listeners_.end(); ++iter) { |
1841 delete iter->second; | 1843 delete iter->second; |
1842 } | 1844 } |
1843 password_listeners_.clear(); | 1845 password_listeners_.clear(); |
1844 } | 1846 } |
OLD | NEW |