Changeset 31951 in webkit


Ignore:
Timestamp:
Apr 16, 2008 12:19:00 PM (16 years ago)
Author:
Adam Roben
Message:

Change calls to Chrome::addMessageToConsole to use Console::addMessage

Part of Bug 17228: console.{log,warn,info,error} should support format
strings, variable arguments
<​http://bugs.webkit.org/show_bug.cgi?id=17228>
<rdar://problem/5732828>

Console now takes care of calling ChromeClient::addMessageToConsole
for the appropriate messages (i.e., just messages from JavaScript). If
you ever want to add a message to the console, Console is the place to
do it.

Reviewed by Darin Adler.

  • WebCore.xcodeproj/project.pbxproj: Mark Console.h Private.
  • page/Chrome.cpp: Removed addMessageToConsole
  • page/Chrome.h: Moved MessageSource/MessageLevel to Console.h.
  • page/Console.cpp: (WebCore::Console::addMessage): Added. Calls ChromeClient::addMessageToConsole for JS messages, and calls InspectorController::addMessageToConsole for all messages. (WebCore::Console::error): Changed to call directly to InspectorController in addition to ChromeClient. (WebCore::Console::info): Ditto. (WebCore::Console::log): Ditto. (WebCore::Console::warn): Ditto.
  • page/Console.h: Added MessageSource/MessageLevel enums from Chrome.h.
Location:
trunk/WebCore
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r31950 r31951  
     12008-04-15  Adam Roben  <aroben@apple.com>
     2
     3        Change calls to Chrome::addMessageToConsole to use Console::addMessage
     4
     5        Part of Bug 17228: console.{log,warn,info,error} should support format
     6        strings, variable arguments
     7        <http://bugs.webkit.org/show_bug.cgi?id=17228>
     8        <rdar://problem/5732828>
     9
     10        Console now takes care of calling ChromeClient::addMessageToConsole
     11        for the appropriate messages (i.e., just messages from JavaScript). If
     12        you ever want to add a message to the console, Console is the place to
     13        do it.
     14
     15        Reviewed by Darin Adler.
     16
     17        * WebCore.xcodeproj/project.pbxproj: Mark Console.h Private.
     18        * page/Chrome.cpp: Removed addMessageToConsole
     19        * page/Chrome.h: Moved MessageSource/MessageLevel to Console.h.
     20        * page/Console.cpp:
     21        (WebCore::Console::addMessage): Added. Calls
     22        ChromeClient::addMessageToConsole for JS messages, and calls
     23        InspectorController::addMessageToConsole for all messages.
     24        (WebCore::Console::error): Changed to call directly to
     25        InspectorController in addition to ChromeClient.
     26        (WebCore::Console::info): Ditto.
     27        (WebCore::Console::log): Ditto.
     28        (WebCore::Console::warn): Ditto.
     29        * page/Console.h: Added MessageSource/MessageLevel enums from Chrome.h.
     30
    1312008-04-15  Adam Roben  <aroben@apple.com>
    232

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r31950 r31951  
    35323532                BC073BAA0C399B1F000F5979 /* FloatConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = BC073BA90C399B1F000F5979 /* FloatConversion.h */; };
    35333533                BC0B36A40CD3C67C00AC7EB5 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0B36A10CD3C67C00AC7EB5 /* Console.cpp */; };
    3534                 BC0B36A50CD3C67C00AC7EB5 /* Console.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0B36A20CD3C67C00AC7EB5 /* Console.h */; };
     3534                BC0B36A50CD3C67C00AC7EB5 /* Console.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0B36A20CD3C67C00AC7EB5 /* Console.h */; settings = {ATTRIBUTES = (Private, ); }; };
    35353535                BC124EE70C2641CD009E2349 /* BarInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC124EE40C2641CD009E2349 /* BarInfo.cpp */; };
    35363536                BC124EE80C2641CD009E2349 /* BarInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC124EE50C2641CD009E2349 /* BarInfo.h */; };

  • trunk/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp

    r30325 r31951  
    3131
    3232#include "CString.h"
     33#include "Console.h"
     34#include "DOMWindow.h"
    3335#include "Frame.h"
    3436#include "kjs_proxy.h"
    3537#include "JSSQLResultSet.h"
    3638#include "JSSQLTransaction.h"
    37 #include "Page.h"
    3839
    3940namespace WebCore {
    … …  
    9394        if (Interpreter::shouldPrintExceptions())
    9495            printf("SQLStatementCallback: %s\n", message.utf8().data());
    95         if (Page* page = m_frame->page())
    96             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     96        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    9797       
    9898        raisedException = true;

  • trunk/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp

    r30325 r31951  
    3131
    3232#include "CString.h"
     33#include "Console.h"
     34#include "DOMWindow.h"
    3335#include "Frame.h"
    3436#include "kjs_proxy.h"
    3537#include "JSSQLError.h"
    3638#include "JSSQLTransaction.h"
    37 #include "Page.h"
    3839
    3940namespace WebCore {
    … …  
    9495        if (Interpreter::shouldPrintExceptions())
    9596            printf("SQLStatementErrorCallback: %s\n", message.utf8().data());
    96         if (Page* page = m_frame->page())
    97             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     97        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    9898        exec->clearException();
    9999           

  • trunk/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp

    r31730 r31951  
    3131
    3232#include "CString.h"
     33#include "Console.h"
     34#include "DOMWindow.h"
    3335#include "Frame.h"
    3436#include "Logging.h"
    … …  
    145147        if (Interpreter::shouldPrintExceptions())
    146148            printf("SQLTransactionCallback: %s\n", message.utf8().data());
    147         if (Page* page = m_data->frame()->page())
    148             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     149        m_data->frame()->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    149150        exec->clearException();
    150151       

  • trunk/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp

    r30325 r31951  
    3131
    3232#include "CString.h"
     33#include "Console.h"
     34#include "DOMWindow.h"
    3335#include "Frame.h"
    3436#include "kjs_proxy.h"
    3537#include "JSSQLError.h"
    36 #include "Page.h"
    3738
    3839namespace WebCore {
    … …  
    9293        if (Interpreter::shouldPrintExceptions())
    9394            printf("SQLTransactionErrorCallback: %s\n", message.utf8().data());
    94         if (Page* page = m_frame->page())
    95             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     95        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    9696        exec->clearException();
    9797    }

  • trunk/WebCore/bindings/js/JSCustomVoidCallback.cpp

    r30787 r31951  
    3131
    3232#include "CString.h"
     33#include "Console.h"
    3334#include "DOMWindow.h"
    3435#include "Frame.h"
    3536#include "JSDOMWindow.h"
    36 #include "Page.h"
    3737#include "kjs_binding.h"
    3838#include "kjs_proxy.h"
    … …  
    9292        if (Interpreter::shouldPrintExceptions())
    9393            printf("VoidCallback: %s\n", message.utf8().data());
    94         if (Page* page = m_frame->page())
    95             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     94        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    9695        exec->clearException();           
    9796    }

  • trunk/WebCore/bindings/js/JSCustomXPathNSResolver.cpp

    r31530 r31951  
    3030
    3131#include "CString.h"
     32#include "Console.h"
    3233#include "DOMWindow.h"
    3334#include "Document.h"
    … …  
    3536#include "Frame.h"
    3637#include "JSDOMWindow.h"
    37 #include "Page.h"
    3838#include "kjs_binding.h"
    3939#include "kjs_proxy.h"
    … …  
    9191    if (!lookupNamespaceURIFunc && !m_customResolver->implementsCall()) {
    9292        // FIXME: pass actual line number and source URL.
    93         if (Page* page = m_frame->page())
    94             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method.", 0, String());
     93        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method.", 0, String());
    9594        return String();
    9695    }
    … …  
    117116        if (Interpreter::shouldPrintExceptions())
    118117            printf("XPathNSResolver: %s\n", message.utf8().data());
    119         if (Page* page = m_frame->page())
    120             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     118        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    121119        exec->clearException();
    122120    } else {

  • trunk/WebCore/bindings/js/JSDOMWindowBase.cpp

    r31766 r31951  
    2626#include "Base64.h"
    2727#include "CString.h"
    28 #include "Chrome.h"
     28#include "Console.h"
    2929#include "DOMWindow.h"
    3030#include "Element.h"
    … …  
    844844        printf("%s", message.utf8().data());
    845845
    846     if (Page* page = frame->page())
    847         page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, 1, String()); // FIXME: provide a real line number and source URL.
     846    frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, 1, String()); // FIXME: provide a real line number and source URL.
    848847}
    849848

  • trunk/WebCore/bindings/js/ScheduledAction.cpp

    r31746 r31951  
    2525
    2626#include "CString.h"
    27 #include "Chrome.h"
     27#include "Console.h"
    2828#include "DOMWindow.h"
    2929#include "Document.h"
    … …  
    3131#include "FrameLoader.h"
    3232#include "JSDOMWindow.h"
    33 #include "Page.h"
    3433#include "kjs_proxy.h"
    3534
    … …  
    8281                if (Interpreter::shouldPrintExceptions())
    8382                    printf("(timer):%s\n", message.utf8().data());
    84                 if (Page* page = frame->page())
    85                     page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, String());
     83                frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, String());
    8684            }
    8785        }

  • trunk/WebCore/bindings/js/kjs_events.cpp

    r31746 r31951  
    2222
    2323#include "CString.h"
    24 #include "Chrome.h"
     24#include "Console.h"
    2525#include "DOMWindow.h"
    2626#include "Document.h"
    … …  
    3232#include "JSEvent.h"
    3333#include "JSEventTargetNode.h"
    34 #include "Page.h"
    3534#include "kjs_proxy.h"
    3635#include <kjs/function_object.h>
    … …  
    111110            if (Interpreter::shouldPrintExceptions())
    112111                printf("(event handler):%s\n", message.utf8().data());
    113             if (Page* page = frame->page())
    114                 page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
     112            frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, sourceURL);
    115113            exec->clearException();
    116114        } else {

  • trunk/WebCore/bindings/js/kjs_proxy.cpp

    r31766 r31951  
    2222#include "kjs_proxy.h"
    2323
    24 #include "Chrome.h"
     24#include "Console.h"
     25#include "DOMWindow.h"
    2526#include "Document.h"
    2627#include "Event.h"
    … …  
    9697        int lineNumber = comp.value()->toObject(exec)->get(exec, "line")->toInt32(exec);
    9798        UString sourceURL = comp.value()->toObject(exec)->get(exec, "sourceURL")->toString(exec);
    98         if (Page* page = m_frame->page())
    99             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, errorMessage, lineNumber, sourceURL);
     99        m_frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, errorMessage, lineNumber, sourceURL);
    100100    }
    101101

  • trunk/WebCore/html/HTMLParser.cpp

    r31358 r31951  
    2929#include "CSSValueKeywords.h"
    3030#include "Comment.h"
     31#include "Console.h"
     32#include "DOMWindow.h"
    3133#include "DocumentFragment.h"
    3234#include "DocumentType.h"
    … …  
    4951#include "HTMLTokenizer.h"
    5052#include "LocalizedStrings.h"
    51 #include "Page.h"
    5253#include "Settings.h"
    5354#include "Text.h"
    … …  
    14551456        return;
    14561457   
    1457     Page* page = frame->page();
    1458     if (!page)
    1459         return;
    1460 
    14611458    HTMLTokenizer* htmlTokenizer = static_cast<HTMLTokenizer*>(document->tokenizer());
    14621459    int lineNumber = htmlTokenizer->lineNumber() + 1;
    … …  
    14921489    message.replace("%tag2", tag2);
    14931490
    1494     page->chrome()->addMessageToConsole(HTMLMessageSource,
     1491    frame->domWindow()->console()->addMessage(HTMLMessageSource,
    14951492        isWarning(errorCode) ? WarningMessageLevel : ErrorMessageLevel,
    14961493        message, lineNumber, document->url().string());

  • trunk/WebCore/loader/Cache.cpp

    r31307 r31951  
    105105            Document* doc = docLoader->doc();
    106106            if(doc && !isPreload)
    107                 FrameLoader::reportLocalLoadFailed(doc->page(), resource->url());
     107                FrameLoader::reportLocalLoadFailed(doc->frame(), resource->url());
    108108            return 0;
    109109        }
    … …  
    112112            Document* doc = docLoader->doc();
    113113            if(doc && !isPreload)
    114                 FrameLoader::reportLocalLoadFailed(doc->page(), url.string());
     114                FrameLoader::reportLocalLoadFailed(doc->frame(), url.string());
    115115            return 0;
    116116        }

  • trunk/WebCore/loader/FrameLoader.cpp

    r31816 r31951  
    3838#include "Chrome.h"
    3939#include "DOMImplementation.h"
     40#include "DOMWindow.h"
    4041#include "DocLoader.h"
    4142#include "Document.h"
    … …  
    462463
    463464    if (!canLoad(url, referrer)) {
    464         FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
     465        FrameLoader::reportLocalLoadFailed(m_frame, url.string());
    465466        return 0;
    466467    }
    … …  
    17121713
    17131714        if (!canLoad(url, frame()->document())) {
    1714             FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
     1715            FrameLoader::reportLocalLoadFailed(m_frame, url.string());
    17151716            return false;
    17161717        }
    … …  
    20362037    if (url.protocolIs("file")) {
    20372038        if (!canLoad(url, frame()->document()) && !canLoad(url, referrer)) {
    2038             FrameLoader::reportLocalLoadFailed(m_frame->page(), url.string());
     2039            FrameLoader::reportLocalLoadFailed(m_frame, url.string());
    20392040            return;
    20402041        }
    … …  
    22512252}
    22522253
    2253 void FrameLoader::reportLocalLoadFailed(const Page* page, const String& url)
     2254void FrameLoader::reportLocalLoadFailed(Frame* frame, const String& url)
    22542255{
    22552256    ASSERT(!url.isEmpty());
    2256     if (page)
    2257         page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url, 0, String());
     2257    if (!frame)
     2258        return;
     2259
     2260    frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Not allowed to load local resource: " + url, 0, String());
    22582261}
    22592262
    … …  
    24482451
    24492452        // FIXME: should we print to the console of the activeFrame as well?
    2450         if (Page* page = targetFrame->page())
    2451             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, 1, String());
     2453        targetFrame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, 1, String());
    24522454    }
    24532455   

  • trunk/WebCore/loader/FrameLoader.h

    r31816 r31951  
    166166        static bool canLoad(const KURL&, const Document*);
    167167        static bool canLoad(const CachedResource&, const Document*);
    168         static void reportLocalLoadFailed(const Page*, const String& url);
     168        static void reportLocalLoadFailed(Frame*, const String& url);
    169169
    170170        static bool shouldHideReferrer(const KURL& url, const String& referrer);

  • trunk/WebCore/loader/SubresourceLoader.cpp

    r31203 r31951  
    9797            && FrameLoader::restrictAccessToLocal()
    9898            && !FrameLoader::canLoad(request.url(), frame->document())) {
    99         FrameLoader::reportLocalLoadFailed(frame->page(), request.url().string());
     99        FrameLoader::reportLocalLoadFailed(frame, request.url().string());
    100100        return 0;
    101101    }

  • trunk/WebCore/page/Chrome.cpp

    r30900 r31951  
    3131#include "HTMLNames.h"
    3232#include "HitTestResult.h"
    33 #include "InspectorController.h"
    3433#include "JSDOMWindow.h"
    3534#include "Page.h"
    … …  
    194193}
    195194
    196 void Chrome::addMessageToConsole(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceID)
    197 {
    198     if (source == JSMessageSource)
    199         m_client->addMessageToConsole(message, lineNumber, sourceID);
    200 
    201     m_page->inspectorController()->addMessageToConsole(source, level, message, lineNumber, sourceID);
    202 }
    203 
    204195bool Chrome::canRunBeforeUnloadConfirmPanel()
    205196{

  • trunk/WebCore/page/Chrome.h

    r29698 r31951  
    4747    struct WindowFeatures;
    4848   
    49     enum MessageSource {
    50         HTMLMessageSource,
    51         XMLMessageSource,
    52         JSMessageSource,
    53         CSSMessageSource,
    54         OtherMessageSource
    55     };
    56 
    57     enum MessageLevel {
    58         TipMessageLevel,
    59         LogMessageLevel,
    60         WarningMessageLevel,
    61         ErrorMessageLevel
    62     };
    63 
    6449    class Chrome : Noncopyable {
    6550    public:
    … …  
    10388        void setResizable(bool) const;
    10489
    105         void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceID);
    106 
    10790        bool canRunBeforeUnloadConfirmPanel();
    10891        bool runBeforeUnloadConfirmPanel(const String& message, Frame* frame);

  • trunk/WebCore/page/Console.cpp

    r31950 r31951  
    3030#include "Console.h"
    3131
    32 #include "Chrome.h"
     32#include "ChromeClient.h"
    3333#include "Frame.h"
    3434#include "FrameLoader.h"
     35#include "InspectorController.h"
    3536#include "Page.h"
    3637#include "PlatformString.h"
    … …  
    5152}
    5253
     54void Console::addMessage(MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
     55{
     56    if (!m_frame)
     57        return;
     58
     59    Page* page = m_frame->page();
     60    if (!page)
     61        return;
     62
     63    if (source == JSMessageSource)
     64        page->chrome()->client()->addMessageToConsole(message, lineNumber, sourceURL);
     65
     66    page->inspectorController()->addMessageToConsole(source, level, message, lineNumber, sourceURL);
     67}
     68
    5369void Console::error(ExecState* exec, const List& arguments)
    5470{
    … …  
    6379        return;
    6480
    65     page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
     81    String message = arguments[0]->toString(exec);
     82    String url = m_frame->loader()->url().prettyURL();
     83
     84    page->chrome()->client()->addMessageToConsole(message, 0, url);
     85    page->inspectorController()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, 0, url);
    6686}
    6787
    … …  
    7898        return;
    7999
    80     page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
     100    String message = arguments[0]->toString(exec);
     101    String url = m_frame->loader()->url().prettyURL();
     102
     103    page->chrome()->client()->addMessageToConsole(message, 0, url);
     104    page->inspectorController()->addMessageToConsole(JSMessageSource, LogMessageLevel, message, 0, url);
    81105}
    82106
    … …  
    93117        return;
    94118
    95     page->chrome()->addMessageToConsole(JSMessageSource, LogMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
     119    String message = arguments[0]->toString(exec);
     120    String url = m_frame->loader()->url().prettyURL();
     121
     122    page->chrome()->client()->addMessageToConsole(message, 0, url);
     123    page->inspectorController()->addMessageToConsole(JSMessageSource, LogMessageLevel, message, 0, url);
    96124}
    97125
    … …  
    108136        return;
    109137
    110     page->chrome()->addMessageToConsole(JSMessageSource, WarningMessageLevel, arguments[0]->toString(exec), 0, m_frame->loader()->url().prettyURL());
     138    String message = arguments[0]->toString(exec);
     139    String url = m_frame->loader()->url().prettyURL();
     140
     141    page->chrome()->client()->addMessageToConsole(message, 0, url);
     142    page->inspectorController()->addMessageToConsole(JSMessageSource, WarningMessageLevel, message, 0, url);
    111143}
    112144

  • trunk/WebCore/page/Console.h

    r31950 r31951  
    4242
    4343    class Frame;
     44    class String;
     45
     46    enum MessageSource {
     47        HTMLMessageSource,
     48        XMLMessageSource,
     49        JSMessageSource,
     50        CSSMessageSource,
     51        OtherMessageSource
     52    };
     53
     54    enum MessageLevel {
     55        TipMessageLevel,
     56        LogMessageLevel,
     57        WarningMessageLevel,
     58        ErrorMessageLevel
     59    };
    4460
    4561    class Console : public RefCounted<Console> {
    … …  
    4864
    4965        void disconnectFrame();
     66
     67        void addMessage(MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL);
    5068
    5169        void error(KJS::ExecState*, const KJS::List& arguments);

  • trunk/WebCore/page/InspectorController.cpp

    r31890 r31951  
    3232#include "CString.h"
    3333#include "CachedResource.h"
     34#include "Console.h"
     35#include "DOMWindow.h"
    3436#include "DocLoader.h"
    3537#include "Document.h"
    … …  
    19831985    String message(JSStringGetCharactersPtr(messageString.get()), JSStringGetLength(messageString.get()));
    19841986
    1985     m_page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, message, lineNumber, __FILE__);
     1987    m_page->mainFrame()->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, message, lineNumber, __FILE__);
    19861988    return true;
    19871989}

  • trunk/WebCore/page/InspectorController.h

    r31736 r31951  
    3030#define InspectorController_h
    3131
    32 #include "Chrome.h"
     32#include "Console.h"
    3333#include <JavaScriptCore/JSContextRef.h>
    3434#include <wtf/HashMap.h>
    … …  
    4747class InspectorClient;
    4848class Node;
     49class Page;
    4950class ResourceResponse;
    5051class ResourceError;

  • trunk/WebCore/svg/SVGDocumentExtensions.cpp

    r31801 r31951  
    2828
    2929#include "AtomicString.h"
    30 #include "Chrome.h"
     30#include "Console.h"
     31#include "DOMWindow.h"
    3132#include "Document.h"
    3233#include "EventListener.h"
    … …  
    9899{
    99100    if (Frame* frame = m_doc->frame())
    100         if (Page* page = frame->page())
    101             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, "Warning: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String());
     101        frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Warning: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String());
    102102}
    103103
    … …  
    105105{
    106106    if (Frame* frame = m_doc->frame())
    107         if (Page* page = frame->page())
    108             page->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, "Error: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String());
     107        frame->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Error: " + message, m_doc->tokenizer() ? m_doc->tokenizer()->lineNumber() : 1, String());
    109108}
    110109

  • trunk/WebCore/xml/XMLHttpRequest.cpp

    r31483 r31951  
    2323
    2424#include "CString.h"
     25#include "Console.h"
    2526#include "DOMImplementation.h"
     27#include "DOMWindow.h"
    2628#include "Event.h"
    2729#include "EventException.h"
    … …  
    552554    // A privileged script (e.g. a Dashboard widget) can set any headers.
    553555    if (!m_doc->isAllowedToLoadLocalResources() && !isSafeRequestHeader(name)) {
    554         if (m_doc && m_doc->frame() && m_doc->frame()->page())
    555             m_doc->frame()->page()->chrome()->addMessageToConsole(JSMessageSource, ErrorMessageLevel, "Refused to set unsafe header " + name, 1, String());
     556        if (m_doc && m_doc->frame())
     557            m_doc->frame()->domWindow()->console()->addMessage(JSMessageSource, ErrorMessageLevel, "Refused to set unsafe header " + name, 1, String());
    556558        return;
    557559    }

  • trunk/WebCore/xml/XSLTProcessor.cpp

    r31947 r31951  
    2929#include "CString.h"
    3030#include "Cache.h"
     31#include "Console.h"
    3132#include "DOMImplementation.h"
     33#include "DOMWindow.h"
    3234#include "DocLoader.h"
    3335#include "DocumentFragment.h"
    … …  
    7678void XSLTProcessor::parseErrorFunc(void* userData, xmlError* error)
    7779{
    78     Chrome* chrome = static_cast<Chrome*>(userData);
    79     if (!chrome)
     80    Console* console = static_cast<Console*>(userData);
     81    if (!console)
    8082        return;
    8183
    … …  
    9597    }
    9698
    97     chrome->addMessageToConsole(XMLMessageSource, level, error->message, error->line, error->file);
     99    console->addMessage(XMLMessageSource, level, error->message, error->line, error->file);
    98100}
    99101
    … …  
    124126                globalDocLoader->frame()->loader()->loadResourceSynchronously(url, error, response, data);
    125127
    126             Chrome* chrome = 0;
    127             if (Page* page = globalProcessor->xslStylesheet()->ownerDocument()->page())
    128                 chrome = page->chrome();
    129             xmlSetStructuredErrorFunc(chrome, XSLTProcessor::parseErrorFunc);
     128            Console* console = 0;
     129            if (Frame* frame = globalProcessor->xslStylesheet()->ownerDocument()->frame())
     130                console = frame->domWindow()->console();
     131            xmlSetStructuredErrorFunc(console, XSLTProcessor::parseErrorFunc);
    130132
    131133            // We don't specify an encoding here. Neither Gecko nor WinIE respects
Note: See TracChangeset for help on using the changeset viewer.