2011-01-02 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74847.
        http://trac.webkit.org/changeset/74847
        https://bugs.webkit.org/show_bug.cgi?id=51803

        "Preprocessor guards should be in header files" (Requested by
        ap on #webkit).

        * bindings/js/JSDOMWindowBase.cpp:
        * dom/Document.cpp:
        (WebCore::Document::recalcStyle):
        * html/HTMLDocument.cpp:
        * loader/FrameLoader.cpp:
        * loader/ResourceLoadNotifier.cpp:
        * page/Chrome.cpp:
        * page/Console.cpp:
        * page/ContextMenuController.cpp:
        * page/DOMWindow.cpp:
        (WebCore::DOMWindow::dispatchEvent):
        * page/EventHandler.cpp:
        * page/Page.cpp:
        * storage/Database.cpp:
        * workers/AbstractWorker.cpp:
        * workers/DefaultSharedWorkerRepository.cpp:
        * workers/SharedWorker.cpp:
        * workers/Worker.cpp:
        * workers/WorkerContext.cpp:
        * workers/WorkerMessagingProxy.cpp:
        * xml/XMLHttpRequest.cpp:
        (WebCore::XMLHttpRequest::callReadyStateChangeListener):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 02b994e3
2011-01-02 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r74847.
http://trac.webkit.org/changeset/74847
https://bugs.webkit.org/show_bug.cgi?id=51803
"Preprocessor guards should be in header files" (Requested by
ap on #webkit).
* bindings/js/JSDOMWindowBase.cpp:
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* html/HTMLDocument.cpp:
* loader/FrameLoader.cpp:
* loader/ResourceLoadNotifier.cpp:
* page/Chrome.cpp:
* page/Console.cpp:
* page/ContextMenuController.cpp:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::dispatchEvent):
* page/EventHandler.cpp:
* page/Page.cpp:
* storage/Database.cpp:
* workers/AbstractWorker.cpp:
* workers/DefaultSharedWorkerRepository.cpp:
* workers/SharedWorker.cpp:
* workers/Worker.cpp:
* workers/WorkerContext.cpp:
* workers/WorkerMessagingProxy.cpp:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::callReadyStateChangeListener):
2011-01-02 Patrick Gansterer <paroga@webkit.org>
[CMake] Unreviewed build fix.
......
......@@ -27,6 +27,7 @@
#include "Console.h"
#include "DOMWindow.h"
#include "Frame.h"
#include "InspectorController.h"
#include "JSDOMWindowCustom.h"
#include "JSNode.h"
#include "Logging.h"
......@@ -38,10 +39,6 @@
#include <wtf/Threading.h>
#include <wtf/text/StringConcatenate.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
using namespace JSC;
namespace WebCore {
......
......@@ -91,6 +91,8 @@
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "ImageLoader.h"
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#include "KeyboardEvent.h"
#include "Logging.h"
#include "MediaQueryList.h"
......@@ -149,11 +151,6 @@
#include <wtf/StdLibExtras.h>
#include <wtf/text/StringBuffer.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#endif
#if ENABLE(SHARED_WORKERS)
#include "SharedWorkerRepository.h"
#endif
......@@ -1548,9 +1545,8 @@ void Document::recalcStyle(StyleChange change)
if (m_inStyleRecalc)
return; // Guard against re-entrancy. -dwh
#if ENABLE(INSPECTOR)
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRecalculateStyle(this);
#endif
m_inStyleRecalc = true;
suspendPostAttachCallbacks();
......@@ -1604,9 +1600,8 @@ bail_out:
m_closeAfterStyleRecalc = false;
implicitClose();
}
#if ENABLE(INSPECTOR)
InspectorInstrumentation::didRecalculateStyle(cookie);
#endif
}
void Document::updateStyleIfNeeded()
......
......@@ -69,15 +69,12 @@
#include "HTMLBodyElement.h"
#include "HTMLElementFactory.h"
#include "HTMLNames.h"
#include "InspectorController.h"
#include "KURL.h"
#include "Page.h"
#include "Settings.h"
#include <wtf/text/CString.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
using namespace HTMLNames;
......
......@@ -69,6 +69,7 @@
#include "HistoryItem.h"
#include "IconDatabase.h"
#include "IconLoader.h"
#include "InspectorController.h"
#include "Logging.h"
#include "MIMETypeRegistry.h"
#include "MainResourceLoader.h"
......@@ -97,10 +98,6 @@
#include <wtf/text/CString.h>
#include <wtf/text/StringConcatenate.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
#include "HTMLMediaElement.h"
#endif
......
......@@ -35,14 +35,11 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "InspectorController.h"
#include "Page.h"
#include "ProgressTracker.h"
#include "ResourceLoader.h"
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
ResourceLoadNotifier::ResourceLoadNotifier(Frame* frame)
......
......@@ -33,6 +33,7 @@
#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "InspectorController.h"
#include "Page.h"
#include "PageGroupLoadDeferrer.h"
#include "RenderObject.h"
......@@ -45,10 +46,6 @@
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
#if ENABLE(DOM_STORAGE)
#include "StorageNamespace.h"
#endif
......
......@@ -35,6 +35,7 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameTree.h"
#include "InspectorController.h"
#include "MemoryInfo.h"
#include "Page.h"
#include "PageGroup.h"
......@@ -48,10 +49,6 @@
#include <wtf/text/CString.h>
#include <wtf/UnusedParam.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
Console::Console(Frame* frame)
......
......@@ -50,6 +50,7 @@
#include "HTMLFormElement.h"
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "InspectorController.h"
#include "LocalizedStrings.h"
#include "MouseEvent.h"
#include "NavigationAction.h"
......@@ -66,10 +67,6 @@
#include "markup.h"
#include <wtf/unicode/Unicode.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
using namespace WTF;
using namespace Unicode;
......
......@@ -64,6 +64,8 @@
#include "History.h"
#include "IDBFactory.h"
#include "IDBFactoryBackendInterface.h"
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#include "KURL.h"
#include "Location.h"
#include "MediaQueryList.h"
......@@ -103,11 +105,6 @@
#include "LocalFileSystem.h"
#endif
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#endif
using std::min;
using std::max;
......@@ -1546,13 +1543,13 @@ bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget
event->setTarget(prpTarget ? prpTarget : this);
event->setCurrentTarget(this);
event->setEventPhase(Event::AT_TARGET);
#if ENABLE(INSPECTOR)
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchEventOnWindow(frame(), *event, this);
#endif
bool result = fireEventListeners(event.get());
#if ENABLE(INSPECTOR)
InspectorInstrumentation::didDispatchEventOnWindow(cookie);
#endif
return result;
}
......
......@@ -50,6 +50,7 @@
#include "HitTestRequest.h"
#include "HitTestResult.h"
#include "Image.h"
#include "InspectorController.h"
#include "KeyboardEvent.h"
#include "MouseEvent.h"
#include "MouseEventWithHitTestResults.h"
......@@ -75,10 +76,6 @@
#include <wtf/CurrentTime.h>
#include <wtf/StdLibExtras.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
#if ENABLE(SVG)
#include "SVGDocument.h"
#include "SVGElementInstance.h"
......
......@@ -45,6 +45,7 @@
#include "FrameView.h"
#include "HTMLElement.h"
#include "HistoryItem.h"
#include "InspectorController.h"
#include "Logging.h"
#include "MediaCanStartListener.h"
#include "Navigator.h"
......@@ -80,10 +81,6 @@
#include "StorageNamespace.h"
#endif
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
#if ENABLE(JAVASCRIPT_DEBUGGER)
#include "ScriptDebugServer.h"
#endif
......
......@@ -36,6 +36,7 @@
#include "DatabaseThread.h"
#include "DatabaseTracker.h"
#include "Document.h"
#include "InspectorController.h"
#include "Logging.h"
#include "NotImplemented.h"
#include "Page.h"
......@@ -59,10 +60,6 @@
#include "JSDOMWindow.h"
#endif
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
class DatabaseCreationCallbackTask : public ScriptExecutionContext::Task {
......
......@@ -38,13 +38,10 @@
#include "Event.h"
#include "EventException.h"
#include "EventNames.h"
#include "InspectorController.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
AbstractWorker::AbstractWorker(ScriptExecutionContext* context)
......
......@@ -37,6 +37,7 @@
#include "ActiveDOMObject.h"
#include "CrossThreadTask.h"
#include "Document.h"
#include "InspectorController.h"
#include "MessageEvent.h"
#include "MessagePort.h"
#include "NotImplemented.h"
......@@ -54,10 +55,6 @@
#include <wtf/HashSet.h>
#include <wtf/Threading.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
class SharedWorkerProxy : public ThreadSafeShared<SharedWorkerProxy>, public WorkerLoaderProxy, public WorkerReportingProxy {
......
......@@ -35,16 +35,13 @@
#include "SharedWorker.h"
#include "InspectorController.h"
#include "KURL.h"
#include "MessageChannel.h"
#include "MessagePort.h"
#include "ScriptExecutionContext.h"
#include "SharedWorkerRepository.h"
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
inline SharedWorker::SharedWorker(ScriptExecutionContext* context)
......
......@@ -40,6 +40,7 @@
#include "ExceptionCode.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "InspectorController.h"
#include "MessageEvent.h"
#include "TextEncoding.h"
#include "WorkerContextProxy.h"
......@@ -47,10 +48,6 @@
#include "WorkerThread.h"
#include <wtf/MainThread.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
inline Worker::Worker(ScriptExecutionContext* context)
......
......@@ -42,6 +42,7 @@
#include "ErrorEvent.h"
#include "Event.h"
#include "EventException.h"
#include "InspectorController.h"
#include "KURL.h"
#include "MessagePort.h"
#include "NotImplemented.h"
......@@ -58,10 +59,6 @@
#include <wtf/RefPtr.h>
#include <wtf/UnusedParam.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
#if ENABLE(NOTIFICATIONS)
#include "NotificationCenter.h"
#endif
......
......@@ -38,14 +38,11 @@
#include "Document.h"
#include "ErrorEvent.h"
#include "ExceptionCode.h"
#include "InspectorController.h"
#include "MessageEvent.h"
#include "ScriptExecutionContext.h"
#include "Worker.h"
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#endif
namespace WebCore {
class MessageWorkerContextTask : public ScriptExecutionContext::Task {
......
......@@ -35,6 +35,8 @@
#include "EventNames.h"
#include "File.h"
#include "HTTPParsers.h"
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#include "ResourceError.h"
#include "ResourceRequest.h"
#include "SecurityOrigin.h"
......@@ -51,11 +53,6 @@
#include <wtf/RefCountedLeakCounter.h>
#include <wtf/UnusedParam.h>
#if ENABLE(INSPECTOR)
#include "InspectorController.h"
#include "InspectorInstrumentation.h"
#endif
#if USE(JSC)
#include "JSDOMBinding.h"
#include "JSDOMWindow.h"
......@@ -358,24 +355,18 @@ void XMLHttpRequest::callReadyStateChangeListener()
{
if (!scriptExecutionContext())
return;
#if ENABLE(INSPECTOR)
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willChangeXHRReadyState(scriptExecutionContext(), this);
#endif
if (m_async || (m_state <= OPENED || m_state == DONE))
m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().readystatechangeEvent), m_state == DONE ? FlushProgressEvent : DoNotFlushProgressEvent);
#if ENABLE(INSPECTOR)
InspectorInstrumentation::didChangeXHRReadyState(cookie);
#endif
if (m_state == DONE && !m_error) {
#if ENABLE(INSPECTOR)
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this);
#endif
m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().loadEvent));
#if ENABLE(INSPECTOR)
InspectorInstrumentation::didLoadXHR(cookie);
#endif
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment