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

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

Issue 20378: Reduce the amount of included header files. Vast change like in "Oh God! This... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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
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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "base/message_loop.h" 127 #include "base/message_loop.h"
128 #include "base/stats_counters.h" 128 #include "base/stats_counters.h"
129 #include "base/string_util.h" 129 #include "base/string_util.h"
130 #include "base/time.h" 130 #include "base/time.h"
131 #include "net/base/net_errors.h" 131 #include "net/base/net_errors.h"
132 #include "skia/ext/bitmap_platform_device.h" 132 #include "skia/ext/bitmap_platform_device.h"
133 #include "skia/ext/platform_canvas.h" 133 #include "skia/ext/platform_canvas.h"
134 #include "webkit/glue/alt_error_page_resource_fetcher.h" 134 #include "webkit/glue/alt_error_page_resource_fetcher.h"
135 #include "webkit/glue/dom_operations.h" 135 #include "webkit/glue/dom_operations.h"
136 #include "webkit/glue/glue_serialize.h" 136 #include "webkit/glue/glue_serialize.h"
137 #include "webkit/glue/glue_util.h"
137 #include "webkit/glue/webdocumentloader_impl.h" 138 #include "webkit/glue/webdocumentloader_impl.h"
139 #include "webkit/glue/webdatasource_impl.h"
138 #include "webkit/glue/weberror_impl.h" 140 #include "webkit/glue/weberror_impl.h"
139 #include "webkit/glue/webframe_impl.h" 141 #include "webkit/glue/webframe_impl.h"
140 #include "webkit/glue/webhistoryitem_impl.h" 142 #include "webkit/glue/webhistoryitem_impl.h"
143 #include "webkit/glue/weburlrequest_impl.h"
141 #include "webkit/glue/webtextinput_impl.h" 144 #include "webkit/glue/webtextinput_impl.h"
142 #include "webkit/glue/webview_impl.h" 145 #include "webkit/glue/webview_impl.h"
143 146
144 #if defined(OS_LINUX) 147 #if defined(OS_LINUX)
145 #include <gdk/gdk.h> 148 #include <gdk/gdk.h>
146 #endif 149 #endif
147 150
148 #if USE(JSC) 151 #if USE(JSC)
149 #include "bridge/c/c_instance.h" 152 #include "bridge/c/c_instance.h"
150 #include "bridge/runtime_object.h" 153 #include "bridge/runtime_object.h"
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 } else if (currently_loading_history_item_) { 586 } else if (currently_loading_history_item_) {
584 extra = currently_loading_history_item_->GetExtraData(); 587 extra = currently_loading_history_item_->GetExtraData();
585 currently_loading_history_item_ = 0; 588 currently_loading_history_item_ = 0;
586 } 589 }
587 590
588 // We must only update this if it is valid, or the valid state will be lost. 591 // We must only update this if it is valid, or the valid state will be lost.
589 if (extra) 592 if (extra)
590 datasource->SetExtraData(extra); 593 datasource->SetExtraData(extra);
591 } 594 }
592 595
596 void WebFrameImpl::set_currently_loading_history_item(
597 WebHistoryItemImpl* item) {
598 currently_loading_history_item_ = item;
599 }
600
593 void WebFrameImpl::StopLoading() { 601 void WebFrameImpl::StopLoading() {
594 if (!frame_) 602 if (!frame_)
595 return; 603 return;
596 604
597 // TODO(darin): Figure out what we should really do here. It seems like a 605 // TODO(darin): Figure out what we should really do here. It seems like a
598 // bug that FrameLoader::stopLoading doesn't call stopAllLoaders. 606 // bug that FrameLoader::stopLoading doesn't call stopAllLoaders.
599 frame_->loader()->stopAllLoaders(); 607 frame_->loader()->stopAllLoaders();
600 frame_->loader()->stopLoading(false); 608 frame_->loader()->stopLoading(false);
601 } 609 }
602 610
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 return password_listeners_.get(input_element); 1845 return password_listeners_.get(input_element);
1838 } 1846 }
1839 1847
1840 void WebFrameImpl::ClearPasswordListeners() { 1848 void WebFrameImpl::ClearPasswordListeners() {
1841 for (PasswordListenerMap::iterator iter = password_listeners_.begin(); 1849 for (PasswordListenerMap::iterator iter = password_listeners_.begin();
1842 iter != password_listeners_.end(); ++iter) { 1850 iter != password_listeners_.end(); ++iter) {
1843 delete iter->second; 1851 delete iter->second;
1844 } 1852 }
1845 password_listeners_.clear(); 1853 password_listeners_.clear();
1846 } 1854 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698