Changeset 164266 in webkit


Ignore:
Timestamp:
Feb 17, 2014 6:50:50 PM (10 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

[CoordinatedGraphics][EFL] Remove view_source functions.
​https://bugs.webkit.org/show_bug.cgi?id=128945

Reviewed by Anders Carlsson.

EFL port has been broken since r164254 because of removing view source files in WK2.
This patch is to follow to remove remained view source functions.

  • UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
  • UIProcess/API/C/CoordinatedGraphics/WKView.h:
  • UIProcess/API/efl/ewk_view.cpp:
  • UIProcess/API/efl/ewk_view.h:
  • UIProcess/API/efl/tests/test_ewk2_view.cpp:
  • UIProcess/CoordinatedGraphics/WebView.cpp:
  • UIProcess/CoordinatedGraphics/WebView.h:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164260 r164266  
     12014-02-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        [CoordinatedGraphics][EFL] Remove view_source functions.
     4        https://bugs.webkit.org/show_bug.cgi?id=128945
     5
     6        Reviewed by Anders Carlsson.
     7
     8        EFL port has been broken since r164254 because of removing view source files in WK2.
     9        This patch is to follow to remove remained view source functions.
     10
     11        * UIProcess/API/C/CoordinatedGraphics/WKView.cpp:
     12        * UIProcess/API/C/CoordinatedGraphics/WKView.h:
     13        * UIProcess/API/efl/ewk_view.cpp:
     14        * UIProcess/API/efl/ewk_view.h:
     15        * UIProcess/API/efl/tests/test_ewk2_view.cpp:
     16        * UIProcess/CoordinatedGraphics/WebView.cpp:
     17        * UIProcess/CoordinatedGraphics/WebView.h:
     18
    1192014-02-17  Tim Horton  <timothy_horton@apple.com>
    220

  • trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.cpp

    r160321 r164266  
    170170}
    171171
    172 void WKViewSetShowsAsSource(WKViewRef viewRef, bool flag)
    173 {
    174     toImpl(viewRef)->setShowsAsSource(flag);
    175 }
    176 
    177 bool WKViewGetShowsAsSource(WKViewRef viewRef)
    178 {
    179     return toImpl(viewRef)->showsAsSource();
    180 }
    181 
    182172bool WKViewExitFullScreen(WKViewRef viewRef)
    183173{

  • trunk/Source/WebKit2/UIProcess/API/C/CoordinatedGraphics/WKView.h

    r160075 r164266  
    107107WK_EXPORT void WKViewResumeActiveDOMObjectsAndAnimations(WKViewRef);
    108108
    109 WK_EXPORT void WKViewSetShowsAsSource(WKViewRef, bool);
    110 WK_EXPORT bool WKViewGetShowsAsSource(WKViewRef);
    111 
    112109WK_EXPORT bool WKViewExitFullScreen(WKViewRef);
    113110

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

    r163614 r164266  
    659659}
    660660
    661 Eina_Bool ewk_view_source_mode_set(Evas_Object* ewkView, Eina_Bool enabled)
    662 {
    663     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    664 
    665     WKViewSetShowsAsSource(impl->wkView(), enabled);
    666 
    667     return true;
    668 }
    669 
    670 Eina_Bool ewk_view_source_mode_get(const Evas_Object* ewkView)
    671 {
    672     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false);
    673 
    674     return WKViewGetShowsAsSource(impl->wkView());
    675 }
    676 
    677661struct Ewk_View_Script_Execute_Callback_Context {
    678662    Ewk_View_Script_Execute_Callback_Context(Ewk_View_Script_Execute_Cb callback, Evas_Object* ewkView, void* userData)

  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.h

    r163614 r164266  
    868868
    869869/**
    870  * Sets the source mode as EINA_TRUE to display the web source code
    871  * or EINA_FALSE otherwise. The default value is EINA_FALSE.
    872  *
    873  * This method should be called before loading new contents on web view
    874  * so that the new view mode will be applied to the new contents.
    875  *
    876  * @param o view object to set the view source mode
    877  * @param enabled a state to set view source mode
    878  *
    879  * @return @c EINA_TRUE on success, or @c EINA_FALSE on failure
    880  */
    881 EAPI Eina_Bool ewk_view_source_mode_set(Evas_Object *o, Eina_Bool enabled);
    882 
    883 /**
    884  * Gets the view source mode of the current web page.
    885  *
    886  * @param o view object to get the view source mode
    887  *
    888  * @return @c EINA_TRUE if the view mode is set to load source code, or
    889  *         @c EINA_FALSE otherwise
    890  */
    891 EAPI Eina_Bool ewk_view_source_mode_get(const Evas_Object *o);
    892 
    893 /**
    894870 * Requests execution of the given script.
    895871 *

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp

    r163614 r164266  
    10021002}
    10031003
    1004 TEST_F(EWK2ViewTest, ewk_view_source_mode)
    1005 {
    1006     const char indexHTML[] = "<html><body>Test Web View Mode<script>document.title=window.document.body.innerText;</script></body></html>";
    1007     const char contents[] = "Test Web View Mode";
    1008 
    1009     // Default source mode is false.
    1010     EXPECT_FALSE(ewk_view_source_mode_get(webView()));
    1011 
    1012     // Load web contents of the web page.
    1013     ewk_view_html_string_load(webView(), indexHTML, 0, 0);
    1014     EXPECT_TRUE(waitUntilTitleChangedTo(contents));
    1015 
    1016     EXPECT_TRUE(ewk_view_source_mode_set(webView(), true));
    1017     EXPECT_TRUE(ewk_view_source_mode_get(webView()));
    1018 
    1019     // TODO: Add a test case when the source mode is true.
    1020     //       But it needs a way to retrieve the body contents to compare the loaded contents
    1021     //       such as excuting the JavaScript, 'window.document.body.innerText'.
    1022     //       https://bugs.webkit.org/show_bug.cgi?id=101904.
    1023 }
    1024 
    10251004TEST_F(EWK2ViewTest, ewk_view_user_agent)
    10261005{

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

    r163908 r164266  
    190190}
    191191
    192 void WebView::setShowsAsSource(bool showsAsSource)
    193 {
    194     m_page->setMainFrameInViewSourceMode(showsAsSource);
    195 }
    196 
    197 bool WebView::showsAsSource() const
    198 {
    199     return m_page->mainFrameInViewSourceMode();
    200 }
    201 
    202192#if ENABLE(FULLSCREEN_API)
    203193WebFullScreenManagerProxyClient& WebView::fullScreenManagerProxyClient()

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h

    r163908 r164266  
    9494    void resumeActiveDOMObjectsAndAnimations();
    9595
    96     void setShowsAsSource(bool);
    97     bool showsAsSource() const;
    98 
    9996#if ENABLE(FULLSCREEN_API)
    10097    bool requestExitFullScreen();

  • trunk/Tools/MiniBrowser/efl/main.c

    r163614 r164266  
    18291829    if (device_pixel_ratio)
    18301830        ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
    1831     ewk_view_source_mode_set(window->ewk_view, view_mode);
    18321831    ewk_view_user_agent_set(window->ewk_view, user_agent_string);
    18331832    ewk_view_layout_fixed_set(window->ewk_view, fixed_layout_enabled);
Note: See TracChangeset for help on using the changeset viewer.