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

webkit/api/src/ContextMenuClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "HitTestResult.h"
 #include "HTMLMediaElement.h"
 #include "HTMLNames.h"
 #include "KURL.h"
 #include "MediaError.h"
 #include "PlatformString.h"
 #include "TextBreakIterator.h"
 #include "Widget.h"
 
 #include "WebContextMenuData.h"
-#include "WebFrame.h"
+#include "WebDataSourceImpl.h"
+#include "WebFrameImpl.h"
 #include "WebPoint.h"
 #include "WebString.h"
 #include "WebURL.h"
 #include "WebURLResponse.h"
 #include "WebViewClient.h"
-#include "WebDataSourceImpl.h"
-#undef LOG
-
-// FIXME: Temporary hack until WebViewImpl is in api/src.
-#include "webkit/glue/webview_impl.h"
+#include "WebViewImpl.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Figure out the URL of a page or subframe. Returns |page_type| as the type,
 // which indicates page or subframe, or ContextNodeType::NONE if the URL could not
 // be determined for some reason.
 static WebURL urlFromFrame(Frame* frame)
 {
@@ skipping 64 matching lines @@
 }
 
 PlatformMenuDescription ContextMenuClientImpl::getCustomMenuFromDefaultItems(
     ContextMenu* defaultMenu)
 {
     // Displaying the context menu in this function is a big hack as we don't
     // have context, i.e. whether this is being invoked via a script or in
     // response to user input (Mouse event WM_RBUTTONDOWN,
     // Keyboard events KeyVK_APPS, Shift+F10). Check if this is being invoked
     // in response to the above input events before popping up the context menu.
-    if (!m_webView->context_menu_allowed())
+    if (!m_webView->contextMenuAllowed())
         return 0;
 
     HitTestResult r = defaultMenu->hitTestResult();
     Frame* selectedFrame = r.innerNonSharedNode()->document()->frame();
 
     WebContextMenuData data;
     data.mousePosition = selectedFrame->view()->contentsToWindow(r.point());
 
     // Links, Images, Media tags, and Image/Media-Links take preference over
     // all else.
@@ skipping 28 matching lines @@
         if (mediaElement->supportsSave())
             data.mediaFlags |= WebContextMenuData::MediaCanSave;
         if (mediaElement->hasAudio())
             data.mediaFlags |= WebContextMenuData::MediaHasAudio;
     }
     // If it's not a link, an image, a media element, or an image/media link,
     // show a selection menu or a more generic page menu.
     data.frameEncoding = selectedFrame->loader()->encoding();
 
     // Send the frame and page URLs in any case.
-    data.pageURL = urlFromFrame(m_webView->main_frame()->frame());
-    if (selectedFrame != m_webView->main_frame()->frame())
+    data.pageURL = urlFromFrame(m_webView->mainFrameImpl()->frame());
+    if (selectedFrame != m_webView->mainFrameImpl()->frame())
         data.frameURL = urlFromFrame(selectedFrame);
 
     if (r.isSelected())
         data.selectedText = selectedFrame->selectedText().stripWhiteSpace();
 
     data.isEditable = false;
     if (r.isContentEditable()) {
         data.isEditable = true;
-        if (m_webView->GetFocusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) {
+        if (m_webView->focusedWebCoreFrame()->editor()->isContinuousSpellCheckingEnabled()) {
             data.isSpellCheckingEnabled = true;
             data.misspelledWord = selectMisspelledWord(defaultMenu, selectedFrame);
         }
     }
 
     // Now retrieve the security info.
     DocumentLoader* dl = selectedFrame->loader()->documentLoader();
     WebDataSource* ds = WebDataSourceImpl::fromDocumentLoader(dl);
     if (ds)
         data.securityInfo = ds->response().securityInfo();
 
     // Compute edit flags.
     data.editFlags = WebContextMenuData::CanDoNone;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canUndo())
+    if (m_webView->focusedWebCoreFrame()->editor()->canUndo())
         data.editFlags |= WebContextMenuData::CanUndo;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canRedo())
+    if (m_webView->focusedWebCoreFrame()->editor()->canRedo())
         data.editFlags |= WebContextMenuData::CanRedo;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canCut())
+    if (m_webView->focusedWebCoreFrame()->editor()->canCut())
         data.editFlags |= WebContextMenuData::CanCut;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canCopy())
+    if (m_webView->focusedWebCoreFrame()->editor()->canCopy())
         data.editFlags |= WebContextMenuData::CanCopy;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canPaste())
+    if (m_webView->focusedWebCoreFrame()->editor()->canPaste())
         data.editFlags |= WebContextMenuData::CanPaste;
-    if (m_webView->GetFocusedWebCoreFrame()->editor()->canDelete())
+    if (m_webView->focusedWebCoreFrame()->editor()->canDelete())
         data.editFlags |= WebContextMenuData::CanDelete;
     // We can always select all...
     data.editFlags |= WebContextMenuData::CanSelectAll;
 
-    WebFrame* selected_web_frame = WebFrameImpl::FromFrame(selectedFrame);
+    WebFrame* selected_web_frame = WebFrameImpl::fromFrame(selectedFrame);
     if (m_webView->client())
         m_webView->client()->showContextMenu(selected_web_frame, data);
 
     return 0;
 }
 
 } // namespace WebKit