[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
loislo at chromium.org
loislo at chromium.org
Wed Dec 22 12:13:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a4e6b23496c3392e23969231e8c9bc2131022776
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 17 14:49:31 2010 +0000
2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65500.
http://trac.webkit.org/changeset/65500
https://bugs.webkit.org/show_bug.cgi?id=44108
Qt bots failed to compile. (Requested by loislo on #webkit).
* GNUmakefile.am:
2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65500.
http://trac.webkit.org/changeset/65500
https://bugs.webkit.org/show_bug.cgi?id=44108
Qt bots failed to compile. (Requested by loislo on #webkit).
* platform/gtk/Skipped:
2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65500.
http://trac.webkit.org/changeset/65500
https://bugs.webkit.org/show_bug.cgi?id=44108
Qt bots failed to compile. (Requested by loislo on #webkit).
* GNUmakefile.am:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* WebCore.pri:
* WebCore.pro:
* WebCore.vcproj/copyInspectorFiles.cmd:
* WebCore.xcodeproj/project.pbxproj:
* combine-javascript-resources:
* inspector/CodeGeneratorInspector.pm:
* inspector/front-end/InspectorBackendStub.js: Added.
(WebInspector.InspectorBackendStub):
(WebInspector.InspectorBackendStub.prototype._registerDelegate):
(WebInspector.InspectorBackendStub.prototype.sendMessageToBackend):
* inspector/front-end/InspectorBackendStub.qrc: Removed.
* inspector/front-end/WebKit.qrc:
2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65500.
http://trac.webkit.org/changeset/65500
https://bugs.webkit.org/show_bug.cgi?id=44108
Qt bots failed to compile. (Requested by loislo on #webkit).
* WebKit.gyp:
2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65500.
http://trac.webkit.org/changeset/65500
https://bugs.webkit.org/show_bug.cgi?id=44108
Qt bots failed to compile. (Requested by loislo on #webkit).
* WebCoreSupport/InspectorClientGtk.cpp:
(WebKit::InspectorClient::openInspectorFrontend):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65501 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 6c11dd9..3c36583 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65500.
+ http://trac.webkit.org/changeset/65500
+ https://bugs.webkit.org/show_bug.cgi?id=44108
+
+ Qt bots failed to compile. (Requested by loislo on #webkit).
+
+ * GNUmakefile.am:
+
2010-08-17 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 3c199d6..91653cf 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -39,7 +39,6 @@ GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
GENPROGRAMS := $(top_builddir)/Programs
-GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
WebCore := $(srcdir)/WebCore
# Programs to run the WebKitGtk unit tests
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bfc652c..0be51dd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65500.
+ http://trac.webkit.org/changeset/65500
+ https://bugs.webkit.org/show_bug.cgi?id=44108
+
+ Qt bots failed to compile. (Requested by loislo on #webkit).
+
+ * platform/gtk/Skipped:
+
2010-08-17 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index e2bfc26..4ebc04c 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5908,7 +5908,3 @@ fast/js/sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T6.h
fast/js/sputnik/Unicode/Unicode_510/S7.6_A3.2.html
fast/js/sputnik/Unicode/Unicode_510/S7.6_A5.3_T1.html
fast/js/sputnik/Unicode/Unicode_510/S7.6_A5.3_T2.html
-
-# Inspector's tests were disabled.
-# https://bugs.webkit.org/show_bug.cgi?id=43977
-inspector/
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f9de7c7..766ef0d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65500.
+ http://trac.webkit.org/changeset/65500
+ https://bugs.webkit.org/show_bug.cgi?id=44108
+
+ Qt bots failed to compile. (Requested by loislo on #webkit).
+
+ * GNUmakefile.am:
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+ * WebCore.pri:
+ * WebCore.pro:
+ * WebCore.vcproj/copyInspectorFiles.cmd:
+ * WebCore.xcodeproj/project.pbxproj:
+ * combine-javascript-resources:
+ * inspector/CodeGeneratorInspector.pm:
+ * inspector/front-end/InspectorBackendStub.js: Added.
+ (WebInspector.InspectorBackendStub):
+ (WebInspector.InspectorBackendStub.prototype._registerDelegate):
+ (WebInspector.InspectorBackendStub.prototype.sendMessageToBackend):
+ * inspector/front-end/InspectorBackendStub.qrc: Removed.
+ * inspector/front-end/WebKit.qrc:
+
2010-08-17 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 58a449e..3b9f37d 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4612,7 +4612,6 @@ EXTRA_DIST += \
webinspectordir = ${datadir}/webkitgtk- at WEBKITGTK_API_VERSION@/webinspector
dist_webinspector_DATA = \
$(WebCore)/English.lproj/localizedStrings.js \
- DerivedSources/WebCore/InspectorBackendStub.js \
$(shell ls $(WebCore)/inspector/front-end/*.js) \
$(shell ls $(WebCore)/inspector/front-end/*.html) \
$(shell ls $(WebCore)/inspector/front-end/*.css)
@@ -4622,13 +4621,6 @@ dist_webinspectorimages_DATA = \
$(shell ls $(WebCore)/inspector/front-end/Images/*.gif) \
$(shell ls $(WebCore)/inspector/front-end/Images/*.png)
-noinst_webinspectordir = ${GENSOURCES_INSPECTOR}
-noinst_webinspector_SCRIPTS = ${GENSOURCES_INSPECTOR}/inspector.html
-${GENSOURCES_INSPECTOR}/inspector.html :
- mkdir -p ${GENSOURCES_INSPECTOR}/images
- cp ${dist_webinspector_DATA} ${GENSOURCES_INSPECTOR}
- cp ${dist_webinspectorimages_DATA} ${GENSOURCES_INSPECTOR}/images
-
webresourcesdir = ${datadir}/webkit- at WEBKITGTK_API_VERSION@/images
dist_webresources_DATA = \
$(WebCore)/Resources/textAreaResizeCorner.png \
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index b20df19..ff1ec27 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -267,51 +267,6 @@
},
'targets': [
{
- 'target_name': 'inspector_protocol_sources',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'generateInspectorProtocolSources',
- # The second input item will be used as item name in vcproj.
- # It is not possible to put Inspector.idl there because
- # all idl files are marking as excluded by gyp generator.
- 'inputs': [
- '../bindings/scripts/generate-bindings.pl',
- '../inspector/CodeGeneratorInspector.pm',
- '../bindings/scripts/CodeGenerator.pm',
- '../bindings/scripts/IDLParser.pm',
- '../bindings/scripts/IDLStructure.pm',
- '../inspector/Inspector.idl',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorBackendDispatcher.h',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/RemoteInspectorFrontend.h',
- ],
- 'variables': {
- 'generator_include_dirs': [
- ],
- },
- 'action': [
- 'python',
- 'scripts/rule_binding.py',
- '../inspector/Inspector.idl',
- '<(SHARED_INTERMEDIATE_DIR)/webcore',
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
- '--',
- '<@(_inputs)',
- '--',
- '--defines', '<(feature_defines) LANGUAGE_JAVASCRIPT',
- '--generator', 'Inspector',
- '<@(generator_include_dirs)'
- ],
- 'message': 'Generating Inspector protocol sources from Inspector.idl',
- },
- ]
- },
- {
'target_name': 'webcore_bindings_sources',
'type': 'none',
'hard_dependency': 1,
@@ -527,6 +482,44 @@
],
},
{
+ 'action_name': 'RemoteInspectorFrontend',
+ # The second input item will be used as item name in vcproj.
+ # It is not possible to put Inspector.idl there because
+ # all idl files are marking as excluded by gyp generator.
+ 'inputs': [
+ '../bindings/scripts/generate-bindings.pl',
+ '../inspector/CodeGeneratorInspector.pm',
+ '../bindings/scripts/CodeGenerator.pm',
+ '../bindings/scripts/IDLParser.pm',
+ '../bindings/scripts/IDLStructure.pm',
+ '../inspector/Inspector.idl',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/InspectorBackendDispatcher.cpp',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/InspectorBackendDispatcher.h',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/RemoteInspectorFrontend.cpp',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings/RemoteInspectorFrontend.h',
+ ],
+ 'variables': {
+ 'generator_include_dirs': [
+ ],
+ },
+ 'action': [
+ 'python',
+ 'scripts/rule_binding.py',
+ '../inspector/Inspector.idl',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings',
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings',
+ '--',
+ '<@(_inputs)',
+ '--',
+ '--defines', '<(feature_defines) LANGUAGE_JAVASCRIPT',
+ '--generator', 'Inspector',
+ '<@(generator_include_dirs)'
+ ],
+ 'message': 'Generating Inspector interface classes from Inspector.idl',
+ },
+ {
'action_name': 'XMLNames',
'inputs': [
'../dom/make_names.pl',
@@ -756,8 +749,8 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/XPathGrammar.cpp',
# Additional .cpp files from the webcore_inspector_sources list.
- '<(SHARED_INTERMEDIATE_DIR)/webcore/RemoteInspectorFrontend.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendDispatcher.cpp',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/RemoteInspectorFrontend.cpp',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/bindings/InspectorBackendDispatcher.cpp',
],
'conditions': [
['javascript_engine=="v8"', {
@@ -813,7 +806,6 @@
'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
'dependencies': [
'webcore_bindings',
- 'inspector_protocol_sources',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre',
'../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 945bc34..6157610 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -4159,6 +4159,7 @@
'inspector/front-end/HAREntry.js',
'inspector/front-end/HelpScreen.js',
'inspector/front-end/ImageView.js',
+ 'inspector/front-end/InspectorBackendStub.js',
'inspector/front-end/InspectorFrontendHostStub.js',
'inspector/front-end/InjectedFakeWorker.js',
'inspector/front-end/InjectedScript.js',
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 4b4323b..7daa76a 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -490,7 +490,6 @@ IDL_BINDINGS += \
INSPECTOR_INTERFACES = inspector/Inspector.idl
-INSPECTOR_BACKEND_STUB_QRC = inspector/front-end/InspectorBackendStub.qrc
mathmlnames.output = $${WC_GENERATED_SOURCES_DIR}/MathMLNames.cpp
mathmlnames.input = MATHML_NAMES
@@ -565,12 +564,6 @@ inspectorIDL.depends = $$PWD/bindings/scripts/CodeGenerator.pm \
$$PWD/bindings/scripts/InFilesParser.pm
addExtraCompiler(inspectorIDL)
-inspectorBackendStub.wkAddOutputToSources = false
-inspectorBackendStub.output = generated/InspectorBackendStub.qrc
-inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC
-inspectorBackendStub.commands = cp $$PWD/$$INSPECTOR_BACKEND_STUB_QRC $${WC_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
-addExtraCompiler(inspectorBackendStub)
-
# GENERATOR 3: tokenizer (flex)
tokenizer.output = $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.cpp
tokenizer.input = TOKENIZER
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f6ce363..76e3782 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -136,7 +136,7 @@ symbian {
RESOURCES += \
$$PWD/../WebCore/WebCore.qrc
-include_webinspector: RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc $$WC_GENERATED_SOURCES_DIR/InspectorBackendStub.qrc
+include_webinspector: RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc
enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
diff --git a/WebCore/WebCore.vcproj/copyInspectorFiles.cmd b/WebCore/WebCore.vcproj/copyInspectorFiles.cmd
index 316fddc..7b5f452 100755
--- a/WebCore/WebCore.vcproj/copyInspectorFiles.cmd
+++ b/WebCore/WebCore.vcproj/copyInspectorFiles.cmd
@@ -1,5 +1,4 @@
mkdir 2>NUL "%WebKitOutputDir%\bin\WebKit.resources\inspector"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%WebKitOutputDir%\bin\WebKit.resources\inspector"
-xcopy /y /d /s /exclude:xcopy.excludes "%WebKitOutputDir%\obj\WebCore\DerivedSources\InspectorBackendStub.js" "%WebKitOutputDir%\bin\WebKit.resources\inspector"
mkdir 2>NUL "%WebKitOutputDir%\bin\WebKit.resources\en.lproj"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%WebKitOutputDir%\bin\WebKit.resources\en.lproj"
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index ce8f68d..43325ec 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -20446,7 +20446,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/combine-javascript-resources\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --generated-scripts-dir ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n # Remove any JavaScript files, since they will be replaced with the combined file.\n cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n rm *.js\n\n # Copy the modified HTML file and the combined script.\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\nfi\n";
+ shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/combine-javascript-resources\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n # Remove any JavaScript files, since they will be replaced with the combined file.\n cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n rm *.js\n\n # Copy the modified HTML file and the combined script.\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\nfi\n";
};
1C81BA330E97357C00266E07 /* Copy Inspector Resources */ = {
isa = PBXShellScriptBuildPhase;
@@ -20462,7 +20462,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Copy all the Inspector front-end resources.\nditto \"${SRCROOT}/inspector/front-end\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\nditto \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendStub.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n\n# Remove the WebKit.qrc file since it is not used on the Mac (this file is for Qt)\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/WebKit.qrc\"\n\n# Remove *.re2js files, they are only used to generate some .js files.\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.re2js\n";
+ shellScript = "# Copy all the Inspector front-end resources.\nditto \"${SRCROOT}/inspector/front-end\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n\n# Remove the WebKit.qrc file since it is not used on the Mac (this file is for Qt)\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/WebKit.qrc\"\n\n# Remove *.re2js files, they are only used to generate some .js files.\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.re2js\n";
};
5D0D540D0E9862F60029E223 /* Check For Weak VTables and Externals */ = {
isa = PBXShellScriptBuildPhase;
diff --git a/WebCore/combine-javascript-resources b/WebCore/combine-javascript-resources
index 428b6b7..96dfc88 100755
--- a/WebCore/combine-javascript-resources
+++ b/WebCore/combine-javascript-resources
@@ -31,14 +31,12 @@ use Getopt::Long;
use File::Basename;
use File::Path;
-my $generatedScriptsDirectory;
my $outputDirectory;
my $scriptName;
my $htmlFile;
GetOptions('output-dir=s' => \$outputDirectory,
'output-script-name=s' => \$scriptName,
- 'generated-scripts-dir=s' => \$generatedScriptsDirectory,
'input-html=s' => \$htmlFile);
unless (defined $htmlFile and defined $scriptName and defined $outputDirectory) {
@@ -64,7 +62,7 @@ open SCRIPT_OUT, ">", "$outputDirectory/$scriptName" or die "Can't open $outputD
while ($headContents =~ m/<script.*src="([^"]*)"[^>]*>/gi) {
local $/;
- open SCRIPT_IN, "$generatedScriptsDirectory/$1" or open SCRIPT_IN, "$htmlDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
+ open SCRIPT_IN, "$htmlDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
print SCRIPT_OUT "/* $1 */\n\n";
print SCRIPT_OUT <SCRIPT_IN>;
close SCRIPT_IN;
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index cd9052a..10e0882 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -138,7 +138,6 @@ my $verbose;
my $namespace;
my $backendClassName;
-my $backendJSStubName;
my %backendTypes;
my %backendMethods;
my @backendMethodsImpl;
@@ -146,7 +145,6 @@ my $backendConstructor;
my @backendConstantDeclarations;
my @backendConstantDefinitions;
my $backendFooter;
-my @backendStubJS;
my $frontendClassName;
my %frontendTypes;
@@ -206,7 +204,6 @@ sub GenerateInterface
$frontendTypes{"PassRefPtr"} = 1;
$backendClassName = $className . "BackendDispatcher";
- $backendJSStubName = $className . "BackendStub";
my @backendHead;
push(@backendHead, " ${backendClassName}(InspectorController* inspectorController) : m_inspectorController(inspectorController) { }");
push(@backendHead, " void reportProtocolError(const long callId, const String& method, const String& errorText) const;");
@@ -241,8 +238,6 @@ sub generateFunctions
}
push(@backendMethodsImpl, generateBackendDispatcher());
push(@backendMethodsImpl, generateBackendReportProtocolError());
-
- @backendStubJS = generateBackendStubJS($interface);
}
sub generateFrontendFunction
@@ -467,40 +462,6 @@ EOF
return split("\n", $messageParserBody);
}
-sub generateBackendStubJS
-{
- my $interface = shift;
- my @backendFunctions = grep(!$_->signature->extendedAttributes->{"notify"}, @{$interface->functions});
- my @JSStubs = map(" this._registerDelegate(\"" . $_->signature->name . "\");", @backendFunctions);
-
- my $JSStubs = join("\n", @JSStubs);
- my $inspectorBackendStubJS = << "EOF";
-$licenseTemplate
-
-WebInspector.InspectorBackendStub = function()
-{
-$JSStubs
-}
-
-WebInspector.InspectorBackendStub.prototype = {
- _registerDelegate: function(methodName)
- {
- this[methodName] = this.sendMessageToBackend.bind(this, methodName);
- },
-
- sendMessageToBackend: function()
- {
- var message = JSON.stringify(Array.prototype.slice.call(arguments));
- InspectorFrontendHost.sendMessageToBackend(message);
- }
-}
-
-InspectorBackend = new WebInspector.InspectorBackendStub();
-
-EOF
- return split("\n", $inspectorBackendStubJS);
-}
-
sub generateHeader
{
my $className = shift;
@@ -602,11 +563,6 @@ sub finish
print $HEADER join("\n", generateHeader($backendClassName, \%backendTypes, $backendConstructor, \@backendConstantDeclarations, \%backendMethods, $backendFooter));
close($HEADER);
undef($HEADER);
-
- open(my $JS_STUB, ">$outputDir/$backendJSStubName.js") || die "Couldn't open file $outputDir/$backendJSStubName.js";
- print $JS_STUB join("\n", @backendStubJS);
- close($JS_STUB);
- undef($JS_STUB);
}
1;
diff --git a/WebCore/inspector/front-end/InspectorBackendStub.js b/WebCore/inspector/front-end/InspectorBackendStub.js
new file mode 100644
index 0000000..8216326
--- /dev/null
+++ b/WebCore/inspector/front-end/InspectorBackendStub.js
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT
+ * OWNER 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.
+ */
+
+WebInspector.InspectorBackendStub = function()
+{
+ this._registerDelegate("addInspectedNode");
+ this._registerDelegate("addScriptToEvaluateOnLoad");
+ this._registerDelegate("changeTagName");
+ this._registerDelegate("clearConsoleMessages");
+ this._registerDelegate("copyNode");
+ this._registerDelegate("deleteCookie");
+ this._registerDelegate("didEvaluateForTestInFrontend");
+ this._registerDelegate("disableMonitoringXHR");
+ this._registerDelegate("disableResourceTracking");
+ this._registerDelegate("disableSearchingForNode");
+ this._registerDelegate("disableTimeline");
+ this._registerDelegate("dispatchOnInjectedScript");
+ this._registerDelegate("enableMonitoringXHR");
+ this._registerDelegate("enableResourceTracking");
+ this._registerDelegate("enableSearchingForNode");
+ this._registerDelegate("enableTimeline");
+ this._registerDelegate("getApplicationCaches");
+ this._registerDelegate("getChildNodes");
+ this._registerDelegate("getCookies");
+ this._registerDelegate("getDatabaseTableNames");
+ this._registerDelegate("executeSQL");
+ this._registerDelegate("getDOMStorageEntries");
+ this._registerDelegate("getEventListenersForNode");
+ this._registerDelegate("getOuterHTML");
+ this._registerDelegate("getProfile");
+ this._registerDelegate("getProfileHeaders");
+ this._registerDelegate("removeProfile");
+ this._registerDelegate("clearProfiles");
+ this._registerDelegate("getResourceContent");
+ this._registerDelegate("highlightDOMNode");
+ this._registerDelegate("hideDOMNodeHighlight");
+ this._registerDelegate("performSearch");
+ this._registerDelegate("pushNodeByPathToFrontend");
+ this._registerDelegate("releaseWrapperObjectGroup");
+ this._registerDelegate("removeAllScriptsToEvaluateOnLoad");
+ this._registerDelegate("reloadPage");
+ this._registerDelegate("removeAttribute");
+ this._registerDelegate("removeDOMStorageItem");
+ this._registerDelegate("removeNode");
+ this._registerDelegate("saveApplicationSettings");
+ this._registerDelegate("saveSessionSettings");
+ this._registerDelegate("searchCanceled");
+ this._registerDelegate("setAttribute");
+ this._registerDelegate("setDOMStorageItem");
+ this._registerDelegate("setInjectedScriptSource");
+ this._registerDelegate("setOuterHTML");
+ this._registerDelegate("setTextNodeValue");
+ this._registerDelegate("startProfiling");
+ this._registerDelegate("startTimelineProfiler");
+ this._registerDelegate("stopProfiling");
+ this._registerDelegate("stopTimelineProfiler");
+ this._registerDelegate("storeLastActivePanel");
+ this._registerDelegate("takeHeapSnapshot");
+ this._registerDelegate("getProfilerLogLines");
+ this._registerDelegate("openInInspectedWindow");
+
+ this._registerDelegate("getAllStyles");
+ this._registerDelegate("getStyles");
+ this._registerDelegate("getComputedStyle");
+ this._registerDelegate("getInlineStyle");
+ this._registerDelegate("getStyleSheet");
+ this._registerDelegate("getRuleRanges");
+ this._registerDelegate("applyStyleText");
+ this._registerDelegate("setStyleText");
+ this._registerDelegate("setStyleProperty");
+ this._registerDelegate("toggleStyleEnabled");
+ this._registerDelegate("setRuleSelector");
+ this._registerDelegate("addRule");
+
+ this._registerDelegate("disableDebugger");
+ this._registerDelegate("editScriptSource");
+ this._registerDelegate("getScriptSource");
+ this._registerDelegate("enableDebugger");
+ this._registerDelegate("setBreakpoint");
+ this._registerDelegate("removeBreakpoint");
+ this._registerDelegate("activateBreakpoints");
+ this._registerDelegate("deactivateBreakpoints");
+ this._registerDelegate("pause");
+ this._registerDelegate("resume");
+ this._registerDelegate("stepIntoStatement");
+ this._registerDelegate("stepOutOfFunction");
+ this._registerDelegate("stepOverStatement");
+ this._registerDelegate("setPauseOnExceptionsState");
+}
+
+WebInspector.InspectorBackendStub.prototype = {
+ _registerDelegate: function(methodName)
+ {
+ this[methodName] = this.sendMessageToBackend.bind(this, methodName);
+ },
+
+ sendMessageToBackend: function()
+ {
+ var message = JSON.stringify(Array.prototype.slice.call(arguments));
+ InspectorFrontendHost.sendMessageToBackend(message);
+ }
+}
+
+InspectorBackend = new WebInspector.InspectorBackendStub();
diff --git a/WebCore/inspector/front-end/InspectorBackendStub.qrc b/WebCore/inspector/front-end/InspectorBackendStub.qrc
deleted file mode 100644
index 30f6d75..0000000
--- a/WebCore/inspector/front-end/InspectorBackendStub.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/webkit/inspector">
- <file>InspectorBackendStub.js</file>
-</qresource>
-</RCC>
-
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index 4901857..febcad6 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -46,6 +46,7 @@
<file>InjectedScript.js</file>
<file>InjectedScriptAccess.js</file>
<file>inspector.js</file>
+ <file>InspectorBackendStub.js</file>
<file>InspectorFrontendHostStub.js</file>
<file>KeyboardShortcut.js</file>
<file>MetricsSidebarPane.js</file>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f4eb8d5..cf62475 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65500.
+ http://trac.webkit.org/changeset/65500
+ https://bugs.webkit.org/show_bug.cgi?id=44108
+
+ Qt bots failed to compile. (Requested by loislo on #webkit).
+
+ * WebKit.gyp:
+
2010-08-17 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index c8be9de..c338b59 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -614,10 +614,7 @@
{
'target_name': 'inspector_resources',
'type': 'none',
- 'dependencies': [
- 'devtools_html',
- '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources',
- ],
+ 'dependencies': ['devtools_html'],
'conditions': [
['debug_devtools==0', {
'dependencies': ['concatenated_devtools_js'],
@@ -629,7 +626,6 @@
'files': [
'<@(devtools_files)',
'<@(webinspector_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
],
'conditions': [
['debug_devtools==0', {
@@ -676,12 +672,10 @@
'<@(_input_page)',
'<@(webinspector_files)',
'<@(devtools_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
],
'search_path': [
'../../WebCore/inspector/front-end',
'src/js',
- '<(SHARED_INTERMEDIATE_DIR)/webcore',
'<(chromium_src_dir)/v8/tools',
],
'outputs': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index c059b3a..b600da5 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-17 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65500.
+ http://trac.webkit.org/changeset/65500
+ https://bugs.webkit.org/show_bug.cgi?id=44108
+
+ Qt bots failed to compile. (Requested by loislo on #webkit).
+
+ * WebCoreSupport/InspectorClientGtk.cpp:
+ (WebKit::InspectorClient::openInspectorFrontend):
+
2010-08-17 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index 7a87db7..691a915 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -82,10 +82,9 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller)
GOwnPtr<gchar> inspectorURI;
// Make the Web Inspector work when running tests
- // FixMe: it is not working. It should be not the subdirectory of the current directory, but a subdirectory of $(WEBKITOUTPUTDIR).
- if (g_file_test("resources/inspector/inspector.html", G_FILE_TEST_EXISTS)) {
+ if (g_file_test("WebCore/inspector/front-end/inspector.html", G_FILE_TEST_EXISTS)) {
GOwnPtr<gchar> currentDirectory(g_get_current_dir());
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/resources/inspector/inspector.html", currentDirectory.get()));
+ GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
} else {
GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list