Changeset 113877 in webkit


Ignore:
Timestamp:
Apr 11, 2012 10:44:34 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r113836.
​http://trac.webkit.org/changeset/113836
​https://bugs.webkit.org/show_bug.cgi?id=83705

Broke all the WebKit2 inspector tests (Requested by andersca
on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-04-11

Source/WebKit/win:

  • WebCoreSupport/WebInspectorClient.cpp:

(registerWindowClass):

(WebInspector::setTimelineProfilingEnabled):

  • WebNodeHighlight.cpp:

(WebNodeHighlight::WebNodeHighlight):
(WebNodeHighlight::update):

  • WebNodeHighlight.h:

(WebNodeHighlight):

  • WebView.cpp:

(WebView::WebView):
(WebView::close):
(WebView::initWithFrame):
(WebView::inspector):

  • WebView.h:

(WebView):

Tools:

  • WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
  • WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:

(WTR::LayoutTestController::showWebInspector):
(WTR::LayoutTestController::closeWebInspector):
(WTR::LayoutTestController::evaluateInWebInspector):
(WTR::LayoutTestController::setJavaScriptProfilingEnabled):

  • WebKitTestRunner/InjectedBundle/LayoutTestController.h:

(LayoutTestController):

  • WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::invoke):

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/win/ChangeLog

    r113836 r113877  
     12012-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r113836.
     4        http://trac.webkit.org/changeset/113836
     5        https://bugs.webkit.org/show_bug.cgi?id=83705
     6
     7        Broke all the WebKit2 inspector tests (Requested by andersca
     8        on #webkit).
     9
     10        * WebCoreSupport/WebInspectorClient.cpp:
     11        (registerWindowClass):
     12        * WebInspector.cpp:
     13        (WebInspector::setTimelineProfilingEnabled):
     14        * WebNodeHighlight.cpp:
     15        (WebNodeHighlight::WebNodeHighlight):
     16        (WebNodeHighlight::update):
     17        * WebNodeHighlight.h:
     18        (WebNodeHighlight):
     19        * WebView.cpp:
     20        (WebView::WebView):
     21        (WebView::close):
     22        (WebView::initWithFrame):
     23        (WebView::inspector):
     24        * WebView.h:
     25        (WebView):
     26
    1272012-04-11  Vivek Galatage  <vivekgalatage@gmail.com>
    228

  • trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp

    r113836 r113877  
    3030#include "WebInspectorClient.h"
    3131
    32 #if ENABLE(INSPECTOR)
    33 
    3432#include "WebInspectorDelegate.h"
    3533#include "WebKit.h"
    … …  
    549547    return ::RegisterClassEx(&wcex);
    550548}
    551 
    552 #endif // ENABLE(INSPECTOR)

  • trunk/Source/WebKit/win/WebInspector.cpp

    r113836 r113877  
    3030#include "WebInspector.h"
    3131
    32 #if ENABLE(INSPECTOR)
    33 
    3432#include "WebInspectorClient.h"
    3533#include "WebKitDLL.h"
    … …  
    279277    return S_OK;
    280278}
    281 
    282 #endif // ENABLE(INSPECTOR)

  • trunk/Source/WebKit/win/WebNodeHighlight.cpp

    r113836 r113877  
    4848
    4949WebNodeHighlight::WebNodeHighlight(WebView* webView)
    50     :
    51 #if ENABLE(INSPECTOR)   
    52       m_inspectedWebView(webView),
    53 #endif // ENABLE(INSPECTOR)
    54       m_overlay(0)
     50    : m_inspectedWebView(webView)
     51    , m_overlay(0)
    5552    , m_observedWindow(0)
    5653    , m_showsWhileWebViewIsVisible(false)
    5754{
    58 #if ENABLE(INSPECTOR)
    5955    m_inspectedWebView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&m_inspectedWebViewWindow));
    60 #endif // ENABLE(INSPECTOR)
    6156}
    6257
    … …  
    164159
    165160    GraphicsContext context(hdc);
    166 #if ENABLE(INSPECTOR)
     161
    167162    m_inspectedWebView->page()->inspectorController()->drawHighlight(context);
    168 #endif // ENABLE(INSPECTOR)
    169163
    170164    BLENDFUNCTION bf;

  • trunk/Source/WebKit/win/WebNodeHighlight.h

    r113836 r113877  
    6060    void onRootWindowPosChanged(WINDOWPOS*);
    6161
    62 #if ENABLE(INSPECTOR)
    6362    WebView* m_inspectedWebView;
    64 #endif // ENABLE(INSPECTOR)
    6563    HWND m_inspectedWebViewWindow;
    6664    HWND m_overlay;

  • trunk/Source/WebKit/win/WebView.cpp

    r113836 r113877  
    338338    , m_mainFrame(0)
    339339    , m_page(0)
    340 #if ENABLE(INSPECTOR)
    341340    , m_inspectorClient(0)
    342 #endif // ENABLE(INSPECTOR)
    343341    , m_hasCustomDropTarget(false)
    344342    , m_useBackForwardList(true)
    … …  
    713711    setFormDelegate(0);
    714712
    715 #if ENABLE(INSPECTOR)
    716713    m_inspectorClient = 0;
    717714    if (m_webInspector)
    718715        m_webInspector->webViewClosed();
    719 #endif // ENABLE(INSPECTOR)
    720716
    721717    delete m_page;
    … …  
    26632659        Settings::setShouldUseHighResolutionTimers(useHighResolutionTimer);
    26642660
    2665 #if ENABLE(INSPECTOR)
    26662661    m_inspectorClient = new WebInspectorClient(this);
    2667 #endif // ENABLE(INSPECTOR)
    26682662
    26692663    Page::PageClients pageClients;
    … …  
    26722666    pageClients.editorClient = new WebEditorClient(this);
    26732667    pageClients.dragClient = new WebDragClient(this);
    2674 #if ENABLE(INSPECTOR)
    26752668    pageClients.inspectorClient = m_inspectorClient;
    2676 #endif // ENABLE(INSPECTOR)
    2677 
    26782669    m_page = new Page(pageClients);
    26792670    provideGeolocationTo(m_page, new WebGeolocationClient(this));
    … …  
    57815772HRESULT STDMETHODCALLTYPE WebView::inspector(IWebInspector** inspector)
    57825773{
    5783 #if ENABLE(INSPECTOR)
    57845774    if (!m_webInspector)
    57855775        m_webInspector.adoptRef(WebInspector::createInstance(this, m_inspectorClient));
    57865776
    57875777    return m_webInspector.copyRefTo(inspector);
    5788 #else // !ENABLE(INSPECTOR)
    5789     return S_OK;
    5790 #endif // ENABLE(INSPECTOR)
    5791 }
    5792 
     5778}
    57935779
    57945780HRESULT STDMETHODCALLTYPE WebView::windowAncestryDidChange()

  • trunk/Source/WebKit/win/WebView.h

    r113836 r113877  
    705705    virtual HRESULT STDMETHODCALLTYPE loadBackForwardListFromOtherView(
    706706        /* [in] */ IWebView *otherView);
    707        
     707
    708708    virtual HRESULT STDMETHODCALLTYPE inspector(
    709709        /* [retval][out] */ IWebInspector**);
    … …  
    10481048    WebFrame* m_mainFrame;
    10491049    WebCore::Page* m_page;
    1050 #if ENABLE(INSPECTOR)
    10511050    WebInspectorClient* m_inspectorClient;
    1052 #endif // ENABLE(INSPECTOR)
    10531051   
    10541052    RefPtr<RefCountedHBITMAP> m_backingStoreBitmap;
    … …  
    10671065    COMPtr<IWebHistoryDelegate> m_historyDelegate;
    10681066    COMPtr<WebPreferences> m_preferences;
    1069 #if ENABLE(INSPECTOR)
    10701067    COMPtr<WebInspector> m_webInspector;
    1071 #endif // ENABLE(INSPECTOR)
    10721068    COMPtr<IWebGeolocationProvider> m_geolocationProvider;
    10731069

  • trunk/Tools/ChangeLog

    r113863 r113877  
     12012-04-11  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r113836.
     4        http://trac.webkit.org/changeset/113836
     5        https://bugs.webkit.org/show_bug.cgi?id=83705
     6
     7        Broke all the WebKit2 inspector tests (Requested by andersca
     8        on #webkit).
     9
     10        * WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl:
     11        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
     12        (WTR::LayoutTestController::showWebInspector):
     13        (WTR::LayoutTestController::closeWebInspector):
     14        (WTR::LayoutTestController::evaluateInWebInspector):
     15        (WTR::LayoutTestController::setJavaScriptProfilingEnabled):
     16        * WebKitTestRunner/InjectedBundle/LayoutTestController.h:
     17        (LayoutTestController):
     18        * WebKitTestRunner/TestInvocation.cpp:
     19        (WTR::TestInvocation::invoke):
     20
    1212012-04-11  Vivek Galatage  <vivekgalatage@gmail.com>
    222

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/LayoutTestController.idl

    r113836 r113877  
    115115        [PassContext] void evaluateScriptInIsolatedWorld(in unsigned long worldID, in DOMString script);
    116116
    117 #if ENABLE_INSPECTOR
    118117        // For Web Inspector tests
    119118        void showWebInspector();
    120119        void closeWebInspector();
    121120        void evaluateInWebInspector(in long callID, in DOMString script);
    122 #endif       
    123121
    124122        void setPOSIXLocale(in DOMString locale);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp

    r113836 r113877  
    459459}
    460460
    461 #if ENABLE(INSPECTOR)
    462461void LayoutTestController::showWebInspector()
    463462{
    464463    WKBundleInspectorShow(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
    465464}
    466 #endif // ENABLE(INSPECTOR)
    467 
    468 #if ENABLE(INSPECTOR)
     465
    469466void LayoutTestController::closeWebInspector()
    470467{
    471468    WKBundleInspectorClose(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()));
    472469}
    473 #endif // ENABLE(INSPECTOR)
    474 
    475 #if ENABLE(INSPECTOR)
     470
    476471void LayoutTestController::evaluateInWebInspector(long callID, JSStringRef script)
    477472{
    … …  
    479474    WKBundleInspectorEvaluateScriptForTest(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), callID, scriptWK.get());
    480475}
    481 #endif // ENABLE(INSPECTOR)
    482 
    483 #if ENABLE(INSPECTOR)
     476
    484477void LayoutTestController::setJavaScriptProfilingEnabled(bool enabled)
    485478{
    486479    WKBundleInspectorSetJavaScriptProfilingEnabled(WKBundlePageGetInspector(InjectedBundle::shared().page()->page()), enabled);
    487480}
    488 #endif // ENABLE(INSPECTOR)
    489481
    490482typedef WTF::HashMap<unsigned, WKRetainPtr<WKBundleScriptWorldRef> > WorldMap;

  • trunk/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.h

    r113836 r113877  
    166166    static unsigned worldIDForWorld(WKBundleScriptWorldRef);
    167167
    168 #if ENABLE(INSPECTOR)
    169168    void showWebInspector();
    170169    void closeWebInspector();
    171170    void evaluateInWebInspector(long callId, JSStringRef script);
    172171    void setJavaScriptProfilingEnabled(bool);
    173 #endif // ENABLE(INSPECTOR)
    174172
    175173    void setPOSIXLocale(JSStringRef);

  • trunk/Tools/WebKitTestRunner/TestInvocation.cpp

    r113836 r113877  
    164164    }
    165165
    166 #if ENABLE(INSPECTOR)
    167166    if (shouldOpenWebInspector(m_pathOrURL.c_str()))
    168167        WKInspectorShow(WKPageGetInspector(TestController::shared().mainWebView()->page()));
    169 #endif // ENABLE(INSPECTOR)       
    170168
    171169    WKPageLoadURL(TestController::shared().mainWebView()->page(), m_url.get());
    … …  
    177175        dump("FAIL\n");
    178176
    179 #if ENABLE(INSPECTOR)
    180177    WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
    181 #endif // ENABLE(INSPECTOR)
    182178}
    183179
Note: See TracChangeset for help on using the changeset viewer.