[EFL] WebInspector: Move to new webinspector
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Sep 2013 21:28:25 +0000 (21:28 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Sep 2013 21:28:25 +0000 (21:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=119559

.:

Patch by Marcelo Morais <m.morais@samsung.com> on 2013-09-10
Reviewed by Gyuyoung Kim.

Enabling the new Web Inspector on EFL port.
Co-author: Andre Loureiro <andre.vl@samsung.com>

* Source/PlatformEfl.cmake:
* Source/cmake/OptionsEfl.cmake:

Source/WebKit/efl:

Patch by Marcelo Morais <m.morais@samsung.com> on 2013-09-10
Reviewed by Gyuyoung Kim.

Loading the new Web Inspector page instead of the old inspector.
Co-author: Andre Loureiro <andre.vl@samsung.com>

* WebCoreSupport/InspectorClientEfl.cpp:
(WebCore::InspectorClientEfl::openInspectorFrontend):

Source/WebKit2:

Patch by Marcelo Morais <m.morais@samsung.com> on 2013-09-10
Reviewed by Gyuyoung Kim.

Loading the new Web Inspector page instead of the old inspector.
Co-Author: Andre Loureiro <andre.vl@samsung.com>

* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::inspectorPageURL):

LayoutTests:

Patch by Marcelo Morais <m.morais@samsung.com> on 2013-09-10
Reviewed by Gyuyoung Kim.

Skipping the tests for the old inspector.

* platform/efl-wk1/TestExpectations:
* platform/efl-wk2/TestExpectations:
* platform/efl/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
LayoutTests/ChangeLog
LayoutTests/platform/efl-wk1/TestExpectations
LayoutTests/platform/efl-wk2/TestExpectations
LayoutTests/platform/efl/TestExpectations
Source/PlatformEfl.cmake
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp
Source/cmake/OptionsEfl.cmake

index f331700..2a15eb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-09-10  Marcelo Morais  <m.morais@samsung.com>
+
+        [EFL] WebInspector: Move to new webinspector
+        https://bugs.webkit.org/show_bug.cgi?id=119559
+
+        Reviewed by Gyuyoung Kim.
+
+        Enabling the new Web Inspector on EFL port.
+        Co-author: Andre Loureiro <andre.vl@samsung.com>
+
+        * Source/PlatformEfl.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+
 2013-09-06  Zan Dobersek  <zdobersek@igalia.com>
 
         REGRESSION(r155143): Build failures on GTK port with Clang and libstdc++ < 4.8.1
index ca52ee8..659a0cb 100644 (file)
@@ -1,3 +1,16 @@
+2013-09-10  Marcelo Morais  <m.morais@samsung.com>
+
+        [EFL] WebInspector: Move to new webinspector
+        https://bugs.webkit.org/show_bug.cgi?id=119559
+
+        Reviewed by Gyuyoung Kim.
+        
+        Skipping the tests for the old inspector.
+
+        * platform/efl-wk1/TestExpectations:
+        * platform/efl-wk2/TestExpectations:
+        * platform/efl/TestExpectations:
+
 2013-09-10  Oliver Hunt  <oliver@apple.com>
 
         Support WeakMap
index ee8225f..c6d6d6f 100644 (file)
@@ -236,7 +236,6 @@ webkit.org/b/86498 http/tests/appcache/origins-with-appcache.html [ Failure ]
 webkit.org/b/84589 fast/animation/request-animation-frame-during-modal.html [ Failure ]
 webkit.org/b/84589 fast/dom/Window/open-window-min-size.html [ Failure ]
 webkit.org/b/84589 http/tests/security/cross-frame-access-call.html [ Failure ]
-webkit.org/b/84589 inspector/console/console-long-eval-crash.html [ Failure ]
 
 # Needs custom policy delegate enhancement to log DOM node info - EFL port is missing DOM node abstraction
 webkit.org/b/87972 fast/forms/mailto/formenctype-attribute-button-html.html [ Failure ]
@@ -313,10 +312,6 @@ fast/block/lineboxcontain/block-font.html
 fast/block/lineboxcontain/block-glyphs.html
 fast/block/lineboxcontain/font.html
 
-# following tests started failing on EFL after r122952.
-webkit.org/b/82886 inspector/styles/override-screen-size.html
-inspector/timeline/timeline-paint.html
-
 # Incorrect rendering results after r115846
 webkit.org/b/85599 http/tests/navigation/postredirect-basic.html [ Failure ]
 webkit.org/b/85599 http/tests/navigation/postredirect-goback1.html [ Failure ]
@@ -365,7 +360,6 @@ webkit.org/b/77219 http/tests/canvas/webgl/origin-clean-conformance.html [ Skip
 webkit.org/b/77219 http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html [ Skip ]
 webkit.org/b/77219 http/tests/security/webgl-remote-read-remote-image-allowed.html [ Skip ]
 webkit.org/b/77219 http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html [ Skip ]
-webkit.org/b/77219 inspector/profiler/webgl [ Skip ]
 webkit.org/b/77219 fast/canvas/webgl/oes-vertex-array-object.html [ Skip ]
 webkit.org/b/77219 fast/canvas/webgl/read-pixels-test.html [ Skip ]
 webkit.org/b/77219 fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html [ Skip ]
index 62a3245..9de9690 100644 (file)
@@ -71,56 +71,12 @@ webkit.org/b/109945 webgl/conformance/uniforms/uniform-default-values.html [ Cra
 #////////////////////////////////////////////////////////////////////////////////////////
 
 webkit.org/b/97560 http/tests/inspector/extensions-useragent.html [ Failure Pass ]
-webkit.org/b/97560 inspector/extensions/extensions-api.html [ Failure Pass ]
-webkit.org/b/97560 inspector/extensions/extensions-audits.html [ Failure Pass ]
 webkit.org/b/111612 animations/animation-delay-changed.html [ Failure Pass ]
 
 Bug(EFL) editing/deleting/4875189.html [ Crash Pass ]
 Bug(EFL) editing/selection/first-letter-selection-crash.html [ Crash Pass ]
 Bug(EFL) editing/selection/fake-doubleclick.html [ Failure Pass ]
 Bug(EFL) http/tests/security/contentSecurityPolicy/connect-src-websocket-blocked.html [ Crash Pass ]
-Bug(EFL) inspector/elements/delete-from-document.html [ Failure Pass ]
-Bug(EFL) inspector/elements/insert-node.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-inspect-iframe-from-different-domain.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-styles.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-selection-on-refresh.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-limited-children.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-reload-assert.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-rewrite-href.html [ Failure Pass ]
-Bug(EFL) inspector/elements/event-listener-sidebar.html [ Failure Pass ]
-Bug(EFL) inspector/elements/elements-panel-structure.html [ Failure Pass ]
-Bug(EFL) inspector/elements/highlight-node-scaled.html [ Failure Pass ]
-Bug(EFL) inspector/console/console-format.html [ Failure Pass ]
-Bug(EFL) inspector/console/command-line-api-inspect.html [ Failure Pass ]
-Bug(EFL) inspector/console/console-api-on-call-frame.html [ Failure Pass ]
-Bug(EFL) inspector/console/console-big-array.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-activation-crash2.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-breakpoints-not-activated-on-reload.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-eval-while-paused.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/callstack-placards-discarded.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-autocontinue-on-syntax-error.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-activation-crash.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-pause-in-eval-script.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-pause-on-debugger-statement.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-pause-on-failed-assertion.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-proto-property.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-set-breakpoint-regex.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/debugger-step-out.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/pause-in-inline-script.html [ Failure Pass ]
-Bug(EFL) inspector/debugger/breakpoint-manager.html [ Crash Failure Pass ]
-Bug(EFL) inspector/debugger/copy-stack-trace.html [ Failure Pass ]
-Bug(EFL) inspector/timeline/timeline-animation-frame.html [ Failure Pass ]
-Bug(EFL) inspector/timeline/timeline-timer.html [ Failure Pass ]
-Bug(EFL) inspector/cookie-parser.html [ Failure Pass ]
-Bug(EFL) inspector/profiler/cpu-profiler-profiling.html [ Failure Pass ]
-Bug(EFL) inspector/extensions/extensions-resources.html [ Failure Pass ]
-Bug(EFL) inspector/extensions/extensions-audits-api.html [ Failure Pass ]
-Bug(EFL) inspector/extensions/extensions-reload.html [ Failure Pass ]
-Bug(EFL) inspector/editor/highlighter-basics.html [ Failure Pass ]
-Bug(EFL) inspector/editor/highlighter-long-line.html [ Failure Pass ]
-Bug(EFL) inspector/audits/audits-panel-functional.html [ Failure Pass ]
-Bug(EFL) inspector/runtime/runtime-callFunctionOn.html [ Failure Pass ]
-Bug(EFL) inspector/storage-panel-dom-storage-update.html [ Failure Pass ]
 Bug(EFL) media/video-played-reset.html [ Failure Pass ]
 Bug(EFL) fast/loader/fragment-after-redirect-gets-back-entry.html [ Failure Pass ]
 Bug(EFL) fast/loader/child-frame-add-after-back-forward.html [ Failure Pass ]
@@ -137,19 +93,6 @@ Bug(EFL) media/track/track-element-load-event.html [ Crash Failure Pass ]
 
 webkit.org/b/98761 svg/text/selection-tripleclick.svg [ Failure Pass ]
 
-# ASSERTION FAILED: m_suspended in WebCore::SuspendableTimer::resume()
-webkit.org/b/81574 inspector/debugger/debugger-no-nested-pause.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-pause-in-internal.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-pause-on-exception.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-reload-on-pause.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-scripts.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-step-in.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/debugger-step-over.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/disable-script.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/function-details.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/script-extract-outline.html [ Crash Failure Pass ]
-webkit.org/b/81574 inspector/debugger/source-frame-count.html [ Crash Failure Pass ]
-
 # Test is flaky and needs to be fixed
 webkit.org/b/56985 http/tests/loading/bad-server-subframe.html [ Crash Pass ]
 
@@ -173,8 +116,6 @@ webkit.org/b/102204 http/tests/security/frameNavigation/inactive-function-in-pop
 webkit.org/b/95428 media/video-controls-captions.html [ Failure ]
 webkit.org/b/113106 media/track/track-prefer-captions.html [ Failure ]
 
-webkit.org/b/113513 inspector/styles/paste-property.html [ Failure ]
-
 # Flaky on Debug bot. See also webkit.org/b/102190
 webkit.org/b/103043 fast/events/overflow-scroll-fake-mouse-move.html [ Failure Pass ]
 webkit.org/b/103043 fast/events/frame-scroll-fake-mouse-move.html [ Failure Pass ]
index 0db639b..64f4f7c 100644 (file)
@@ -268,8 +268,7 @@ http/tests/xmlhttprequest/cross-origin-no-authorization.html
 http/tests/xmlhttprequest/logout.html
 http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
 
-# These test -apple- and -khtml- prefixed CSS properties, which we don't support.
-inspector/styles/vendor-prefixes.html [ WontFix ]
+webkit.org/b/121096 inspector [ Skip ]
 
 # There are no expected result set yet.
 editing/unsupported-content/list-delete-001.html 
@@ -303,15 +302,6 @@ fast/profiler/dead-time.html
 
 # following tests started failing on EFL afrer r122952.
 http/tests/inspector/resource-parameters.html
-inspector/styles/svg-style.xhtml
-inspector/debugger/live-edit.html
-inspector/debugger/live-edit-breakpoints.html
-inspector/debugger/debugger-compile-and-run.html
-
-webkit.org/b/88780 inspector/debugger/dom-breakpoints.html [ Timeout Failure ]
-webkit.org/b/88780 inspector/debugger/event-listener-breakpoints.html [ Failure ]
-webkit.org/b/88780 inspector/debugger/step-through-event-listeners.html [ Failure ]
-webkit.org/b/89056 inspector/debugger/xhr-breakpoints.html [ Failure Timeout ]
 
 # ENABLE(DRAGGABLE_REGION) is disabled
 fast/css/draggable-region-parser.html
@@ -370,7 +360,6 @@ Bug(EFL) fast/dom/shadow [ WontFix ]
 Bug(EFL) editing/text-iterator/basic-iteration-shadowdom.html [ WontFix ]
 Bug(EFL) accessibility/corresponding-control-deleted-crash.html [ WontFix ]
 Bug(EFL) fast/dom/HTMLTemplateElement/cycles-in-shadow.html [ WontFix ]
-Bug(EFL) inspector/elements/update-shadowdom.html [ WontFix ]
 
 # Rounding issues when running on 32-bits machines.
 svg/css/stars-with-shadow.html
@@ -508,7 +497,6 @@ webkit.org/b/101809 fast/canvas/canvas-resize-reset-pixelRatio.html [ Skip ]
 # DeviceOrientation support is not enabled by default.
 Bug(EFL) fast/dom/DeviceOrientation [ Skip ]
 Bug(EFL) fast/dom/Window/window-properties-device-orientation.html [ Skip ]
-Bug(EFL) inspector/device-orientation-success.html [ Skip ]
 
 # EFL port does not enable ORIENTATION_EVENTS
 webkit.org/b/90928 fast/dom/Orientation [ Skip ]
@@ -628,15 +616,6 @@ webkit.org/b/78869 http/tests/inspector/inspect-element.html [ Failure Pass ]
 webkit.org/b/91958 http/tests/inspector-enabled/injected-script-discard.html [ Failure Pass ]
 webkit.org/b/85615 http/tests/inspector/resource-har-pages.html [ Failure Pass ]
 Bug(EFL) http/tests/inspector/search/resources-search-match-index.html [ Failure Pass ]
-webkit.org/b/93820 inspector/console/console-format-collections.html [ Failure Pass ]
-webkit.org/b/96886 [ Release ] inspector/debugger/dynamic-script-tag.html [ Failure Pass ]
-webkit.org/b/114160 [ Debug ] inspector/debugger/dynamic-script-tag.html [ Crash Failure Pass ]
-
-Bug(EFL) inspector/profiler/heap-snapshot.html [ Failure Pass ]
-Bug(EFL) inspector/timeline/timeline-enum-stability.html [ Failure Pass ]
-
-# New test added in r139405 that gives different output every run.
-webkit.org/b/104384 inspector/debugger/debugger-script-preprocessor.html [ Failure Pass ]
 
 # Sometimes asserts in MessagePort::contextDestroyed
 webkit.org/b/94458 http/tests/security/XFrameOptions/x-frame-options-deny-meta-tag-in-body.html [ Crash Failure Pass ]
@@ -1068,8 +1047,6 @@ Bug(EFL) storage/domstorage/localstorage/storagetracker
 
 # JSC does not support setIsolatedWorldSecurityOrigin.
 webkit.org/b/61540 http/tests/security/isolatedWorld/cross-origin-xhr.html [ Failure ]
-webkit.org/b/61540 inspector/extensions/extensions-audits-content-script.html [ Failure ]
-webkit.org/b/61540 inspector/extensions/extensions-eval-content-script.html [ Failure ]
 
 #__worldID is undefined in isolated world
 Bug(EFL) http/tests/security/isolatedWorld/didClearWindowObject.html
@@ -1257,9 +1234,6 @@ Bug(EFL) fast/media/media-query-list-06.html [ Failure ]
 # EFL's TestRunner should support for the Geolocation API
 webkit.org/b/82140 fast/dom/Geolocation [ Skip ]
 webkit.org/b/82140 fast/dom/Window/window-properties-geolocation.html [ Failure ]
-webkit.org/b/82140 inspector/geolocation-error.html [ Failure ]
-webkit.org/b/82140 inspector/geolocation-success.html [ Failure ]
-webkit.org/b/82140 inspector/geolocation-watchPosition.html [ Failure ]
 
 # IETC namespace failures
 webkit.org/b/86142 ietestcenter/css3/namespaces/syntax-021.xml [ ImageOnlyFailure ]
@@ -1336,16 +1310,6 @@ webkit.org/b/61799 canvas/philip/tests/2d.text.draw.space.collapse.start.html [
 webkit.org/b/61799 canvas/philip/tests/2d.text.measure.width.space.html [ Failure ]
 
 # JSC doesn't support heap profiling
-webkit.org/b/50485 inspector/profiler/heap-snapshot-inspect-dom-wrapper.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-comparison-dom-groups-change.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-comparison-show-all.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-loader.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-reveal-in-dominators-view.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-retainers.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-show-ranges.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting-fields.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting.html [ Skip ]
-webkit.org/b/50485 inspector/profiler/heap-snapshot-summary-sorting-instances.html [ Skip ]
 webkit.org/b/50485 inspector-protocol/heap-profiler [ Skip ]
 
 webkit.org/b/93976 fast/css-generated-content/quotes-lang.html [ ImageOnlyFailure ]
@@ -1368,9 +1332,6 @@ webkit.org/b/84037 fast/text/international/spaces-combined-in-vertical-text.html
 # Failed table/mozilla test, fields are not on the same line
 webkit.org/b/97109 tables/mozilla/bugs/bug99948.html [ Pass ]
 
-# New test introduced in r125790 fails
-webkit.org/b/94341 inspector/timeline/timeline-decode-resize.html [ Failure ]
-
 # Fails after r126350
 webkit.org/b/94788 media/track/track-cue-rendering-snap-to-lines-not-set.html [ Failure ]
 
@@ -1421,10 +1382,6 @@ webkit.org/b/100324 css3/supports-dom-api.html
 # fast/selectors/unqualified-hover-quirks.html or itself.
 webkit.org/b/10890 fast/selectors/unqualified-hover-strict.html [ Failure Pass ]
 
-webkit.org/b/73936 inspector/profiler/canvas2d/canvas-has-uninstrumented-canvases.html
-webkit.org/b/73936 inspector/profiler/canvas2d/canvas-stack-trace.html
-webkit.org/b/73936 inspector/profiler/canvas2d/canvas-replay-log-grid.html
-
 # EFL port does not support Emacs commands.
 Bug(EFL) editing/pasteboard/emacs-cntl-y-001.html [ Missing ]
 Bug(EFL) editing/pasteboard/emacs-ctrl-a-k-y.html [ Missing ]
@@ -1594,13 +1551,6 @@ webkit.org/b/106439 editing/pasteboard/paste-noplugin.html [ Failure ]
 # Mark as missing image result, same as other ports. Test should be updated to text-based repaint test.
 webkit.org/b/103955 fast/repaint/caret-with-transformation.html [ Missing ]
 
-# New inspector/editor/text-editor-formatter.html introduced in r139617 fails on EFL, Mac, QT
-# https://bugs.webkit.org/show_bug.cgi?id=106883
-inspector/editor/text-editor-formatter.html
-inspector/editor/text-editor-word-jumps.html
-inspector/editor/text-editor-home-button.html
-inspector/editor/text-editor-smart-braces.html
-
 # Test fails on JSC platforms due to GC timing problems
 webkit.org/b/106957 svg/dom/SVGViewSpec-invalid-ref-crash.html [ Failure ]
 
index 3750282..a2867f2 100644 (file)
@@ -3,10 +3,8 @@ add_subdirectory(${WEBCORE_DIR}/platform/efl/DefaultTheme)
 if (ENABLE_INSPECTOR)
     add_custom_target(
         web-inspector-resources ALL
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBCORE_DIR}/inspector/front-end ${WEB_INSPECTOR_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
+        COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
         DEPENDS WebCore
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )
@@ -16,15 +14,15 @@ if (ENABLE_INSPECTOR)
                        PATTERN "*.html"
                        PATTERN "*.css"
                        PATTERN "*.gif"
-                       PATTERN "*.png")
+                       PATTERN "*.png"
+                       PATTERN "*.svg")
 
     find_program(UGLIFYJS_EXECUTABLE uglifyjs)
     if (UGLIFYJS_EXECUTABLE AND (NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug"))
-        file(GLOB frontend_js_files "${WEBCORE_DIR}/inspector/front-end/*.js")
+        file(GLOB frontend_js_files "${WEBINSPECTORUI_DIR}/UserInterface/*.js")
         set(all_js_files
             ${frontend_js_files}
-            "${WEBCORE_DIR}/English.lproj/localizedStrings.js"
-            "${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js"
+            "${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js"
         )
 
         foreach (js_file ${all_js_files})
@@ -34,5 +32,14 @@ if (ENABLE_INSPECTOR)
                     COMMAND ${UGLIFYJS_EXECUTABLE} --overwrite ${filename}
                     WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${WEB_INSPECTOR_DIR})")
         endforeach ()
+
+        file(GLOB codemirror_js_files "${WEBINSPECTORUI_DIR}/UserInterface/External/CodeMirror/*.js")
+        foreach (js_file ${codemirror_js_files})
+            get_filename_component(filename ${js_file} NAME)
+            install(CODE
+                "execute_process(
+                    COMMAND ${UGLIFYJS_EXECUTABLE} --overwrite ${filename}
+                    WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${WEB_INSPECTOR_DIR}/External/CodeMirror/)")
+        endforeach ()
     endif ()
 endif ()
index 6515861..215d182 100644 (file)
@@ -1,3 +1,16 @@
+2013-09-10  Marcelo Morais  <m.morais@samsung.com>
+
+        [EFL] WebInspector: Move to new webinspector
+        https://bugs.webkit.org/show_bug.cgi?id=119559
+
+        Reviewed by Gyuyoung Kim.
+
+        Loading the new Web Inspector page instead of the old inspector.
+        Co-author: Andre Loureiro <andre.vl@samsung.com>
+
+        * WebCoreSupport/InspectorClientEfl.cpp:
+        (WebCore::InspectorClientEfl::openInspectorFrontend):
+
 2013-09-05  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [CMAKE] Add c++0x into CXX_FLAGS as a default
index b73957e..012f6e8 100644 (file)
@@ -94,7 +94,7 @@ InspectorFrontendChannel* InspectorClientEfl::openInspectorFrontend(InspectorCon
 
     m_inspectorView = inspectorView;
 
-    String inspectorUri = inspectorFilesPath() + "/inspector.html";
+    String inspectorUri = inspectorFilesPath() + "/Main.html";
     ewk_view_uri_set(m_inspectorView, inspectorUri.utf8().data());
 
     OwnPtr<InspectorFrontendClientEfl> frontendClient = adoptPtr(new InspectorFrontendClientEfl(m_inspectedView, m_inspectorView, this));
index 1eeeb5c..444ea89 100644 (file)
@@ -1,3 +1,16 @@
+2013-09-10  Marcelo Morais  <m.morais@samsung.com>
+
+        [EFL] WebInspector: Move to new webinspector
+        https://bugs.webkit.org/show_bug.cgi?id=119559
+
+        Reviewed by Gyuyoung Kim.
+
+        Loading the new Web Inspector page instead of the old inspector.
+        Co-Author: Andre Loureiro <andre.vl@samsung.com>
+
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        (WebKit::WebInspectorProxy::inspectorPageURL):
+
 2013-09-10  Sergio Villar Senin  <svillar@igalia.com>
 
         [WK2][GTK] Frequent crashes when showing context menus in Debug builds
index 19fee00..ce75d53 100644 (file)
@@ -172,7 +172,7 @@ String WebInspectorProxy::inspectorPageURL() const
 {
     StringBuilder builder;
     builder.append(inspectorBaseURL());
-    builder.appendLiteral("/inspector.html");
+    builder.appendLiteral("/Main.html");
 
     return builder.toString();
 }
index 1bb5874..2800a20 100644 (file)
@@ -234,6 +234,7 @@ endif ()
 
 if (ENABLE_INSPECTOR)
     set(WEB_INSPECTOR_DIR "${DATA_INSTALL_DIR}/inspector")
+    set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
     add_definitions(-DWEB_INSPECTOR_DIR=\"${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}\")
     add_definitions(-DWEB_INSPECTOR_INSTALL_DIR=\"${CMAKE_INSTALL_PREFIX}/${WEB_INSPECTOR_DIR}\")
 endif ()