Changeset 168151 in webkit
- Timestamp:
- May 1, 2014 10:49:24 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r168148 r168151 1 2014-05-01 Ryuan Choi <ryuan.choi@samsung.com> 2 3 Remove TiledBackingStore stuff from Frame 4 https://bugs.webkit.org/show_bug.cgi?id=132458 5 6 Reviewed by Andreas Kling. 7 8 Although TiledBackingStore is using for the CoordinatedGraphics, 9 CoordinatedGraphics does not use tiledBackingStore of Frame. 10 11 This patch removed TiledBackingStore related code of the Frame. 12 13 * page/Frame.cpp: 14 (WebCore::Frame::Frame): 15 (WebCore::Frame::setView): 16 (WebCore::Frame::setTiledBackingStoreEnabled): Deleted. 17 (WebCore::Frame::tiledBackingStorePaintBegin): Deleted. 18 (WebCore::Frame::tiledBackingStorePaint): Deleted. 19 (WebCore::Frame::tiledBackingStorePaintEnd): Deleted. 20 (WebCore::Frame::tiledBackingStoreContentsRect): Deleted. 21 (WebCore::Frame::tiledBackingStoreVisibleRect): Deleted. 22 (WebCore::Frame::tiledBackingStoreBackgroundColor): Deleted. 23 * page/Frame.h: 24 (WebCore::Frame::tiledBackingStore): Deleted. 25 * page/FrameView.cpp: 26 (WebCore::FrameView::repaintContentRectangle): 27 * page/Settings.cpp: 28 (WebCore::Settings::Settings): 29 (WebCore::Settings::setTiledBackingStoreEnabled): Deleted. 30 * page/Settings.h: 31 (WebCore::Settings::tiledBackingStoreEnabled): Deleted. 32 1 33 2014-05-01 Myles C. Maxfield <mmaxfield@apple.com> 2 34 -
trunk/Source/WebCore/page/Frame.cpp
r167861 r168151 111 111 #include <yarr/RegularExpression.h> 112 112 113 114 #if USE(TILED_BACKING_STORE)115 #include "TiledBackingStore.h"116 #endif117 118 113 #if PLATFORM(IOS) 119 114 #include "WKContentObservation.h" … … 189 184 WebKitFontFamilyNames::init(); 190 185 191 if (!ownerElement) { 192 #if USE(TILED_BACKING_STORE) 193 // Top level frame only for now. 194 setTiledBackingStoreEnabled(settings().tiledBackingStoreEnabled()); 195 #endif 196 } else { 186 if (ownerElement) { 197 187 m_mainFrame.selfOnlyRef(); 198 188 page.incrementSubframeCount(); … … 279 269 // pulled from the back/forward cache, reset this flag. 280 270 loader().resetMultipleFormSubmissionProtection(); 281 282 #if USE(TILED_BACKING_STORE)283 if (m_view && tiledBackingStore())284 m_view->setPaintsEntireContents(true);285 #endif286 271 } 287 272 … … 930 915 } 931 916 932 #if USE(TILED_BACKING_STORE)933 void Frame::setTiledBackingStoreEnabled(bool enabled)934 {935 if (!enabled) {936 m_tiledBackingStore = nullptr;937 return;938 }939 if (m_tiledBackingStore)940 return;941 m_tiledBackingStore = std::make_unique<TiledBackingStore>(this);942 m_tiledBackingStore->setCommitTileUpdatesOnIdleEventLoop(true);943 if (m_view)944 m_view->setPaintsEntireContents(true);945 }946 947 void Frame::tiledBackingStorePaintBegin()948 {949 if (!m_view)950 return;951 m_view->updateLayoutAndStyleIfNeededRecursive();952 }953 954 void Frame::tiledBackingStorePaint(GraphicsContext* context, const IntRect& rect)955 {956 if (!m_view)957 return;958 m_view->paintContents(context, rect);959 }960 961 void Frame::tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea)962 {963 if (!m_page || !m_view)964 return;965 unsigned size = paintedArea.size();966 // Request repaint from the system967 for (unsigned n = 0; n < size; ++n)968 m_page->chrome().invalidateContentsAndRootView(m_view->contentsToRootView(paintedArea[n]));969 }970 971 IntRect Frame::tiledBackingStoreContentsRect()972 {973 if (!m_view)974 return IntRect();975 return IntRect(IntPoint(), m_view->contentsSize());976 }977 978 IntRect Frame::tiledBackingStoreVisibleRect()979 {980 if (!m_page)981 return IntRect();982 return m_page->chrome().client().visibleRectForTiledBackingStore();983 }984 985 Color Frame::tiledBackingStoreBackgroundColor() const986 {987 if (!m_view)988 return Color();989 return m_view->baseBackgroundColor();990 }991 #endif992 993 917 String Frame::layerTreeAsText(LayerTreeFlags flags) const 994 918 { -
trunk/Source/WebCore/page/Frame.h
r167861 r168151 48 48 #endif 49 49 50 #if USE(TILED_BACKING_STORE)51 #include "TiledBackingStoreClient.h"52 #endif53 54 50 #if PLATFORM(IOS) 55 51 OBJC_CLASS DOMCSSStyleDeclaration; … … 92 88 class ScriptController; 93 89 class Settings; 94 class TiledBackingStore;95 90 class VisiblePosition; 96 91 class Widget; … … 107 102 enum OverflowScrollAction { DoNotPerformOverflowScroll, PerformOverflowScroll }; 108 103 typedef Node* (*NodeQualifier)(const HitTestResult&, Node* terminationNode, IntRect* nodeBounds); 109 #endif110 111 #if !USE(TILED_BACKING_STORE)112 class TiledBackingStoreClient { };113 104 #endif 114 105 … … 123 114 typedef unsigned LayerTreeFlags; 124 115 125 class Frame : public RefCounted<Frame> , public TiledBackingStoreClient{116 class Frame : public RefCounted<Frame> { 126 117 public: 127 118 static PassRefPtr<Frame> create(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*); … … 328 319 #endif 329 320 330 #if USE(TILED_BACKING_STORE)331 // FIXME: The tiled backing store belongs in FrameView, not Frame.332 333 public:334 TiledBackingStore* tiledBackingStore() const { return m_tiledBackingStore.get(); }335 void setTiledBackingStoreEnabled(bool);336 337 private:338 // TiledBackingStoreClient interface339 virtual void tiledBackingStorePaintBegin() override final;340 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) override final;341 virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) override final;342 virtual IntRect tiledBackingStoreContentsRect() override final;343 virtual IntRect tiledBackingStoreVisibleRect() override final;344 virtual Color tiledBackingStoreBackgroundColor() const override final;345 346 std::unique_ptr<TiledBackingStore> m_tiledBackingStore;347 #endif348 349 321 int m_activeDOMObjectsAndAnimationsSuspendedCount; 350 322 }; -
trunk/Source/WebCore/page/FrameView.cpp
r168079 r168151 2144 2144 return; 2145 2145 2146 #if USE(TILED_BACKING_STORE)2147 if (frame().tiledBackingStore()) {2148 frame().tiledBackingStore()->invalidate(r);2149 return;2150 }2151 #endif2152 2146 ScrollView::repaintContentRectangle(r); 2153 2147 } -
trunk/Source/WebCore/page/Settings.cpp
r168079 r168151 176 176 , m_fontRenderingMode(0) 177 177 , m_showTiledScrollingIndicator(false) 178 , m_tiledBackingStoreEnabled(false)179 178 , m_backgroundShouldExtendBeyondPage(false) 180 179 , m_dnsPrefetchingEnabled(false) … … 557 556 } 558 557 559 void Settings::setTiledBackingStoreEnabled(bool enabled)560 {561 m_tiledBackingStoreEnabled = enabled;562 #if USE(TILED_BACKING_STORE)563 m_page->mainFrame().setTiledBackingStoreEnabled(enabled);564 #endif565 }566 567 558 void Settings::setBackgroundShouldExtendBeyondPage(bool shouldExtend) 568 559 { -
trunk/Source/WebCore/page/Settings.h
r168079 r168151 193 193 #endif 194 194 195 void setTiledBackingStoreEnabled(bool);196 bool tiledBackingStoreEnabled() const { return m_tiledBackingStoreEnabled; }197 198 195 void setBackgroundShouldExtendBeyondPage(bool); 199 196 bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; } … … 303 300 unsigned m_fontRenderingMode : 1; 304 301 bool m_showTiledScrollingIndicator : 1; 305 bool m_tiledBackingStoreEnabled : 1;306 302 bool m_backgroundShouldExtendBeyondPage : 1; 307 303 bool m_dnsPrefetchingEnabled : 1;
Note: See TracChangeset
for help on using the changeset viewer.