Changeset 142169 in webkit
- Timestamp:
- Feb 7, 2013 1:20:14 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r142160 r142169 1 2013-02-07 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> 2 3 [WK2][EFL] Removal of non coordinated graphics code path from WK2 EFL 4 https://bugs.webkit.org/show_bug.cgi?id=109165 5 6 Reviewed by Anders Carlsson. 7 8 Removed non coordinated graphics code path from WK2 EFL as it was not used by 9 anyone and caused a lot of preprocessor macros in the code making it less readable. 10 11 * UIProcess/API/efl/EvasGLContext.cpp: 12 * UIProcess/API/efl/EvasGLContext.h: 13 (WebKit::EvasGLContext::context): 14 * UIProcess/API/efl/EvasGLSurface.cpp: 15 * UIProcess/API/efl/EvasGLSurface.h: 16 (WebKit::EvasGLSurface::surface): 17 18 Removed also 'inline' and 'const' keywords from functions declaration, 19 as both EvasGLContext::context() and EvasGLSurface::surface() 20 are defined inside their classes and return mutable pointer. 21 22 * UIProcess/API/efl/EwkView.cpp: 23 (EwkView::EwkView): 24 (EwkView::transformFromScene): 25 (EwkView::transformToScreen): 26 (EwkView::coordinatedGraphicsScene): 27 (EwkView::displayTimerFired): 28 (EwkView::scheduleUpdateDisplay): Renamed from EwkView::update(). 29 (EwkView::exitAcceleratedCompositingMode): 30 (EwkView::handleEvasObjectCalculate): 31 (EwkView::takeSnapshot): 32 * UIProcess/API/efl/EwkView.h: 33 (WebCore): 34 (EwkView): 35 * UIProcess/API/efl/SnapshotImageGL.cpp: 36 (getImageSurfaceFromFrameBuffer): 37 * UIProcess/API/efl/SnapshotImageGL.h: 38 * UIProcess/API/efl/ewk_view.cpp: 39 * UIProcess/efl/PageClientBase.cpp: 40 (WebKit::PageClientBase::setViewNeedsDisplay): 41 (WebKit::PageClientBase::updateAcceleratedCompositingMode): 42 * UIProcess/efl/PageClientBase.h: 43 (PageClientBase): 44 * UIProcess/efl/PageClientDefaultImpl.cpp: 45 (WebKit::PageClientDefaultImpl::didCommitLoad): 46 (WebKit::PageClientDefaultImpl::updateViewportSize): 47 (WebKit::PageClientDefaultImpl::didChangeViewportProperties): 48 (WebKit::PageClientDefaultImpl::didChangeContentsSize): 49 (WebKit::PageClientDefaultImpl::pageTransitionViewportReady): 50 * UIProcess/efl/PageClientDefaultImpl.h: 51 (PageClientDefaultImpl): 52 * UIProcess/efl/PageClientLegacyImpl.cpp: 53 (WebKit::PageClientLegacyImpl::didCommitLoad): 54 (WebKit::PageClientLegacyImpl::updateViewportSize): 55 (WebKit::PageClientLegacyImpl::didChangeViewportProperties): 56 (WebKit::PageClientLegacyImpl::didChangeContentsSize): 57 (WebKit::PageClientLegacyImpl::pageDidRequestScroll): 58 (WebKit::PageClientLegacyImpl::didRenderFrame): 59 (WebKit::PageClientLegacyImpl::pageTransitionViewportReady): 60 * UIProcess/efl/PageClientLegacyImpl.h: 61 (PageClientLegacyImpl): 62 * UIProcess/efl/PageLoadClientEfl.cpp: 63 (WebKit::PageLoadClientEfl::didCommitLoadForFrame): 64 (WebKit::PageLoadClientEfl::PageLoadClientEfl): 65 * UIProcess/efl/PageLoadClientEfl.h: 66 (PageLoadClientEfl): 67 * UIProcess/efl/PageViewportControllerClientEfl.cpp: 68 (WebKit::PageViewportControllerClientEfl::didChangeContentsSize): 69 (WebKit::PageViewportControllerClientEfl::didChangeVisibleContents): 70 * UIProcess/efl/PageViewportControllerClientEfl.h: 71 * UIProcess/efl/WebInspectorProxyEfl.cpp: 72 (WebKit::WebInspectorProxy::platformCreateInspectorPage): 73 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 74 (WebKit::WebChromeClient::contentsSizeChanged): 75 1 76 2013-02-06 Sam Weinig <sam@webkit.org> 2 77 -
trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp
r133041 r142169 27 27 #include "EvasGLContext.h" 28 28 29 #if USE(ACCELERATED_COMPOSITING)30 31 29 namespace WebKit { 32 30 … … 45 43 46 44 } // namespace WebKit 47 48 #endif // USE(ACCELERATED_COMPOSITING) -
trunk/Source/WebKit2/UIProcess/API/efl/EvasGLContext.h
r133041 r142169 27 27 #define EvasGLContext_h 28 28 29 #if USE(ACCELERATED_COMPOSITING)30 29 #include <Evas_GL.h> 31 30 #include <wtf/PassOwnPtr.h> … … 47 46 ~EvasGLContext(); 48 47 49 inline Evas_GL_Context* context() const{ return m_context; }48 Evas_GL_Context* context() { return m_context; } 50 49 51 50 private: … … 58 57 } // namespace WebKit 59 58 60 #endif // USE(ACCELERATED_COMPOSITING)61 62 59 #endif // EvasGLContext_h -
trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp
r133041 r142169 27 27 #include "EvasGLSurface.h" 28 28 29 #if USE(ACCELERATED_COMPOSITING)30 31 29 namespace WebKit { 32 30 … … 45 43 46 44 } // namespace WebKit 47 48 #endif // USE(ACCELERATED_COMPOSITING) -
trunk/Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h
r138154 r142169 27 27 #define EvasGLSurface_h 28 28 29 #if USE(ACCELERATED_COMPOSITING)30 29 #include <Evas_GL.h> 31 30 #include <WebCore/IntSize.h> … … 55 54 ~EvasGLSurface(); 56 55 57 inline Evas_GL_Surface* surface() const{ return m_surface; }56 Evas_GL_Surface* surface() { return m_surface; } 58 57 59 58 private: … … 66 65 } // namespace WebKit 67 66 68 #endif // USE(ACCELERATED_COMPOSITING)69 70 67 #endif // EvasGLSurface_h -
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
r142157 r142169 65 65 #include <Ecore_X.h> 66 66 #include <Edje.h> 67 #include <Evas_GL.h> 67 68 #include <WebCore/CairoUtilitiesEfl.h> 68 69 #include <WebCore/CoordinatedGraphicsScene.h> … … 77 78 #if ENABLE(FULLSCREEN_API) 78 79 #include "WebFullScreenManagerProxy.h" 79 #endif80 81 #if USE(ACCELERATED_COMPOSITING)82 #include <Evas_GL.h>83 80 #endif 84 81 … … 227 224 : m_evasObject(evasObject) 228 225 , m_context(context) 229 #if USE(ACCELERATED_COMPOSITING)230 226 , m_pendingSurfaceResize(false) 231 #endif232 227 , m_pageClient(behavior == DefaultBehavior ? PageClientDefaultImpl::create(this) : PageClientLegacyImpl::create(this)) 233 228 , m_webView(adoptRef(new WebView(toImpl(m_context->wkContext()), m_pageClient.get(), toImpl(pageGroup), evasObject))) … … 242 237 #endif 243 238 , m_backForwardList(EwkBackForwardList::create(WKPageGetBackForwardList(wkPage()))) 244 #if USE(TILED_BACKING_STORE)245 239 , m_pageScaleFactor(1) 246 #endif247 240 , m_settings(EwkSettings::create(this)) 248 241 , m_cursorIdentifier(0) … … 453 446 AffineTransform transform; 454 447 455 #if USE(TILED_BACKING_STORE)456 448 // Note that we apply both page and device scale factors. 457 449 transform.scale(1 / pageScaleFactor()); 458 450 transform.scale(1 / deviceScaleFactor()); 459 451 transform.translate(pagePosition().x(), pagePosition().y()); 460 #endif461 452 462 453 Ewk_View_Smart_Data* sd = smartData(); … … 484 475 485 476 Ecore_X_Window window; 486 #if USE(ACCELERATED_COMPOSITING)487 477 window = ecore_evas_gl_x11_window_get(ecoreEvas); 488 478 // Fallback to software mode if necessary. 489 479 if (!window) 490 #endif 491 window = ecore_evas_software_x11_window_get(ecoreEvas); // Returns 0 if none. 480 window = ecore_evas_software_x11_window_get(ecoreEvas); // Returns 0 if none. 492 481 493 482 int x, y; // x, y are relative to parent (in a reparenting window manager). … … 506 495 } 507 496 508 #if USE(COORDINATED_GRAPHICS)509 497 CoordinatedGraphicsScene* EwkView::coordinatedGraphicsScene() 510 498 { … … 519 507 return coordinatedLayerTreeHostProxy->coordinatedGraphicsScene(); 520 508 } 521 #endif522 509 523 510 inline Ewk_View_Smart_Data* EwkView::smartData() const … … 528 515 void EwkView::displayTimerFired(Timer<EwkView>*) 529 516 { 530 #if USE(COORDINATED_GRAPHICS)531 517 Ewk_View_Smart_Data* sd = smartData(); 532 518 … … 568 554 evas_object_image_data_update_add(sd->image, 0, 0, viewport.width(), viewport.height()); 569 555 } 570 #endif 571 } 572 573 void EwkView::update(const IntRect& rect) 574 { 575 Ewk_View_Smart_Data* sd = smartData(); 576 #if USE(COORDINATED_GRAPHICS) 556 } 557 558 void EwkView::scheduleUpdateDisplay() 559 { 577 560 // Coordinated graphices needs to schedule an full update, not 578 561 // repainting of a region. Update in the event loop. 579 UNUSED_PARAM(rect); 580 562 Ewk_View_Smart_Data* sd = smartData(); 581 563 // Guard for zero sized viewport. 582 564 if (!(sd->view.w && sd->view.h)) … … 585 567 if (!m_displayTimer.isActive()) 586 568 m_displayTimer.startOneShot(0); 587 #else588 if (!sd->image)589 return;590 591 evas_object_image_data_update_add(sd->image, rect.x(), rect.y(), rect.width(), rect.height());592 #endif593 569 } 594 570 … … 789 765 } 790 766 791 #if USE(ACCELERATED_COMPOSITING)792 767 bool EwkView::createGLSurface(const IntSize& viewSize) 793 768 { … … 863 838 return true; 864 839 } 865 #endif866 840 867 841 #if ENABLE(INPUT_TYPE_COLOR) … … 1196 1170 view->page()->drawingArea()->setSize(IntSize(width, height), IntSize()); 1197 1171 1198 #if USE(ACCELERATED_COMPOSITING)1199 1172 view->setNeedsSurfaceResize(); 1200 #endif1201 #if USE(TILED_BACKING_STORE)1202 1173 view->pageClient()->updateViewportSize(); 1203 #endif1204 1174 } 1205 1175 } … … 1366 1336 1367 1337 Ewk_View_Smart_Data* sd = smartData(); 1368 #if USE(ACCELERATED_COMPOSITING)1369 1338 if (!m_isHardwareAccelerated) { 1370 #endif1371 1339 RefPtr<cairo_surface_t> snapshot = createSurfaceForImage(sd->image); 1372 1340 // Resume all animations. … … 1374 1342 1375 1343 return snapshot.release(); 1376 #if USE(ACCELERATED_COMPOSITING)1377 1344 } 1378 1345 … … 1382 1349 1383 1350 return snapshot.release(); 1384 #endif1385 1351 } 1386 1352 -
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h
r142157 r142169 22 22 #define EwkView_h 23 23 24 #include "EvasGLContext.h" 25 #include "EvasGLSurface.h" 24 26 #include "EwkViewCallbacks.h" 25 27 #include "ImmutableDictionary.h" … … 46 48 #endif 47 49 48 #if USE(ACCELERATED_COMPOSITING)49 #include "EvasGLContext.h"50 #include "EvasGLSurface.h"51 #endif52 50 53 51 #include "WebContext.h" … … 81 79 class Cursor; 82 80 class IntSize; 83 #if USE(COORDINATED_GRAPHICS)84 81 class CoordinatedGraphicsScene; 85 #endif86 82 } 87 83 … … 94 90 class EwkWindowFeatures; 95 91 96 #if USE(ACCELERATED_COMPOSITING)97 92 typedef struct _Evas_GL_Context Evas_GL_Context; 98 93 typedef struct _Evas_GL_Surface Evas_GL_Surface; 99 #endif100 94 101 95 typedef struct Ewk_View_Smart_Data Ewk_View_Smart_Data; … … 160 154 void setImageData(void* imageData, const WebCore::IntSize& size); 161 155 162 void update(const WebCore::IntRect& rect = WebCore::IntRect());156 void scheduleUpdateDisplay(); 163 157 164 158 #if ENABLE(FULLSCREEN_API) … … 170 164 void setWindowGeometry(const WKRect&); 171 165 172 #if USE(ACCELERATED_COMPOSITING)173 166 bool createGLSurface(const WebCore::IntSize& viewSize); 174 167 bool enterAcceleratedCompositingMode(); 175 168 bool exitAcceleratedCompositingMode(); 176 169 void setNeedsSurfaceResize() { m_pendingSurfaceResize = true; } 177 #endif178 170 179 171 #if ENABLE(INPUT_TYPE_COLOR) … … 205 197 unsigned long long informDatabaseQuotaReached(const String& databaseName, const String& displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage); 206 198 207 #if USE(TILED_BACKING_STORE)208 199 WebKit::PageClientBase* pageClient() { return m_pageClient.get(); } 209 200 … … 213 204 void setPagePosition(const WebCore::FloatPoint& position) { m_pagePosition = position; } 214 205 const WebCore::FloatPoint pagePosition() const { return m_pagePosition; } 215 #endif216 206 217 207 // FIXME: needs refactoring (split callback invoke) … … 230 220 void displayTimerFired(WebCore::Timer<EwkView>*); 231 221 232 #if USE(COORDINATED_GRAPHICS)233 222 WebCore::CoordinatedGraphicsScene* coordinatedGraphicsScene(); 234 #endif235 223 236 224 void informIconChange(); … … 268 256 Evas_Object* m_evasObject; 269 257 RefPtr<EwkContext> m_context; 270 #if USE(ACCELERATED_COMPOSITING)271 258 OwnPtr<Evas_GL> m_evasGL; 272 259 OwnPtr<WebKit::EvasGLContext> m_evasGLContext; 273 260 OwnPtr<WebKit::EvasGLSurface> m_evasGLSurface; 274 261 bool m_pendingSurfaceResize; 275 #endif276 262 OwnPtr<WebKit::PageClientBase> m_pageClient; 277 263 RefPtr<WebKit::WebView> m_webView; … … 286 272 #endif 287 273 OwnPtr<EwkBackForwardList> m_backForwardList; 288 #if USE(TILED_BACKING_STORE)289 274 float m_pageScaleFactor; 290 275 WebCore::FloatPoint m_pagePosition; 291 #endif292 276 OwnPtr<EwkSettings> m_settings; 293 277 RefPtr<EwkWindowFeatures> m_windowFeatures; -
trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.cpp
r138518 r142169 27 27 #include "SnapshotImageGL.h" 28 28 29 #if USE(ACCELERATED_COMPOSITING)30 29 #if USE(OPENGL_ES_2) 31 30 #include <GLES2/gl2.h> … … 58 57 return newSurface; 59 58 } 60 61 #endif -
trunk/Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.h
r138518 r142169 30 30 #include <wtf/OwnArrayPtr.h> 31 31 32 #if USE(ACCELERATED_COMPOSITING)33 32 PassRefPtr<cairo_surface_t> getImageSurfaceFromFrameBuffer(int x, int y, int width, int height); 34 #endif35 33 36 34 #endif // SnapshotImageGL_h -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
r142157 r142169 30 30 #include "PagePolicyClientEfl.h" 31 31 #include "PageUIClientEfl.h" 32 #include "PageViewportController.h" 33 #include "PageViewportControllerClientEfl.h" 32 34 #include "WKAPICast.h" 33 35 #include "WKEinaSharedString.h" … … 58 60 #endif 59 61 60 #if USE(TILED_BACKING_STORE)61 #include "PageViewportController.h"62 #include "PageViewportControllerClientEfl.h"63 #endif64 65 62 using namespace WebKit; 66 63 using namespace WebCore; -
trunk/Source/WebKit2/UIProcess/efl/PageClientBase.cpp
r141978 r142169 74 74 } 75 75 76 void PageClientBase::setViewNeedsDisplay(const WebCore::IntRect& rect)77 { 78 m_view-> update(rect);76 void PageClientBase::setViewNeedsDisplay(const WebCore::IntRect&) 77 { 78 m_view->scheduleUpdateDisplay(); 79 79 } 80 80 … … 236 236 } 237 237 238 #if USE(ACCELERATED_COMPOSITING)239 238 void PageClientBase::enterAcceleratedCompositingMode(const LayerTreeContext&) 240 239 { … … 251 250 notImplemented(); 252 251 } 253 #endif // USE(ACCELERATED_COMPOSITING)254 252 255 253 void PageClientBase::didCommitLoadForMainFrame(bool) -
trunk/Source/WebKit2/UIProcess/efl/PageClientBase.h
r140686 r142169 95 95 96 96 virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool, bool); 97 #if USE(ACCELERATED_COMPOSITING)98 97 virtual void enterAcceleratedCompositingMode(const LayerTreeContext&); 99 98 virtual void exitAcceleratedCompositingMode(); 100 99 virtual void updateAcceleratedCompositingMode(const LayerTreeContext&); 101 #endif102 100 103 101 virtual void didCommitLoadForMainFrame(bool); … … 110 108 virtual void countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned); 111 109 112 #if USE(TILED_BACKING_STORE)113 110 virtual void pageDidRequestScroll(const WebCore::IntPoint&) = 0; 114 111 virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect) = 0; 115 112 virtual void pageTransitionViewportReady() = 0; 116 #endif117 113 118 114 protected: -
trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.cpp
r140686 r142169 27 27 #include "config.h" 28 28 #include "PageClientDefaultImpl.h" 29 #include "PageViewportController.h" 30 #include "PageViewportControllerClientEfl.h" 29 31 30 32 #include "EwkView.h" 31 33 #include "ewk_view.h" 32 33 #if USE(TILED_BACKING_STORE)34 #include "PageViewportController.h"35 #include "PageViewportControllerClientEfl.h"36 #endif37 34 38 35 using namespace WebCore; … … 48 45 void PageClientDefaultImpl::didCommitLoad() 49 46 { 50 #if USE(TILED_BACKING_STORE)51 47 ASSERT(m_pageViewportController); 52 48 m_pageViewportController->didCommitLoad(); 53 #endif54 49 } 55 50 56 51 void PageClientDefaultImpl::updateViewportSize() 57 52 { 58 #if USE(TILED_BACKING_STORE)59 53 if (!m_pageViewportControllerClient) { 60 54 m_pageViewportControllerClient = PageViewportControllerClientEfl::create(m_view); … … 62 56 } 63 57 m_pageViewportControllerClient->updateViewportSize(); 64 #endif65 58 } 66 59 … … 81 74 void PageClientDefaultImpl::didChangeViewportProperties(const WebCore::ViewportAttributes& attr) 82 75 { 83 #if USE(TILED_BACKING_STORE)84 76 ASSERT(m_pageViewportController); 85 77 m_pageViewportController->didChangeViewportAttributes(attr); 86 #else87 UNUSED_PARAM(attr);88 #endif89 78 } 90 79 91 80 void PageClientDefaultImpl::didChangeContentsSize(const WebCore::IntSize& size) 92 81 { 93 #if USE(TILED_BACKING_STORE)94 82 ASSERT(m_pageViewportController); 95 83 m_pageViewportController->didChangeContentsSize(size); 96 #endif97 98 84 m_view->smartCallback<ContentsSizeChanged>().call(size); 99 85 } 100 86 101 #if USE(TILED_BACKING_STORE)102 87 void PageClientDefaultImpl::pageDidRequestScroll(const IntPoint& position) 103 88 { … … 117 102 m_pageViewportController->pageTransitionViewportReady(); 118 103 } 119 #endif120 104 121 105 } // namespace WebKit -
trunk/Source/WebKit2/UIProcess/efl/PageClientDefaultImpl.h
r140686 r142169 55 55 virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&); 56 56 virtual void didChangeContentsSize(const WebCore::IntSize&); 57 #if USE(TILED_BACKING_STORE)58 57 virtual void pageDidRequestScroll(const WebCore::IntPoint&); 59 58 virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect); … … 62 61 OwnPtr<WebKit::PageViewportControllerClientEfl> m_pageViewportControllerClient; 63 62 OwnPtr<WebKit::PageViewportController> m_pageViewportController; 64 #endif65 63 }; 66 64 -
trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.cpp
r141310 r142169 45 45 void PageClientLegacyImpl::didCommitLoad() 46 46 { 47 m_view-> update();47 m_view->scheduleUpdateDisplay(); 48 48 } 49 49 50 50 void PageClientLegacyImpl::updateViewportSize() 51 51 { 52 #if USE(TILED_BACKING_STORE)53 52 m_view->page()->drawingArea()->setVisibleContentsRect(IntRect(roundedIntPoint(m_view->pagePosition()), m_view->size()), FloatPoint()); 54 #endif55 53 } 56 54 … … 69 67 void PageClientLegacyImpl::didChangeViewportProperties(const WebCore::ViewportAttributes&) 70 68 { 71 m_view-> update();69 m_view->scheduleUpdateDisplay(); 72 70 } 73 71 74 72 void PageClientLegacyImpl::didChangeContentsSize(const WebCore::IntSize& size) 75 73 { 76 #if USE(TILED_BACKING_STORE)77 74 m_view->page()->drawingArea()->coordinatedLayerTreeHostProxy()->setContentsSize(FloatSize(size.width(), size.height())); 78 m_view->update(); 79 #endif 75 m_view->scheduleUpdateDisplay(); 80 76 81 77 m_view->smartCallback<ContentsSizeChanged>().call(size); 82 78 } 83 79 84 #if USE(TILED_BACKING_STORE)85 80 void PageClientLegacyImpl::pageDidRequestScroll(const IntPoint& position) 86 81 { 87 82 m_view->setPagePosition(FloatPoint(position)); 88 m_view-> update();83 m_view->scheduleUpdateDisplay(); 89 84 } 90 85 91 86 void PageClientLegacyImpl::didRenderFrame(const WebCore::IntSize&, const WebCore::IntRect&) 92 87 { 93 m_view-> update();88 m_view->scheduleUpdateDisplay(); 94 89 } 95 90 96 91 void PageClientLegacyImpl::pageTransitionViewportReady() 97 92 { 98 m_view-> update();93 m_view->scheduleUpdateDisplay(); 99 94 } 100 #endif101 95 102 96 } // namespace WebKit -
trunk/Source/WebKit2/UIProcess/efl/PageClientLegacyImpl.h
r140686 r142169 52 52 virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&); 53 53 virtual void didChangeContentsSize(const WebCore::IntSize&); 54 #if USE(TILED_BACKING_STORE)55 54 virtual void pageDidRequestScroll(const WebCore::IntPoint&); 56 55 virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect); 57 56 virtual void pageTransitionViewportReady(); 58 #endif59 57 }; 60 58 -
trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp
r141978 r142169 112 112 } 113 113 114 #if USE(TILED_BACKING_STORE)115 114 void PageLoadClientEfl::didCommitLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo) 116 115 { … … 121 120 view->pageClient()->didCommitLoad(); 122 121 } 123 #endif124 122 125 123 void PageLoadClientEfl::didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void* clientInfo) … … 171 169 loadClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame; 172 170 loadClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame; 173 #if USE(TILED_BACKING_STORE)174 171 loadClient.didCommitLoadForFrame = didCommitLoadForFrame; 175 #endif176 172 loadClient.didChangeBackForwardList = didChangeBackForwardList; 177 173 loadClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame; -
trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.h
r141439 r142169 54 54 static void didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef userData, const void* clientInfo); 55 55 static void didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef, WKErrorRef, WKTypeRef userData, const void* clientInfo); 56 #if USE(TILED_BACKING_STORE)57 56 static void didCommitLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef userData, const void* clientInfo); 58 #endif59 57 static void didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void* clientInfo); 60 58 static void didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocumentNavigationType, WKTypeRef, const void* clientInfo); -
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
r141543 r142169 26 26 #include "config.h" 27 27 #include "PageViewportControllerClientEfl.h" 28 29 #if USE(TILED_BACKING_STORE)30 28 31 29 #include "CoordinatedLayerTreeHostProxy.h" … … 72 70 { 73 71 drawingArea()->coordinatedLayerTreeHostProxy()->setContentsSize(contentsSize); 74 m_view-> update();72 m_view->scheduleUpdateDisplay(); 75 73 } 76 74 … … 100 98 void PageViewportControllerClientEfl::didChangeVisibleContents() 101 99 { 102 m_view-> update();100 m_view->scheduleUpdateDisplay(); 103 101 } 104 102 … … 113 111 114 112 } // namespace WebKit 115 #endif // USE(TILED_BACKING_STORE)116 -
trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.h
r140686 r142169 26 26 #ifndef PageViewportControllerClientEfl_h 27 27 #define PageViewportControllerClientEfl_h 28 29 #if USE(TILED_BACKING_STORE)30 28 31 29 #include "EwkView.h" … … 72 70 } // namespace WebKit 73 71 74 #endif75 76 72 #endif // PageViewportControllerClientEfl_h -
trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp
r141978 r142169 88 88 ASSERT(m_page); 89 89 90 #if USE(ACCELERATED_COMPOSITING) && definedHAVE_ECORE_X90 #ifdef HAVE_ECORE_X 91 91 const char* engine = "opengl_x11"; 92 92 m_inspectorWindow = ecore_evas_new(engine, 0, 0, initialWindowWidth, initialWindowHeight, 0); -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r140713 r142169 447 447 return; 448 448 449 #if PLATFORM(QT) || (PLATFORM(EFL) && USE(TILED_BACKING_STORE))449 #if PLATFORM(QT) || PLATFORM(EFL) 450 450 if (m_page->useFixedLayout()) { 451 451 // The below method updates the size().
Note: See TracChangeset
for help on using the changeset viewer.