Changeset 142157 in webkit
- Timestamp:
- Feb 7, 2013 11:19:06 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r142153 r142157 1 2013-02-07 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 3 [WK2][EFL] Add WKView methods related to background drawing 4 https://bugs.webkit.org/show_bug.cgi?id=109159 5 6 Reviewed by Anders Carlsson. 7 8 * UIProcess/API/C/efl/WKView.cpp: 9 (WKViewSetDrawsBackground): 10 (WKViewGetDrawsBackground): 11 (WKViewSetDrawsTransparentBackground): 12 (WKViewGetDrawsTransparentBackground): 13 * UIProcess/efl/WebView.cpp: 14 (WebKit::WebView::setDrawsBackground): 15 (WebKit): 16 (WebKit::WebView::drawsBackground): 17 (WebKit::WebView::setDrawsTransparentBackground): 18 (WebKit::WebView::drawsTransparentBackground): 19 * UIProcess/efl/WebView.h: 20 (WebView): 21 * UIProcess/API/C/efl/WKView.h: 22 23 New methods added 24 25 * UIProcess/API/efl/EwkView.cpp: 26 (EwkView::EwkView): 27 (EwkView::displayTimerFired): 28 (EwkView::handleEvasObjectColorSet): 29 * UIProcess/API/efl/EwkView.h: 30 (EwkView): 31 * UIProcess/API/efl/ewk_view.cpp: 32 (ewk_view_draws_page_background_set): 33 34 Remove the unneeded m_setDrawsBackground and replace 35 it with the WKView setting. 36 1 37 2013-02-07 Christophe Dumez <dchris@gmail.com> 2 38 -
trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.cpp
r141978 r142157 58 58 } 59 59 60 void WKViewSetDrawsBackground(WKViewRef viewRef, bool flag) 61 { 62 toImpl(viewRef)->setDrawsBackground(flag); 63 } 64 65 bool WKViewGetDrawsBackground(WKViewRef viewRef) 66 { 67 return toImpl(viewRef)->drawsBackground(); 68 } 69 70 void WKViewSetDrawsTransparentBackground(WKViewRef viewRef, bool flag) 71 { 72 toImpl(viewRef)->setDrawsTransparentBackground(flag); 73 } 74 75 bool WKViewGetDrawsTransparentBackground(WKViewRef viewRef) 76 { 77 return toImpl(viewRef)->drawsTransparentBackground(); 78 } 79 60 80 void WKViewSetThemePath(WKViewRef viewRef, WKStringRef theme) 61 81 { -
trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.h
r141836 r142157 45 45 WK_EXPORT void WKViewSetThemePath(WKViewRef, WKStringRef); 46 46 47 WK_EXPORT void WKViewSetDrawsBackground(WKViewRef, bool); 48 WK_EXPORT bool WKViewGetDrawsBackground(WKViewRef); 49 50 WK_EXPORT void WKViewSetDrawsTransparentBackground(WKViewRef, bool); 51 WK_EXPORT bool WKViewGetDrawsTransparentBackground(WKViewRef); 52 47 53 WK_EXPORT void WKViewSuspendActiveDOMObjectsAndAnimations(WKViewRef); 48 54 WK_EXPORT void WKViewResumeActiveDOMObjectsAndAnimations(WKViewRef); -
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
r141978 r142157 254 254 , m_inputMethodContext(InputMethodContextEfl::create(this, smartData()->base.evas)) 255 255 , m_isHardwareAccelerated(true) 256 , m_setDrawsBackground(false)257 256 { 258 257 ASSERT(m_evasObject); … … 550 549 551 550 scene->setActive(true); 552 scene->setDrawsBackground(m_setDrawsBackground); 551 scene->setDrawsBackground(WKViewGetDrawsBackground(wkView())); 552 553 553 if (m_isHardwareAccelerated) { 554 554 scene->paintToCurrentGLContext(transformToScene().toTransformationMatrix(), /* opacity */ 1, viewport); … … 1238 1238 1239 1239 evas_object_image_alpha_set(smartData->image, alpha < 255); 1240 view->page()->setDrawsBackground(red || green || blue);1241 view->page()->setDrawsTransparentBackground(alpha < 255);1240 WKViewSetDrawsBackground(view->wkView(), red || green || blue); 1241 WKViewSetDrawsTransparentBackground(view->wkView(), alpha < 255); 1242 1242 1243 1243 parentSmartClass.color_set(evasObject, red, green, blue, alpha); -
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h
r141978 r142157 219 219 220 220 bool isHardwareAccelerated() const { return m_isHardwareAccelerated; } 221 void setDrawsBackground(bool enable) { m_setDrawsBackground = enable; }222 221 223 222 PassRefPtr<cairo_surface_t> takeSnapshot(); … … 311 310 #endif 312 311 bool m_isHardwareAccelerated; 313 bool m_setDrawsBackground;314 312 315 313 static Evas_Smart_Class parentSmartClass; -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
r141978 r142157 37 37 #include "WKString.h" 38 38 #include "WKURL.h" 39 #include "WKView.h" 39 40 #include "WebContext.h" 40 41 #include "WebData.h" … … 480 481 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl); 481 482 482 impl->setDrawsBackground(enabled);483 WKViewSetDrawsBackground(impl->wkView(), enabled); 483 484 } 484 485 -
trunk/Source/WebKit2/UIProcess/efl/WebView.cpp
r141836 r142157 65 65 } 66 66 67 void WebView::setDrawsBackground(bool drawsBackground) 68 { 69 m_webPageProxy->setDrawsBackground(drawsBackground); 70 } 71 72 bool WebView::drawsBackground() const 73 { 74 return m_webPageProxy->drawsBackground(); 75 } 76 77 void WebView::setDrawsTransparentBackground(bool transparentBackground) 78 { 79 m_webPageProxy->setDrawsTransparentBackground(transparentBackground); 80 } 81 82 bool WebView::drawsTransparentBackground() const 83 { 84 return m_webPageProxy->drawsTransparentBackground(); 85 } 86 67 87 void WebView::suspendActiveDOMObjectsAndAnimations() 68 88 { -
trunk/Source/WebKit2/UIProcess/efl/WebView.h
r141836 r142157 47 47 WKPageRef pageRef() const { return toAPI(m_webPageProxy.get()); } 48 48 49 void setDrawsBackground(bool); 50 bool drawsBackground() const; 51 void setDrawsTransparentBackground(bool); 52 bool drawsTransparentBackground() const; 53 49 54 void setThemePath(WKStringRef); 55 50 56 void suspendActiveDOMObjectsAndAnimations(); 51 57 void resumeActiveDOMObjectsAndAnimations();
Note: See TracChangeset
for help on using the changeset viewer.