diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/HTMLDocument.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/HTMLDocument.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLDocument.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/WebCore/html/HTMLDocument.cpp b/Source/WebCore/html/HTMLDocument.cpp index 84ad706..dd41514 100644 --- a/Source/WebCore/html/HTMLDocument.cpp +++ b/Source/WebCore/html/HTMLDocument.cpp @@ -69,7 +69,7 @@ #include "HTMLBodyElement.h" #include "HTMLElementFactory.h" #include "HTMLNames.h" -#include "InspectorController.h" +#include "InspectorInstrumentation.h" #include "KURL.h" #include "Page.h" #include "Settings.h" @@ -79,8 +79,8 @@ namespace WebCore { using namespace HTMLNames; -HTMLDocument::HTMLDocument(Frame* frame, const KURL& url, const KURL& baseURL) - : Document(frame, url, false, true, baseURL) +HTMLDocument::HTMLDocument(Frame* frame, const KURL& url) + : Document(frame, url, false, true) { clearXMLVersion(); } @@ -277,11 +277,7 @@ void HTMLDocument::releaseEvents() PassRefPtr<DocumentParser> HTMLDocument::createParser() { - bool reportErrors = false; -#if ENABLE(INSPECTOR) - if (Page* page = this->page()) - reportErrors = page->inspectorController()->hasFrontend(); -#endif + bool reportErrors = InspectorInstrumentation::hasFrontend(this->page()); return HTMLDocumentParser::create(this, reportErrors); } |