Changeset 123778 in webkit


Ignore:
Timestamp:
Jul 26, 2012, 11:45:46 AM (13 years ago)
Author:
jer.noble@apple.com
Message:

Add a ChromeClient method to send diagnostic logging messages from WebCore to the client.
​https://bugs.webkit.org/show_bug.cgi?id=92340

Reviewed by Anders Carlsson.

Source/WebCore:

Add a new ChromeClient menthod, to be implemented by WebKit and WebKit2, which sends
a diagnostic logging message up to the client.

  • page/ChromeClient.h:

(WebCore::ChromeClient::logDiagnosticMessage):

  • page/ChromeClient.h:

(WebCore::ChromeClient::logDiagnosticMessage):
(ChromeClient):

  • page/DiagnosticLoggingKeys.cpp: Added.

(WebCore::DiagnosticLoggingKeys::mediaLoadedKey):
(WebCore::DiagnosticLoggingKeys::mediaLoadingFailedKey):
(WebCore::DiagnosticLoggingKeys::pluginLoadedKey):
(WebCore::DiagnosticLoggingKeys::pluginLoadingFailedKey):
(WebCore::DiagnosticLoggingKeys::passKey):
(WebCore::DiagnosticLoggingKeys::failKey):
(WebCore::DiagnosticLoggingKeys::noopKey):

  • page/DiagnosticLoggingKeys.h: Added.

(DiagnosticLoggingKeys):

Add the new files DiagnosticLoggingKeys.cpp,h to the project:

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:

Source/WebKit2:

Pipe the ChromeClient logDiagnosticMessage() function through WebKit2 to a new bundle class
InjectedBundlePageDiagnosticLoggingClient, to be implemented by the client.

  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageSetDiagnosticLoggingClient): Added.

  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: Added.

(WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage):

  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: Added.

(InjectedBundlePageDiagnosticLoggingClient):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::logDiagnosticMessage):

  • WebProcess/WebCoreSupport/WebChromeClient.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient):

  • WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::injectedBundleDiagnosticLoggingClient):

Add a convenience class to retrieve the diagnostic message keys:

  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: Added.

(WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage):

  • WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: Added.

(InjectedBundlePageDiagnosticLoggingClient):

Add the InjectedBundlePageDiagnosticLoggingClient.cpp,h files.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • win/WebKit2.vcproj:
  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source
Files:
4 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r123773 r123778  
    16231623    page/ContextMenuController.cpp
    16241624    page/Crypto.cpp
     1625    page/DiagnosticLoggingKeys.cpp
    16251626    page/DOMSecurityPolicy.cpp
    16261627    page/DOMSelection.cpp

  • trunk/Source/WebCore/ChangeLog

    r123775 r123778  
     12012-07-26  Jer Noble  <jer.noble@apple.com>
     2
     3        Add a ChromeClient method to send diagnostic logging messages from WebCore to the client.
     4        https://bugs.webkit.org/show_bug.cgi?id=92340
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Add a new ChromeClient menthod, to be implemented by WebKit and WebKit2, which sends
     9        a diagnostic logging message up to the client.
     10
     11        * page/ChromeClient.h:
     12        (WebCore::ChromeClient::logDiagnosticMessage):
     13        * page/ChromeClient.h:
     14        (WebCore::ChromeClient::logDiagnosticMessage):
     15        (ChromeClient):
     16        * page/DiagnosticLoggingKeys.cpp: Added.
     17        (WebCore::DiagnosticLoggingKeys::mediaLoadedKey):
     18        (WebCore::DiagnosticLoggingKeys::mediaLoadingFailedKey):
     19        (WebCore::DiagnosticLoggingKeys::pluginLoadedKey):
     20        (WebCore::DiagnosticLoggingKeys::pluginLoadingFailedKey):
     21        (WebCore::DiagnosticLoggingKeys::passKey):
     22        (WebCore::DiagnosticLoggingKeys::failKey):
     23        (WebCore::DiagnosticLoggingKeys::noopKey):
     24        * page/DiagnosticLoggingKeys.h: Added.
     25        (DiagnosticLoggingKeys):
     26
     27        Add the new files DiagnosticLoggingKeys.cpp,h to the project:
     28        * CMakeLists.txt:
     29        * GNUmakefile.list.am:
     30        * Target.pri:
     31        * WebCore.gypi:
     32        * WebCore.vcproj/WebCore.vcproj:
     33        * WebCore.xcodeproj/project.pbxproj:
     34
    1352012-07-25  Jer Noble  <jer.noble@apple.com>
    236

  • trunk/Source/WebCore/GNUmakefile.list.am

    r123773 r123778  
    30253025        Source/WebCore/page/Crypto.cpp \
    30263026        Source/WebCore/page/Crypto.h \
     3027        Source/WebCore/page/DiagnosticLoggingKeys.cpp \
     3028        Source/WebCore/page/DiagnosticLoggingKeys.h \
    30273029        Source/WebCore/page/DOMSecurityPolicy.cpp \
    30283030        Source/WebCore/page/DOMSecurityPolicy.h \

  • trunk/Source/WebCore/Target.pri

    r123773 r123778  
    862862    page/ContextMenuController.cpp \
    863863    page/Crypto.cpp \
     864    page/DiagnosticLoggingKeys.cpp \
    864865    page/DOMSelection.cpp \
    865866    page/DOMTimer.cpp \
    … …  
    19551956    page/ContextMenuProvider.h \
    19561957    page/Coordinates.h \
     1958    page/DiagnosticLoggingKeys.h \
    19571959    page/DOMSelection.h \
    19581960    page/DOMTimer.h \

  • trunk/Source/WebCore/WebCore.gypi

    r123773 r123778  
    30393039            'page/Crypto.cpp',
    30403040            'page/Crypto.h',
     3041            'page/DiagnosticLoggingKeys.cpp',
     3042            'page/DiagnosticLoggingKeys.h',
    30413043            'page/DOMSecurityPolicy.cpp',
    30423044            'page/DOMSelection.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r123768 r123778  
    2676826768                        </File>
    2676926769                        <File
     26770                                RelativePath="..\page\DiagnosticLoggingKeys.cpp"
     26771                                >
     26772                        </File>
     26773                        <File
     26774                                RelativePath="..\page\DiagnosticLoggingKeys.h"
     26775                                >
     26776                        </File>
     26777                        <File
    2677026778                                RelativePath="..\page\DOMSelection.cpp"
    2677126779                                >

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

    r123773 r123778  
    58205820                CD27F6E51457685A0078207D /* JSMediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD27F6E2145767580078207D /* JSMediaController.cpp */; };
    58215821                CD27F6E7145770D30078207D /* MediaController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD27F6E6145770D30078207D /* MediaController.cpp */; };
     5822                CD37B39815C1B971006DC898 /* DiagnosticLoggingKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD37B37415C1A7E1006DC898 /* DiagnosticLoggingKeys.cpp */; };
    58225823                CD4AC52A1496AE9A0087C4EF /* Composite.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD4AC5281496AE2F0087C4EF /* Composite.wav */; };
    58235824                CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */ = {isa = PBXBuildFile; fileRef = CD8203061395AB6A00F956C6 /* WebVideoFullscreenController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    1308813089                CD27F6E4145767870078207D /* MediaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaController.h; sourceTree = "<group>"; };
    1308913090                CD27F6E6145770D30078207D /* MediaController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaController.cpp; sourceTree = "<group>"; };
     13091                CD37B37415C1A7E1006DC898 /* DiagnosticLoggingKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DiagnosticLoggingKeys.cpp; sourceTree = "<group>"; };
     13092                CD37B37515C1A7E1006DC898 /* DiagnosticLoggingKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticLoggingKeys.h; sourceTree = "<group>"; };
    1309013093                CD4AC5281496AE2F0087C4EF /* Composite.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = Composite.wav; path = platform/audio/resources/Composite.wav; sourceTree = SOURCE_ROOT; };
    1309113094                CD4E0AFA11F7BC27009D3811 /* fullscreen.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = fullscreen.css; sourceTree = "<group>"; };
    … …  
    1579615799                                E1271A0A0EEEC77A00F61213 /* WorkerNavigator.h */,
    1579715800                                E1271A510EEECD1C00F61213 /* WorkerNavigator.idl */,
     15801                                CD37B37415C1A7E1006DC898 /* DiagnosticLoggingKeys.cpp */,
     15802                                CD37B37515C1A7E1006DC898 /* DiagnosticLoggingKeys.h */,
    1579815803                        );
    1579915804                        path = page;
    … …  
    2839628401                                1059459715B42A8E004D37FD /* PropertyNodeList.cpp in Sources */,
    2839728402                                1059459D15B42B0C004D37FD /* JSPropertyNodeList.cpp in Sources */,
     28403                                CD37B39815C1B971006DC898 /* DiagnosticLoggingKeys.cpp in Sources */,
    2839828404                        );
    2839928405                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/page/ChromeClient.h

    r123354 r123778  
    350350#endif
    351351
     352        virtual void logDiagnosticMessage(const String& message, const String& description, const String& status) { UNUSED_PARAM(message); UNUSED_PARAM(description); UNUSED_PARAM(status); }
     353
    352354    protected:
    353355        virtual ~ChromeClient() { }

  • trunk/Source/WebKit2/CMakeLists.txt

    r123774 r123778  
    372372    WebProcess/InjectedBundle/InjectedBundleIntentRequest.cpp
    373373    WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
     374    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
    374375    WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
    375376    WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp

  • trunk/Source/WebKit2/ChangeLog

    r123775 r123778  
     12012-07-26  Jer Noble  <jer.noble@apple.com>
     2
     3        Add a ChromeClient method to send diagnostic logging messages from WebCore to the client.
     4        https://bugs.webkit.org/show_bug.cgi?id=92340
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Pipe the ChromeClient logDiagnosticMessage() function through WebKit2 to a new bundle class
     9        InjectedBundlePageDiagnosticLoggingClient, to be implemented by the client.
     10
     11        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     12        (WKBundlePageSetDiagnosticLoggingClient): Added.
     13        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     14        * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: Added.
     15        (WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage):
     16        * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: Added.
     17        (InjectedBundlePageDiagnosticLoggingClient):
     18        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     19        (WebKit::WebChromeClient::logDiagnosticMessage):
     20        * WebProcess/WebCoreSupport/WebChromeClient.h:
     21        * WebProcess/WebPage/WebPage.cpp:
     22        (WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient):
     23        * WebProcess/WebPage/WebPage.h:
     24        (WebKit::WebPage::injectedBundleDiagnosticLoggingClient):
     25
     26        Add a convenience class to retrieve the diagnostic message keys:
     27        * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: Added.
     28        (WebKit::InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage):
     29        * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: Added.
     30        (InjectedBundlePageDiagnosticLoggingClient):
     31
     32        Add the InjectedBundlePageDiagnosticLoggingClient.cpp,h files.
     33        * CMakeLists.txt:
     34        * GNUmakefile.list.am:
     35        * Target.pri:
     36        * win/WebKit2.vcproj:
     37        * WebKit2.xcodeproj/project.pbxproj:
     38
    1392012-07-25  Jer Noble  <jer.noble@apple.com>
    240

  • trunk/Source/WebKit2/GNUmakefile.list.am

    r123652 r123778  
    10051005        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp \
    10061006        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h \
     1007        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp \
     1008        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h \
    10071009        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
    10081010        Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h \

  • trunk/Source/WebKit2/Target.pri

    r123652 r123778  
    336336    WebProcess/InjectedBundle/InjectedBundleNavigationAction.h \
    337337    WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h \
     338    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h \
    338339    WebProcess/InjectedBundle/InjectedBundlePageFormClient.h \
    339340    WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h \
    … …  
    721722    WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp \
    722723    WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp \
     724    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp \   
    723725    WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
    724726    WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp \

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r120890 r123778  
    875875                CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; };
    876876                CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; };
     877                CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */; };
    877878                CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */; };
    878879                CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */; };
    … …  
    19361937                CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageFullScreenClient.cpp; sourceTree = "<group>"; };
    19371938                CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageFullScreenClient.h; sourceTree = "<group>"; };
     1939                CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
     1940                CD67D30915C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
    19381941                CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebFullScreenManager.cpp; path = FullScreen/WebFullScreenManager.cpp; sourceTree = "<group>"; };
    19391942                CD73BA38131A29FE00EEDED2 /* WebFullScreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebFullScreenManager.h; path = FullScreen/WebFullScreenManager.h; sourceTree = "<group>"; };
    … …  
    32443247                                BC8147D412F66D31007B2C32 /* InjectedBundleNavigationAction.cpp */,
    32453248                                BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */,
     3249                                CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */,
     3250                                CD67D30915C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.h */,
    32463251                                512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */,
    32473252                                512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */,
    … …  
    49524957                                1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
    49534958                                3F87B9BD158940120090FF62 /* WebColorChooser.cpp in Sources */,
     4959                                CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */,
    49544960                        );
    49554961                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r122204 r123778  
    125125}
    126126
     127void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClient* client)
     128{
     129    toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
     130}
     131
    127132WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef pageRef)
    128133{

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r123652 r123778  
    355355enum { kWKBundlePageFullScreenClientCurrentVersion = 1 };
    356356
     357// MessageTrace client
     358typedef void (*WKBundlePageDiagnosticLoggingCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef success, const void* clientInfo);
     359
     360struct WKBundlePageDiagnosticLoggingClient {
     361    int                                                                 version;
     362    const void *                                                        clientInfo;
     363    WKBundlePageDiagnosticLoggingCallback                               logDiagnosticMessage;
     364};
     365typedef struct WKBundlePageDiagnosticLoggingClient WKBundlePageDiagnosticLoggingClient;
     366
     367enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion = 0 };
     368
    357369WK_EXPORT void WKBundlePageWillEnterFullScreen(WKBundlePageRef page);
    358370WK_EXPORT void WKBundlePageDidEnterFullScreen(WKBundlePageRef page);
    … …  
    369381WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClient* client);
    370382WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClient* client);
    371    
    372383WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClient* client);
     384WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClient* client);
    373385
    374386WK_EXPORT WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef page);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r122676 r123778  
    774774}
    775775
     776void WebChromeClient::logDiagnosticMessage(const String& message, const String& description, const String& success)
     777{
     778    if (!m_page->corePage()->settings()->diagnosticLoggingEnabled())
     779        return;
     780
     781    m_page->injectedBundleDiagnosticLoggingClient().logDiagnosticMessage(m_page, message, description, success);
     782}
     783
    776784} // namespace WebKit

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r123354 r123778  
    220220    virtual void numWheelEventHandlersChanged(unsigned) OVERRIDE;
    221221
     222    virtual void logDiagnosticMessage(const String& message, const String& description, const String& success) OVERRIDE;
     223
    222224    String m_cachedToolTip;
    223225    mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r123775 r123778  
    420420#endif
    421421
     422void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient* client)
     423{
     424    m_logDiagnosticMessageClient.initialize(client);
     425}
     426
    422427PassRefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters)
    423428{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r123216 r123778  
    3636#include "InjectedBundlePageContextMenuClient.h"
    3737#endif
     38#include "InjectedBundlePageDiagnosticLoggingClient.h"
    3839#include "InjectedBundlePageEditorClient.h"
    3940#include "InjectedBundlePageFormClient.h"
    … …  
    249250    void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClient*);
    250251#endif
     252    void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClient*);
    251253
    252254#if ENABLE(CONTEXT_MENUS)
    … …  
    259261    InjectedBundlePageResourceLoadClient& injectedBundleResourceLoadClient() { return m_resourceLoadClient; }
    260262    InjectedBundlePageUIClient& injectedBundleUIClient() { return m_uiClient; }
     263    InjectedBundlePageDiagnosticLoggingClient& injectedBundleDiagnosticLoggingClient() { return m_logDiagnosticMessageClient; }
    261264#if ENABLE(FULLSCREEN_API)
    262265    InjectedBundlePageFullScreenClient& injectedBundleFullScreenClient() { return m_fullScreenClient; }
    … …  
    812815    InjectedBundlePageFullScreenClient m_fullScreenClient;
    813816#endif
     817    InjectedBundlePageDiagnosticLoggingClient m_logDiagnosticMessageClient;
    814818
    815819#if USE(TILED_BACKING_STORE)

  • trunk/Source/WebKit2/win/WebKit2.vcproj

    r120890 r123778  
    23952395                                </File>
    23962396                                <File
     2397                                        RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageDiagnosticLoggingClient.cpp"
     2398                                        >
     2399                                </File>
     2400                                <File
     2401                                        RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageDiagnosticLoggingClient.h"
     2402                                        >
     2403                                </File>
     2404                                <File
    23972405                                        RelativePath="..\WebProcess\InjectedBundle\InjectedBundlePageEditorClient.cpp"
    23982406                                        >
Note: See TracChangeset for help on using the changeset viewer.