Commit 81183fd1 authored by kevino@webkit.org's avatar kevino@webkit.org
Browse files

Reviewed by Eric Seidel.

[wx] Get DumpRenderTree building after waf switch.
        
https://bugs.webkit.org/show_bug.cgi?id=32041


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51618 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 419c3693
2009-12-01 Kevin Ollivier <kevino@theolliviers.com>
Reviewed by Eric Seidel.
[wx] Get DumpRenderTree building after waf switch.
https://bugs.webkit.org/show_bug.cgi?id=32041
* DumpRenderTree/wscript: Added.
* DumpRenderTree/wx/LayoutTestControllerWx.cpp:
(LayoutTestController::setTimelineProfilingEnabled):
(LayoutTestController::evaluateScriptInIsolatedWorld):
(LayoutTestController::disableImageLoading):
(LayoutTestController::whiteListAccessFromOrigin):
(LayoutTestController::counterValueForElementById):
* Scripts/build-webkit:
2009-12-02 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
#! /usr/bin/env python
# Copyright (C) 2009 Kevin Ollivier All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# wxBrowser sample app build script for the waf build system
import sys
from settings import *
include_paths = [
os.path.join(output_dir),
os.path.join(wk_root, 'JavaScriptCore'),
os.path.join(wk_root, 'WebCore'),
os.path.join(wk_root, 'WebKit', 'wx'),
'.',
'wx'
]
sources = [
'LayoutTestController.cpp',
'WorkQueue.cpp',
'wx/DumpRenderTreeWx.cpp',
'wx/LayoutTestControllerWx.cpp',
'wx/WorkQueueItemWx.cpp'
]
def set_options(opt):
common_set_options(opt)
def configure(conf):
common_configure(conf)
def build(bld):
obj = bld.new_task_gen(
features = 'cxx cprogram',
includes = ' '.join(include_paths),
source = sources,
target = 'DumpRenderTree',
uselib = 'WXWEBKIT WX ' + get_config(),
libpath = [output_dir],
uselib_local = '',
install_path = output_dir)
......@@ -329,3 +329,28 @@ void LayoutTestController::removeAllVisitedLinks()
{
// FIXME: Implement this.
}
void LayoutTestController::setTimelineProfilingEnabled(bool enabled)
{
}
void LayoutTestController::evaluateScriptInIsolatedWorld(unsigned worldId, JSObjectRef globalObject, JSStringRef script)
{
}
void LayoutTestController::disableImageLoading()
{
}
void LayoutTestController::whiteListAccessFromOrigin(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
{
}
JSRetainPtr<JSStringRef> LayoutTestController::counterValueForElementById(JSStringRef id)
{
}
......@@ -316,6 +316,7 @@ removeLibraryDependingOnSVG("WebCore", $svgSupport);
if (isWx()) {
downloadWafIfNeeded();
push @projects, 'WebKitTools/DumpRenderTree';
push @projects, 'WebKitTools/wx/browser';
push @projects, 'WebKit/wx/bindings/python';
}
......
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