Changeset 63866 in webkit


Ignore:
Timestamp:
Jul 21, 2010 5:46:26 PM (14 years ago)
Author:
Darin Adler
Message:

2010-07-21 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

WebKitTestRunner needs to support dumping of scroll position
​https://bugs.webkit.org/show_bug.cgi?id=42514

  • platform/mac-wk2/Skipped: Removed now-passing tests from skipped list and moved one miscategorized test.

2010-07-21 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

WebKitTestRunner needs to support dumping of scroll position
​https://bugs.webkit.org/show_bug.cgi?id=42514

  • MiniBrowser/mac/WebBundle/WebBundleMain.m: (_didClearWindowForFrame): Use JSGlobalContextRef instead of JSContextRef.
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: (WTR::InjectedBundlePage::_didClearWindowForFrame): Use JSGlobalContextRef instead of JSContextRef. (WTR::InjectedBundlePage::dump): Call dumpFrameScrollPosition when appropriate. (WTR::numericWindowProperty): Added. Helper for dumpFrameScrollPosition. (WTR::InjectedBundlePage::dumpFrameScrollPosition): Added. (WTR::InjectedBundlePage::didClearWindowForFrame): Use JSGlobalContextRef instead of JSContextRef.
  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: Removed names from arguments that simply repeat the argument type. Added dumpFrameScrollPosition.
  • WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: (WTR::LayoutTestController::shouldDumpDOMAsWebArchive): Added. Currently returns false. (WTR::LayoutTestController::shouldDumpSourceAsWebArchive): Added. Currently returns false. (WTR::LayoutTestController::shouldDumpFrameScrollPositions): Added. Matches the logic in DumpRenderTree.
  • WebKitTestRunner/InjectedBundle/LayoutTestController.h: Updated for above changes.
  • WebKitTestRunner/WebKitTestRunner.xcodeproj: Added property svn:ignore.

2010-07-21 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

WebKitTestRunner needs to support dumping of scroll position
​https://bugs.webkit.org/show_bug.cgi?id=42514

Added WKBundleFrameGetJavaScriptContext function.

  • WebKit2.xcodeproj: Added property svn:ignore.
  • WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: (WKBundleFrameGetJavaScriptContext): Added.
  • WebProcess/InjectedBundle/API/c/WKBundleFrame.h: Ditto.
  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp: (WebKit::InjectedBundlePageLoaderClient::didClearWindowObjectForFrame):
  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld): Use JSGlobalContextRef instead of JSContextRef and context instead of ct.
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r63865 r63866  
     12010-07-21  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        WebKitTestRunner needs to support dumping of scroll position
     6        https://bugs.webkit.org/show_bug.cgi?id=42514
     7
     8        * platform/mac-wk2/Skipped: Removed now-passing tests from
     9        skipped list and moved one miscategorized test.
     10
    1112010-07-21  Justin Schuh  <jschuh@chromium.org>
    212

  • trunk/LayoutTests/platform/mac-wk2/Skipped

    r63850 r63866  
    5858# WebKitTestRunner does not block remote resources or complain about them
    5959# <https://bugs.webkit.org/show_bug.cgi?id=42139>
    60 canvas/philip/tests/security.pattern.canvas.timing.html
    61 canvas/philip/tests/security.pattern.create.html
    6260fast/loader/null-request-after-willSendRequest.html
    6361
    … …  
    20932091editing/selection/move-left-right.html
    20942092
    2095 # WebKitTestRunner needs to support dumping of scroll position
    2096 # <https://bugs.webkit.org/show_bug.cgi?id=42514>
    2097 compositing/geometry/fixed-in-composited.html
    2098 compositing/geometry/fixed-position.html
    2099 compositing/geometry/horizontal-scroll-composited.html
    2100 compositing/geometry/vertical-scroll-composited.html
    2101 compositing/geometry/video-fixed-scrolling.html
    2102 compositing/overflow/fixed-position-ancestor-clip.html
    2103 fast/dom/focus-contenteditable.html
    2104 fast/dynamic/anchor-lock.html
    2105 fast/events/reveal-link-when-focused.html
    2106 fast/layers/scroll-rect-to-visible.html
    2107 fast/overflow/clip-rects-fixed-ancestor.html
    2108 fast/overflow/position-fixed-transform-clipping.html
    2109 fast/overflow/scrollRevealButton.html
    2110 fast/repaint/fixed-child-move-after-scroll.html
    2111 fast/repaint/fixed-child-of-fixed-move-after-scroll.html
    2112 fast/repaint/fixed-child-of-transformed-move-after-scroll.html
    2113 fast/repaint/fixed.html
    2114 fast/repaint/fixed-move-after-scroll.html
    2115 fast/repaint/fixed-tranformed.html
    2116 fast/repaint/repaint-during-scroll.html
    2117 svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html
    2118 transforms/2d/transform-fixed-container.html
    2119 
    2120 
    21212093# WebKitTestRunner needs to support needsDeletionUI mechanism to show deletion UI
    21222094# <https://bugs.webkit.org/show_bug.cgi?id=42535>
    … …  
    21272099platform/mac/editing/deleting/deletionUI-minimum-size.html
    21282100platform/mac/editing/deleting/deletionUI-successful-deletion.html
    2129 
    21302101
    21312102# WebKitTestRunner needs to support layoutTestController.setFrameFlatteningEnabled
    … …  
    21432114fast/frames/flattening/iframe-flattening-simple.html
    21442115
    2145 
    21462116# WebKitTestRunner needs to support layoutTestController.counterValueForElementById
    21472117# <https://bugs.webkit.org/show_bug.cgi?id=42537>
    … …  
    21562126fast/css/counters/counter-reset-000.html
    21572127fast/css/counters/nesting.html
    2158 
    21592128
    21602129# WebKitTestRunner needs to support layoutTestController.execCommand
    … …  
    22692238svg/custom/svg-disallowed-in-dashboard-object.html
    22702239
    2271 
    22722240# WebKitTestRunner needs layoutTestController.dumpChildFrameScrollPositions
    22732241# <https://bugs.webkit.org/show_bug.cgi?id=42548>
     2242fast/overflow/scrollRevealButton.html
    22742243http/tests/navigation/anchor-frames.html
    22752244http/tests/navigation/anchor-subframeload.html
    … …  
    22922261transitions/transition-hit-test-transform.html
    22932262transitions/transition-shorthand-delay.html
    2294 
    2295 
    2296 
    22972263
    22982264# WebKitTestRunner needs layoutTestController.setJavaScriptCanAccessClipboard

  • trunk/WebKit2/ChangeLog

    r63855 r63866  
     12010-07-21  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        WebKitTestRunner needs to support dumping of scroll position
     6        https://bugs.webkit.org/show_bug.cgi?id=42514
     7
     8        Added WKBundleFrameGetJavaScriptContext function.
     9
     10        * WebKit2.xcodeproj: Added property svn:ignore.
     11
     12        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
     13        (WKBundleFrameGetJavaScriptContext): Added.
     14        * WebProcess/InjectedBundle/API/c/WKBundleFrame.h: Ditto.
     15
     16        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     17        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
     18        (WebKit::InjectedBundlePageLoaderClient::didClearWindowObjectForFrame):
     19        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
     20        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     21        (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
     22        Use JSGlobalContextRef instead of JSContextRef and context instead of ct.
     23
    1242010-07-21  Adam Roben  <aroben@apple.com>
    225

  • trunk/WebKit2/WebKit2.xcodeproj

    • Property svn:ignore set to
      *.pbxuser
      *.mode2v3

  • trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r63063 r63866  
    2929#include "WKBundleAPICast.h"
    3030#include "WebFrame.h"
    31 #include <WebCore/PlatformString.h>
     31#include <JavaScriptCore/APICast.h>
     32#include <WebCore/Frame.h>
    3233
     34using namespace WebCore;
    3335using namespace WebKit;
    3436
    … …  
    6466    return toWK(frameRef)->pauseAnimationOnElementWithId(toWK(name), toWK(elementID), time);
    6567}
     68
     69JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
     70{
     71    // FIXME: Is there a way to get this and know that it's a JSGlobalContextRef?
     72    // The const_cast here is a bit ugly.
     73    return const_cast<JSGlobalContextRef>(toRef(toWK(frameRef)->coreFrame()->script()->globalObject(mainThreadNormalWorld())->globalExec()));
     74}

  • trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h

    r63063 r63866  
    2727#define WKBundleFrame_h
    2828
     29#include <JavaScriptCore/JavaScript.h>
    2930#include <WebKit2/WKBase.h>
    3031#include <WebKit2/WKBundleBase.h>
    … …  
    3940
    4041WK_EXPORT bool WKBundleFrameIsMainFrame(WKBundleFrameRef frame);
     42
     43WK_EXPORT JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frame);
    4144
    4245WK_EXPORT WKURLRef WKBundleFrameGetURL(WKBundleFrameRef frame);

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

    r63850 r63866  
    4444typedef void (*WKBundlePageDidFailLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
    4545typedef void (*WKBundlePageDidReceiveTitleForFrameCallback)(WKBundlePageRef page, WKStringRef title, WKBundleFrameRef frame, const void *clientInfo);
    46 typedef void (*WKBundlePageDidClearWindowObjectForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window, const void *clientInfo);
     46typedef void (*WKBundlePageDidClearWindowObjectForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window, const void *clientInfo);
    4747
    4848struct WKBundlePageLoaderClient {

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp

    r62590 r63866  
    8989}
    9090
    91 void InjectedBundlePageLoaderClient::didClearWindowObjectForFrame(WebPage* page, WebFrame* frame, JSContextRef ctx, JSObjectRef window)
     91void InjectedBundlePageLoaderClient::didClearWindowObjectForFrame(WebPage* page, WebFrame* frame, JSGlobalContextRef context, JSObjectRef window)
    9292{
    9393    if (m_client.didClearWindowObjectForFrame)
    94         m_client.didClearWindowObjectForFrame(toRef(page), toRef(frame), ctx, window, m_client.clientInfo);
     94        m_client.didClearWindowObjectForFrame(toRef(page), toRef(frame), context, window, m_client.clientInfo);
    9595}
    9696

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h

    r62590 r63866  
    5151    void didFailLoadWithErrorForFrame(WebPage*, WebFrame*);
    5252    void didReceiveTitleForFrame(WebPage*, const WebCore::String&, WebFrame*);
    53     void didClearWindowObjectForFrame(WebPage*, WebFrame*, JSContextRef, JSObjectRef);
     53    void didClearWindowObjectForFrame(WebPage*, WebFrame*, JSGlobalContextRef, JSObjectRef);
    5454
    5555private:

  • trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r63794 r63866  
    871871        return;
    872872
    873     JSContextRef context = toRef(m_frame->coreFrame()->script()->globalObject(world)->globalExec());
     873    // FIXME: Is there a way to get this and know that it's a JSGlobalContextRef?
     874    // The const_cast here is a bit ugly.
     875    JSGlobalContextRef context = const_cast<JSGlobalContextRef>(toRef(m_frame->coreFrame()->script()->globalObject(world)->globalExec()));
    874876    JSObjectRef windowObject = toRef(m_frame->coreFrame()->script()->globalObject(world));
    875877

  • trunk/WebKitTools/ChangeLog

    r63853 r63866  
     12010-07-21  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        WebKitTestRunner needs to support dumping of scroll position
     6        https://bugs.webkit.org/show_bug.cgi?id=42514
     7
     8        * MiniBrowser/mac/WebBundle/WebBundleMain.m:
     9        (_didClearWindowForFrame): Use JSGlobalContextRef instead of JSContextRef.
     10
     11        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     12        (WTR::InjectedBundlePage::_didClearWindowForFrame): Use JSGlobalContextRef
     13        instead of JSContextRef.
     14        (WTR::InjectedBundlePage::dump): Call dumpFrameScrollPosition when appropriate.
     15        (WTR::numericWindowProperty): Added. Helper for dumpFrameScrollPosition.
     16        (WTR::InjectedBundlePage::dumpFrameScrollPosition): Added.
     17        (WTR::InjectedBundlePage::didClearWindowForFrame): Use JSGlobalContextRef
     18        instead of JSContextRef.
     19
     20        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: Removed names from
     21        arguments that simply repeat the argument type. Added dumpFrameScrollPosition.
     22
     23        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
     24        (WTR::LayoutTestController::shouldDumpDOMAsWebArchive): Added. Currently
     25        returns false.
     26        (WTR::LayoutTestController::shouldDumpSourceAsWebArchive): Added. Currently
     27        returns false.
     28        (WTR::LayoutTestController::shouldDumpFrameScrollPositions): Added. Matches
     29        the logic in DumpRenderTree.
     30
     31        * WebKitTestRunner/InjectedBundle/LayoutTestController.h: Updated for above changes.
     32
     33        * WebKitTestRunner/WebKitTestRunner.xcodeproj: Added property svn:ignore.
     34
    1352010-07-21  Kevin Ollivier  <kevino@theolliviers.com>
    236

  • trunk/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m

    r62595 r63866  
    6666}
    6767
    68 void _didClearWindowForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window, const void *clientInfo)
     68void _didClearWindowForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window, const void *clientInfo)
    6969{
    7070    CFURLRef cfURL = WKURLCopyCFURL(0, WKBundleFrameGetURL(WKBundlePageGetMainFrame(page)));

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r63850 r63866  
    122122}
    123123
    124 void InjectedBundlePage::_didClearWindowForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window, const void *clientInfo)
    125 {
    126     static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didClearWindowForFrame(frame, ctx, window);
     124void InjectedBundlePage::_didClearWindowForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window, const void *clientInfo)
     125{
     126    static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didClearWindowForFrame(frame, context, window);
    127127}
    128128
    … …  
    159159        InjectedBundle::shared().os() << utf8externalRepresentation->data();
    160160    }
     161
     162    if (InjectedBundle::shared().layoutTestController()->shouldDumpFrameScrollPositions())
     163        dumpFrameScrollPosition(WKBundlePageGetMainFrame(m_page));
     164
    161165    InjectedBundle::shared().done();
    162166}
    163167
     168static double numericWindowProperty(WKBundleFrameRef frame, const char* propertyName)
     169{
     170    JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
     171    JSObjectRef window = JSContextGetGlobalObject(context);
     172    JSValueRef exception = 0;
     173    JSStringRef propertyNameString = JSStringCreateWithUTF8CString(propertyName);
     174    JSValueRef value = JSObjectGetProperty(context, window, propertyNameString, &exception);
     175    JSStringRelease(propertyNameString);
     176    if (exception)
     177        return 0;
     178    return JSValueToNumber(context, value, &exception);
     179}
     180
     181void InjectedBundlePage::dumpFrameScrollPosition(WKBundleFrameRef frame)
     182{
     183    double x = numericWindowProperty(frame, "pageXOffset");
     184    double y = numericWindowProperty(frame, "pageYOffset");
     185    if (fabs(x) > 0.00000001 || fabs(y) > 0.00000001)
     186        InjectedBundle::shared().os() << "scrolled to " << x << "," << y << "\n";
     187}
     188
    164189void InjectedBundlePage::didFinishLoadForFrame(WKBundleFrameRef frame)
    165190{
    … …  
    189214}
    190215
    191 void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window)
     216void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window)
    192217{
    193218    JSValueRef exception = 0;
    194     InjectedBundle::shared().layoutTestController()->makeWindowObject(ctx, window, &exception);
     219    InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
    195220}
    196221

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h

    r63850 r63866  
    4343private:
    4444    // Loader Client
    45     static void _didStartProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    46     static void _didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    47     static void _didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    48     static void _didCommitLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    49     static void _didFinishLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    50     static void _didFailLoadWithErrorForFrame(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    51     static void _didReceiveTitleForFrame(WKBundlePageRef page, WKStringRef title, WKBundleFrameRef frame, const void *clientInfo);
    52     static void _didClearWindowForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window, const void *clientInfo);
    53     void didStartProvisionalLoadForFrame(WKBundleFrameRef frame);
    54     void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundleFrameRef frame);
    55     void didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRef frame);
    56     void didCommitLoadForFrame(WKBundleFrameRef frame);
    57     void didFinishLoadForFrame(WKBundleFrameRef frame);
    58     void didFailLoadWithErrorForFrame(WKBundleFrameRef frame);
    59     void didReceiveTitleForFrame(WKStringRef title, WKBundleFrameRef frame);
    60     void didClearWindowForFrame(WKBundleFrameRef frame, JSContextRef ctx, JSObjectRef window);
     45    static void _didStartProvisionalLoadForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     46    static void _didReceiveServerRedirectForProvisionalLoadForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     47    static void _didFailProvisionalLoadWithErrorForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     48    static void _didCommitLoadForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     49    static void _didFinishLoadForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     50    static void _didFailLoadWithErrorForFrame(WKBundlePageRef, WKBundleFrameRef, const void* clientInfo);
     51    static void _didReceiveTitleForFrame(WKBundlePageRef, WKStringRef title, WKBundleFrameRef, const void* clientInfo);
     52    static void _didClearWindowForFrame(WKBundlePageRef, WKBundleFrameRef, JSGlobalContextRef, JSObjectRef window, const void* clientInfo);
     53    void didStartProvisionalLoadForFrame(WKBundleFrameRef);
     54    void didReceiveServerRedirectForProvisionalLoadForFrame(WKBundleFrameRef);
     55    void didFailProvisionalLoadWithErrorForFrame(WKBundleFrameRef);
     56    void didCommitLoadForFrame(WKBundleFrameRef);
     57    void didFinishLoadForFrame(WKBundleFrameRef);
     58    void didFailLoadWithErrorForFrame(WKBundleFrameRef);
     59    void didReceiveTitleForFrame(WKStringRef title, WKBundleFrameRef);
     60    void didClearWindowForFrame(WKBundleFrameRef, JSGlobalContextRef, JSObjectRef window);
    6161
    6262    // UI Client
    63     static void _willAddMessageToConsole(WKBundlePageRef page, WKStringRef message, uint32_t lineNumber, const void* clientInfo);
    64     static void _willSetStatusbarText(WKBundlePageRef page, WKStringRef statusbarText, const void* clientInfo);
    65     static void _willRunJavaScriptAlert(WKBundlePageRef page, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
    66     static void _willRunJavaScriptConfirm(WKBundlePageRef page, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
    67     static void _willRunJavaScriptPrompt(WKBundlePageRef page, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void* clientInfo);
     63    static void _willAddMessageToConsole(WKBundlePageRef, WKStringRef message, uint32_t lineNumber, const void* clientInfo);
     64    static void _willSetStatusbarText(WKBundlePageRef, WKStringRef statusbarText, const void* clientInfo);
     65    static void _willRunJavaScriptAlert(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
     66    static void _willRunJavaScriptConfirm(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo);
     67    static void _willRunJavaScriptPrompt(WKBundlePageRef, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void* clientInfo);
    6868    void willAddMessageToConsole(WKStringRef message, uint32_t lineNumber);
    6969    void willSetStatusbarText(WKStringRef statusbarText);
    … …  
    7171    void willRunJavaScriptConfirm(WKStringRef message, WKBundleFrameRef);
    7272    void willRunJavaScriptPrompt(WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef);
     73
     74    void dumpFrameScrollPosition(WKBundleFrameRef);
    7375
    7476    WKBundlePageRef m_page;

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

    r63693 r63866  
    125125}
    126126
     127bool LayoutTestController::shouldDumpDOMAsWebArchive() const
     128{
     129    return false;
     130}
     131
     132bool LayoutTestController::shouldDumpSourceAsWebArchive() const
     133{
     134    return false;
     135}
     136
     137bool LayoutTestController::shouldDumpFrameScrollPositions() const
     138{
     139    return !shouldDumpAsText() && !shouldDumpDOMAsWebArchive() && !shouldDumpSourceAsWebArchive();
     140}
     141
    127142// Object Creation
    128143

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

    r63693 r63866  
    4545    void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);
    4646
     47    void dumpAsText() { m_dumpAsText = true; }
     48    void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
     49
    4750    bool shouldDumpAsText() const { return m_dumpAsText; }
    48     void dumpAsText() { m_dumpAsText = true; }
    49 
     51    bool shouldDumpDOMAsWebArchive() const;
     52    bool shouldDumpFrameScrollPositions() const;
     53    bool shouldDumpSourceAsWebArchive() const;
    5054    bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
    51     void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
    5255
    5356    bool waitToDump() const { return m_waitToDump; }

  • trunk/WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj

    • Property svn:ignore set to
      *.pbxuser
      *.mode2v3
Note: See TracChangeset for help on using the changeset viewer.