Changeset 94578 in webkit

Timestamp:

Sep 6, 2011, 10:49:41 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Do not allocate memory for extremely large surfaces.
​https://bugs.webkit.org/show_bug.cgi?id=65192

Patch by Raphael Kubo da Costa <​kubo@profusion.mobi> on 2011-09-06
Reviewed by Martin Robinson.

So far, RenderThemeEfl tried to allocate a buffer and a cairo surface
the size of the whole form element passed to it.

In the case of
fast/overflow/overflow-height-float-not-removed-crash.html and others,
this meant extremely large widgets, which crashed the code.

We now only render the widgets if they are smaller than some hardcoded
and sufficiently large values which should work in most cases.

No new tests, as this was uncovered by existing ones.

• platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::isFormElementTooLargeToDisplay):
(WebCore::RenderThemeEfl::cacheThemePartNew):
(WebCore::RenderThemeEfl::paintThemePart):

• platform/efl/RenderThemeEfl.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/RenderThemeEfl.cpp (modified) (2 diffs)
• platform/efl/RenderThemeEfl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-06  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [EFL] Do not allocate memory for extremely large surfaces.
+        https://bugs.webkit.org/show_bug.cgi?id=65192
+
+        Reviewed by Martin Robinson.
+
+        So far, RenderThemeEfl tried to allocate a buffer and a cairo surface
+        the size of the whole form element passed to it.
+
+        In the case of
+        fast/overflow/overflow-height-float-not-removed-crash.html and others,
+        this meant extremely large widgets, which crashed the code.
+
+        We now only render the widgets if they are smaller than some hardcoded
+        and sufficiently large values which should work in most cases.
+
+        No new tests, as this was uncovered by existing ones.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::isFormElementTooLargeToDisplay):
+        (WebCore::RenderThemeEfl::cacheThemePartNew):
+        (WebCore::RenderThemeEfl::paintThemePart):
+        * platform/efl/RenderThemeEfl.h:
+
 2011-08-30  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -144 +144 @@
 }
 
+bool RenderThemeEfl::isFormElementTooLargeToDisplay(const IntSize& elementSize)
+{
+    // This limit of 20000 pixels is hardcoded inside edje -- anything above this size
+    // will be clipped. This value seems to be reasonable enough so that hardcoding it
+    // here won't be a problem.
+    static const int maxEdjeDimension = 20000;
+
+    return elementSize.width() > maxEdjeDimension || elementSize.height() > maxEdjeDimension;
+}
+
 // allocate a new entry and fill it with edje group
 struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartNew(FormType type, const IntSize& size)
 {
-    struct ThemePartCacheEntry *entry = new struct ThemePartCacheEntry;
-
+    if (isFormElementTooLargeToDisplay(size)) {
+        EINA_LOG_ERR("cannot render an element of size %dx%d", size.width(), size.height());
+        return 0;
+    }
+
+    ThemePartCacheEntry* entry = new ThemePartCacheEntry;
     if (!entry) {
         EINA_LOG_ERR("could not allocate ThemePartCacheEntry.");
@@ -298 +312 @@
 
     entry = cacheThemePartGet(type, rect.size());
-    ASSERT(entry);
     if (!entry)
         return false;

trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

@@ -201 +201 @@
     void applyEdjeStateFromForm(Evas_Object*, ControlStates);
     bool paintThemePart(RenderObject*, FormType, const PaintInfo&, const IntRect&);
+    bool isFormElementTooLargeToDisplay(const IntSize&);
 
 #if ENABLE(VIDEO)