Changeset 162597 in webkit
- Timestamp:
- Jan 22, 2014 10:32:12 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r162588 r162597 1 2014-01-22 Simon Fraser <simon.fraser@apple.com> 2 3 Surround fixedVisibleContentRect code with USE(TILED_BACKING_STORE) 4 https://bugs.webkit.org/show_bug.cgi?id=127461 5 6 Reviewed by Andreas Kling. 7 8 The "fixedVisibleContentRect" code path is only used by platforms 9 which enabled TILED_BACKING_STORE, so to reduce confusion, surround 10 this code with #if USE(TILED_BACKING_STORE). 11 12 * page/Frame.cpp: 13 (WebCore::Frame::createView): 14 * page/FrameView.cpp: 15 * page/FrameView.h: 16 * platform/ScrollView.cpp: 17 (WebCore::ScrollView::unscaledVisibleContentSize): 18 (WebCore::ScrollView::visibleContentRect): 19 * platform/ScrollView.h: 20 (WebCore::ScrollView::visibleSize): 21 1 22 2014-01-22 Myles C. Maxfield <mmaxfield@apple.com> 2 23 -
trunk/Source/WebCore/page/Frame.cpp
r162395 r162597 911 911 frameView = FrameView::create(*this, viewportSize); 912 912 frameView->setFixedLayoutSize(fixedLayoutSize); 913 #if !PLATFORM(IOS)913 #if USE(TILED_BACKING_STORE) 914 914 frameView->setFixedVisibleContentRect(fixedVisibleContentRect); 915 915 #else -
trunk/Source/WebCore/page/FrameView.cpp
r162480 r162597 1979 1979 } 1980 1980 1981 #if !PLATFORM(IOS)1981 #if USE(TILED_BACKING_STORE) 1982 1982 void FrameView::setFixedVisibleContentRect(const IntRect& visibleContentRect) 1983 1983 { -
trunk/Source/WebCore/page/FrameView.h
r162230 r162597 215 215 virtual float visibleContentScaleFactor() const override; 216 216 217 #if !PLATFORM(IOS)217 #if USE(TILED_BACKING_STORE) 218 218 virtual void setFixedVisibleContentRect(const IntRect&) override; 219 219 #endif -
trunk/Source/WebCore/platform/ScrollView.cpp
r162515 r162597 242 242 return platformVisibleContentSize(scrollbarInclusion == IncludeScrollbars); 243 243 244 #if !PLATFORM(IOS)244 #if USE(TILED_BACKING_STORE) 245 245 if (!m_fixedVisibleContentRect.isEmpty()) 246 246 return m_fixedVisibleContentRect.size(); … … 267 267 return platformVisibleContentRect(scollbarInclusion == IncludeScrollbars); 268 268 269 #if !PLATFORM(IOS)269 #if USE(TILED_BACKING_STORE) 270 270 if (!m_fixedVisibleContentRect.isEmpty()) 271 271 return m_fixedVisibleContentRect; -
trunk/Source/WebCore/platform/ScrollView.h
r162139 r162597 161 161 // which usually will happen when panning, pinching and rotation ends, or when scale or position are changed manually. 162 162 virtual IntRect visibleContentRect(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const override; 163 #if !PLATFORM(IOS) 163 IntSize visibleSize() const { return visibleContentRect().size(); } 164 165 #if USE(TILED_BACKING_STORE) 164 166 virtual void setFixedVisibleContentRect(const IntRect& visibleContentRect) { m_fixedVisibleContentRect = visibleContentRect; } 165 167 IntRect fixedVisibleContentRect() const { return m_fixedVisibleContentRect; } 166 168 #endif 167 IntSize visibleSize() const { return visibleContentRect().size(); } 169 168 170 #if PLATFORM(IOS) 169 171 // This is the area that is not covered by UI elements. -
trunk/Source/WebKit2/ChangeLog
r162590 r162597 1 2014-01-22 Simon Fraser <simon.fraser@apple.com> 2 3 Surround fixedVisibleContentRect code with USE(TILED_BACKING_STORE) 4 https://bugs.webkit.org/show_bug.cgi?id=127461 5 6 Reviewed by Andreas Kling. 7 8 The "fixedVisibleContentRect" code path is only used by platforms 9 which enabled TILED_BACKING_STORE, so to reduce confusion, surround 10 this code with #if USE(TILED_BACKING_STORE). 11 12 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 13 (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage): 14 1 15 2014-01-22 Benjamin Poulain <bpoulain@apple.com> 2 16 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r162548 r162597 1176 1176 bool shouldDisableScrolling = isMainFrame && !webPage->mainFrameIsScrollable(); 1177 1177 bool shouldHideScrollbars = shouldUseFixedLayout || shouldDisableScrolling; 1178 #if PLATFORM(IOS) 1179 IntRect currentFixedVisibleContentRect = IntRect(); 1180 #else 1181 IntRect currentFixedVisibleContentRect = m_frame->coreFrame()->view() ? m_frame->coreFrame()->view()->fixedVisibleContentRect() : IntRect(); 1178 IntRect fixedVisibleContentRect; 1179 1180 #if USE(TILED_BACKING_STORE) 1181 if (m_frame->coreFrame()->view()) 1182 fixedVisibleContentRect = m_frame->coreFrame()->view()->fixedVisibleContentRect(); 1182 1183 #endif 1183 1184 … … 1187 1188 1188 1189 m_frame->coreFrame()->createView(webPage->size(), backgroundColor, isTransparent, 1189 IntSize(), currentFixedVisibleContentRect, shouldUseFixedLayout,1190 IntSize(), fixedVisibleContentRect, shouldUseFixedLayout, 1190 1191 defaultScrollbarMode, /* lock */ shouldHideScrollbars, defaultScrollbarMode, /* lock */ shouldHideScrollbars); 1191 1192
Note: See TracChangeset
for help on using the changeset viewer.