Changeset 163033 in webkit
- Timestamp:
- Jan 29, 2014 12:17:37 PM (10 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r162887 r163033 1 2014-01-29 Ryuan Choi <ryuan.choi@samsung.com> 2 3 EFL port should stop using COMPILE_ASSERT_MATCHING_ENUM macros 4 https://bugs.webkit.org/show_bug.cgi?id=127801 5 6 Reviewed by Anders Carlsson. 7 8 * PlatformEfl.cmake: Removed AssertMatchingEnums.cpp 9 1 10 2014-01-27 Roger Fong <roger_fong@apple.com> 2 11 -
trunk/Source/WebKit/PlatformEfl.cmake
r162061 r163033 102 102 list(APPEND WebKit_SOURCES 103 103 efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp 104 efl/WebCoreSupport/AssertMatchingEnums.cpp105 104 efl/WebCoreSupport/BatteryClientEfl.cpp 106 105 efl/WebCoreSupport/ChromeClientEfl.cpp -
trunk/Source/WebKit/efl/ChangeLog
r162930 r163033 1 2014-01-29 Ryuan Choi <ryuan.choi@samsung.com> 2 3 EFL port should stop using COMPILE_ASSERT_MATCHING_ENUM macros 4 https://bugs.webkit.org/show_bug.cgi?id=127801 5 6 Reviewed by Anders Carlsson. 7 8 Instead of COMPILE_ASSERT_MATCHING_ENUMS with static_cast, this patch 9 added switch and conversion functions if needed. 10 11 * WebCoreSupport/AssertMatchingEnums.cpp: Removed. 12 * WebCoreSupport/FrameLoaderClientEfl.cpp: 13 (WebCore::FrameLoaderClientEfl::dispatchDecidePolicyForNavigationAction): 14 * ewk/ewk_contextmenu.cpp: 15 (toEwkContextMenuAction): 16 * ewk/ewk_contextmenu.h: 17 Added missing enum variables. These are required not to break the build. 18 * ewk/ewk_frame.cpp: 19 (ewk_frame_text_selection_type_get): 20 * ewk/ewk_touch_event.cpp: 21 (toPlatformTouchPointState): 22 (WebKitPlatformTouchEvent::WebKitPlatformTouchEvent): 23 * ewk/ewk_view.cpp: 24 (ewk_view_text_direction_set): 25 (ewk_view_navigation_policy_decision): 26 (toViewMode): 27 (toEwkViewMode): 28 (ewk_view_mode_set): 29 (ewk_view_mode_get): 30 (ewk_view_visibility_state_get): 31 * ewk/ewk_view_private.h: 32 1 33 2014-01-28 Zan Dobersek <zdobersek@igalia.com> 2 34 -
trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
r162786 r163033 325 325 CString httpMethod = resourceRequest.httpMethod().utf8(); 326 326 Ewk_Frame_Resource_Request request = { url.data(), firstParty.data(), httpMethod.data(), 0, m_frame, false }; 327 bool ret = ewk_view_navigation_policy_decision(m_view, &request, static_cast<Ewk_Navigation_Type>(action.type()));327 bool ret = ewk_view_navigation_policy_decision(m_view, &request, action.type()); 328 328 329 329 PolicyAction policy; -
trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp
r145841 r163033 59 59 bool enabled : 1; 60 60 }; 61 62 #if ENABLE(CONTEXT_MENUS) 63 inline static Ewk_Context_Menu_Action toEwkContextMenuAction(WebCore::ContextMenuAction action) 64 { 65 switch (action) { 66 case WebCore::ContextMenuItemTagNoAction: 67 return EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION; 68 case WebCore::ContextMenuItemTagOpenLinkInNewWindow: 69 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW; 70 case WebCore::ContextMenuItemTagDownloadLinkToDisk: 71 return EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_LINK_TO_DISK; 72 case WebCore::ContextMenuItemTagCopyLinkToClipboard: 73 return EWK_CONTEXT_MENU_ITEM_TAG_COPY_LINK_TO_CLIPBOARD; 74 case WebCore::ContextMenuItemTagOpenImageInNewWindow: 75 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_IMAGE_IN_NEW_WINDOW; 76 case WebCore::ContextMenuItemTagDownloadImageToDisk: 77 return EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_IMAGE_TO_DISK; 78 case WebCore::ContextMenuItemTagCopyImageToClipboard: 79 return EWK_CONTEXT_MENU_ITEM_TAG_COPY_IMAGE_TO_CLIPBOARD; 80 case WebCore::ContextMenuItemTagCopyImageUrlToClipboard: 81 return EWK_CONTEXT_MENU_ITEM_TAG_COPY_IMAGE_URL_TO_CLIPBOARD; 82 case WebCore::ContextMenuItemTagOpenFrameInNewWindow: 83 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_FRAME_IN_NEW_WINDOW; 84 case WebCore::ContextMenuItemTagCopy: 85 return EWK_CONTEXT_MENU_ITEM_TAG_COPY; 86 case WebCore::ContextMenuItemTagGoBack: 87 return EWK_CONTEXT_MENU_ITEM_TAG_GO_BACK; 88 case WebCore::ContextMenuItemTagGoForward: 89 return EWK_CONTEXT_MENU_ITEM_TAG_GO_FORWARD; 90 case WebCore::ContextMenuItemTagStop: 91 return EWK_CONTEXT_MENU_ITEM_TAG_STOP; 92 case WebCore::ContextMenuItemTagReload: 93 return EWK_CONTEXT_MENU_ITEM_TAG_RELOAD; 94 case WebCore::ContextMenuItemTagCut: 95 return EWK_CONTEXT_MENU_ITEM_TAG_CUT; 96 case WebCore::ContextMenuItemTagPaste: 97 return EWK_CONTEXT_MENU_ITEM_TAG_PASTE; 98 case WebCore::ContextMenuItemTagSelectAll: 99 return EWK_CONTEXT_MENU_ITEM_TAG_SELECT_ALL; 100 case WebCore::ContextMenuItemTagSpellingGuess: 101 return EWK_CONTEXT_MENU_ITEM_TAG_SPELLING_GUESS; 102 case WebCore::ContextMenuItemTagNoGuessesFound: 103 return EWK_CONTEXT_MENU_ITEM_TAG_NO_GUESSES_FOUND; 104 case WebCore::ContextMenuItemTagIgnoreSpelling: 105 return EWK_CONTEXT_MENU_ITEM_TAG_IGNORE_SPELLING; 106 case WebCore::ContextMenuItemTagLearnSpelling: 107 return EWK_CONTEXT_MENU_ITEM_TAG_LEARN_SPELLING; 108 case WebCore::ContextMenuItemTagOther: 109 return EWK_CONTEXT_MENU_ITEM_TAG_OTHER; 110 case WebCore::ContextMenuItemTagSearchInSpotlight: 111 return EWK_CONTEXT_MENU_ITEM_TAG_SEARCH_IN_SPOTLIGHT; 112 case WebCore::ContextMenuItemTagSearchWeb: 113 return EWK_CONTEXT_MENU_ITEM_TAG_SEARCH_WEB; 114 case WebCore::ContextMenuItemTagLookUpInDictionary: 115 return EWK_CONTEXT_MENU_ITEM_TAG_LOOK_UP_IN_DICTIONARY; 116 case WebCore::ContextMenuItemTagOpenWithDefaultApplication: 117 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_WITH_DEFAULT_APPLICATION; 118 case WebCore::ContextMenuItemPDFActualSize: 119 return EWK_CONTEXT_MENU_ITEM_PDFACTUAL_SIZE; 120 case WebCore::ContextMenuItemPDFZoomIn: 121 return EWK_CONTEXT_MENU_ITEM_PDFZOOM_IN; 122 case WebCore::ContextMenuItemPDFZoomOut: 123 return EWK_CONTEXT_MENU_ITEM_PDFZOOM_OUT; 124 case WebCore::ContextMenuItemPDFAutoSize: 125 return EWK_CONTEXT_MENU_ITEM_PDFAUTO_SIZE; 126 case WebCore::ContextMenuItemPDFSinglePage: 127 return EWK_CONTEXT_MENU_ITEM_PDFSINGLE_PAGE; 128 case WebCore::ContextMenuItemPDFFacingPages: 129 return EWK_CONTEXT_MENU_ITEM_PDFFACING_PAGES; 130 case WebCore::ContextMenuItemPDFContinuous: 131 return EWK_CONTEXT_MENU_ITEM_PDFCONTINUOUS; 132 case WebCore::ContextMenuItemPDFNextPage: 133 return EWK_CONTEXT_MENU_ITEM_PDFNEXT_PAGE; 134 case WebCore::ContextMenuItemPDFPreviousPage: 135 return EWK_CONTEXT_MENU_ITEM_PDFPREVIOUS_PAGE; 136 case WebCore::ContextMenuItemTagOpenLink: 137 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK; 138 case WebCore::ContextMenuItemTagIgnoreGrammar: 139 return EWK_CONTEXT_MENU_ITEM_TAG_IGNORE_GRAMMAR; 140 case WebCore::ContextMenuItemTagSpellingMenu: 141 return EWK_CONTEXT_MENU_ITEM_TAG_SPELLING_MENU; 142 case WebCore::ContextMenuItemTagShowSpellingPanel: 143 return EWK_CONTEXT_MENU_ITEM_TAG_SHOW_SPELLING_PANEL; 144 case WebCore::ContextMenuItemTagCheckSpelling: 145 return EWK_CONTEXT_MENU_ITEM_TAG_CHECK_SPELLING; 146 case WebCore::ContextMenuItemTagCheckSpellingWhileTyping: 147 return EWK_CONTEXT_MENU_ITEM_TAG_CHECK_SPELLING_WHILE_TYPING; 148 case WebCore::ContextMenuItemTagCheckGrammarWithSpelling: 149 return EWK_CONTEXT_MENU_ITEM_TAG_CHECK_GRAMMAR_WITH_SPELLING; 150 case WebCore::ContextMenuItemTagFontMenu: 151 return EWK_CONTEXT_MENU_ITEM_TAG_FONT_MENU; 152 case WebCore::ContextMenuItemTagShowFonts: 153 return EWK_CONTEXT_MENU_ITEM_TAG_SHOW_FONTS; 154 case WebCore::ContextMenuItemTagBold: 155 return EWK_CONTEXT_MENU_ITEM_TAG_BOLD; 156 case WebCore::ContextMenuItemTagItalic: 157 return EWK_CONTEXT_MENU_ITEM_TAG_ITALIC; 158 case WebCore::ContextMenuItemTagUnderline: 159 return EWK_CONTEXT_MENU_ITEM_TAG_UNDERLINE; 160 case WebCore::ContextMenuItemTagOutline: 161 return EWK_CONTEXT_MENU_ITEM_TAG_OUTLINE; 162 case WebCore::ContextMenuItemTagStyles: 163 return EWK_CONTEXT_MENU_ITEM_TAG_STYLES; 164 case WebCore::ContextMenuItemTagShowColors: 165 return EWK_CONTEXT_MENU_ITEM_TAG_SHOW_COLORS; 166 case WebCore::ContextMenuItemTagSpeechMenu: 167 return EWK_CONTEXT_MENU_ITEM_TAG_SPEECH_MENU; 168 case WebCore::ContextMenuItemTagStartSpeaking: 169 return EWK_CONTEXT_MENU_ITEM_TAG_START_SPEAKING; 170 case WebCore::ContextMenuItemTagStopSpeaking: 171 return EWK_CONTEXT_MENU_ITEM_TAG_STOP_SPEAKING; 172 case WebCore::ContextMenuItemTagWritingDirectionMenu: 173 return EWK_CONTEXT_MENU_ITEM_TAG_WRITING_DIRECTION_MENU; 174 case WebCore::ContextMenuItemTagDefaultDirection: 175 return EWK_CONTEXT_MENU_ITEM_TAG_DEFAULT_DIRECTION; 176 case WebCore::ContextMenuItemTagLeftToRight: 177 return EWK_CONTEXT_MENU_ITEM_TAG_LEFT_TO_RIGHT; 178 case WebCore::ContextMenuItemTagRightToLeft: 179 return EWK_CONTEXT_MENU_ITEM_TAG_RIGHT_TO_LEFT; 180 case WebCore::ContextMenuItemTagPDFSinglePageScrolling: 181 return EWK_CONTEXT_MENU_ITEM_TAG_PDFSINGLE_PAGE_SCROLLING; 182 case WebCore::ContextMenuItemTagPDFFacingPagesScrolling: 183 return EWK_CONTEXT_MENU_ITEM_TAG_PDFFACING_PAGES_SCROLLING; 184 #if ENABLE(INSPECTOR) 185 case WebCore::ContextMenuItemTagInspectElement: 186 return EWK_CONTEXT_MENU_ITEM_TAG_INSPECT_ELEMENT; 187 #endif 188 case WebCore::ContextMenuItemTagTextDirectionMenu: 189 return EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_MENU; 190 case WebCore::ContextMenuItemTagTextDirectionDefault: 191 return EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_DEFAULT; 192 case WebCore::ContextMenuItemTagTextDirectionLeftToRight: 193 return EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_LEFT_TO_RIGHT; 194 case WebCore::ContextMenuItemTagTextDirectionRightToLeft: 195 return EWK_CONTEXT_MENU_ITEM_TAG_TEXT_DIRECTION_RIGHT_TO_LEFT; 196 case WebCore::ContextMenuItemTagOpenMediaInNewWindow: 197 return EWK_CONTEXT_MENU_ITEM_OPEN_MEDIA_IN_NEW_WINDOW; 198 case WebCore::ContextMenuItemTagDownloadMediaToDisk: 199 return EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_MEDIA_TO_DISK; 200 case WebCore::ContextMenuItemTagCopyMediaLinkToClipboard: 201 return EWK_CONTEXT_MENU_ITEM_TAG_COPY_MEDIA_LINK_TO_CLIPBOARD; 202 case WebCore::ContextMenuItemTagToggleMediaControls: 203 return EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_MEDIA_CONTROLS; 204 case WebCore::ContextMenuItemTagToggleMediaLoop: 205 return EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_MEDIA_LOOP; 206 case WebCore::ContextMenuItemTagEnterVideoFullscreen: 207 return EWK_CONTEXT_MENU_ITEM_TAG_ENTER_VIDEO_FULLSCREEN; 208 case WebCore::ContextMenuItemTagMediaPlayPause: 209 return EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_PLAY_PAUSE; 210 case WebCore::ContextMenuItemTagMediaMute: 211 return EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_MUTE; 212 case WebCore::ContextMenuItemTagDictationAlternative: 213 return EWK_CONTEXT_MENU_ITEM_TAG_DICTATION_ALTERNATIVE; 214 case WebCore::ContextMenuItemTagOpenLinkInThisWindow: 215 return EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_THIS_WINDOW; 216 case WebCore::ContextMenuItemTagToggleVideoFullscreen: 217 return EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_VIDEO_FULL_SCREEN; 218 case WebCore::ContextMenuItemBaseCustomTag: 219 return EWK_CONTEXT_MENU_ITEM_BASE_CUSTOM_TAG; 220 case WebCore::ContextMenuItemCustomTagNoAction: 221 return EWK_CONTEXT_MENU_ITEM_CUSTOM_TAG_NO_ACTION; 222 case WebCore::ContextMenuItemLastCustomTag: 223 return EWK_CONTEXT_MENU_ITEM_LAST_CUSTOM_TAG; 224 case WebCore::ContextMenuItemBaseApplicationTag: 225 return EWK_CONTEXT_MENU_ITEM_BASE_APPLICATION_TAG; 226 } 227 } 228 #endif 61 229 62 230 void ewk_context_menu_ref(Ewk_Context_Menu* menu) -
trunk/Source/WebKit/efl/ewk/ewk_contextmenu.h
r151656 r163033 123 123 EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_PLAY_PAUSE, 124 124 EWK_CONTEXT_MENU_ITEM_TAG_MEDIA_MUTE, 125 EWK_CONTEXT_MENU_ITEM_TAG_DICTATION_ALTERNATIVE, 126 EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_THIS_WINDOW, 127 EWK_CONTEXT_MENU_ITEM_TAG_TOGGLE_VIDEO_FULL_SCREEN, 125 128 EWK_CONTEXT_MENU_ITEM_BASE_CUSTOM_TAG = 5000, 126 129 EWK_CONTEXT_MENU_ITEM_CUSTOM_TAG_NO_ACTION = 5998, -
trunk/Source/WebKit/efl/ewk/ewk_frame.cpp
r162745 r163033 1076 1076 WebCore::FrameSelection& controller = smartData->frame->selection(); 1077 1077 1078 return static_cast<Ewk_Text_Selection_Type>(controller.selectionType()); 1078 switch (controller.selectionType()) { 1079 case WebCore::VisibleSelection::NoSelection: 1080 return EWK_TEXT_SELECTION_NONE; 1081 case WebCore::VisibleSelection::CaretSelection: 1082 return EWK_TEXT_SELECTION_CARET; 1083 case WebCore::VisibleSelection::RangeSelection: 1084 return EWK_TEXT_SELECTION_RANGE; 1085 } 1086 ASSERT_NOT_REACHED(); 1087 1088 return EWK_TEXT_SELECTION_NONE; 1079 1089 } 1080 1090 -
trunk/Source/WebKit/efl/ewk/ewk_touch_event.cpp
r126022 r163033 44 44 }; 45 45 46 inline static WebCore::PlatformTouchPoint::State toPlatformTouchPointState(Ewk_Touch_Point_Type type) 47 { 48 switch (type) { 49 case EWK_TOUCH_POINT_RELEASED: 50 return WebCore::PlatformTouchPoint::TouchReleased; 51 case EWK_TOUCH_POINT_PRESSED: 52 return WebCore::PlatformTouchPoint::TouchPressed; 53 case EWK_TOUCH_POINT_MOVED: 54 return WebCore::PlatformTouchPoint::TouchMoved; 55 case EWK_TOUCH_POINT_STATIONARY: 56 return WebCore::PlatformTouchPoint::TouchStationary; 57 case EWK_TOUCH_POINT_CANCELLED: 58 return WebCore::PlatformTouchPoint::TouchCancelled; 59 case EWK_TOUCH_POINT_END: 60 return WebCore::PlatformTouchPoint::TouchStateEnd; 61 } 62 63 ASSERT_NOT_REACHED(); 64 65 return WebCore::PlatformTouchPoint::TouchCancelled; 66 } 67 46 68 class WebKitPlatformTouchEvent : public WebCore::PlatformTouchEvent { 47 69 public: … … 82 104 Ewk_Touch_Point* point = static_cast<Ewk_Touch_Point*>(item); 83 105 WebCore::IntPoint pnt = WebCore::IntPoint(point->x - pos.x(), point->y - pos.y()); 84 m_touchPoints.append(WebKitPlatformTouchPoint(point->id, pnt, static_cast<WebCore::PlatformTouchPoint::State>(point->state)));106 m_touchPoints.append(WebKitPlatformTouchPoint(point->id, pnt, toPlatformTouchPointState(point->state))); 85 107 } 86 108 } -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r162762 r163033 4124 4124 return; 4125 4125 4126 editor.setBaseWritingDirection(static_cast<WritingDirection>(direction)); 4126 switch (direction) { 4127 case EWK_TEXT_DIRECTION_DEFAULT: 4128 editor.setBaseWritingDirection(NaturalWritingDirection); 4129 case EWK_TEXT_DIRECTION_LEFT_TO_RIGHT: 4130 editor.setBaseWritingDirection(LeftToRightWritingDirection); 4131 case EWK_TEXT_DIRECTION_RIGHT_TO_LEFT: 4132 editor.setBaseWritingDirection(RightToLeftWritingDirection); 4133 } 4134 4135 ASSERT_NOT_REACHED(); 4127 4136 } 4128 4137 … … 4177 4186 * is to accept. 4178 4187 */ 4179 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request, Ewk_Navigation_Type navigationType)4188 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request, WebCore::NavigationType navigationType) 4180 4189 { 4181 4190 EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false); … … 4185 4194 return true; 4186 4195 4187 return smartData->api->navigation_policy_decision(smartData, request, navigationType); 4196 Ewk_Navigation_Type type; 4197 switch (navigationType) { 4198 case WebCore::NavigationTypeLinkClicked: 4199 type = EWK_NAVIGATION_TYPE_LINK_CLICKED; 4200 case WebCore::NavigationTypeFormSubmitted: 4201 type = EWK_NAVIGATION_TYPE_FORM_SUBMITTED; 4202 case WebCore::NavigationTypeBackForward: 4203 type = EWK_NAVIGATION_TYPE_BACK_FORWARD; 4204 case WebCore::NavigationTypeReload: 4205 type = EWK_NAVIGATION_TYPE_RELOAD; 4206 case WebCore::NavigationTypeFormResubmitted: 4207 type = EWK_NAVIGATION_TYPE_FORM_RESUBMITTED; 4208 case WebCore::NavigationTypeOther: 4209 type = EWK_NAVIGATION_TYPE_OTHER; 4210 } 4211 4212 return smartData->api->navigation_policy_decision(smartData, request, type); 4188 4213 } 4189 4214 … … 4276 4301 #endif 4277 4302 4303 inline static WebCore::Page::ViewMode toViewMode(Ewk_View_Mode viewMode) 4304 { 4305 switch (viewMode) { 4306 case EWK_VIEW_MODE_INVALID: 4307 return WebCore::Page::ViewModeInvalid; 4308 case EWK_VIEW_MODE_WINDOWED: 4309 return WebCore::Page::ViewModeWindowed; 4310 case EWK_VIEW_MODE_FLOATING: 4311 return WebCore::Page::ViewModeFloating; 4312 case EWK_VIEW_MODE_FULLSCREEN: 4313 return WebCore::Page::ViewModeFullscreen; 4314 case EWK_VIEW_MODE_MAXIMIZED: 4315 return WebCore::Page::ViewModeMaximized; 4316 case EWK_VIEW_MODE_MINIMIZED: 4317 return WebCore::Page::ViewModeMinimized; 4318 } 4319 ASSERT_NOT_REACHED(); 4320 4321 return WebCore::Page::ViewModeInvalid; 4322 } 4323 4324 inline static Ewk_View_Mode toEwkViewMode(WebCore::Page::ViewMode viewMode) 4325 { 4326 switch (viewMode) { 4327 case WebCore::Page::ViewModeInvalid: 4328 return EWK_VIEW_MODE_INVALID; 4329 case WebCore::Page::ViewModeWindowed: 4330 return EWK_VIEW_MODE_WINDOWED; 4331 case WebCore::Page::ViewModeFloating: 4332 return EWK_VIEW_MODE_FLOATING; 4333 case WebCore::Page::ViewModeFullscreen: 4334 return EWK_VIEW_MODE_FULLSCREEN; 4335 case WebCore::Page::ViewModeMaximized: 4336 return EWK_VIEW_MODE_MAXIMIZED; 4337 case WebCore::Page::ViewModeMinimized: 4338 return EWK_VIEW_MODE_MINIMIZED; 4339 } 4340 ASSERT_NOT_REACHED(); 4341 4342 return EWK_VIEW_MODE_INVALID; 4343 } 4344 4278 4345 Eina_Bool ewk_view_mode_set(Evas_Object* ewkView, Ewk_View_Mode viewMode) 4279 4346 { … … 4282 4349 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false); 4283 4350 4284 priv->page->setViewMode( static_cast<WebCore::Page::ViewMode>(viewMode));4351 priv->page->setViewMode(toViewMode(viewMode)); 4285 4352 return true; 4286 4353 #else … … 4297 4364 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EWK_VIEW_MODE_INVALID); 4298 4365 4299 return static_cast<Ewk_View_Mode>(priv->page->viewMode());4366 return toEwkViewMode(priv->page->viewMode()); 4300 4367 #else 4301 4368 UNUSED_PARAM(ewkView); … … 4420 4487 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EWK_PAGE_VISIBILITY_STATE_VISIBLE); 4421 4488 4422 return static_cast<Ewk_Page_Visibility_State>(priv->page->visibilityState()); 4489 4490 switch (priv->page->visibilityState()) { 4491 case WebCore::PageVisibilityStateVisible: 4492 return EWK_PAGE_VISIBILITY_STATE_VISIBLE; 4493 case WebCore::PageVisibilityStateHidden: 4494 return EWK_PAGE_VISIBILITY_STATE_HIDDEN; 4495 case WebCore::PageVisibilityStatePrerender: 4496 return EWK_PAGE_VISIBILITY_STATE_PRERENDER; 4497 default: 4498 ASSERT_NOT_REACHED(); 4499 } 4423 4500 #else 4424 4501 DBG("PAGE_VISIBILITY_API is disabled."); 4425 4502 UNUSED_PARAM(ewkView); 4503 #endif 4504 4426 4505 return EWK_PAGE_VISIBILITY_STATE_VISIBLE; 4427 #endif4428 4506 } 4429 4507 -
trunk/Source/WebKit/efl/ewk/ewk_view_private.h
r162303 r163033 143 143 void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv); 144 144 145 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request, Ewk_Navigation_Type navigationType);145 bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request, WebCore::NavigationType); 146 146 147 147 void ewk_view_contents_size_changed(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height);
Note: See TracChangeset
for help on using the changeset viewer.