[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
tonyg at chromium.org
tonyg at chromium.org
Fri Jan 21 14:54:36 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 987a93b503f3f34d162768e6569c3b949ee0479d
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 4 16:56:17 2011 +0000
2010-12-29 Tony Gentilcore <tonyg at chromium.org>
Reviewed by Darin Adler.
Remove 2 unnecessary includes from Document.h
https://bugs.webkit.org/show_bug.cgi?id=51727
No new tests because no changed functionality.
* dom/Document.cpp:
* dom/Document.h:
* editing/Editor.cpp:
* editing/SpellChecker.h:
* editing/SplitTextNodeCommand.cpp:
* editing/TextCheckingHelper.cpp:
* page/FrameView.cpp:
* page/Page.cpp:
* rendering/HitTestResult.cpp:
* rendering/InlineTextBox.cpp:
* rendering/InlineTextBox.h:
* rendering/svg/SVGInlineFlowBox.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74969 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6fd77c6..41deb1f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-12-29 Tony Gentilcore <tonyg at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Remove 2 unnecessary includes from Document.h
+ https://bugs.webkit.org/show_bug.cgi?id=51727
+
+ No new tests because no changed functionality.
+
+ * dom/Document.cpp:
+ * dom/Document.h:
+ * editing/Editor.cpp:
+ * editing/SpellChecker.h:
+ * editing/SplitTextNodeCommand.cpp:
+ * editing/TextCheckingHelper.cpp:
+ * page/FrameView.cpp:
+ * page/Page.cpp:
+ * rendering/HitTestResult.cpp:
+ * rendering/InlineTextBox.cpp:
+ * rendering/InlineTextBox.h:
+ * rendering/svg/SVGInlineFlowBox.cpp:
+
2011-01-04 Patrick Gansterer <paroga at webkit.org>
Unreviewed WinCE build fix.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index ae604e9..76b0a4f 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -37,6 +37,7 @@
#include "CSSStyleSheet.h"
#include "CSSValueKeywords.h"
#include "CachedCSSStyleSheet.h"
+#include "CachedResourceLoader.h"
#include "Chrome.h"
#include "ChromeClient.h"
#include "Comment.h"
@@ -48,9 +49,9 @@
#include "DOMWindow.h"
#include "DeviceMotionEvent.h"
#include "DeviceOrientationEvent.h"
-#include "CachedResourceLoader.h"
#include "DocumentFragment.h"
#include "DocumentLoader.h"
+#include "DocumentMarkerController.h"
#include "DocumentType.h"
#include "EditingText.h"
#include "Editor.h"
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 39072dd..7e7967f 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -27,13 +27,11 @@
#ifndef Document_h
#define Document_h
-#include "CachedResourceHandle.h"
#include "CheckedRadioButtons.h"
#include "CollectionCache.h"
#include "CollectionType.h"
#include "Color.h"
#include "ContainerNode.h"
-#include "DocumentMarkerController.h"
#include "DocumentTiming.h"
#include "QualifiedName.h"
#include "ScriptExecutionContext.h"
@@ -55,6 +53,7 @@ class Attr;
class AXObjectCache;
class CDATASection;
class CachedCSSStyleSheet;
+class CachedResourceLoader;
class CachedScript;
class CanvasRenderingContext;
class CharacterData;
@@ -62,13 +61,13 @@ class CSSStyleDeclaration;
class CSSStyleSelector;
class CSSStyleSheet;
class Comment;
-class Database;
class DOMImplementation;
class DOMSelection;
class DOMWindow;
+class Database;
class DatabaseThread;
-class CachedResourceLoader;
class DocumentFragment;
+class DocumentMarkerController;
class DocumentType;
class DocumentWeakReference;
class EditingText;
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 3b4dc25..4433b45 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -35,14 +35,15 @@
#include "CSSPropertyNames.h"
#include "CSSStyleSelector.h"
#include "CSSValueKeywords.h"
+#include "CachedResourceLoader.h"
#include "CharacterNames.h"
#include "ClipboardEvent.h"
#include "CompositionEvent.h"
#include "CreateLinkCommand.h"
#include "DeleteButtonController.h"
#include "DeleteSelectionCommand.h"
-#include "CachedResourceLoader.h"
#include "DocumentFragment.h"
+#include "DocumentMarkerController.h"
#include "EditingText.h"
#include "EditorClient.h"
#include "EventHandler.h"
diff --git a/WebCore/editing/SpellChecker.h b/WebCore/editing/SpellChecker.h
index 6922f0e..f6215d2 100644
--- a/WebCore/editing/SpellChecker.h
+++ b/WebCore/editing/SpellChecker.h
@@ -26,13 +26,14 @@
#ifndef SpellChecker_h
#define SpellChecker_h
-#include "Document.h"
+#include "DocumentMarker.h"
#include <wtf/Noncopyable.h>
namespace WebCore {
class EditorClient;
class Frame;
+class Node;
class SpellCheckingResult {
public:
diff --git a/WebCore/editing/SplitTextNodeCommand.cpp b/WebCore/editing/SplitTextNodeCommand.cpp
index 6c414f9..aea36b9 100644
--- a/WebCore/editing/SplitTextNodeCommand.cpp
+++ b/WebCore/editing/SplitTextNodeCommand.cpp
@@ -27,6 +27,7 @@
#include "SplitTextNodeCommand.h"
#include "Document.h"
+#include "DocumentMarkerController.h"
#include "Text.h"
#include <wtf/Assertions.h>
diff --git a/WebCore/editing/TextCheckingHelper.cpp b/WebCore/editing/TextCheckingHelper.cpp
index 2241b85..b4429a6 100644
--- a/WebCore/editing/TextCheckingHelper.cpp
+++ b/WebCore/editing/TextCheckingHelper.cpp
@@ -27,6 +27,7 @@
#include "config.h"
#include "TextCheckingHelper.h"
+#include "DocumentMarkerController.h"
#include "Range.h"
#include "TextIterator.h"
#include "VisiblePosition.h"
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 850e1bb..66ea9c7 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -32,6 +32,7 @@
#include "CachedResourceLoader.h"
#include "Chrome.h"
#include "ChromeClient.h"
+#include "DocumentMarkerController.h"
#include "EventHandler.h"
#include "FloatRect.h"
#include "FocusController.h"
diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index 552a109..a78cfb7 100644
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -31,6 +31,7 @@
#include "DOMWindow.h"
#include "DeviceMotionController.h"
#include "DeviceOrientationController.h"
+#include "DocumentMarkerController.h"
#include "DragController.h"
#include "EditorClient.h"
#include "Event.h"
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 24fd732..81264b3 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -36,6 +36,7 @@
#include "Extensions3DChromium.h"
#include "GraphicsContext3D.h"
#include "LayerRendererChromium.h"
+#include "NotImplemented.h"
#include "RenderLayerBacking.h"
#include "VideoFrameChromium.h"
#include "VideoFrameProvider.h"
diff --git a/WebCore/rendering/HitTestResult.cpp b/WebCore/rendering/HitTestResult.cpp
index 579042b..5d9b3df 100644
--- a/WebCore/rendering/HitTestResult.cpp
+++ b/WebCore/rendering/HitTestResult.cpp
@@ -21,6 +21,7 @@
#include "config.h"
#include "HitTestResult.h"
+#include "DocumentMarkerController.h"
#include "Frame.h"
#include "FrameTree.h"
#include "HTMLAnchorElement.h"
diff --git a/WebCore/rendering/InlineTextBox.cpp b/WebCore/rendering/InlineTextBox.cpp
index 5196854..c839ae7 100644
--- a/WebCore/rendering/InlineTextBox.cpp
+++ b/WebCore/rendering/InlineTextBox.cpp
@@ -26,6 +26,7 @@
#include "Chrome.h"
#include "ChromeClient.h"
#include "Document.h"
+#include "DocumentMarkerController.h"
#include "Editor.h"
#include "EllipsisBox.h"
#include "Frame.h"
diff --git a/WebCore/rendering/InlineTextBox.h b/WebCore/rendering/InlineTextBox.h
index c97a061..e7ec3d7 100644
--- a/WebCore/rendering/InlineTextBox.h
+++ b/WebCore/rendering/InlineTextBox.h
@@ -29,6 +29,7 @@
namespace WebCore {
struct CompositionUnderline;
+struct DocumentMarker;
const unsigned short cNoTruncation = USHRT_MAX;
const unsigned short cFullTruncation = USHRT_MAX - 1;
diff --git a/WebCore/rendering/svg/SVGInlineFlowBox.cpp b/WebCore/rendering/svg/SVGInlineFlowBox.cpp
index b35c7e2..ea806c7 100644
--- a/WebCore/rendering/svg/SVGInlineFlowBox.cpp
+++ b/WebCore/rendering/svg/SVGInlineFlowBox.cpp
@@ -25,6 +25,7 @@
#include "SVGInlineFlowBox.h"
#if ENABLE(SVG)
+#include "DocumentMarkerController.h"
#include "GraphicsContext.h"
#include "RenderSVGInlineText.h"
#include "SVGInlineTextBox.h"
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 80d07be..a113644 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -82,6 +82,7 @@
#include "DocumentFragment.h" // Only needed for ReplaceSelectionCommand.h :(
#include "DocumentLoader.h"
#include "DocumentMarker.h"
+#include "DocumentMarkerController.h"
#include "Editor.h"
#include "EventHandler.h"
#include "FormState.h"
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index e8b914b..1cadc77 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -24,6 +24,7 @@
#include "config.h"
#include "ewk_frame.h"
+#include "DocumentMarkerController.h"
#include "EWebKit.h"
#include "EventHandler.h"
#include "FocusController.h"
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index d9ff71d..0156bab 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -56,11 +56,12 @@
#import <WebCore/AccessibilityObject.h>
#import <WebCore/AnimationController.h>
#import <WebCore/CSSMutableStyleDeclaration.h>
+#import <WebCore/CachedResourceLoader.h>
#import <WebCore/Chrome.h>
#import <WebCore/ColorMac.h>
#import <WebCore/DOMImplementation.h>
-#import <WebCore/CachedResourceLoader.h>
#import <WebCore/DocumentFragment.h>
+#import <WebCore/DocumentMarkerController.h>
#import <WebCore/EventHandler.h>
#import <WebCore/EventNames.h>
#import <WebCore/Frame.h>
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index 5ddbccc..54f0a45 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -83,6 +83,7 @@
#import <WebCore/ContextMenuController.h>
#import <WebCore/Document.h>
#import <WebCore/DocumentFragment.h>
+#import <WebCore/DocumentMarkerController.h>
#import <WebCore/DragController.h>
#import <WebCore/Editor.h>
#import <WebCore/EditorDeleteAction.h>
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index e91a9e2..bb5f886 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -58,6 +58,7 @@
#include <WebCore/MemoryCache.h>
#include <WebCore/Document.h>
#include <WebCore/DocumentLoader.h>
+#include <WebCore/DocumentMarkerController.h>
#include <WebCore/DOMImplementation.h>
#include <WebCore/DOMWindow.h>
#include <WebCore/Event.h>
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 1b658bf..b3107c3 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -75,6 +75,7 @@
#include <WebCore/ContextMenuController.h>
#include <WebCore/Cursor.h>
#include <WebCore/Document.h>
+#include <WebCore/DocumentMarkerController.h>
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/Editor.h>
diff --git a/WebKit2/WebProcess/WebPage/FindController.cpp b/WebKit2/WebProcess/WebPage/FindController.cpp
index f1a251c..a32391c 100644
--- a/WebKit2/WebProcess/WebPage/FindController.cpp
+++ b/WebKit2/WebProcess/WebPage/FindController.cpp
@@ -31,6 +31,7 @@
#include "WebPage.h"
#include "WebPageProxyMessages.h"
#include "WebProcess.h"
+#include <WebCore/DocumentMarkerController.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
#include <WebCore/GraphicsContext.h>
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 96b701d..5990cb3 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -63,6 +63,7 @@
#include <WebCore/Chrome.h>
#include <WebCore/ContextMenuController.h>
#include <WebCore/DocumentLoader.h>
+#include <WebCore/DocumentMarkerController.h>
#include <WebCore/EventHandler.h>
#include <WebCore/FocusController.h>
#include <WebCore/Frame.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list