Attachment 251084 Details for Bug 143566 – Patch

[patch] Patch

bug-143566-20150418145520.patch (text/plain), 18.99 KB, created by Hunseop Jeong on 2015-04-17 22:56:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Hunseop Jeong

Created: 2015-04-17 22:56:22 PDT

Size: 18.99 KB

patch

obsolete

>Subversion Revision: 182831
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5c40f7a75cd84acc4649cc19c184f6f8d74864e2..91a2876a24997fab5fd6def3bc747562181f6212 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,38 @@
>+2015-04-17  Hunseop Jeong  <hs85.jeong@samsung.com>
>+
>+        [EFL] Scrollbar is not drawn on MiniBrowser and WebKitTestRunner.  
>+        https://bugs.webkit.org/show_bug.cgi?id=143566
>+
>+        WIP
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformEfl.cmake:
>+        * platform/Scrollbar.cpp:
>+        (WebCore::Scrollbar::createNativeScrollbar):
>+        * platform/efl/RenderThemeEfl.cpp:
>+        (WebCore::RenderThemeEfl::paintThemePart):
>+        * platform/efl/RenderThemeEfl.h:
>+        * platform/efl/ScrollbarEfl.cpp: Removed.
>+        * platform/efl/ScrollbarEfl.h: Removed.
>+        * platform/efl/ScrollbarThemeEfl.cpp:
>+        (WebCore::ScrollbarThemeEfl::ScrollbarThemeEfl):
>+        (WebCore::ScrollbarThemeEfl::~ScrollbarThemeEfl):
>+        (WebCore::ScrollbarThemeEfl::paintTrackBackground):
>+        (WebCore::ScrollbarThemeEfl::paintThumb):
>+        (WebCore::ScrollbarThemeEfl::scrollbarThickness):
>+        (WebCore::scrollbarMap):
>+        (WebCore::ScrollbarThemeEfl::updateEnabledState):
>+        (WebCore::ScrollbarThemeEfl::hasThumb):
>+        (WebCore::ScrollbarThemeEfl::backButtonRect):
>+        (WebCore::ScrollbarThemeEfl::forwardButtonRect):
>+        (WebCore::ScrollbarThemeEfl::thumbRect):
>+        (WebCore::ScrollbarThemeEfl::trackRect):
>+        (WebCore::ScrollbarThemeEfl::minimumThumbLength):
>+        (WebCore::ScrollbarThemeEfl::registerScrollbar):
>+        (WebCore::ScrollbarThemeEfl::unregisterScrollbar):
>+        * platform/efl/ScrollbarThemeEfl.h:
>+
> 2015-04-14  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r180020): Web Inspector crashes on pages that have a stylesheet with an invalid MIME type
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 7d8fdfa7438afd4db9fa48475cd7d1a134017859..eb309519f03a499162a3d497028022e082f16cbc 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,16 @@
>+2015-04-17  Hunseop Jeong  <hs85.jeong@samsung.com>
>+
>+        [EFL] Scrollbar is not drawn on MiniBrowser and WebKitTestRunner.  
>+        https://bugs.webkit.org/show_bug.cgi?id=143566
>+
>+        WIP
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
>+        (WebKit::CoordinatedDrawingArea::setNeedsDisplayInRect):
>+        (WebKit::CoordinatedDrawingArea::display):
>+
> 2015-04-14  Tim Horton  <timothy_horton@apple.com>
> 
>         Update gesture swipe shadow style
>diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
>index f71eb60520d507afb93f6aeeb8aa753ce5b9eb65..47a09838dd0fe20e0657ddacbd879a193b77206a 100644
>--- a/Source/WebCore/PlatformEfl.cmake
>+++ b/Source/WebCore/PlatformEfl.cmake
>@@ -96,7 +96,6 @@ list(APPEND WebCore_SOURCES
>     platform/efl/PlatformScreenEfl.cpp
>     platform/efl/PlatformWheelEventEfl.cpp
>     platform/efl/RenderThemeEfl.cpp
>-    platform/efl/ScrollbarEfl.cpp
>     platform/efl/ScrollbarThemeEfl.cpp
>     platform/efl/SharedTimerEfl.cpp
>     platform/efl/SoundEfl.cpp
>diff --git a/Source/WebCore/platform/Scrollbar.cpp b/Source/WebCore/platform/Scrollbar.cpp
>index d5c11fd5a159cabef1f713f67799a13a2c121830..a2a6fbee62abc97b364b71bae27cb36e4d7d3997 100644
>--- a/Source/WebCore/platform/Scrollbar.cpp
>+++ b/Source/WebCore/platform/Scrollbar.cpp
>@@ -43,12 +43,10 @@
> 
> namespace WebCore {
> 
>-#if !PLATFORM(EFL)
> PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
> {
>     return adoptRef(new Scrollbar(scrollableArea, orientation, size));
> }
>-#endif
> 
> int Scrollbar::maxOverlapBetweenPages()
> {
>diff --git a/Source/WebCore/platform/efl/RenderThemeEfl.cpp b/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>index 28adcb0b2444f68fce3b2d31468434e4a6486693..d050c31bf689532c79d246b4b7d64ea9b51b5f00 100755
>--- a/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>+++ b/Source/WebCore/platform/efl/RenderThemeEfl.cpp
>@@ -341,6 +341,30 @@ bool RenderThemeEfl::isControlStyled(const RenderStyle& style, const BorderData&
>     return RenderTheme::isControlStyled(style, border, background, backgroundColor) || style.appearance() == MenulistButtonPart;
> }
> 
>+bool RenderThemeEfl::paintThemePart(FormType type, const GraphicsContext* context, const IntRect& rect)
>+{
>+    loadThemeIfNeeded();
>+    _ASSERT_ON_RELEASE_RETURN_VAL(edje(), false, "Could not paint native HTML part due to missing theme.");
>+
>+    ThemePartCacheEntry* entry = getThemePartFromCache(type, rect.size());
>+    if (!entry)
>+        return false;
>+
>+    edje_object_calc_force(entry->edje());
>+    edje_object_message_signal_process(entry->edje());
>+    evas_render(ecore_evas_get(entry->canvas()));
>+
>+    cairo_t* cairo = context->platformContext()->cr();
>+    ASSERT(cairo);
>+
>+    cairo_save(cairo);
>+    cairo_set_source_surface(cairo, entry->surface(), rect.x(), rect.y());
>+    cairo_paint_with_alpha(cairo, 1.0);
>+    cairo_restore(cairo);
>+
>+    return false;
>+}
>+
> bool RenderThemeEfl::paintThemePart(const RenderObject& object, FormType type, const PaintInfo& info, const IntRect& rect)
> {
>     loadThemeIfNeeded();
>diff --git a/Source/WebCore/platform/efl/RenderThemeEfl.h b/Source/WebCore/platform/efl/RenderThemeEfl.h
>index 1d29939839dbda77b24faafaf7a48dd233d59795..ae04b3e253ffcc8d1c0145f95cbef4205da99d30 100644
>--- a/Source/WebCore/platform/efl/RenderThemeEfl.h
>+++ b/Source/WebCore/platform/efl/RenderThemeEfl.h
>@@ -38,6 +38,8 @@
> 
> namespace WebCore {
> 
>+class ScrollBarThemeEfl;
>+
> enum FormType { // KEEP IN SYNC WITH edjeGroupFromFormType()
>     Button,
>     RadioButton,
>@@ -176,6 +178,8 @@ public:
>     void setThemePath(const String&);
>     String themePath() const;
> 
>+    bool paintThemePart(FormType, const GraphicsContext*, const IntRect&);
>+
> protected:
>     static float defaultFontSize;
> 
>diff --git a/Source/WebCore/platform/efl/ScrollbarEfl.cpp b/Source/WebCore/platform/efl/ScrollbarEfl.cpp
>deleted file mode 100644
>index c84a566c3a81629393710a93e298122403aa65ea..0000000000000000000000000000000000000000
>--- a/Source/WebCore/platform/efl/ScrollbarEfl.cpp
>+++ /dev/null
>@@ -1,68 +0,0 @@
>-/*
>- *  Copyright (C) 2007 Holger Hans Peter Freyther zecke@selfish.org
>- *            (C) 2009 Kenneth Rohde Christiansen
>- *            (C) 2009 INdT, Instituto Nokia de Technologia
>- *            (C) 2009-2010 ProFUSION embedded systems
>- *            (C) 2009-2010 Samsung Electronics
>- *
>- *  This library is free software; you can redistribute it and/or
>- *  modify it under the terms of the GNU Lesser 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
>- *  Lesser General Public License for more details.
>- *
>- *  You should have received a copy of the GNU Lesser General Public
>- *  License along with this library; if not, write to the Free Software
>- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
>- */
>-
>-#include "config.h"
>-#include "ScrollbarEfl.h"
>-
>-#include "IntRect.h"
>-#include "Settings.h"
>-
>-namespace WebCore {
>-
>-PassRefPtr<Scrollbar> Scrollbar::createNativeScrollbar(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize size)
>-{
>-    if (Settings::mockScrollbarsEnabled())
>-        return adoptRef(new Scrollbar(scrollableArea, orientation, size));
>-
>-    return adoptRef(new ScrollbarEfl(scrollableArea, orientation, size));
>-}
>-ScrollbarEfl::ScrollbarEfl(ScrollableArea& scrollableArea, ScrollbarOrientation orientation, ScrollbarControlSize controlSize)
>-
>-    : Scrollbar(scrollableArea, orientation, controlSize)
>-{
>-}
>-
>-ScrollbarEfl::~ScrollbarEfl()
>-{
>-}
>-
>-void ScrollbarEfl::setParent(ScrollView* view)
>-{
>-    Widget::setParent(view);
>-}
>-
>-void ScrollbarEfl::setFrameRect(const IntRect& rect)
>-{
>-    Widget::setFrameRect(rect);
>-    frameRectsChanged();
>-}
>-
>-void ScrollbarEfl::frameRectsChanged()
>-{
>-}
>-
>-void ScrollbarEfl::invalidate()
>-{
>-    Widget::invalidate();
>-}
>-
>-}
>diff --git a/Source/WebCore/platform/efl/ScrollbarEfl.h b/Source/WebCore/platform/efl/ScrollbarEfl.h
>deleted file mode 100644
>index 40c646b259b0bb6bb7cd2f6f277eaedd83c50555..0000000000000000000000000000000000000000
>--- a/Source/WebCore/platform/efl/ScrollbarEfl.h
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-/*
>- * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
>- * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
>- * Copyright (C) 2009-2010 ProFUSION embedded systems
>- * Copyright (C) 2009-2010 Samsung Electronics
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef ScrollbarEfl_h
>-#define ScrollbarEfl_h
>-
>-#include "Scrollbar.h"
>-#include <wtf/PassRefPtr.h>
>-
>-namespace WebCore {
>-
>-class ScrollbarEfl final : public Scrollbar {
>-public:
>-    friend class Scrollbar;
>-
>-    virtual ~ScrollbarEfl();
>-
>-    virtual void setFrameRect(const IntRect&) override;
>-    virtual void frameRectsChanged() override;
>-    virtual void invalidate() override;
>-
>-protected:
>-    ScrollbarEfl(ScrollableArea&, ScrollbarOrientation, ScrollbarControlSize);
>-
>-    virtual void setParent(ScrollView*) override;
>-};
>-
>-}
>-
>-#endif // ScrollbarEfl_h
>diff --git a/Source/WebCore/platform/efl/ScrollbarThemeEfl.cpp b/Source/WebCore/platform/efl/ScrollbarThemeEfl.cpp
>index f3be5669ce772a272b27be6c7710b596f14e3f71..81fd9c203f94c9ed0e7e856673d829d56387c15d 100644
>--- a/Source/WebCore/platform/efl/ScrollbarThemeEfl.cpp
>+++ b/Source/WebCore/platform/efl/ScrollbarThemeEfl.cpp
>@@ -29,6 +29,16 @@
> #include "config.h"
> #include "ScrollbarThemeEfl.h"
> 
>+#include "CairoUtilities.h"
>+#include "CairoUtilitiesEfl.h"
>+#include "FrameView.h"
>+#include "PaintInfo.h"
>+#include "PlatformContextCairo.h"
>+#include "RenderThemeEfl.h"
>+#include "ScrollView.h"
>+#include "Scrollbar.h"
>+#include <wtf/NeverDestroyed.h>
>+
> namespace WebCore {
> 
> ScrollbarTheme* ScrollbarTheme::nativeTheme()
>@@ -37,5 +47,106 @@ ScrollbarTheme* ScrollbarTheme::nativeTheme()
>     return &theme;
> }
> 
>+static int cScrollbarThickness = 11;
>+
>+static int cScrollbarThumbWidth = 11;
>+static int cScrollbarThumbHeight = 29;
>+
>+ScrollbarThemeEfl::ScrollbarThemeEfl()
>+{
>+    if (!m_theme)
>+        m_theme = RenderThemeEfl::create(0);
>+
>+    static_cast<RenderThemeEfl*>(m_theme.get())->setThemePath(DEFAULT_THEME_DIR "/default.edj");
>+}
>+
>+ScrollbarThemeEfl::~ScrollbarThemeEfl()
>+{
>+}
>+
>+void ScrollbarThemeEfl::paintTrackBackground(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
>+{
>+    ScrollbarOrientation orientation = scrollbar->orientation();
>+
>+    static_cast<RenderThemeEfl*>(m_theme.get())->paintThemePart(orientation == VerticalScrollbar ? SliderVertical : SliderHorizontal, context, rect);
>+}
>+
>+void ScrollbarThemeEfl::paintThumb(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect)
>+{
>+    ScrollbarOrientation orientation = scrollbar->orientation();
>+
>+    static_cast<RenderThemeEfl*>(m_theme.get())->paintThemePart(orientation == VerticalScrollbar ? SliderThumbVertical : SliderThumbHorizontal, context, rect);
>+}
>+
>+int ScrollbarThemeEfl::scrollbarThickness(ScrollbarControlSize)
>+{
>+    return cScrollbarThickness;
>+}
>+
>+typedef HashSet<ScrollbarThemeClient*> ScrollbarMap;
>+
>+static ScrollbarMap& scrollbarMap()
>+{
>+    static NeverDestroyed<ScrollbarMap> map;
>+    return map;
>+}
>+
>+void ScrollbarThemeEfl::updateEnabledState(ScrollbarThemeClient*)
>+{
>+}
>+
>+bool ScrollbarThemeEfl::hasThumb(ScrollbarThemeClient* scrollbar)
>+{
>+    return thumbLength(scrollbar) > 0;
>+}
>+
>+IntRect ScrollbarThemeEfl::backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool)
>+{
>+    return IntRect();
>+}
>+
>+IntRect ScrollbarThemeEfl::forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool)
>+{
>+    return IntRect();
>+}
>+
>+IntRect ScrollbarThemeEfl::thumbRect(ScrollbarThemeClient* scrollbar, const IntRect& unconstrainedTrackRect)
>+{
>+    IntRect trackRect = constrainTrackRectToTrackPieces(scrollbar, unconstrainedTrackRect);
>+    int thumbPos = thumbPosition(scrollbar);
>+    if (scrollbar->orientation() == HorizontalScrollbar)
>+        return IntRect(trackRect.x() + thumbPos, trackRect.y() + (trackRect.height() - cScrollbarThickness) / 2, cScrollbarThumbHeight, cScrollbarThumbWidth);
>+
>+    // VerticalScrollbar
>+    return IntRect(trackRect.x() + (trackRect.width() - cScrollbarThumbWidth) / 2, trackRect.y() + thumbPos, cScrollbarThumbWidth, cScrollbarThumbHeight);
>+}
>+
>+IntRect ScrollbarThemeEfl::trackRect(ScrollbarThemeClient* scrollbar, bool painting)
>+{
>+    if (painting || !hasButtons(scrollbar))
>+        return scrollbar->frameRect();
>+
>+    int thickness = cScrollbarThickness;
>+    if (scrollbar->orientation() == HorizontalScrollbar)
>+        return IntRect(scrollbar->x() + cScrollbarThumbWidth, scrollbar->y(), scrollbar->width() - 2 * cScrollbarThumbWidth, thickness);
>+    return IntRect(scrollbar->x(), scrollbar->y() + cScrollbarThumbWidth, thickness, scrollbar->height() - 2 * cScrollbarThumbHeight);
>+}
>+
>+int ScrollbarThemeEfl::minimumThumbLength(ScrollbarThemeClient*)
>+{
>+    return cScrollbarThumbWidth;
>+}
>+
>+void ScrollbarThemeEfl::registerScrollbar(ScrollbarThemeClient* scrollbar)
>+{
>+    scrollbar->setEnabled(true);
>+    scrollbarMap().add(scrollbar);
>+}
>+
>+void ScrollbarThemeEfl::unregisterScrollbar(ScrollbarThemeClient* scrollbar)
>+{
>+    scrollbarMap().remove(scrollbar);
>+}
>+
> }
> 
>diff --git a/Source/WebCore/platform/efl/ScrollbarThemeEfl.h b/Source/WebCore/platform/efl/ScrollbarThemeEfl.h
>index 8974728065fa5912176ee9cc5a0f37b4e4e9f9ac..97dfc0756efb7d869ffc348d19f681dd54b769c5 100644
>--- a/Source/WebCore/platform/efl/ScrollbarThemeEfl.h
>+++ b/Source/WebCore/platform/efl/ScrollbarThemeEfl.h
>@@ -29,19 +29,41 @@
> #ifndef ScrollbarThemeEfl_h
> #define ScrollbarThemeEfl_h
> 
>-#include "ScrollbarTheme.h"
>+#include "ScrollbarThemeComposite.h"
> 
> namespace WebCore {
> 
>-class ScrollbarThemeEfl final : public ScrollbarTheme {
>+class RenderTheme;
>+
>+class ScrollbarThemeEfl : public ScrollbarThemeComposite {
> public:
>-    ScrollbarThemeEfl() : m_scrollbarThickness(0) { }
>+    ScrollbarThemeEfl();
>+    virtual ~ScrollbarThemeEfl();
>+
>+    virtual void paintTrackBackground(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
>+    virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) override;
>+
>     void setScrollbarThickness(int thickness) { m_scrollbarThickness = thickness; }
>-    virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) override { return m_scrollbarThickness; }
>+    virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) override;
>+
>+    IntRect thumbRect(ScrollbarThemeClient*, const IntRect&);
>+
>+    virtual void updateEnabledState(ScrollbarThemeClient*) override;
>+
>+    virtual bool hasButtons(ScrollbarThemeClient*) override { return false; }
>+    virtual bool hasThumb(ScrollbarThemeClient*) override;
>+    virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) override;
>+    virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool) override;
>+    virtual IntRect trackRect(ScrollbarThemeClient*, bool) override;
>+
>+    virtual int minimumThumbLength(ScrollbarThemeClient *) override;
>+
>+    virtual void registerScrollbar(ScrollbarThemeClient*) override;
>+    virtual void unregisterScrollbar(ScrollbarThemeClient*) override;
> 
>-    virtual void registerScrollbar(ScrollbarThemeClient*) override { }
>-    virtual void unregisterScrollbar(ScrollbarThemeClient*) override { }
> private:
>+    RefPtr<RenderTheme> m_theme;
>+
>     int m_scrollbarThickness;
> };
> 
>diff --git a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
>index ad2579dbd790d8e3cbca6d32d50989ae3e7e8df3..14e7fb5d6c3317aa7b00db2e1222fce466af5106 100644
>--- a/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
>+++ b/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
>@@ -92,11 +92,11 @@ void CoordinatedDrawingArea::setNeedsDisplayInRect(const IntRect& rect)
>     if (!m_isPaintingEnabled)
>         return;
> 
>-    if (m_layerTreeHost) {
>-        ASSERT(m_dirtyRegion.isEmpty());
>-        m_layerTreeHost->setNonCompositedContentsNeedDisplayInRect(rect);
>-        return;
>-    }
>+//    if (m_layerTreeHost) {
>+//        ASSERT(m_dirtyRegion.isEmpty());
>+//        m_layerTreeHost->setNonCompositedContentsNeedDisplayInRect(rect);
>+//        return;
>+//    }
> 
>     IntRect dirtyRect = rect;
>     dirtyRect.intersect(m_webPage.bounds());
>@@ -509,11 +509,11 @@ void CoordinatedDrawingArea::display()
>     UpdateInfo updateInfo;
>     display(updateInfo);
> 
>-    if (m_layerTreeHost) {
>-        // The call to update caused layout which turned on accelerated compositing.
>-        // Don't send an Update message in this case.
>-        return;
>-    }
>+//    if (m_layerTreeHost) {
>+//        // The call to update caused layout which turned on accelerated compositing.
>+//        // Don't send an Update message in this case.
>+//        return;
>+//    }
> 
>     m_webPage.send(Messages::DrawingAreaProxy::Update(m_backingStoreStateID, updateInfo));
>     m_isWaitingForDidUpdate = true;
>@@ -550,8 +550,8 @@ void CoordinatedDrawingArea::display(UpdateInfo& updateInfo)
> 
>     // The layout may have put the page into accelerated compositing mode. If the LayerTreeHost is
>     // in charge of displaying, we have nothing more to do.
>-    if (m_layerTreeHost)
>-        return;
>+//    if (m_layerTreeHost)
>+//        return;
> 
>     updateInfo.viewSize = m_webPage.size();
>     updateInfo.deviceScaleFactor = m_webPage.corePage()->deviceScaleFactor();

Actions: View | Formatted Diff | Diff

Attachments on bug 143566: 251002 | 251084 | 251227 | 251311 | 251535 | 252459 | 256355 | 256563 | 256764 | 256819