Changeset 61987 in webkit

Timestamp:

Jun 28, 2010 1:47:01 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-28 Eric Seidel <​eric@webkit.org>

Unreviewed. Attempt to fix Chromium and Qt builders.

Add a new baseclass for XML, HTML and Text DocumentParsers to clean up DocumentParser call sites
​https://bugs.webkit.org/show_bug.cgi?id=41141

No functional changes, thus no tests.

• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::eventHandlerLineNumber): (WebCore::ScriptController::eventHandlerColumnNumber):
• dom/XMLDocumentParserQt.cpp: (WebCore::XMLDocumentParser::XMLDocumentParser): (WebCore::XMLDocumentParser::stopParsing):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (3 diffs)
• dom/XMLDocumentParserQt.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.  Attempt to fix Chromium and Qt builders.
+
+        Add a new baseclass for XML, HTML and Text DocumentParsers to clean up DocumentParser call sites
+        https://bugs.webkit.org/show_bug.cgi?id=41141
+
+        No functional changes, thus no tests.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::eventHandlerLineNumber):
+        (WebCore::ScriptController::eventHandlerColumnNumber):
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::XMLDocumentParser::XMLDocumentParser):
+        (WebCore::XMLDocumentParser::stopParsing):
+
 2010-06-28  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/bindings/v8/ScriptController.cpp

@@ -35 +35 @@
 #include "PlatformBridge.h"
 #include "Document.h"
-#include "DocumentParser.h"
+#include "ScriptableDocumentParser.h"
 #include "DOMWindow.h"
 #include "Event.h"
@@ -252 +252 @@
 int ScriptController::eventHandlerLineNumber() const
 {
-    if (DocumentParser* parser = m_frame->document()->parser())
+    ScriptableDocumentParser* parser = m_frame->document()->scriptableDocumentParser();
+    if (parser)
         return parser->lineNumber();
     return 0;
@@ -259 +260 @@
 int ScriptController::eventHandlerColumnNumber() const
 {
-    if (DocumentParser* parser = m_frame->document()->parser())
+    ScriptableDocumentParser* parser = m_frame->document()->scriptableDocumentParser();
+    if (parser)
         return parser->columnNumber();
     return 0;

trunk/WebCore/dom/XMLDocumentParserQt.cpp

@@ -45 +45 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
+#include "ScriptableDocumentParser.h"
 #include "ScriptController.h"
 #include "ScriptElement.h"
@@ -79 +80 @@
 
 XMLDocumentParser::XMLDocumentParser(Document* document, FrameView* frameView)
-    : DocumentParser(document)
+    : ScriptableDocumentParser(document)
     , m_view(frameView)
     , m_wroteText(false)
@@ -106 +107 @@
 
 XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parentElement, FragmentScriptingPermission permission)
-    : DocumentParser(fragment->document())
+    : ScriptableDocumentParser(fragment->document())
     , m_view(0)
     , m_wroteText(false)
@@ -229 +230 @@
 void XMLDocumentParser::stopParsing()
 {
-    DocumentParser::stopParsing();
+    ScriptableDocumentParser::stopParsing();
 }