diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 00:20:32 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 00:20:32 +0000 |
| commit | f296ba562c8a5170962d4282e6c782fbedf774be (patch) | |
| tree | 6b5c8d36437f830d0a38a6569bb3891793ab5240 /webkit/glue | |
| parent | 05a7ce23a1847f0dc5cc1caa643841ca7eb7f415 (diff) | |
| download | chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.zip chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.tar.gz chromium_src-f296ba562c8a5170962d4282e6c782fbedf774be.tar.bz2 | |
WebKit merge 41498:41530.
Review URL: http://codereview.chromium.org/41017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/editor_client_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/searchable_form_data.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index 3c25b5a..6355d5b 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -23,6 +23,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "KeyboardEvent.h" #include "PlatformKeyboardEvent.h" #include "PlatformString.h" +#include "RenderObject.h" MSVC_POP_WARNING(); #include "WebKit.h" diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc index 71453cf..93a1f94 100644 --- a/webkit/glue/searchable_form_data.cc +++ b/webkit/glue/searchable_form_data.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" MSVC_PUSH_WARNING_LEVEL(0); +#include "CSSHelper.h" #include "CString.h" #include "Document.h" #include "DocumentLoader.h" @@ -296,7 +297,7 @@ WebCore::HTMLInputElement* GetTextElement( } // namespace SearchableFormData* SearchableFormData::Create(WebCore::Element* element) { - if (!element->isFormControlElement() || !element->isHTMLElement()) { + if (!element->isFormControlElement() || !element->isHTMLElement()) { return NULL; } diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 2207fca..81dcc1d 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -1218,7 +1218,9 @@ void WebFrameLoaderClient::frameLoadCompleted() { // Note: Can be called multiple times. // Even if already complete, we might have set a previous item on a frame that // didn't do any data loading on the past transaction. Make sure to clear these out. - webframe_->frame()->loader()->setPreviousHistoryItem(0); + + // FIXME: setPreviousHistoryItem() no longer exists. http://crbug.com/8566 + // webframe_->frame()->loader()->setPreviousHistoryItem(0); } void WebFrameLoaderClient::saveViewStateToItem(HistoryItem*) { |