<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167428] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167428">167428</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-17 07:53:31 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Remove deprecated ewk_paint code.
https://bugs.webkit.org/show_bug.cgi?id=131266
Patch by Hyowon Kim <hw1008.kim@samsung.com> on 2014-04-17
Reviewed by Gyuyoung Kim.
ewk_paint related code was deprecated since <a href="http://trac.webkit.org/projects/webkit/changeset/166637">r166637</a>.
Source/WebKit:
* PlatformEfl.cmake: Remove ewk_paint_context.cpp
Source/WebKit/efl:
* WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::invalidateRootView): Deleted.
(WebCore::ChromeClientEfl::invalidateContentsAndRootView): Deleted.
(WebCore::ChromeClientEfl::invalidateContentsForSlowScroll): Deleted.
(WebCore::ChromeClientEfl::scroll): Deleted.
* WebCoreSupport/ChromeClientEfl.h:
* WebCoreSupport/InspectorClientEfl.cpp:
* ewk/ewk_paint_context.cpp: Removed.
* ewk/ewk_paint_context_private.h: Removed.
* ewk/ewk_view.cpp:
(_ewk_view_priv_del):
(_ewk_view_smart_calculate):
(ewk_view_smart_set):
(_ewk_view_repaints_resize): Deleted.
(_ewk_view_repaint_add): Deleted.
(_ewk_view_repaints_flush): Deleted.
(_ewk_view_smart_flush): Deleted.
(ewk_view_repaints_pop): Deleted.
(ewk_view_repaint_add): Deleted.
(ewk_view_paint): Deleted.
(ewk_view_paint_contents): Deleted.
(ewk_view_repaint): Deleted.
(ewk_view_scroll): Deleted.
(ewk_view_tiled_backing_store_invalidate): Deleted.
* ewk/ewk_view_private.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformEflcmake">trunk/Source/WebKit/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportAcceleratedCompositingContextEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportChromeClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportChromeClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportInspectorClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_view_privateh">trunk/Source/WebKit/efl/ewk/ewk_view_private.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKiteflewkewk_paint_contextcpp">trunk/Source/WebKit/efl/ewk/ewk_paint_context.cpp</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_paint_context_privateh">trunk/Source/WebKit/efl/ewk/ewk_paint_context_private.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/ChangeLog 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-17 Hyowon Kim <hw1008.kim@samsung.com>
+
+ [EFL] Remove deprecated ewk_paint code.
+ https://bugs.webkit.org/show_bug.cgi?id=131266
+
+ Reviewed by Gyuyoung Kim.
+
+ ewk_paint related code was deprecated since r166637.
+
+ * PlatformEfl.cmake: Remove ewk_paint_context.cpp
+
</ins><span class="cx"> 2014-04-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make Windows fail with a link error so I know what the new symbol is.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformEfl.cmake (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformEfl.cmake 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> efl/ewk/ewk_js.cpp
</span><span class="cx"> efl/ewk/ewk_main.cpp
</span><span class="cx"> efl/ewk/ewk_network.cpp
</span><del>- efl/ewk/ewk_paint_context.cpp
</del><span class="cx"> efl/ewk/ewk_security_origin.cpp
</span><span class="cx"> efl/ewk/ewk_security_policy.cpp
</span><span class="cx"> efl/ewk/ewk_settings.cpp
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-04-17 Hyowon Kim <hw1008.kim@samsung.com>
+
+ [EFL] Remove deprecated ewk_paint code.
+ https://bugs.webkit.org/show_bug.cgi?id=131266
+
+ Reviewed by Gyuyoung Kim.
+
+ ewk_paint related code was deprecated since r166637.
+
+ * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
+ * WebCoreSupport/ChromeClientEfl.cpp:
+ (WebCore::ChromeClientEfl::invalidateRootView): Deleted.
+ (WebCore::ChromeClientEfl::invalidateContentsAndRootView): Deleted.
+ (WebCore::ChromeClientEfl::invalidateContentsForSlowScroll): Deleted.
+ (WebCore::ChromeClientEfl::scroll): Deleted.
+ * WebCoreSupport/ChromeClientEfl.h:
+ * WebCoreSupport/InspectorClientEfl.cpp:
+ * ewk/ewk_paint_context.cpp: Removed.
+ * ewk/ewk_paint_context_private.h: Removed.
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_del):
+ (_ewk_view_smart_calculate):
+ (ewk_view_smart_set):
+ (_ewk_view_repaints_resize): Deleted.
+ (_ewk_view_repaint_add): Deleted.
+ (_ewk_view_repaints_flush): Deleted.
+ (_ewk_view_smart_flush): Deleted.
+ (ewk_view_repaints_pop): Deleted.
+ (ewk_view_repaint_add): Deleted.
+ (ewk_view_paint): Deleted.
+ (ewk_view_paint_contents): Deleted.
+ (ewk_view_repaint): Deleted.
+ (ewk_view_scroll): Deleted.
+ (ewk_view_tiled_backing_store_invalidate): Deleted.
+ * ewk/ewk_view_private.h:
+
</ins><span class="cx"> 2014-04-16 Jeongeun Kim <je_julie.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Cleanup the build from unused parameters in WebKit-efl.
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportAcceleratedCompositingContextEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "AcceleratedCompositingContextEfl.h"
</span><span class="cx"> #include "CairoUtilities.h"
</span><span class="cx"> #include "CairoUtilitiesEfl.h"
</span><ins>+#include "FrameView.h"
</ins><span class="cx"> #include "GraphicsLayerTextureMapper.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "PlatformContextCairo.h"
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportChromeClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -514,40 +514,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void ChromeClientEfl::invalidateRootView(const IntRect& updateRect)
-{
-#if USE(TILED_BACKING_STORE)
- ewk_view_tiled_backing_store_invalidate(m_view, updateRect);
-#else
- UNUSED_PARAM(updateRect);
- notImplemented();
-#endif
-}
-
-void ChromeClientEfl::invalidateContentsAndRootView(const IntRect& updateRect)
-{
- if (updateRect.isEmpty())
- return;
-
- Evas_Coord x, y, w, h;
-
- x = updateRect.x();
- y = updateRect.y();
- w = updateRect.width();
- h = updateRect.height();
- ewk_view_repaint(m_view, x, y, w, h);
-}
-
-void ChromeClientEfl::invalidateContentsForSlowScroll(const IntRect& updateRect)
-{
- invalidateContentsAndRootView(updateRect);
-}
-
-void ChromeClientEfl::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
-{
- ewk_view_scroll(m_view, scrollDelta, rectToScroll, clipRect);
-}
-
</del><span class="cx"> void ChromeClientEfl::loadIconForFiles(const Vector<String>&, FileIconLoader*)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportChromeClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -156,10 +156,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void scrollRectIntoView(const IntRect&) const override { }
</span><span class="cx">
</span><del>- virtual void invalidateRootView(const IntRect&) override;
- virtual void invalidateContentsAndRootView(const IntRect&) override;
- virtual void invalidateContentsForSlowScroll(const IntRect&) override;
- virtual void scroll(const IntSize&, const IntRect&, const IntRect&) override;
</del><ins>+ virtual void invalidateRootView(const IntRect&) override { }
+ virtual void invalidateContentsAndRootView(const IntRect&) override { }
+ virtual void invalidateContentsForSlowScroll(const IntRect&) override { }
+ virtual void scroll(const IntSize&, const IntRect&, const IntRect&) override { }
</ins><span class="cx">
</span><span class="cx"> virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportInspectorClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "EflInspectorUtilities.h"
</span><ins>+#include "FrameView.h"
</ins><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "NotImplemented.h"
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_paint_contextcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/efl/ewk/ewk_paint_context.cpp (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_paint_context.cpp 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/ewk/ewk_paint_context.cpp 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -1,202 +0,0 @@
</span><del>-/*
- Copyright (C) 2009-2012 Samsung Electronics
- Copyright (C) 2009-2010 ProFUSION embedded systems
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-
-#include "Frame.h"
-#include "TiledBackingStore.h"
-#include "ewk_paint_context_private.h"
-#include "ewk_private.h"
-
-#if ENABLE(INSPECTOR)
-#include "InspectorController.h"
-#include "Page.h"
-#endif
-
-Ewk_Paint_Context* ewk_paint_context_new(cairo_t* cairo)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(cairo, 0);
-
- Ewk_Paint_Context* context = new Ewk_Paint_Context;
- context->graphicContext = adoptPtr(new WebCore::GraphicsContext(cairo));
- context->cairo = adoptRef(cairo_reference(cairo));
- context->image = 0;
- context->pixels = 0;
-
- return context;
-}
-
-Ewk_Paint_Context* ewk_paint_context_from_image_new(Evas_Object* image)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(image, 0);
-
- Evas_Coord width, height;
- uint8_t* pixels = static_cast<uint8_t*>(evas_object_image_data_get(image, true));
- evas_object_image_size_get(image, &width, &height);
-
- Ewk_Paint_Context* context = ewk_paint_context_from_image_data_new(pixels, width, height, EVAS_COLORSPACE_ARGB8888);
- if (context) {
- context->pixels = pixels;
- context->image = image;
- }
-
- return context;
-}
-
-Ewk_Paint_Context* ewk_paint_context_from_image_data_new(uint8_t* pixels, int width, int height, int colorSpace)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(pixels, 0);
-
- OwnPtr<Ewk_Paint_Context> context = adoptPtr(new Ewk_Paint_Context);
- context->pixels = pixels;
- context->image = 0;
-
- cairo_format_t format;
- int stride;
- switch (colorSpace) {
- case EVAS_COLORSPACE_ARGB8888:
- stride = width * 4;
- format = CAIRO_FORMAT_ARGB32;
- break;
- case EVAS_COLORSPACE_RGB565_A5P:
- stride = width * 2;
- format = CAIRO_FORMAT_RGB16_565;
- break;
- default:
- ERR("unknown color space: %d", colorSpace);
- return 0;
- }
-
- context->surface = adoptRef(cairo_image_surface_create_for_data(pixels, format, width, height, stride));
- cairo_status_t status = cairo_surface_status(context->surface.get());
- if (status != CAIRO_STATUS_SUCCESS) {
- ERR("could not create surface from data %dx%d: %s", width, height, cairo_status_to_string(status));
- return 0;
- }
-
- context->cairo = adoptRef(cairo_create(context->surface.get()));
- status = cairo_status(context->cairo.get());
- if (status != CAIRO_STATUS_SUCCESS) {
- ERR("could not create cairo from surface %dx%d: %s", width, height, cairo_status_to_string(status));
- return 0;
- }
-
- context->graphicContext = adoptPtr(new WebCore::GraphicsContext(context->cairo.get()));
-
- return context.release().leakPtr();
-}
-
-void ewk_paint_context_free(Ewk_Paint_Context* context)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- if (context->image && context->pixels) {
- // Decrease refcount inside image object.
- evas_object_image_data_set(context->image, context->pixels);
- }
- delete context;
-}
-
-void ewk_paint_context_save(Ewk_Paint_Context* context)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- cairo_save(context->cairo.get());
- context->graphicContext->save();
-}
-
-void ewk_paint_context_restore(Ewk_Paint_Context* context)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- context->graphicContext->restore();
- cairo_restore(context->cairo.get());
-}
-
-void ewk_paint_context_clip(Ewk_Paint_Context* context, const Eina_Rectangle* area)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
- EINA_SAFETY_ON_NULL_RETURN(area);
-
- context->graphicContext->clip(WebCore::IntRect(*area));
-}
-
-void ewk_paint_context_scale(Ewk_Paint_Context* context, float scaleX, float scaleY)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- context->graphicContext->scale(WebCore::FloatSize(scaleX, scaleY));
-}
-
-void ewk_paint_context_translate(Ewk_Paint_Context* context, float x, float y)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- context->graphicContext->translate(x, y);
-}
-
-void ewk_paint_context_paint(Ewk_Paint_Context* context, WebCore::FrameView* view, const Eina_Rectangle* area)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
- EINA_SAFETY_ON_NULL_RETURN(view);
- EINA_SAFETY_ON_NULL_RETURN(area);
-
- WebCore::IntRect paintArea(*area);
-
-#if USE(TILED_BACKING_STORE)
- if (view->frame().tiledBackingStore()) {
- int scrollX = view->scrollX();
- int scrollY = view->scrollY();
-
- context->graphicContext->translate(-scrollX, -scrollY);
-
- paintArea.move(scrollX, scrollY);
-
- view->frame().tiledBackingStore()->paint(context->graphicContext.get(), paintArea);
- return;
- }
-#endif
-
- if (view->isTransparent())
- context->graphicContext->clearRect(paintArea);
- view->paint(context->graphicContext.get(), paintArea);
-}
-
-void ewk_paint_context_paint_contents(Ewk_Paint_Context* context, WebCore::FrameView* view, const Eina_Rectangle* area)
-{
- EINA_SAFETY_ON_NULL_RETURN(context);
- EINA_SAFETY_ON_NULL_RETURN(view);
- EINA_SAFETY_ON_NULL_RETURN(area);
-
- WebCore::IntRect paintArea(*area);
-
- if (view->isTransparent())
- context->graphicContext->clearRect(paintArea);
- view->paintContents(context->graphicContext.get(), paintArea);
-
-#if ENABLE(INSPECTOR)
- WebCore::Page* page = view->frame().page();
- if (page) {
- WebCore::InspectorController& controller = page->inspectorController();
- if (controller.highlightedNode())
- controller.drawHighlight(*context->graphicContext);
- }
-#endif
-}
</del></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_paint_context_privateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/efl/ewk/ewk_paint_context_private.h (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_paint_context_private.h 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/ewk/ewk_paint_context_private.h 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -1,221 +0,0 @@
</span><del>-/*
- Copyright (C) 2009-2012 Samsung Electronics
- Copyright (C) 2009-2010 ProFUSION embedded systems
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-/**
- * @file ewk_paint_context_private.h
- * @brief Describes the paint context API.
- */
-
-#ifndef ewk_paint_context_private_h
-#define ewk_paint_context_private_h
-
-#include "FrameView.h"
-#include "GraphicsContext.h"
-#include "RefPtrCairo.h"
-#include <Evas.h>
-#include <cairo.h>
-
-/// Creates a type name for @a _Ewk_Paint_Context.
-typedef struct _Ewk_Paint_Context Ewk_Paint_Context;
-
-/**
- * @brief Structure that keeps the paint context.
- *
- * @internal
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-struct _Ewk_Paint_Context {
- OwnPtr<WebCore::GraphicsContext> graphicContext;
- RefPtr<cairo_t> cairo;
- RefPtr<cairo_surface_t> surface; /**< surface used to create cairo object */
- Evas_Object* image; /**< image used to create cairo surface */
- unsigned char* pixels; /**< pixels form image */
-};
-
-/**
- * @internal
- * Creates a new paint context using a cairo as output.
- *
- * @param cairo context to use as paint destination, a new
- * reference is taken, so it's safe to call @c cairo_destroy()
- * after this function returns.
- *
- * @return a newly allocated instance of @c Ewk_Paint_Context on success,
- * or @c 0 on failure
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-Ewk_Paint_Context* ewk_paint_context_new(cairo_t* cairo);
-
-/**
- * @internal
- * Creates a new paint context using an image as output.
- *
- * @param image to use as paint destination
- *
- * @return a newly allocated instance of @c Ewk_Paint_Context on success,
- * or @c 0 on failure
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-Ewk_Paint_Context* ewk_paint_context_from_image_new(Evas_Object* image);
-
-/**
- * @internal
- * Creates a new paint context using an image as output.
- *
- * @param pixel pointer to pixel buffer
- * @param width size of pixel buffer
- * @param height size of pixel buffer
- * @param colorSpace Evas_Colorspace of pixel buffer
- *
- * @return a newly allocated instance of @c Ewk_Paint_Context on success,
- * or @c 0 on failure
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-Ewk_Paint_Context* ewk_paint_context_from_image_data_new(uint8_t* pixels, int width, int height, int colorSpace);
-
-/**
- * @internal
- * Destroys the previously created the paint context.
- *
- * @param context the paint context to destroy, must @b not be @c 0
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_free(Ewk_Paint_Context* context);
-
-/**
- * @internal
- * Saves (push to stack) the paint context status.
- *
- * @param context the paint context to save, must @b not be @c 0
- *
- * @see ewk_paint_context_restore()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_save(Ewk_Paint_Context* context);
-
-/**
- * @internal
- * Restores (pop from stack) the paint context status.
- *
- * @param context the paint context to restore, must @b not be @c 0
- *
- * @see ewk_paint_context_save()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_restore(Ewk_Paint_Context* context);
-
-/**
- * @internal
- * Clips the paint context drawings to the given area.
- *
- * @param context the paint context to clip, must @b not be @c 0
- * @param area clip area to use, must @b not be @c 0
- *
- * @see ewk_paint_context_save()
- * @see ewk_paint_context_restore()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_clip(Ewk_Paint_Context* context, const Eina_Rectangle* area);
-
-/**
- * @internal
- * Scales the contents by the given factors.
- *
- * This function applies a scaling transformation using Cairo.
- *
- * @param context the paint context to scale, must @b not be @c 0
- * @param scale_x the scale factor for the X dimension
- * @param scale_y the scale factor for the Y dimension
- */
-void ewk_paint_context_scale(Ewk_Paint_Context* context, float scale_x, float scale_y);
-
-/**
- * @internal
- * Performs a translation of the origin coordinates.
- *
- * This function moves the origin coordinates by @a x and @a y pixels.
- *
- * @param context the paint context to translate, must @b not be @c 0
- * @param x amount of pixels to translate in the X dimension
- * @param y amount of pixels to translate in the Y dimension
- */
-void ewk_paint_context_translate(Ewk_Paint_Context* context, float x, float y);
-
-/**
- * @internal
- * Paints the context using given area.
- *
- * @param context the paint context to paint, must @b not be @c 0
- * @param view the view to paint
- * @param area the paint area to use, coordinates are relative to current viewport,
- * thus "scrolled", must @b not be @c 0
- *
- * @note One may use cairo functions on the cairo context to
- * translate, scale or any modification that may fit his desires.
- *
- * @see ewk_paint_context_clip()
- * @see ewk_paint_context_paint_contents()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_paint(Ewk_Paint_Context* context, WebCore::FrameView* view, const Eina_Rectangle* area);
-
-/**
- * @internal
- * Paints just contents using context using given area.
- *
- * Unlike ewk_paint_context_paint(), this function paint just
- * bare contents and ignores any scrolling, scrollbars and extras. It
- * will walk the rendering tree and paint contents inside the given
- * area to the cairo context specified in @a context.
- *
- * @param context the paint context to paint, must @b not be @c 0.
- * @param view the view to paint
- * @param area the paint area to use, coordinates are absolute to page, must @b not be @c 0
- *
- * @note One may use cairo functions on the cairo context to
- * translate, scale or any modification that may fit his desires.
- *
- * @see ewk_paint_context_clip()
- * @see ewk_paint_context_paint()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_paint_context_paint_contents(Ewk_Paint_Context* context, WebCore::FrameView* view, const Eina_Rectangle* area);
-
-#endif // ewk_paint_context_private_h
</del></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -69,14 +69,12 @@
</span><span class="cx"> #include "SessionID.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SoupNetworkSession.h"
</span><del>-#include "TiledBackingStore.h"
</del><span class="cx"> #include "c_instance.h"
</span><span class="cx"> #include "ewk_contextmenu_private.h"
</span><span class="cx"> #include "ewk_frame.h"
</span><span class="cx"> #include "ewk_frame_private.h"
</span><span class="cx"> #include "ewk_history_private.h"
</span><span class="cx"> #include "ewk_js_private.h"
</span><del>-#include "ewk_paint_context_private.h"
</del><span class="cx"> #include "ewk_private.h"
</span><span class="cx"> #include "ewk_settings_private.h"
</span><span class="cx"> #include "ewk_view_private.h"
</span><span class="lines">@@ -263,11 +261,6 @@
</span><span class="cx"> Ewk_Menu menu;
</span><span class="cx"> WebCore::PopupMenuClient* menuClient;
</span><span class="cx"> } popup;
</span><del>- struct {
- Eina_Rectangle* array;
- size_t count;
- size_t allocated;
- } repaints;
</del><span class="cx"> unsigned int imh; /**< input method hints */
</span><span class="cx"> struct {
</span><span class="cx"> bool viewCleared : 1;
</span><span class="lines">@@ -421,51 +414,6 @@
</span><span class="cx"> evas_object_smart_changed(smartData->self);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Eina_Bool _ewk_view_repaints_resize(Ewk_View_Private_Data* priv, size_t size)
-{
- void* tmp = realloc(priv->repaints.array, size * sizeof(Eina_Rectangle));
- if (!tmp) {
- CRITICAL("could not realloc repaints array to %zu elements.", size);
- return false;
- }
- priv->repaints.allocated = size;
- priv->repaints.array = static_cast<Eina_Rectangle*>(tmp);
- return true;
-}
-
-static void _ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
-{
- size_t newSize = 0;
-
- if (priv->repaints.allocated == priv->repaints.count)
- newSize = priv->repaints.allocated + ewkViewRepaintsSizeStep;
- else if (!priv->repaints.count && priv->repaints.allocated > ewkViewRepaintsSizeInitial)
- newSize = ewkViewRepaintsSizeInitial;
-
- if (newSize) {
- if (!_ewk_view_repaints_resize(priv, newSize))
- return;
- }
-
- Eina_Rectangle* rect = priv->repaints.array + priv->repaints.count;
- priv->repaints.count++;
-
- rect->x = x;
- rect->y = y;
- rect->w = width;
- rect->h = height;
-
- DBG("add repaint %d, %d+%dx%d", x, y, width, height);
-}
-
-static void _ewk_view_repaints_flush(Ewk_View_Private_Data* priv)
-{
- priv->repaints.count = 0;
- if (priv->repaints.allocated <= ewkViewRepaintsSizeMaximumFree)
- return;
- _ewk_view_repaints_resize(priv, ewkViewRepaintsSizeMaximumFree);
-}
-
</del><span class="cx"> // Default Event Handling //////////////////////////////////////////////
</span><span class="cx"> static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* smartData)
</span><span class="cx"> {
</span><span class="lines">@@ -832,8 +780,6 @@
</span><span class="cx">
</span><span class="cx"> /* do not delete priv->main_frame */
</span><span class="cx">
</span><del>- free(priv->repaints.array);
-
</del><span class="cx"> eina_stringshare_del(priv->settings.userAgent);
</span><span class="cx"> eina_stringshare_del(priv->settings.userStylesheet);
</span><span class="cx"> eina_stringshare_del(priv->settings.encodingDefault);
</span><span class="lines">@@ -1054,8 +1000,6 @@
</span><span class="cx"> smartData->view.w = width;
</span><span class="cx"> smartData->view.h = height;
</span><span class="cx">
</span><del>- _ewk_view_repaint_add(priv, 0, 0, width, height);
-
</del><span class="cx"> // This callback is a good place e.g. to change fixed layout size (ewk_view_fixed_layout_size_set).
</span><span class="cx"> evas_object_smart_callback_call(ewkView, "view,resized", 0);
</span><span class="cx"> }
</span><span class="lines">@@ -1129,12 +1073,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void _ewk_view_smart_flush(Ewk_View_Smart_Data* smartData)
-{
- EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
- _ewk_view_repaints_flush(priv);
-}
-
</del><span class="cx"> static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* smartData)
</span><span class="cx"> {
</span><span class="cx"> smartData->animated_zoom.zoom.start = 0.0;
</span><span class="lines">@@ -1313,7 +1251,6 @@
</span><span class="cx"> api->zoom_set = _ewk_view_smart_zoom_set;
</span><span class="cx"> api->zoom_weak_set = _ewk_view_smart_zoom_weak_set;
</span><span class="cx"> api->zoom_weak_smooth_scale_set = _ewk_view_smart_zoom_weak_smooth_scale_set;
</span><del>- api->flush = _ewk_view_smart_flush;
</del><span class="cx"> api->disable_render = _ewk_view_smart_disable_render;
</span><span class="cx"> api->enable_render = _ewk_view_smart_enable_render;
</span><span class="cx">
</span><span class="lines">@@ -2662,56 +2599,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Gets the internal array of repaint requests.
- *
- * This array should not be modified anyhow. It should be processed
- * immediately as any further ewk_view call might change it, like
- * those that add repaints or flush them, so be sure that your code
- * does not call any of those while you process the repaints,
- * otherwise copy the array.
- *
- * @param priv private handle pointer of the view to get repaints.
- * @param count where to return the number of elements of returned array, may be @c 0.
- *
- * @return reference to array of requested repaints.
- *
- * @note this is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count)
-{
- if (count)
- *count = 0;
- EINA_SAFETY_ON_NULL_RETURN_VAL(priv, 0);
- if (count)
- *count = priv->repaints.count;
-
- priv->repaints.count = 0;
-
- return priv->repaints.array;
-}
-
-/**
- * Add a new repaint request to queue.
- *
- * The repaints are assumed to be relative to current viewport.
- *
- * @param priv private handle pointer of the view to add repaint request.
- * @param x horizontal position relative to current view port (scrolled).
- * @param y vertical position relative to current view port (scrolled).
- * @param width width of area to be repainted
- * @param height height of area to be repainted
- *
- * @note this is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
-{
- EINA_SAFETY_ON_NULL_RETURN(priv);
- _ewk_view_repaint_add(priv, x, y, width, height);
-}
-
-/**
</del><span class="cx"> * Do layout if required, applied recursively.
</span><span class="cx"> *
</span><span class="cx"> * @param priv private handle pointer of the view to layout.
</span><span class="lines">@@ -2731,97 +2618,8 @@
</span><span class="cx"> view->updateLayoutAndStyleIfNeededRecursive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* internal methods ****************************************************/
</del><span class="cx"> /**
</span><span class="cx"> * @internal
</span><del>- * Paints using given graphics context the given area.
- *
- * This uses viewport relative area and will also handle scrollbars
- * and other extra elements. See ewk_view_paint_contents() for the
- * alternative function.
- *
- * @param priv the pointer to the private data of the view to use as paint source
- * @param cr the cairo context to use as paint destination, its state will
- * be saved before operation and restored afterwards
- * @param area viewport relative geometry to paint
- *
- * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
- *
- * @note This is an easy to use version, but internal structures are
- * always created, then graphics context is clipped, then
- * painted, restored and destroyed. This might not be optimum,
- * so using @a Ewk_Paint_Context may be a better solutions
- * for large number of operations.
- *
- * @see ewk_view_paint_contents()
- * @see ewk_paint_context_paint()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
-*/
-Eina_Bool ewk_view_paint(Ewk_View_Private_Data* priv, Ewk_Paint_Context* context, const Eina_Rectangle* area)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(priv, false);
- EINA_SAFETY_ON_NULL_RETURN_VAL(context, false);
- EINA_SAFETY_ON_NULL_RETURN_VAL(area, false);
- WebCore::FrameView* view = priv->page->mainFrame().view();
- EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);
-
- ewk_paint_context_save(context);
- ewk_paint_context_clip(context, area);
- ewk_paint_context_paint(context, view, area);
- ewk_paint_context_restore(context);
-
- return true;
-}
-
-/**
- * @internal
- * Paints just contents using given graphics context the given area.
- *
- * This uses absolute coordinates for area and will just handle
- * contents, no scrollbars or extras. See ewk_view_paint() for the
- * alternative solution.
- *
- * @param priv the pointer to the private data of the view to use as paint source
- * @param cr the cairo context to use as paint destination, its state will
- * be saved before operation and restored afterwards
- * @param area absolute geometry to paint
- *
- * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
- *
- * @note This is an easy to use version, but internal structures are
- * always created, then graphics context is clipped, then
- * painted, restored and destroyed. This might not be optimum,
- * so using @a Ewk_Paint_Context may be a better solutions
- * for large number of operations.
- *
- * @see ewk_view_paint()
- * @see ewk_paint_context_paint_contents()
- *
- * @note This is not for general use but just for subclasses that want
- * to define their own backing store.
- */
-Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data* priv, Ewk_Paint_Context* context, const Eina_Rectangle* area)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(priv, false);
- EINA_SAFETY_ON_NULL_RETURN_VAL(context, false);
- EINA_SAFETY_ON_NULL_RETURN_VAL(area, false);
- WebCore::FrameView* view = priv->page->mainFrame().view();
- EINA_SAFETY_ON_NULL_RETURN_VAL(view, false);
-
- view->updateLayoutAndStyleIfNeededRecursive();
-
- ewk_paint_context_save(context);
- ewk_paint_context_clip(context, area);
- ewk_paint_context_paint_contents(context, view, area);
- ewk_paint_context_restore(context);
-
- return true;
-}
-
-/**
- * @internal
</del><span class="cx"> * Reports the view is ready to be displayed as all elements are aready.
</span><span class="cx"> *
</span><span class="cx"> * Emits signal: "ready" with no parameters.
</span><span class="lines">@@ -3508,27 +3306,6 @@
</span><span class="cx"> return confirm;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
-{
- DBG("ewkView=%p, region=%d,%d + %dx%d", ewkView, x, y, width, height);
- EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
- EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
-
- _ewk_view_repaint_add(priv, x, y, width, height);
- _ewk_view_smart_changed(smartData);
-}
-
-void ewk_view_scroll(Evas_Object* ewkView, const WebCore::IntSize& delta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect&)
-{
- ASSERT_UNUSED(rectToScroll, !rectToScroll.isEmpty());
- ASSERT_UNUSED(delta, delta.width() || delta.height());
-
- EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
- EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
-
- ewk_view_mark_for_sync(ewkView);
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * @internal
</span><span class="cx"> *
</span><span class="lines">@@ -4603,26 +4380,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(TILED_BACKING_STORE)
-/**
- * @internal
- * Invalidate given area to repaint. The backing store will mark tiles that are
- * in the area as dirty.
- *
- * @param ewkView View.
- * @param area Area to invalidate
- */
-void ewk_view_tiled_backing_store_invalidate(Evas_Object* ewkView, const WebCore::IntRect& area)
-{
- EINA_SAFETY_ON_NULL_RETURN(ewkView);
- EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
- EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
-
- if (priv->page->mainFrame().tiledBackingStore())
- priv->page->mainFrame().tiledBackingStore()->invalidate(area);
-}
-#endif
-
</del><span class="cx"> namespace EWKPrivate {
</span><span class="cx">
</span><span class="cx"> WebCore::Page* corePage(const Evas_Object* ewkView)
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_view_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view_private.h (167427 => 167428)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view_private.h 2014-04-17 14:48:18 UTC (rev 167427)
+++ trunk/Source/WebKit/efl/ewk/ewk_view_private.h 2014-04-17 14:53:31 UTC (rev 167428)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Widget.h"
</span><del>-#include "ewk_paint_context_private.h"
</del><span class="cx"> #include "ewk_view.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -95,8 +94,6 @@
</span><span class="cx">
</span><span class="cx"> bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, Ewk_File_Chooser* fileChooser, Eina_List** selectedFilenames);
</span><span class="cx">
</span><del>-void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
-void ewk_view_scroll(Evas_Object*, const WebCore::IntSize& delta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
</del><span class="cx"> WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView);
</span><span class="cx">
</span><span class="cx"> void ewk_view_frame_rect_changed(Evas_Object* ewkView);
</span><span class="lines">@@ -118,26 +115,15 @@
</span><span class="cx">
</span><span class="cx"> bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction);
</span><span class="cx">
</span><del>-Eina_Bool ewk_view_paint(Ewk_View_Private_Data* priv, Ewk_Paint_Context* context, const Eina_Rectangle* area);
-Eina_Bool ewk_view_paint_contents(Ewk_View_Private_Data* priv, Ewk_Paint_Context* context, const Eina_Rectangle* area);
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TILED_BACKING_STORE)
-void ewk_view_tiled_backing_store_invalidate(Evas_Object* ewkView, const WebCore::IntRect& area);
-#endif
-
</del><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> void ewk_view_need_touch_events_set(Evas_Object*, bool needed);
</span><span class="cx"> bool ewk_view_need_touch_events_get(const Evas_Object*);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-const Eina_Rectangle* ewk_view_repaints_pop(Ewk_View_Private_Data* priv, size_t* count);
-
-void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height);
-
</del><span class="cx"> void ewk_view_layout_if_needed_recursive(Ewk_View_Private_Data* priv);
</span><span class="cx">
</span><span class="cx"> bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request, WebCore::NavigationType);
</span></span></pre>
</div>
</div>
</body>
</html>