Roll out dominantScript, getGenericFontFamily patches to unfork a bunch of fi...

webkit/glue/webview_impl.cc

 /*
 * Copyright 2007 Google Inc. All Rights Reserved.
 *
 * Portions Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
 *
 * ***** BEGIN LICENSE BLOCK *****
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ skipping 132 matching lines @@
   void Init(WebCore::HTMLInputElement* text_field,
             const std::vector<std::wstring>& suggestions,
             int default_suggestion_index) {
     DCHECK(default_suggestion_index < static_cast<int>(suggestions.size()));
     text_field_ = text_field;
     selected_index_ = default_suggestion_index;
     SetSuggestions(suggestions);
 
     FontDescription font_description;
 #if defined(OS_WIN)
-    theme()->systemFont(CSSValueWebkitControl, text_field->document(),
-                        font_description);
+    theme()->systemFont(CSSValueWebkitControl, font_description);
 #else
     NOTIMPLEMENTED();
 #endif
     // Use a smaller font size to match IE/Firefox.
     // TODO(jcampan): http://crbug.com/7376 use the system size instead of a
     //                fixed font size value.
     font_description.setComputedSize(12.0);
     Font font(font_description, 0, 0);
     font.update(text_field->document()->styleSelector()->fontSelector());
     style_.reset(new PopupMenuStyle(Color::black, Color::white, font, true,
@@ skipping 1690 matching lines @@
 
   return document->focusedNode();
 }
 
 HitTestResult WebViewImpl::HitTestResultForWindowPos(const IntPoint& pos) {
   IntPoint doc_point(
       page_->mainFrame()->view()->windowToContents(pos));
   return page_->mainFrame()->eventHandler()->
       hitTestResultAtPoint(doc_point, false);
 }