Skip to content
  • abarth@webkit.org's avatar
    LayoutTestController.dumpConfigurationForViewport should move to Internals · 41d97fbf
    abarth@webkit.org authored
    https://bugs.webkit.org/show_bug.cgi?id=45652
    
    Reviewed by Eric Seidel.
    
    Source/WebCore:
    
    This patch replaces LayoutTestController.dumpConfigurationForViewport
    with Internals.configurationForViewport. The old
    dumpConfigurationForViewport function just ended up calling WebCore
    functions anyway, so there's no benefit in implementing the API in the
    LayoutTestController.
    
    As a result, these tests can now run on every port.
    
    * testing/Internals.cpp:
    (WebCore::Internals::configurationForViewport):
    (WebCore):
    * testing/Internals.h:
    (Internals):
    * testing/Internals.idl:
    
    Source/WebKit/blackberry:
    
    * WebKitSupport/DumpRenderTreeSupport.cpp:
    * WebKitSupport/DumpRenderTreeSupport.h:
    (DumpRenderTreeSupport):
    
    Source/WebKit/efl:
    
    * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
    * WebCoreSupport/DumpRenderTreeSupportEfl.h:
    
    Source/WebKit/gtk:
    
    * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
    * WebCoreSupport/DumpRenderTreeSupportGtk.h:
    (DumpRenderTreeSupportGtk):
    
    Tools:
    
    Remove dumpConfigurationForViewport from LayoutTestController. This API
    has been replaced by an API on Internals that does the same thing in a
    port-agnostic way.
    
    * DumpRenderTree/LayoutTestController.cpp:
    (LayoutTestController::staticFunctions):
    * DumpRenderTree/LayoutTestController.h:
    (LayoutTestController):
    * DumpRenderTree/blackberry/LayoutTestControllerBlackBerry.cpp:
    * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
    * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
    * DumpRenderTree/mac/LayoutTestControllerMac.mm:
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    * DumpRenderTree/qt/LayoutTestControllerQt.h:
    (LayoutTestController):
    * DumpRenderTree/win/LayoutTestControllerWin.cpp:
    * DumpRenderTree/wx/LayoutTestControllerWx.cpp:
    
    LayoutTests:
    
    Update these tests to use the Internals API rather than the
    LayoutTestController API.  This changed the output format of the tests
    slightly because the LayoutTestController API printed directly to
    stdout whereas the new API just returns a string that we pipe to stdout
    using alert.
    
    This patch also cleans up some platform-specific results for these
    tests that had drifted out of sync a bit. The patch also correctly
    marks the legacy tests as failing on GTK instead of checking in bogus
    expected results for them.
    
    This patch unskips these tests on Chromium. Once this patch lands, I'll
    go through an unskip them on the other ports as well.
    
    * fast/viewport/viewport-1-expected.txt:
    * fast/viewport/viewport-1.html:
    * fast/viewport/viewport-10-expected.txt:
    * fast/viewport/viewport-10.html:
    * fast/viewport/viewport-100-expected.txt:
    * fast/viewport/viewport-100.html:
    * fast/viewport/viewport-101-expected.txt:
    * fast/viewport/viewport-101.html:
    * fast/viewport/viewport-102-expected.txt:
    * fast/viewport/viewport-102.html:
    * fast/viewport/viewport-103-expected.txt:
    * fast/viewport/viewport-103.html:
    * fast/viewport/viewport-104-expected.txt:
    * fast/viewport/viewport-104.html:
    * fast/viewport/viewport-105-expected.txt:
    * fast/viewport/viewport-105.html:
    * fast/viewport/viewport-106-expected.txt:
    * fast/viewport/viewport-106.html:
    * fast/viewport/viewport-107-expected.txt:
    * fast/viewport/viewport-107.html:
    * fast/viewport/viewport-108-expected.txt:
    * fast/viewport/viewport-108.html:
    * fast/viewport/viewport-109-expected.txt:
    * fast/viewport/viewport-109.html:
    * fast/viewport/viewport-11-expected.txt:
    * fast/viewport/viewport-11.html:
    * fast/viewport/viewport-110-expected.txt:
    * fast/viewport/viewport-110.html:
    * fast/viewport/viewport-111-expected.txt:
    * fast/viewport/viewport-111.html:
    * fast/viewport/viewport-112-expected.txt:
    * fast/viewport/viewport-112.html:
    * fast/viewport/viewport-113-expected.txt:
    * fast/viewport/viewport-113.html:
    * fast/viewport/viewport-114-expected.txt:
    * fast/viewport/viewport-114.html:
    * fast/viewport/viewport-115-expected.txt:
    * fast/viewport/viewport-115.html:
    * fast/viewport/viewport-116-expected.txt:
    * fast/viewport/viewport-116.html:
    * fast/viewport/viewport-117-expected.txt:
    * fast/viewport/viewport-117.html:
    * fast/viewport/viewport-118-expected.txt:
    * fast/viewport/viewport-118.html:
    * fast/viewport/viewport-119-expected.txt:
    * fast/viewport/viewport-119.html:
    * fast/viewport/viewport-12-expected.txt:
    * fast/viewport/viewport-12.html:
    * fast/viewport/viewport-120-expected.txt:
    * fast/viewport/viewport-120.html:
    * fast/viewport/viewport-121-expected.txt:
    * fast/viewport/viewport-121.html:
    * fast/viewport/viewport-122-expected.txt:
    * fast/viewport/viewport-122.html:
    * fast/viewport/viewport-123-expected.txt:
    * fast/viewport/viewport-123.html:
    * fast/viewport/viewport-124-expected.txt:
    * fast/viewport/viewport-124.html:
    * fast/viewport/viewport-125-expected.txt:
    * fast/viewport/viewport-125.html:
    * fast/viewport/viewport-126-expected.txt: Renamed from LayoutTests/platform/gtk/fast/viewport/viewport-126-expected.txt.
    * fast/viewport/viewport-126.html:
    * fast/viewport/viewport-127-expected.txt: Renamed from LayoutTests/platform/gtk/fast/viewport/viewport-127-expected.txt.
    * fast/viewport/viewport-127.html:
    * fast/viewport/viewport-128-expected.txt:
    * fast/viewport/viewport-128.html:
    * fast/viewport/viewport-129-expected.txt:
    * fast/viewport/viewport-129.html:
    * fast/viewport/viewport-13-expected.txt:
    * fast/viewport/viewport-13.html:
    * fast/viewport/viewport-130-expected.txt:
    * fast/viewport/viewport-130.html:
    * fast/viewport/viewport-131-expected.txt:
    * fast/viewport/viewport-131.html:
    * fast/viewport/viewport-132-expected.txt:
    * fast/viewport/viewport-132.html:
    * fast/viewport/viewport-14-expected.txt:
    * fast/viewport/viewport-14.html:
    * fast/viewport/viewport-15-expected.txt:
    * fast/viewport/viewport-15.html:
    * fast/viewport/viewport-16-expected.txt:
    * fast/viewport/viewport-16.html:
    * fast/viewport/viewport-17-expected.txt:
    * fast/viewport/viewport-17.html:
    * fast/viewport/viewport-18-expected.txt:
    * fast/viewport/viewport-18.html:
    * fast/viewport/viewport-19-expected.txt:
    * fast/viewport/viewport-19.html:
    * fast/viewport/viewport-2-expected.txt:
    * fast/viewport/viewport-2.html:
    * fast/viewport/viewport-20-expected.txt:
    * fast/viewport/viewport-20.html:
    * fast/viewport/viewport-21-expected.txt:
    * fast/viewport/viewport-21.html:
    * fast/viewport/viewport-22-expected.txt:
    * fast/viewport/viewport-22.html:
    * fast/viewport/viewport-23-expected.txt:
    * fast/viewport/viewport-23.html:
    * fast/viewport/viewport-24-expected.txt:
    * fast/viewport/viewport-24.html:
    * fast/viewport/viewport-25-expected.txt:
    * fast/viewport/viewport-25.html:
    * fast/viewport/viewport-26-expected.txt:
    * fast/viewport/viewport-26.html:
    * fast/viewport/viewport-27-expected.txt:
    * fast/viewport/viewport-27.html:
    * fast/viewport/viewport-28-expected.txt:
    * fast/viewport/viewport-28.html:
    * fast/viewport/viewport-29-expected.txt:
    * fast/viewport/viewport-29.html:
    * fast/viewport/viewport-3-expected.txt:
    * fast/viewport/viewport-3.html:
    * fast/viewport/viewport-30-expected.txt:
    * fast/viewport/viewport-30.html:
    * fast/viewport/viewport-31-expected.txt:
    * fast/viewport/viewport-31.html:
    * fast/viewport/viewport-32-expected.txt:
    * fast/viewport/viewport-32.html:
    * fast/viewport/viewport-33-expected.txt:
    * fast/viewport/viewport-33.html:
    * fast/viewport/viewport-34-expected.txt:
    * fast/viewport/viewport-34.html:
    * fast/viewport/viewport-35-expected.txt:
    * fast/viewport/viewport-35.html:
    * fast/viewport/viewport-36-expected.txt:
    * fast/viewport/viewport-36.html:
    * fast/viewport/viewport-37-expected.txt:
    * fast/viewport/viewport-37.html:
    * fast/viewport/viewport-38-expected.txt:
    * fast/viewport/viewport-38.html:
    * fast/viewport/viewport-39-expected.txt:
    * fast/viewport/viewport-39.html:
    * fast/viewport/viewport-4-expected.txt:
    * fast/viewport/viewport-4.html:
    * fast/viewport/viewport-40-expected.txt:
    * fast/viewport/viewport-40.html:
    * fast/viewport/viewport-41-expected.txt:
    * fast/viewport/viewport-41.html:
    * fast/viewport/viewport-42-expected.txt:
    * fast/viewport/viewport-42.html:
    * fast/viewport/viewport-43-expected.txt:
    * fast/viewport/viewport-43.html:
    * fast/viewport/viewport-44-expected.txt:
    * fast/viewport/viewport-44.html:
    * fast/viewport/viewport-45-expected.txt:
    * fast/viewport/viewport-45.html:
    * fast/viewport/viewport-46-expected.txt:
    * fast/viewport/viewport-46.html:
    * fast/viewport/viewport-47-expected.txt:
    * fast/viewport/viewport-47.html:
    * fast/viewport/viewport-48-expected.txt:
    * fast/viewport/viewport-48.html:
    * fast/viewport/viewport-49-expected.txt:
    * fast/viewport/viewport-49.html:
    * fast/viewport/viewport-5-expected.txt:
    * fast/viewport/viewport-5.html:
    * fast/viewport/viewport-50-expected.txt:
    * fast/viewport/viewport-50.html:
    * fast/viewport/viewport-51-expected.txt:
    * fast/viewport/viewport-51.html:
    * fast/viewport/viewport-52-expected.txt:
    * fast/viewport/viewport-52.html:
    * fast/viewport/viewport-53-expected.txt:
    * fast/viewport/viewport-53.html:
    * fast/viewport/viewport-54-expected.txt:
    * fast/viewport/viewport-54.html:
    * fast/viewport/viewport-55-expected.txt:
    * fast/viewport/viewport-55.html:
    * fast/viewport/viewport-56-expected.txt:
    * fast/viewport/viewport-56.html:
    * fast/viewport/viewport-57-expected.txt:
    * fast/viewport/viewport-57.html:
    * fast/viewport/viewport-58-expected.txt:
    * fast/viewport/viewport-58.html:
    * fast/viewport/viewport-59-expected.txt:
    * fast/viewport/viewport-59.html:
    * fast/viewport/viewport-6-expected.txt:
    * fast/viewport/viewport-6.html:
    * fast/viewport/viewport-60-expected.txt:
    * fast/viewport/viewport-60.html:
    * fast/viewport/viewport-61-expected.txt:
    * fast/viewport/viewport-61.html:
    * fast/viewport/viewport-62-expected.txt:
    * fast/viewport/viewport-62.html:
    * fast/viewport/viewport-63-expected.txt:
    * fast/viewport/viewport-63.html:
    * fast/viewport/viewport-64-expected.txt:
    * fast/viewport/viewport-64.html:
    * fast/viewport/viewport-65-expected.txt: Renamed from LayoutTests/platform/gtk/fast/viewport/viewport-65-expected.txt.
    * fast/viewport/viewport-65.html:
    * fast/viewport/viewport-66-expected.txt:
    * fast/viewport/viewport-66.html:
    * fast/viewport/viewport-67-expected.txt:
    * fast/viewport/viewport-67.html:
    * fast/viewport/viewport-68-expected.txt:
    * fast/viewport/viewport-68.html:
    * fast/viewport/viewport-69-expected.txt:
    * fast/viewport/viewport-69.html:
    * fast/viewport/viewport-7-expected.txt:
    * fast/viewport/viewport-7.html:
    * fast/viewport/viewport-70-expected.txt:
    * fast/viewport/viewport-70.html:
    * fast/viewport/viewport-71-expected.txt:
    * fast/viewport/viewport-71.html:
    * fast/viewport/viewport-72-expected.txt:
    * fast/viewport/viewport-72.html:
    * fast/viewport/viewport-73-expected.txt:
    * fast/viewport/viewport-73.html:
    * fast/viewport/viewport-74-expected.txt:
    * fast/viewport/viewport-74.html:
    * fast/viewport/viewport-75-expected.txt:
    * fast/viewport/viewport-75.html:
    * fast/viewport/viewport-76-expected.txt:
    * fast/viewport/viewport-76.html:
    * fast/viewport/viewport-77-expected.txt:
    * fast/viewport/viewport-77.html:
    * fast/viewport/viewport-78-expected.txt:
    * fast/viewport/viewport-78.html:
    * fast/viewport/viewport-79-expected.txt:
    * fast/viewport/viewport-79.html:
    * fast/viewport/viewport-8-expected.txt:
    * fast/viewport/viewport-8.html:
    * fast/viewport/viewport-80-expected.txt:
    * fast/viewport/viewport-80.html:
    * fast/viewport/viewport-81-expected.txt:
    * fast/viewport/viewport-81.html:
    * fast/viewport/viewport-82-expected.txt: Renamed from LayoutTests/platform/gtk/fast/viewport/viewport-82-expected.txt.
    * fast/viewport/viewport-82.html:
    * fast/viewport/viewport-83-expected.txt:
    * fast/viewport/viewport-83.html:
    * fast/viewport/viewport-84-expected.txt: Renamed from LayoutTests/platform/efl/fast/viewport/viewport-87-expected.txt.
    * fast/viewport/viewport-84.html:
    * fast/viewport/viewport-85-expected.txt:
    * fast/viewport/viewport-85.html:
    * fast/viewport/viewport-86-expected.txt:
    * fast/viewport/viewport-86.html:
    * fast/viewport/viewport-87-expected.txt: Renamed from LayoutTests/platform/gtk/fast/viewport/viewport-87-expected.txt.
    * fast/viewport/viewport-87.html:
    * fast/viewport/viewport-88-expected.txt:
    * fast/viewport/viewport-88.html:
    * fast/viewport/viewport-9-expected.txt:
    * fast/viewport/viewport-9.html:
    * fast/viewport/viewport-90-expected.txt:
    * fast/viewport/viewport-90.html:
    * fast/viewport/viewport-91-expected.txt:
    * fast/viewport/viewport-91.html:
    * fast/viewport/viewport-legacy-handheldfriendly-expected.txt:
    * fast/viewport/viewport-legacy-handheldfriendly.html:
    * fast/viewport/viewport-legacy-mobileoptimized-2-expected.txt:
    * fast/viewport/viewport-legacy-mobileoptimized-2.html:
    * fast/viewport/viewport-legacy-mobileoptimized-3-expected.txt:
    * fast/viewport/viewport-legacy-mobileoptimized-3.html:
    * fast/viewport/viewport-legacy-mobileoptimized-expected.txt:
    * fast/viewport/viewport-legacy-mobileoptimized.html:
    * fast/viewport/viewport-legacy-ordering-1-expected.txt:
    * fast/viewport/viewport-legacy-ordering-1.html:
    * fast/viewport/viewport-legacy-ordering-2-expected.txt:
    * fast/viewport/viewport-legacy-ordering-2.html:
    * fast/viewport/viewport-legacy-ordering-3-expected.txt:
    * fast/viewport/viewport-legacy-ordering-3.html:
    * fast/viewport/viewport-legacy-ordering-4-expected.txt:
    * fast/viewport/viewport-legacy-ordering-4.html:
    * fast/viewport/viewport-legacy-ordering-5-expected.txt:
    * fast/viewport/viewport-legacy-ordering-5.html:
    * fast/viewport/viewport-legacy-ordering-6-expected.txt:
    * fast/viewport/viewport-legacy-ordering-6.html:
    * fast/viewport/viewport-legacy-ordering-7-expected.txt:
    * fast/viewport/viewport-legacy-ordering-7.html:
    * fast/viewport/viewport-legacy-ordering-8-expected.txt:
    * fast/viewport/viewport-legacy-ordering-8.html:
    * fast/viewport/viewport-legacy-ordering-9-expected.txt:
    * fast/viewport/viewport-legacy-ordering-9.html:
    * fast/viewport/viewport-legacy-xhtmlmp-misplaced-doctype-expected.txt:
    * fast/viewport/viewport-legacy-xhtmlmp-misplaced-doctype.html:
    * fast/viewport/viewport-legacy-xhtmlmp-ordering-expected.txt:
    * fast/viewport/viewport-legacy-xhtmlmp-ordering.html:
    * fast/viewport/viewport-legacy-xhtmlmp.html:
    * fast/viewport/viewport-warnings-1-expected.txt:
    * fast/viewport/viewport-warnings-1.html:
    * fast/viewport/viewport-warnings-2-expected.txt:
    * fast/viewport/viewport-warnings-2.html:
    * fast/viewport/viewport-warnings-3-expected.txt:
    * fast/viewport/viewport-warnings-3.html:
    * fast/viewport/viewport-warnings-4-expected.txt:
    * fast/viewport/viewport-warnings-4.html:
    * fast/viewport/viewport-warnings-5-expected.txt:
    * fast/viewport/viewport-warnings-5.html:
    * fast/viewport/viewport-warnings-6-expected.txt:
    * fast/viewport/viewport-warnings-6.html:
    * platform/chromium/TestExpectations:
    * platform/efl/fast/viewport/viewport-126-expected.txt: Removed.
    * platform/efl/fast/viewport/viewport-127-expected.txt: Removed.
    * platform/efl/fast/viewport/viewport-65-expected.txt: Removed.
    * platform/efl/fast/viewport/viewport-82-expected.txt: Removed.
    * platform/efl/fast/viewport/viewport-84-expected.txt: Removed.
    * platform/gtk/TestExpectations:
    * platform/gtk/fast/viewport/viewport-84-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-handheldfriendly-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-mobileoptimized-2-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-mobileoptimized-3-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-mobileoptimized-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-ordering-5-expected.txt: Removed.
    * platform/gtk/fast/viewport/viewport-legacy-ordering-6-expected.txt: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@122204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    41d97fbf