Attachment #122148 for bug #75695

View Details Raw Unified Return to Bug 75695

| Differences between



2012-01-11  KwangHyuk Kim  <hyuki.kim@samsung.com>

        [EFL] Modify some API's implementation to let it directly pass Eina_Rectangle into IntRect.
        https://bugs.webkit.org/show_bug.cgi?id=75695

        Reviewed by NOBODY (OOPS!).

        As some APIs in ewk_view doesn't make the best use of direct passing of
        Eina_Rectangle parameter into IntRect although IntRect supports it,
        I just refactor the code to let it directly pass Eina_Rectangle into IntRect.

        * ewk/ewk_view.cpp:
        (ewk_view_paint_context_clip):
        (ewk_view_paint_context_paint):
        (ewk_view_paint_context_paint_contents):
        (ewk_view_paint):
        (ewk_view_paint_contents):

2012-01-11  JungJik Lee  <jungjik.lee@samsung.com>

        [EFL] Refactor single backing store scroll code.



{
    EINA_SAFETY_ON_NULL_RETURN(context);
    EINA_SAFETY_ON_NULL_RETURN(area);
    context->graphicContext->clip(WebCore::IntRect(*area));
    context->graphicContext->clip(WebCore::IntRect(area->x, area->y, area->w, area->h));
}

void ewk_view_paint_context_paint(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)

    EINA_SAFETY_ON_NULL_RETURN(context);
    EINA_SAFETY_ON_NULL_RETURN(area);

    WebCore::IntRect rect(*area);

    if (context->view->isTransparent())
        context->graphicContext->clearRect(rect);

    EINA_SAFETY_ON_NULL_RETURN(context);
    EINA_SAFETY_ON_NULL_RETURN(area);

    WebCore::IntRect rect(*area);

    if (context->view->isTransparent())
        context->graphicContext->clearRect(rect);

    if (view->needsLayout())
        view->forceLayout();
    WebCore::GraphicsContext graphicsContext(cr);
    WebCore::IntRect rect(*area);

    cairo_save(cr);
    graphicsContext.save();

    EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);

    WebCore::GraphicsContext graphicsContext(cr);
    WebCore::IntRect rect(*area);

    cairo_save(cr);
    graphicsContext.save();

Return to Bug 75695

Lines 2609-2616 void ewk_view_paint_context_clip(Ewk_View_Paint_Context* context, const Eina_Rec a/Source/WebKit/efl/ewk/ewk_view.cpp_sec1
- a/Source/WebKit/efl/ewk/ewk_view.cpp -6 / +5 lines
2609	{	2609	{
2610	EINA_SAFETY_ON_NULL_RETURN(context);	2610	EINA_SAFETY_ON_NULL_RETURN(context);
2611	EINA_SAFETY_ON_NULL_RETURN(area);	2611	EINA_SAFETY_ON_NULL_RETURN(area);
2612		2612	context->graphicContext->clip(WebCore::IntRect(*area));
2613	context->graphicContext->clip(WebCore::IntRect(area->x, area->y, area->w, area->h));
2614	}	2613	}
2615		2614
2616	void ewk_view_paint_context_paint(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)	2615	void ewk_view_paint_context_paint(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)
Lines 2618-2624 void ewk_view_paint_context_paint(Ewk_View_Paint_Context* context, const Eina_Re a/Source/WebKit/efl/ewk/ewk_view.cpp_sec2
2618	EINA_SAFETY_ON_NULL_RETURN(context);	2617	EINA_SAFETY_ON_NULL_RETURN(context);
2619	EINA_SAFETY_ON_NULL_RETURN(area);	2618	EINA_SAFETY_ON_NULL_RETURN(area);
2620		2619
2621	WebCore::IntRect rect(area->x, area->y, area->w, area->h);	2620	WebCore::IntRect rect(*area);
2622		2621
2623	if (context->view->isTransparent())	2622	if (context->view->isTransparent())
2624	context->graphicContext->clearRect(rect);	2623	context->graphicContext->clearRect(rect);
Lines 2630-2636 void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context* context, cons a/Source/WebKit/efl/ewk/ewk_view.cpp_sec3
2630	EINA_SAFETY_ON_NULL_RETURN(context);	2629	EINA_SAFETY_ON_NULL_RETURN(context);
2631	EINA_SAFETY_ON_NULL_RETURN(area);	2630	EINA_SAFETY_ON_NULL_RETURN(area);
2632		2631
2633	WebCore::IntRect rect(area->x, area->y, area->w, area->h);	2632	WebCore::IntRect rect(*area);
2634		2633
2635	if (context->view->isTransparent())	2634	if (context->view->isTransparent())
2636	context->graphicContext->clearRect(rect);	2635	context->graphicContext->clearRect(rect);
Lines 2663-2669 Eina_Bool ewk_view_paint(Ewk_View_Private_Data* priv, cairo_t* cr, const Eina_Re a/Source/WebKit/efl/ewk/ewk_view.cpp_sec4
2663	if (view->needsLayout())	2662	if (view->needsLayout())
2664	view->forceLayout();	2663	view->forceLayout();
2665	WebCore::GraphicsContext graphicsContext(cr);	2664	WebCore::GraphicsContext graphicsContext(cr);
2666	WebCore::IntRect rect(area->x, area->y, area->w, area->h);	2665	WebCore::IntRect rect(*area);
2667		2666
2668	cairo_save(cr);	2667	cairo_save(cr);
2669	graphicsContext.save();	2668	graphicsContext.save();
Lines 2686-2692 Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data* priv, cairo_t* cr, cons a/Source/WebKit/efl/ewk/ewk_view.cpp_sec5
2686	EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);	2685	EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);
2687		2686
2688	WebCore::GraphicsContext graphicsContext(cr);	2687	WebCore::GraphicsContext graphicsContext(cr);
2689	WebCore::IntRect rect(area->x, area->y, area->w, area->h);	2688	WebCore::IntRect rect(*area);
2690		2689
2691	cairo_save(cr);	2690	cairo_save(cr);
2692	graphicsContext.save();	2691	graphicsContext.save();

Lines 1-3 a/Source/WebKit/efl/ChangeLog_sec1
- a/Source/WebKit/efl/ChangeLog +18 lines
		1	2012-01-11 KwangHyuk Kim <hyuki.kim@samsung.com>
		2
		3	[EFL] Modify some API's implementation to let it directly pass Eina_Rectangle into IntRect.
		4	https://bugs.webkit.org/show_bug.cgi?id=75695
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	As some APIs in ewk_view doesn't make the best use of direct passing of
		9	Eina_Rectangle parameter into IntRect although IntRect supports it,
		10	I just refactor the code to let it directly pass Eina_Rectangle into IntRect.
		11
		12	* ewk/ewk_view.cpp:
		13	(ewk_view_paint_context_clip):
		14	(ewk_view_paint_context_paint):
		15	(ewk_view_paint_context_paint_contents):
		16	(ewk_view_paint):
		17	(ewk_view_paint_contents):
		18
1	2012-01-11 JungJik Lee <jungjik.lee@samsung.com>	19	2012-01-11 JungJik Lee <jungjik.lee@samsung.com>
2		20
3	[EFL] Refactor single backing store scroll code.	21	[EFL] Refactor single backing store scroll code.