Changeset 148355 in webkit

Timestamp:

Apr 13, 2013 5:04:46 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] --minimal build fails with error: 'ViewModeInvalid' is not a member of 'WebCore::Page'
​https://bugs.webkit.org/show_bug.cgi?id=114048

Patch by Ed Bartosh <​bartosh@gmail.com> on 2013-04-13
Reviewed by Gyuyoung Kim.

Source/WebKit/efl:

Wrapped view-mode media related code into #if ENABLE(VIEW_MODE_CSS_MEDIA)

• WebCoreSupport/AssertMatchingEnums.cpp:
• ewk/ewk_view.cpp:

(ewk_view_mode_set):

Tools:

Wrapped view media related code in #if ENABLE(VIEW_MODE_CSS_MEDIA)

• DumpRenderTree/efl/TestRunnerEfl.cpp:

(TestRunner::setViewModeMediaFeature):

Location:

trunk

Files:

• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp (modified) (2 diffs)
• Source/WebKit/efl/ewk/ewk_view.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (modified) (2 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-04-13  Ed Bartosh  <bartosh@gmail.com>
+
+        [EFL] --minimal build fails with error: 'ViewModeInvalid' is not a member of 'WebCore::Page'
+        https://bugs.webkit.org/show_bug.cgi?id=114048
+
+        Reviewed by Gyuyoung Kim.
+
+        Wrapped view-mode media related code into #if ENABLE(VIEW_MODE_CSS_MEDIA)
+
+        * WebCoreSupport/AssertMatchingEnums.cpp:
+        * ewk/ewk_view.cpp:
+        (ewk_view_mode_set):
+
 2013-04-10  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp

@@ -76 +76 @@
 #endif
 
+#if ENABLE(VIEW_MODE_CSS_MEDIA)
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_INVALID, Page::ViewModeInvalid);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_WINDOWED, Page::ViewModeWindowed);
@@ -82 +83 @@
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_MAXIMIZED, Page::ViewModeMaximized);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_MINIMIZED, Page::ViewModeMinimized);
+#endif
 
 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_DEFAULT, NaturalWritingDirection);

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -4260 +4260 @@
 Eina_Bool ewk_view_mode_set(Evas_Object* ewkView, Ewk_View_Mode viewMode)
 {
+#if ENABLE(VIEW_MODE_CSS_MEDIA)
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
@@ -4265 +4266 @@
     priv->page->setViewMode(static_cast<WebCore::Page::ViewMode>(viewMode));
     return true;
+#else
+    UNUSED_PARAM(ewkView);
+    UNUSED_PARAM(viewMode);
+    return false;
+#endif
 }
 
 Ewk_View_Mode ewk_view_mode_get(const Evas_Object* ewkView)
 {
+#if ENABLE(VIEW_MODE_CSS_MEDIA)
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, EWK_VIEW_MODE_INVALID);
     EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, EWK_VIEW_MODE_INVALID);
 
     return static_cast<Ewk_View_Mode>(priv->page->viewMode());
+#else
+    UNUSED_PARAM(ewkView);
+    return EWK_VIEW_MODE_INVALID;
+#endif
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-13  Ed Bartosh  <bartosh@gmail.com>
+
+        [EFL] --minimal build fails with error: 'ViewModeInvalid' is not a member of 'WebCore::Page'
+        https://bugs.webkit.org/show_bug.cgi?id=114048
+
+        Reviewed by Gyuyoung Kim.
+
+        Wrapped view media related code in #if ENABLE(VIEW_MODE_CSS_MEDIA)
+
+        * DumpRenderTree/efl/TestRunnerEfl.cpp:
+        (TestRunner::setViewModeMediaFeature):
+
 2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

@@ -252 +252 @@
 void TestRunner::setViewModeMediaFeature(JSStringRef mode)
 {
+#if ENABLE(VIEW_MODE_CSS_MEDIA)
     Evas_Object* view = browser->mainView();
     if (!view)
@@ -266 +267 @@
     else if (equals(mode, "minimized"))
         ewk_view_mode_set(view, EWK_VIEW_MODE_MINIMIZED);
+#else
+    UNUSED_PARAM(mode);
+#endif
 }