| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2007 Google Inc. All Rights Reserved. | 2 * Copyright 2007 Google Inc. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Portions Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 4 * Portions Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * ***** BEGIN LICENSE BLOCK ***** | 6 * ***** BEGIN LICENSE BLOCK ***** |
| 7 * | 7 * |
| 8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
| 9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
| 10 * are met: | 10 * are met: |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 if (view) | 831 if (view) |
| 832 view->setFrameRect(view->frameRect()); | 832 view->setFrameRect(view->frameRect()); |
| 833 | 833 |
| 834 // setFrameRect may have the side-effect of causing existing page | 834 // setFrameRect may have the side-effect of causing existing page |
| 835 // layout to be invalidated, so layout needs to be called last. | 835 // layout to be invalidated, so layout needs to be called last. |
| 836 | 836 |
| 837 webframe->Layout(); | 837 webframe->Layout(); |
| 838 } | 838 } |
| 839 } | 839 } |
| 840 | 840 |
| 841 void WebViewImpl::Paint(gfx::PlatformCanvas* canvas, const gfx::Rect& rect) { | 841 void WebViewImpl::Paint(skia::PlatformCanvas* canvas, const gfx::Rect& rect) { |
| 842 WebFrameImpl* webframe = main_frame(); | 842 WebFrameImpl* webframe = main_frame(); |
| 843 if (webframe) | 843 if (webframe) |
| 844 webframe->Paint(canvas, rect); | 844 webframe->Paint(canvas, rect); |
| 845 } | 845 } |
| 846 | 846 |
| 847 // TODO(eseidel): g_current_input_event should be removed once | 847 // TODO(eseidel): g_current_input_event should be removed once |
| 848 // ChromeClient:show() can get the current-event information from WebCore. | 848 // ChromeClient:show() can get the current-event information from WebCore. |
| 849 /* static */ | 849 /* static */ |
| 850 const WebInputEvent* WebViewImpl::g_current_input_event = NULL; | 850 const WebInputEvent* WebViewImpl::g_current_input_event = NULL; |
| 851 | 851 |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1609 MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher); | 1609 MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher); |
| 1610 } | 1610 } |
| 1611 | 1611 |
| 1612 void WebViewImpl::HideAutoCompletePopup() { | 1612 void WebViewImpl::HideAutoCompletePopup() { |
| 1613 if (autocomplete_popup_) { | 1613 if (autocomplete_popup_) { |
| 1614 autocomplete_popup_->hidePopup(); | 1614 autocomplete_popup_->hidePopup(); |
| 1615 autocomplete_popup_.clear(); | 1615 autocomplete_popup_.clear(); |
| 1616 autocomplete_popup_client_.clear(); | 1616 autocomplete_popup_client_.clear(); |
| 1617 } | 1617 } |
| 1618 } | 1618 } |
| OLD | NEW |