Changeset 133266 in webkit
- Timestamp:
- Nov 1, 2012 10:54:31 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r133264 r133266 1 2012-11-01 Seonae Kim <sunaeluv.kim@samsung.com> 2 3 [EFL][DRT] Support Geolocation 4 https://bugs.webkit.org/show_bug.cgi?id=97427 5 6 Reviewed by Gyuyoung Kim. 7 8 Change the comment of Geolocation test cases. 9 10 * platform/efl/TestExpectations: 11 1 12 2012-11-01 Simon Fraser <simon.fraser@apple.com> 2 13 -
trunk/LayoutTests/platform/efl/TestExpectations
r133224 r133266 1338 1338 webkit.org/b/68591 http/tests/inspector/filesystem 1339 1339 1340 # The EFL port has no support for the Geolocation1340 # EFL's TestRunner should support for the Geolocation API 1341 1341 webkit.org/b/82140 fast/dom/Geolocation [ Skip ] 1342 1342 webkit.org/b/82140 fast/dom/Window/window-properties-geolocation.html [ Failure ] -
trunk/Source/WebKit/ChangeLog
r133094 r133266 1 2012-11-01 Seonae Kim <sunaeluv.kim@samsung.com> 2 3 [EFL][DRT] Support Geolocation 4 https://bugs.webkit.org/show_bug.cgi?id=97427 5 6 Reviewed by Gyuyoung Kim. 7 8 Add a mock directory to use GeolocationClientMock in DumpRenderTree. 9 10 * PlatformEfl.cmake: 11 1 12 2012-10-31 Otto Derek Cheung <otcheung@rim.com> 2 13 -
trunk/Source/WebKit/PlatformEfl.cmake
r133000 r133266 8 8 "${WEBCORE_DIR}/platform/graphics/cairo" 9 9 "${WEBCORE_DIR}/platform/graphics/efl" 10 "${WEBCORE_DIR}/platform/mock" 10 11 "${WEBCORE_DIR}/platform/network/soup" 11 12 ${CAIRO_INCLUDE_DIRS} … … 84 85 "${WEBCORE_DIR}/platform/graphics/texmap" 85 86 "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG" 87 ) 88 ENDIF () 89 90 IF (ENABLE_GEOLOCATION) 91 LIST(APPEND WebKit_INCLUDE_DIRECTORIES 92 "${WEBCORE_DIR}/Modules/geolocation" 86 93 ) 87 94 ENDIF () -
trunk/Source/WebKit/efl/ChangeLog
r133000 r133266 1 2012-11-01 Seonae Kim <sunaeluv.kim@samsung.com> 2 3 [EFL][DRT] Support Geolocation 4 https://bugs.webkit.org/show_bug.cgi?id=97427 5 6 Reviewed by Gyuyoung Kim. 7 8 Implement methods to use GeolocationClientMock in DumpRenderTree. 9 This client attaches to the page whenever a view is created. 10 11 * WebCoreSupport/DumpRenderTreeSupportEfl.cpp: 12 (DumpRenderTreeSupportEfl::attachClientToPage): 13 (DumpRenderTreeSupportEfl::resetGeolocationClientMock): 14 (DumpRenderTreeSupportEfl::setMockGeolocationPermission): 15 (DumpRenderTreeSupportEfl::setMockGeolocationPosition): 16 (DumpRenderTreeSupportEfl::setMockGeolocationPositionUnavailableError): 17 (DumpRenderTreeSupportEfl::numberOfPendingGeolocationPermissionRequests): 18 * WebCoreSupport/DumpRenderTreeSupportEfl.h: 19 1 20 2012-10-31 Michał Pakuła vel Rutka <m.pakula@samsung.com> 2 21 -
trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
r131991 r133266 63 63 #include <wtf/HashMap.h> 64 64 65 #if ENABLE(GEOLOCATION) 66 #include <GeolocationClientMock.h> 67 #include <GeolocationController.h> 68 #include <GeolocationError.h> 69 #include <GeolocationPosition.h> 70 #include <wtf/CurrentTime.h> 71 #endif 72 65 73 #define DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, ...) \ 66 74 WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame); \ … … 72 80 if (!page) \ 73 81 return __VA_ARGS__; 74 82 83 bool DumpRenderTreeSupportEfl::s_drtRun = false; 84 85 void DumpRenderTreeSupportEfl::setDumpRenderTreeModeEnabled(bool enabled) 86 { 87 s_drtRun = enabled; 88 } 89 90 bool DumpRenderTreeSupportEfl::dumpRenderTreeModeEnabled() 91 { 92 return s_drtRun; 93 } 94 75 95 unsigned DumpRenderTreeSupportEfl::activeAnimationsCount(const Evas_Object* ewkFrame) 76 96 { … … 780 800 WebCore::SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme); 781 801 } 802 803 void DumpRenderTreeSupportEfl::resetGeolocationClientMock(const Evas_Object* ewkView) 804 { 805 #if ENABLE(GEOLOCATION) 806 DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page); 807 808 WebCore::GeolocationClientMock* mock = static_cast<WebCore::GeolocationClientMock*>(WebCore::GeolocationController::from(page)->client()); 809 mock->reset(); 810 #else 811 UNUSED_PARAM(ewkView); 812 #endif 813 } 814 815 void DumpRenderTreeSupportEfl::setMockGeolocationPermission(const Evas_Object* ewkView, bool allowed) 816 { 817 #if ENABLE(GEOLOCATION) 818 DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page); 819 820 WebCore::GeolocationClientMock* mock = static_cast<WebCore::GeolocationClientMock*>(WebCore::GeolocationController::from(page)->client()); 821 mock->setPermission(allowed); 822 #else 823 UNUSED_PARAM(ewkView); 824 UNUSED_PARAM(allowed); 825 #endif 826 } 827 828 void DumpRenderTreeSupportEfl::setMockGeolocationPosition(const Evas_Object* ewkView, double latitude, double longitude, double accuracy, bool canProvideAltitude, double altitude, bool canProvideAltitudeAccuracy, double altitudeAccuracy, bool canProvideHeading, double heading, bool canProvideSpeed, double speed) 829 { 830 #if ENABLE(GEOLOCATION) 831 DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page); 832 833 WebCore::GeolocationClientMock* mock = static_cast<WebCore::GeolocationClientMock*>(WebCore::GeolocationController::from(page)->client()); 834 mock->setPosition(WebCore::GeolocationPosition::create(currentTime(), latitude, longitude, accuracy, canProvideAltitude, altitude, canProvideAltitudeAccuracy, altitudeAccuracy, canProvideHeading, heading, canProvideSpeed, speed)); 835 #else 836 UNUSED_PARAM(ewkView); 837 UNUSED_PARAM(latitude); 838 UNUSED_PARAM(longitude); 839 UNUSED_PARAM(accuracy); 840 UNUSED_PARAM(canProvideAltitude); 841 UNUSED_PARAM(altitude); 842 UNUSED_PARAM(canProvideAltitudeAccuracy); 843 UNUSED_PARAM(altitudeAccuracy); 844 UNUSED_PARAM(canProvideHeading); 845 UNUSED_PARAM(heading); 846 UNUSED_PARAM(canProvideSpeed); 847 UNUSED_PARAM(speed); 848 #endif 849 } 850 851 void DumpRenderTreeSupportEfl::setMockGeolocationPositionUnavailableError(const Evas_Object* ewkView, const char* errorMessage) 852 { 853 #if ENABLE(GEOLOCATION) 854 DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page); 855 856 WebCore::GeolocationClientMock* mock = static_cast<WebCore::GeolocationClientMock*>(WebCore::GeolocationController::from(page)->client()); 857 mock->setPositionUnavailableError(errorMessage); 858 #else 859 UNUSED_PARAM(ewkView); 860 UNUSED_PARAM(errorMessage); 861 #endif 862 } 863 864 int DumpRenderTreeSupportEfl::numberOfPendingGeolocationPermissionRequests(const Evas_Object* ewkView) 865 { 866 #if ENABLE(GEOLOCATION) 867 DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page, -1); 868 869 WebCore::GeolocationClientMock* mock = static_cast<WebCore::GeolocationClientMock*>(WebCore::GeolocationController::from(page)->client()); 870 return mock->numberOfPendingPermissionRequests(); 871 #else 872 UNUSED_PARAM(ewkView); 873 return 0; 874 #endif 875 } -
trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
r131991 r133266 49 49 50 50 ~DumpRenderTreeSupportEfl() { } 51 52 static void setDumpRenderTreeModeEnabled(bool); 53 static bool dumpRenderTreeModeEnabled(); 51 54 52 55 static unsigned activeAnimationsCount(const Evas_Object* ewkFrame); … … 128 131 static WebCore::IntRect firstRectForCharacterRange(Evas_Object*, int, int); 129 132 static bool selectedRange(Evas_Object*, int*, int*); 133 134 // Geolocation 135 static void resetGeolocationClientMock(const Evas_Object*); 136 static void setMockGeolocationPermission(const Evas_Object*, bool allowed); 137 static void setMockGeolocationPosition(const Evas_Object*, double latitude, double longitude, double accuracy, bool canProvideAltitude, double altitude, bool canProvideAltitudeAccuracy, double altitudeAccuracy, bool canProvideHeading, double heading, bool canProvideSpeed, double speed); 138 static void setMockGeolocationPositionUnavailableError(const Evas_Object*, const char* errorMessage); 139 static int numberOfPendingGeolocationPermissionRequests(const Evas_Object*); 140 141 private: 142 static bool s_drtRun; 130 143 }; 131 144 -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r133000 r133266 32 32 #include "DocumentLoader.h" 33 33 #include "DragClientEfl.h" 34 #include "DumpRenderTreeSupportEfl.h" 34 35 #include "EditorClientEfl.h" 35 36 #include "EflScreenUtilities.h" … … 84 85 #include "DeviceMotionClientEfl.h" 85 86 #include "DeviceOrientationClientEfl.h" 87 #endif 88 89 #if ENABLE(GEOLOCATION) 90 #include "GeolocationClientMock.h" 91 #include "GeolocationController.h" 86 92 #endif 87 93 … … 785 791 #endif 786 792 793 #if ENABLE(GEOLOCATION) 794 if (DumpRenderTreeSupportEfl::dumpRenderTreeModeEnabled()) { 795 WebCore::GeolocationClientMock* mock = new WebCore::GeolocationClientMock; 796 WebCore::provideGeolocationTo(priv->page.get(), mock); 797 mock->setController(WebCore::GeolocationController::from(priv->page.get())); 798 } 799 #endif 800 787 801 priv->pageSettings = priv->page->settings(); 788 802 -
trunk/Tools/ChangeLog
r133260 r133266 1 2012-11-01 Seonae Kim <sunaeluv.kim@samsung.com> 2 3 [EFL][DRT] Support Geolocation 4 https://bugs.webkit.org/show_bug.cgi?id=97427 5 6 Reviewed by Gyuyoung Kim. 7 8 Implement methods to use GeolocationClientMock in DumpRenderTree. 9 This client attaches to the page whenever a view is created. 10 11 * DumpRenderTree/efl/DumpRenderTreeChrome.cpp: 12 (DumpRenderTreeChrome::createView): 13 (DumpRenderTreeChrome::resetDefaultsToConsistentValues): 14 * DumpRenderTree/efl/TestRunnerEfl.cpp: 15 (TestRunner::setMockGeolocationPosition): 16 (TestRunner::setMockGeolocationPositionUnavailableError): 17 (TestRunner::setGeolocationPermission): 18 (TestRunner::numberOfPendingGeolocationPermissionRequests): 19 1 20 2012-11-01 Ryosuke Niwa <rniwa@webkit.org> 2 21 -
trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
r131991 r133266 197 197 bool DumpRenderTreeChrome::initialize() 198 198 { 199 // Notifies that DRT is running for ewkView to create testable objects. 200 DumpRenderTreeSupportEfl::setDumpRenderTreeModeEnabled(true); 199 201 DumpRenderTreeSupportEfl::setMockScrollbarsEnabled(true); 200 202 … … 309 311 DumpRenderTreeSupportEfl::clearUserScripts(mainView()); 310 312 DumpRenderTreeSupportEfl::clearUserStyleSheets(mainView()); 313 DumpRenderTreeSupportEfl::resetGeolocationClientMock(mainView()); 311 314 DumpRenderTreeSupportEfl::setInteractiveFormValidationEnabled(mainView(), true); 312 315 DumpRenderTreeSupportEfl::setValidationMessageTimerMagnification(mainView(), -1); -
trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
r131119 r133266 366 366 } 367 367 368 void TestRunner::setMockGeolocationPosition(double, double, double, bool, double, bool, double, bool, double, bool, double) 369 { 370 // FIXME: Implement for Geolocation layout tests. 371 // See https://bugs.webkit.org/show_bug.cgi?id=28264. 372 notImplemented(); 373 } 374 375 void TestRunner::setMockGeolocationPositionUnavailableError(JSStringRef) 376 { 377 // FIXME: Implement for Geolocation layout tests. 378 // See https://bugs.webkit.org/show_bug.cgi?id=28264. 379 notImplemented(); 368 void TestRunner::setMockGeolocationPosition(double latitude, double longitude, double accuracy, bool canProvideAltitude, double altitude, bool canProvideAltitudeAccuracy, double altitudeAccuracy, bool canProvideHeading, double heading, bool canProvideSpeed, double speed) 369 { 370 Evas_Object* view = browser->mainView(); 371 if (browser->extraViews().size() > 0) 372 view = browser->extraViews().last(); 373 374 DumpRenderTreeSupportEfl::setMockGeolocationPosition(view, latitude, longitude, accuracy, canProvideAltitude, altitude, canProvideAltitudeAccuracy, altitudeAccuracy, canProvideHeading, heading, canProvideSpeed, speed); 375 } 376 377 void TestRunner::setMockGeolocationPositionUnavailableError(JSStringRef message) 378 { 379 Evas_Object* view = browser->mainView(); 380 if (browser->extraViews().size() > 0) 381 view = browser->extraViews().last(); 382 383 DumpRenderTreeSupportEfl::setMockGeolocationPositionUnavailableError(view, message->string().utf8().data()); 380 384 } 381 385 382 386 void TestRunner::setGeolocationPermission(bool allow) 383 387 { 384 // FIXME: Implement for Geolocation layout tests.385 388 setGeolocationPermissionCommon(allow); 389 Evas_Object* view = browser->mainView(); 390 if (browser->extraViews().size() > 0) 391 view = browser->extraViews().last(); 392 393 DumpRenderTreeSupportEfl::setMockGeolocationPermission(view, allow); 386 394 } 387 395 388 396 int TestRunner::numberOfPendingGeolocationPermissionRequests() 389 397 { 390 // FIXME: Implement for Geolocation layout tests. 391 return -1; 398 Evas_Object* view = browser->mainView(); 399 if (browser->extraViews().size() > 0) 400 view = browser->extraViews().last(); 401 402 return DumpRenderTreeSupportEfl::numberOfPendingGeolocationPermissionRequests(view); 392 403 } 393 404
Note: See TracChangeset
for help on using the changeset viewer.