Chrome side of WebKit Merge 40165:40297

Review URL: http://codereview.chromium.org/19603

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8776 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 9 deletions

diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc
index d8a982c..9b03204 100644
--- a/webkit/glue/searchable_form_data.cc
+++ b/webkit/glue/searchable_form_data.cc
@@ -38,7 +38,6 @@ using WebCore::HTMLInputElement;
 using WebCore::HTMLOptionElement;
 
 namespace {
-
 // TODO(eseidel): appendString and appendEncodedString do *not* follow Google
 // style because they are copy/paste from WebKit and will go away as soon as the
 // WebKit functions are made public.
@@ -296,8 +295,7 @@ WebCore::HTMLInputElement* GetTextElement(
 } // namespace
 
 SearchableFormData* SearchableFormData::Create(WebCore::Element* element) {
-  if (!element->isHTMLElement() ||
-      !static_cast<WebCore::HTMLElement*>(element)->isGenericFormElement()) {
+	if (!element->isFormControlElement() || !element->isHTMLElement()) {
     return NULL;
   }
 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index ad862c3..fcae8a1 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1758,7 +1758,7 @@ bool WebFrameImpl::SetPrintingMode(bool printing,
   // The document width is well hidden.
   if (width) {
     WebCore::RenderObject* obj = frame()->document()->renderer();
-    *width = WebCore::RenderBox::toRenderBox(obj)->width();
+    *width = WebCore::toRenderBox(obj)->width();
   }
   return true;
 }
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index e531972..3363485 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1268,11 +1268,11 @@ String WebFrameLoaderClient::userAgent(const KURL& url) {
       webkit_glue::GetUserAgent(webkit_glue::KURLToGURL(url)));
 }
 
-void WebFrameLoaderClient::savePlatformDataToCachedPage(WebCore::CachedPage*) {
+void WebFrameLoaderClient::savePlatformDataToCachedFrame(WebCore::CachedFrame*) {
   NOTREACHED() << "Page cache should be disabled";
 }
 
-void WebFrameLoaderClient::transitionToCommittedFromCachedPage(WebCore::CachedPage*) {
+void WebFrameLoaderClient::transitionToCommittedFromCachedFrame(WebCore::CachedFrame*) {
   ASSERT_NOT_REACHED();
 }
 
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 7fd59dc..e743951 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -151,8 +151,8 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
 
   virtual WebCore::String userAgent(const WebCore::KURL&);
 
-  virtual void savePlatformDataToCachedPage(WebCore::CachedPage*);
-  virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
+  virtual void savePlatformDataToCachedFrame(WebCore::CachedFrame*);
+  virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*);
   virtual void transitionToCommittedForNewPage();
 
   virtual bool canCachePage() const;
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 4064a27..4b3cdb7 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -623,7 +623,7 @@ void WebPluginImpl::windowCutoutRects(
       if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) {
         if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) {
           WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute());
-          WebCore::RenderBox* rbox = WebCore::RenderBox::toRenderBox(ro);
+          WebCore::RenderBox* rbox = WebCore::toRenderBox(ro);
           WebCore::IntSize size(rbox->width(), rbox->height());
           cutouts->append(WebCore::IntRect(point, size));
         }