Moves webview_impl.cc, webframe_impl.cc and webframeloaderclient_impl.cc into...

webkit/glue/webkit_glue.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 26 matching lines @@
 #include "base/sys_string_conversions.h"
 #include "net/base/escape.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/api/public/WebHistoryItem.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebVector.h"
 #if defined(OS_WIN)
 #include "webkit/api/public/win/WebInputEventFactory.h"
 #endif
+#include "webkit/api/src/WebFrameImpl.h"
+#include "webkit/api/src/WebViewImpl.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
-#include "webkit/glue/webframe_impl.h"
-#include "webkit/glue/webview_impl.h"
 
 #include "webkit_version.h"  // Generated
 
 using WebKit::WebCanvas;
 using WebKit::WebFrame;
+using WebKit::WebFrameImpl;
 using WebKit::WebHistoryItem;
 using WebKit::WebString;
 using WebKit::WebVector;
 using WebKit::WebView;
+using WebKit::WebViewImpl;
 
 namespace {
 
 static const char kLayoutTestsPattern[] = "/LayoutTests/";
 static const std::string::size_type kLayoutTestsPatternSize =
     arraysize(kLayoutTestsPattern) - 1;
 static const char kFileUrlPattern[] = "file:/";
 static const char kDataUrlPattern[] = "data:";
 static const std::string::size_type kDataUrlPatternSize =
     arraysize(kDataUrlPattern) - 1;
@@ skipping 46 matching lines @@
     result.append(L"'\n--------\n");
   }
 
   result.append(DumpDocumentText(web_frame));
   result.append(L"\n");
 
   if (recursive) {
     WebCore::Frame* child = webFrameImpl->frame()->tree()->firstChild();
     for (; child; child = child->tree()->nextSibling()) {
       result.append(
-          DumpFramesAsText(WebFrameImpl::FromFrame(child), recursive));
+          DumpFramesAsText(WebFrameImpl::fromFrame(child), recursive));
     }
   }
 
   return result;
 }
 
 std::wstring DumpRenderer(WebFrame* web_frame) {
   WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame);
   WebCore::Frame* frame = webFrameImpl->frame();
 
@@ skipping 11 matching lines @@
       frame->document()->getElementById(WebCore::AtomicString(id.c_str()));
   if (!element)
       return false;
   WebCore::String counterValue = WebCore::counterValueForElement(element);
   *counter_value = StringToStdWString(counterValue);
   return true;
 }
 
 std::wstring DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) {
   WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame);
-  WebCore::IntSize offset = webFrameImpl->frameview()->scrollOffset();
+  WebCore::IntSize offset = webFrameImpl->frameView()->scrollOffset();
   std::wstring result;
 
   if (offset.width() > 0 || offset.height() > 0) {
     if (webFrameImpl->parent()) {
       StringAppendF(&result, L"frame '%ls' ", StringToStdWString(
           webFrameImpl->frame()->tree()->name()).c_str());
     }
     StringAppendF(&result, L"scrolled to %d,%d\n",
                   offset.width(), offset.height());
   }
 
   if (recursive) {
     WebCore::Frame* child = webFrameImpl->frame()->tree()->firstChild();
     for (; child; child = child->tree()->nextSibling()) {
-      result.append(DumpFrameScrollPosition(WebFrameImpl::FromFrame(child),
+      result.append(DumpFrameScrollPosition(WebFrameImpl::fromFrame(child),
                                             recursive));
     }
   }
 
   return result;
 }
 
 // Returns True if item1 < item2.
 static bool HistoryItemCompareLess(const WebHistoryItem& item1,
                                    const WebHistoryItem& item2) {
@@ skipping 83 matching lines @@
 // The log macro was having problems due to collisions with WTF, so we just
 // code here what that would have inlined.
 void DumpLeakedObject(const char* file, int line, const char* object, int count) {
   std::string msg = StringPrintf("%s LEAKED %d TIMES", object, count);
   AppendToLog(file, line, msg.c_str());
 }
 #endif
 
 void CheckForLeaks() {
 #ifndef NDEBUG
-  int count = WebFrameImpl::live_object_count();
+  int count = WebFrameImpl::liveObjectCount();
   if (count)
     DumpLeakedObject(__FILE__, __LINE__, "WebFrame", count);
 #endif
 }
 
 bool DecodeImage(const std::string& image_data, SkBitmap* image) {
    RefPtr<WebCore::SharedBuffer> buffer(
        WebCore::SharedBuffer::create(image_data.data(),
                                      static_cast<int>(image_data.length())));
   WebCore::ImageSource image_source;
@@ skipping 228 matching lines @@
 
 bool IsMediaCacheEnabled() {
   return g_enable_media_cache;
 }
 
 void SetMediaCacheEnabled(bool enabled) {
   g_enable_media_cache = enabled;
 }
 
 } // namespace webkit_glue