[webkit-changes] [148355] trunk

Sat, 13 Apr 2013 05:03:01 -0700

Title: [148355] trunk
Revision
148355
Author
[email protected]
Date
2013-04-13 05:04:46 -0700 (Sat, 13 Apr 2013)

Log 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 <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (148354 => 148355)


--- trunk/Source/WebKit/efl/ChangeLog	2013-04-13 09:47:21 UTC (rev 148354)
+++ trunk/Source/WebKit/efl/ChangeLog	2013-04-13 12:04:46 UTC (rev 148355)
@@ -1,3 +1,16 @@
+2013-04-13  Ed Bartosh  <[email protected]>
+
+        [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  <[email protected]>
 
         Mass remove all the empty directories

Modified: trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp (148354 => 148355)


--- trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp	2013-04-13 09:47:21 UTC (rev 148354)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp	2013-04-13 12:04:46 UTC (rev 148355)
@@ -75,12 +75,14 @@
 COMPILE_ASSERT_MATCHING_ENUM(EWK_TOUCH_POINT_END, PlatformTouchPoint::TouchStateEnd);
 #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);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_FLOATING, Page::ViewModeFloating);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_VIEW_MODE_FULLSCREEN, Page::ViewModeFullscreen);
 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);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_DIRECTION_LEFT_TO_RIGHT, LeftToRightWritingDirection);

Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (148354 => 148355)


--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-04-13 09:47:21 UTC (rev 148354)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2013-04-13 12:04:46 UTC (rev 148355)
@@ -4259,19 +4259,30 @@
 
 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);
 
     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
 }
 
 Eina_Bool ewk_view_mixed_content_displayed_get(const Evas_Object* ewkView)

Modified: trunk/Tools/ChangeLog (148354 => 148355)


--- trunk/Tools/ChangeLog	2013-04-13 09:47:21 UTC (rev 148354)
+++ trunk/Tools/ChangeLog	2013-04-13 12:04:46 UTC (rev 148355)
@@ -1,3 +1,15 @@
+2013-04-13  Ed Bartosh  <[email protected]>
+
+        [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  <[email protected]>
 
         Merge watchlistloader into host since it's an unnecessary indirection

Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (148354 => 148355)


--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp	2013-04-13 09:47:21 UTC (rev 148354)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp	2013-04-13 12:04:46 UTC (rev 148355)
@@ -251,6 +251,7 @@
 
 void TestRunner::setViewModeMediaFeature(JSStringRef mode)
 {
+#if ENABLE(VIEW_MODE_CSS_MEDIA)
     Evas_Object* view = browser->mainView();
     if (!view)
         return;
@@ -265,6 +266,9 @@
         ewk_view_mode_set(view, EWK_VIEW_MODE_MAXIMIZED);
     else if (equals(mode, "minimized"))
         ewk_view_mode_set(view, EWK_VIEW_MODE_MINIMIZED);
+#else
+    UNUSED_PARAM(mode);
+#endif
 }
 
 void TestRunner::setWindowIsKey(bool)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to