Minor cleanup in webkit/glue:

- created dom_operations_private.h for things that mention WebCore types
  that are only needed within webkit/glue.
- moved contents of webkit_glue.h to the right locations.
- moved FilePath::StringType <-> WebString conversion out of glue_util
  into webkit_glue since it is part of the public API.
- minimized includes in webkit_glue.h

R=dglazkov

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

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

20 files changed, 151 insertions, 131 deletions

diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 29f601f..e5cf44a 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -26,7 +26,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
-#include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin.h"
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc
index 3af3a53..f832150 100644
--- a/webkit/glue/chromium_bridge_impl.cc
+++ b/webkit/glue/chromium_bridge_impl.cc
@@ -44,9 +44,11 @@
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/screen_info.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webplugin_impl.h"
+#include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -106,7 +108,18 @@ bool ChromiumBridge::ensureFontLoaded(HFONT font) {
 // JavaScript -----------------------------------------------------------------
 
 void ChromiumBridge::notifyJSOutOfMemory(Frame* frame) {
-  webkit_glue::NotifyJSOutOfMemory(frame);
+  if (!frame)
+    return;
+
+  // Dispatch to the delegate of the view that owns the frame.
+  WebFrame* webframe = WebFrameImpl::FromFrame(frame);
+  WebView* webview = webframe->GetView();
+  if (!webview)
+    return;
+  WebViewDelegate* delegate = webview->GetDelegate();
+  if (!delegate)
+    return;
+  delegate->JSOutOfMemory();
 }
 
 // Plugin ---------------------------------------------------------------------
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index 00e0802..e77e375 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -30,6 +30,7 @@ MSVC_POP_WARNING();
 
 #include "base/string_util.h"
 #include "webkit/glue/dom_operations.h"
+#include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/password_autocomplete_listener.h"
diff --git a/webkit/glue/dom_operations.h b/webkit/glue/dom_operations.h
index 61af34e..c6276de 100644
--- a/webkit/glue/dom_operations.h
+++ b/webkit/glue/dom_operations.h
@@ -16,18 +16,6 @@ struct FormData;
 class WebFrameImpl;
 class WebView;
 
-namespace WebCore {
-class AtomicString;
-class Document;
-class Element;
-class HTMLLinkElement;
-class HTMLMetaElement;
-class HTMLOptionElement;
-class Node;
-class QualifiedName;
-class String;
-}
-
 // A collection of operations that access the underlying WebKit DOM directly.
 namespace webkit_glue {
 
@@ -63,43 +51,6 @@ bool FillForm(WebView* view, const FormData& data);
 void FillPasswordForm(WebView* view,
                       const PasswordFormDomManager::FillData& data);
 
-// If node is an HTML node with a tag name of name it is casted and returned.
-// If node is not an HTML node or the tag name is not name NULL is returned.
-WebCore::HTMLLinkElement* CastToHTMLLinkElement(WebCore::Node* node);
-WebCore::HTMLMetaElement* CastToHTMLMetaElement(WebCore::Node* node);
-WebCore::HTMLOptionElement* CastToHTMLOptionElement(WebCore::Node* node);
-
-// If element is HTML:IFrame or HTML:Frame, then return the WebFrameImpl
-// object corresponding to the content frame, otherwise return NULL.
-// The parameter is_frame_element indicates whether the input element
-// is frame/iframe element or not.
-WebFrameImpl* GetWebFrameImplFromElement(WebCore::Element* element,
-                                         bool* is_frame_element);
-
-
-// If element is img, script or input type=image, then return its link refer
-// to the "src" attribute. If element is link, then return its link refer to
-// the "href" attribute. If element is body, table, tr, td, then return its
-// link refer to the "background" attribute. If element is blockquote, q, del,
-// ins, then return its link refer to the "cite" attribute. Otherwise return
-// NULL.
-const WebCore::AtomicString* GetSubResourceLinkFromElement(
-    const WebCore::Element* element);
-
-// For img, script, iframe, frame element, when attribute name is src,
-// for link, a, area element, when attribute name is href,
-// for form element, when attribute name is action,
-// for input, type=image, when attribute name is src,
-// for body, table, tr, td, when attribute name is background,
-// for blockquote, q, del, ins, when attribute name is cite,
-// we can consider the attribute value has legal link.
-bool ElementHasLegalLinkAttribute(const WebCore::Element* element,
-                                  const WebCore::QualifiedName& attr_name);
-
-// Get pointer of WebFrameImpl from webview according to specific URL.
-WebFrameImpl* GetWebFrameImplFromWebViewForSpecificURL(WebView* view,
-                                                       const GURL& page_url);
-
 // Structure for storage the result of getting all savable resource links
 // for current page. The consumer of the SavableResourcesResult is responsible
 // for keeping these pointers valid for the lifetime of the
diff --git a/webkit/glue/dom_operations_private.h b/webkit/glue/dom_operations_private.h
new file mode 100644
index 0000000..460cdcb
--- /dev/null
+++ b/webkit/glue/dom_operations_private.h
@@ -0,0 +1,62 @@
+// 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.
+
+#ifndef WEBKIT_GLUE_DOM_OPERATIONS_PRIVATE_H_
+#define WEBKIT_GLUE_DOM_OPERATIONS_PRIVATE_H_
+
+namespace WebCore {
+class AtomicString;
+class Document;
+class Element;
+class HTMLLinkElement;
+class HTMLMetaElement;
+class HTMLOptionElement;
+class Node;
+class QualifiedName;
+class String;
+}
+
+class WebFrameImpl;
+
+namespace webkit_glue {
+
+// If node is an HTML node with a tag name of name it is casted and returned.
+// If node is not an HTML node or the tag name is not name NULL is returned.
+WebCore::HTMLLinkElement* CastToHTMLLinkElement(WebCore::Node* node);
+WebCore::HTMLMetaElement* CastToHTMLMetaElement(WebCore::Node* node);
+WebCore::HTMLOptionElement* CastToHTMLOptionElement(WebCore::Node* node);
+
+// If element is HTML:IFrame or HTML:Frame, then return the WebFrameImpl
+// object corresponding to the content frame, otherwise return NULL.
+// The parameter is_frame_element indicates whether the input element
+// is frame/iframe element or not.
+WebFrameImpl* GetWebFrameImplFromElement(WebCore::Element* element,
+                                         bool* is_frame_element);
+
+// If element is img, script or input type=image, then return its link refer
+// to the "src" attribute. If element is link, then return its link refer to
+// the "href" attribute. If element is body, table, tr, td, then return its
+// link refer to the "background" attribute. If element is blockquote, q, del,
+// ins, then return its link refer to the "cite" attribute. Otherwise return
+// NULL.
+const WebCore::AtomicString* GetSubResourceLinkFromElement(
+    const WebCore::Element* element);
+
+// For img, script, iframe, frame element, when attribute name is src,
+// for link, a, area element, when attribute name is href,
+// for form element, when attribute name is action,
+// for input, type=image, when attribute name is src,
+// for body, table, tr, td, when attribute name is background,
+// for blockquote, q, del, ins, when attribute name is cite,
+// we can consider the attribute value has legal link.
+bool ElementHasLegalLinkAttribute(const WebCore::Element* element,
+                                  const WebCore::QualifiedName& attr_name);
+
+// Get pointer of WebFrameImpl from webview according to specific URL.
+WebFrameImpl* GetWebFrameImplFromWebViewForSpecificURL(WebView* view,
+                                                       const GURL& page_url);
+
+}  // namespace webkit_glue
+
+#endif  // WEBKIT_GLUE_DOM_OPERATIONS_PRIVATE_H_
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc
index f44e761..8aa2310 100644
--- a/webkit/glue/dom_serializer.cc
+++ b/webkit/glue/dom_serializer.cc
@@ -74,6 +74,7 @@ MSVC_POP_WARNING();
 
 #include "base/string_util.h"
 #include "webkit/glue/dom_operations.h"
+#include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/entity_map.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index c5c0072..03afe5b 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -29,6 +29,7 @@ MSVC_POP_WARNING();
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/dom_operations.h"
+#include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/dom_serializer.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/glue.vcproj b/webkit/glue/glue.vcproj
index 304c24b..4ce48b8 100644
--- a/webkit/glue/glue.vcproj
+++ b/webkit/glue/glue.vcproj
@@ -153,6 +153,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\dom_operations.h"

+				>

+			</File>

+			<File

 				RelativePath=".\form_data.h"

 				>

 			</File>

@@ -349,7 +353,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\dom_operations.h"

+				RelativePath=".\dom_operations_private.h"

 				>

 			</File>

 			<File

diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc
index 359eb40..be96a7c 100644
--- a/webkit/glue/glue_util.cc
+++ b/webkit/glue/glue_util.cc
@@ -27,6 +27,10 @@ MSVC_POP_WARNING();
 #include "googleurl/src/gurl.h"
 
 
+// TODO(darin): This file will be deleted once we complete the move to
+// third_party/WebKit/WebKit/chromium
+
+
 namespace webkit_glue {
 
 // String conversions ----------------------------------------------------------
@@ -99,22 +103,6 @@ WebCore::String FilePathStringToString(const FilePath::StringType& str) {
 #endif
 }
 
-FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str) {
-#if defined(OS_POSIX)
-  return base::SysWideToNativeMB(UTF16ToWide(str));
-#elif defined(OS_WIN)
-  return UTF16ToWide(str);
-#endif
-}
-
-WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str) {
-#if defined(OS_POSIX)
-  return WideToUTF16(base::SysNativeMBToWide(str));
-#elif defined(OS_WIN)
-  return WideToUTF16(str);
-#endif
-}
-
 // URL conversions -------------------------------------------------------------
 
 GURL KURLToGURL(const WebCore::KURL& url) {
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index 54902c0..566d9f9 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -15,6 +15,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 MSVC_POP_WARNING();
 
 #undef LOG
+#include "base/gfx/rect.h"
 #include "webkit/glue/inspector_client_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/weburlrequest.h"
diff --git a/webkit/glue/media_player_private_impl.cc b/webkit/glue/media_player_private_impl.cc
index 8fbef04..5435ebb 100644
--- a/webkit/glue/media_player_private_impl.cc
+++ b/webkit/glue/media_player_private_impl.cc
@@ -13,6 +13,7 @@
 #include "PlatformContextSkia.h"
 #undef LOG
 
+#include "base/gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe.h"
diff --git a/webkit/glue/plugins/mozilla_extensions.cc b/webkit/glue/plugins/mozilla_extensions.cc
index f3e3195..b3fb987 100644
--- a/webkit/glue/plugins/mozilla_extensions.cc
+++ b/webkit/glue/plugins/mozilla_extensions.cc
@@ -12,6 +12,7 @@
 #include "net/base/net_errors.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 
 #define QI_SUPPORTS_IID(iid, iface)                                           \
diff --git a/webkit/glue/searchable_form_data.cc b/webkit/glue/searchable_form_data.cc
index 9b03204..bdc5abd 100644
--- a/webkit/glue/searchable_form_data.cc
+++ b/webkit/glue/searchable_form_data.cc
@@ -30,6 +30,7 @@ MSVC_POP_WARNING();
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "webkit/glue/dom_operations.h"
+#include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webframe_impl.h"
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 4e9db87..029643f 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -75,7 +75,7 @@ WebString WebClipboardImpl::readPlainText() {
     std::wstring text;
     ClipboardReadText(&text);
     if (!text.empty())
-      return WideToUTF16(text);
+      return WideToUTF16Hack(text);
   }
 
   if (ClipboardIsFormatAvailable(Clipboard::GetPlainTextFormatType())) {
@@ -93,15 +93,15 @@ WebString WebClipboardImpl::readHTML(WebURL* source_url) {
   GURL gurl;
   ClipboardReadHTML(&html_stdstr, &gurl);
   *source_url = gurl;
-  return WideToUTF16(html_stdstr);
+  return WideToUTF16Hack(html_stdstr);
 }
 
 void WebClipboardImpl::writeHTML(
     const WebString& html_text, const WebURL& source_url,
     const WebString& plain_text, bool write_smart_paste) {
   ScopedClipboardWriterGlue scw(ClipboardGetClipboard());
-  scw.WriteHTML(UTF16ToWide(html_text), source_url.spec());
-  scw.WriteText(UTF16ToWide(plain_text));
+  scw.WriteHTML(UTF16ToWideHack(html_text), source_url.spec());
+  scw.WriteText(UTF16ToWideHack(plain_text));
 
   if (write_smart_paste)
     scw.WriteWebSmartPaste();
@@ -110,7 +110,7 @@ void WebClipboardImpl::writeHTML(
 void WebClipboardImpl::writeURL(const WebURL& url, const WebString& title) {
   ScopedClipboardWriterGlue scw(ClipboardGetClipboard());
 
-  scw.WriteBookmark(UTF16ToWide(title), url.spec());
+  scw.WriteBookmark(UTF16ToWideHack(title), url.spec());
   scw.WriteHTML(UTF8ToWide(URLToMarkup(url, title)), "");
   scw.WriteText(UTF8ToWide(url.spec()));
 }
@@ -125,7 +125,7 @@ void WebClipboardImpl::writeImage(
 #endif
 
   if (!url.isEmpty()) {
-    scw.WriteBookmark(UTF16ToWide(title), url.spec());
+    scw.WriteBookmark(UTF16ToWideHack(title), url.spec());
     scw.WriteHTML(UTF8ToWide(URLToImageMarkup(url, title)), "");
     scw.WriteText(UTF8ToWide(url.spec()));
   }
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 63b47a8..28ba59c 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -134,6 +134,7 @@ MSVC_POP_WARNING();
 #include "skia/ext/platform_canvas.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/dom_operations.h"
+#include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdocumentloader_impl.h"
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 70f17fd..ae783e3 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -31,6 +31,8 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "SharedBuffer.h"
 MSVC_POP_WARNING();
 
+#include "WebString.h"
+
 #undef LOG
 #include "webkit/glue/webkit_glue.h"
 
@@ -66,7 +68,6 @@ void SetRecordPlaybackMode(bool value) {
 #endif
 }
 
-
 void SetShouldExposeGCController(bool enable) {
 #if USE(V8)
   WebCore::ScriptController::setShouldExposeGCController(enable);
@@ -276,6 +277,22 @@ bool DecodeImage(const std::string& image_data, SkBitmap* image) {
 #endif
 }
 
+FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str) {
+#if defined(OS_POSIX)
+  return base::SysWideToNativeMB(UTF16ToWideHack(str));
+#elif defined(OS_WIN)
+  return UTF16ToWideHack(str);
+#endif
+}
+
+WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str) {
+#if defined(OS_POSIX)
+  return WideToUTF16Hack(base::SysNativeMBToWide(str));
+#elif defined(OS_WIN)
+  return WideToUTF16Hack(str);
+#endif
+}
+
 // Convert from WebKit types to Glue types and notify the embedder. This should
 // not perform complex processing since it may be called a lot.
 void NotifyFormStateChanged(const WebCore::Document* document) {
@@ -408,21 +425,6 @@ const std::string& GetUserAgent(const GURL& url) {
   return g_user_agent->user_agent;
 }
 
-void NotifyJSOutOfMemory(WebCore::Frame* frame) {
-  if (!frame)
-    return;
-
-  // Dispatch to the delegate of the view that owns the frame.
-  WebFrame* webframe = WebFrameImpl::FromFrame(frame);
-  WebView* webview = webframe->GetView();
-  if (!webview)
-    return;
-  WebViewDelegate* delegate = webview->GetDelegate();
-  if (!delegate)
-    return;
-  delegate->JSOutOfMemory();
-}
-
 void SetForcefullyTerminatePluginProcess(bool value) {
   if (IsPluginRunningInRendererProcess()) {
     // Ignore this quirk when the plugins are not running in their own process.
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index efe0576..264d23a 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -15,35 +15,20 @@
 #include <vector>
 
 #include "base/clipboard.h"
+#include "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/string16.h"
-#include "webkit/glue/screen_info.h"
-#include "webkit/glue/webplugin.h"
 
-// We do not include the header files for these interfaces since this header
-// file is included by code in webkit/port
-class SharedCursor;
+class GURL;
+class SkBitmap;
 class WebView;
-class WebViewDelegate;
-class WebRequest;
 class WebFrame;
-class WebFrameImpl;
-class GURL;
-struct _NPNetscapeFuncs;
-typedef _NPNetscapeFuncs NPNetscapeFuncs;
+struct WebPluginInfo;
 
-#if defined(OS_WIN)
-struct IMLangFontLink2;
-#endif
-
-// TODO(darin): This file should not be dealing in WebCore types!!
-namespace WebCore {
-class Document;
-class Frame;
+namespace WebKit {
+class WebString;
 }
 
-class SkBitmap;
-
 #if defined(OS_MACOSX)
 // TODO(port):
 // When the code (that got compiled) only used SkBitmap*, it was OK to
@@ -67,15 +52,15 @@ typedef SkBitmap GlueBitmap;
 
 namespace webkit_glue {
 
-//-----------------------------------------------------------------------------
-// Functions implemented by JS engines.
+struct ScreenInfo;
+
+
+//---- BEGIN FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -----------------------------
+
 void SetJavaScriptFlags(const std::wstring& flags);
 void SetRecordPlaybackMode(bool value);
 void SetShouldExposeGCController(bool enable);
 
-//-----------------------------------------------------------------------------
-// Functions implemented by WebKit, called by the embedder:
-
 // Turn on the logging for notImplemented() calls from WebCore.
 void EnableWebCoreNotImplementedLogging();
 
@@ -132,8 +117,22 @@ void CheckForLeaks();
 // Returns false if the image could not be decoded.
 bool DecodeImage(const std::string& image_data, SkBitmap* image);
 
-//-----------------------------------------------------------------------------
-// Functions implemented by the embedder, called by WebKit:
+// Tells the plugin thread to terminate the process forcefully instead of
+// exiting cleanly.
+void SetForcefullyTerminatePluginProcess(bool value);
+
+// Returns true if the plugin thread should terminate the process forcefully
+// instead of exiting cleanly.
+bool ShouldForcefullyTerminatePluginProcess();
+
+// File path string conversions.
+FilePath::StringType WebStringToFilePathString(const WebKit::WebString& str);
+WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str);
+
+//---- END FUNCTIONS IMPLEMENTED BY WEBKIT/GLUE -------------------------------
+
+
+//---- BEGIN FUNCTIONS IMPLEMENTED BY EMBEDDER --------------------------------
 
 // Set during RenderProcess::GlobalInit when --enable-video has been passed in
 // and all media related libraries were successfully loaded.
@@ -231,8 +230,6 @@ bool EnsureFontLoaded(HFONT font);
 // Returns screen information corresponding to the given window.
 ScreenInfo GetScreenInfo(gfx::NativeViewId window);
 
-// Functions implemented by webkit_glue for WebKit ----------------------------
-
 // Returns a bool indicating if the Null plugin should be enabled or not.
 bool IsDefaultPluginEnabled();
 
@@ -252,17 +249,6 @@ bool FindProxyForUrl(const GURL& url, std::string* proxy_list);
 // the form language-country (e.g., en-US or pt-BR).
 std::wstring GetWebKitLocale();
 
-// Notifies the browser that the current page runs out of JS memory.
-void NotifyJSOutOfMemory(WebCore::Frame* frame);
-
-// Tells the plugin thread to terminate the process forcefully instead of
-// exiting cleanly.
-void SetForcefullyTerminatePluginProcess(bool value);
-
-// Returns true if the plugin thread should terminate the process forcefully
-// instead of exiting cleanly.
-bool ShouldForcefullyTerminatePluginProcess();
-
 // Returns the hash for the given canonicalized URL for use in visited link
 // coloring.
 uint64 VisitedLinkHash(const char* canonical_url, size_t length);
@@ -271,6 +257,9 @@ uint64 VisitedLinkHash(const char* canonical_url, size_t length);
 // have been generated by calling VisitedLinkHash().
 bool IsLinkVisited(uint64 link_hash);
 
+// ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
+
+
 } // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_
diff --git a/webkit/glue/webkit_glue_win.cc b/webkit/glue/webkit_glue_win.cc
index eeb6cbb..f41feb5 100644
--- a/webkit/glue/webkit_glue_win.cc
+++ b/webkit/glue/webkit_glue_win.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/glue/webkit_glue.h"
 
+#include "webkit/glue/screen_info.h"
+
 namespace webkit_glue {
 
 ScreenInfo GetScreenInfoHelper(gfx::NativeView window) {
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index c0cbd4d..4b82dab 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -31,6 +31,7 @@
 #include "net/url_request/url_request_filter.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/screen_info.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 8aac9ae..671d244 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4184,6 +4184,7 @@
         'glue/debugger_bridge.h',
         'glue/dom_operations.cc',
         'glue/dom_operations.h',
+        'glue/dom_operations_private.h',
         'glue/dom_serializer.cc',
         'glue/dom_serializer.h',
         'glue/dom_serializer_delegate.h',