Changeset 87449 in webkit
- Timestamp:
- May 26, 2011 4:47:32 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87444 r87449 1 2011-05-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r87444. 4 http://trac.webkit.org/changeset/87444 5 https://bugs.webkit.org/show_bug.cgi?id=61582 6 7 Layout test regressions in Chromium/WebKit: fast/css/first- 8 letter-text-fragment-crash.html, fast/css/first-letter- 9 visibility.html (Requested by aklein on #webkit). 10 11 * page/Chrome.cpp: 12 * page/Chrome.h: 13 * page/ChromeClient.h: 14 * page/FrameView.cpp: 15 (WebCore::FrameView::setContentsSize): 16 * page/FrameView.h: 17 1 18 2011-05-26 David Levin <levin@chromium.org> 2 19 -
trunk/Source/WebCore/page/Chrome.cpp
r87444 r87449 115 115 } 116 116 117 void Chrome::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const118 {119 m_client->contentsPreferredSizeChanged(frame, size);120 }121 122 117 void Chrome::scrollRectIntoView(const IntRect& rect) const 123 118 { -
trunk/Source/WebCore/page/Chrome.h
r87444 r87449 85 85 86 86 void contentsSizeChanged(Frame*, const IntSize&) const; 87 void contentsPreferredSizeChanged(Frame*, const IntSize&) const;88 87 89 88 void setWindowRect(const FloatRect&) const; -
trunk/Source/WebCore/page/ChromeClient.h
r87444 r87449 162 162 163 163 virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0; 164 virtual void contentsPreferredSizeChanged(Frame*, const IntSize&) const { }165 164 virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const = 0; // Currently only Mac has a non empty implementation. 166 165 -
trunk/Source/WebCore/page/FrameView.cpp
r87444 r87449 476 476 void FrameView::setContentsSize(const IntSize& size) 477 477 { 478 bool contentsSizeChanged = size != contentsSize(); 478 if (size == contentsSize()) 479 return; 480 481 m_deferSetNeedsLayouts++; 482 483 ScrollView::setContentsSize(size); 484 scrollAnimator()->contentsResized(); 485 479 486 Page* page = frame() ? frame()->page() : 0; 480 if (contentsSizeChanged) { 481 m_deferSetNeedsLayouts++; 482 483 ScrollView::setContentsSize(size); 484 scrollAnimator()->contentsResized(); 485 if (page) 486 page->chrome()->contentsSizeChanged(frame(), size); // notify only 487 } 488 489 if (page) { 490 Document* document = frame()->document(); 491 if (document && document->renderView() && document->documentElement()) { 492 IntSize preferedSize(document->renderView()->minPreferredLogicalWidth(), 493 document->documentElement()->scrollHeight()); 494 if (preferedSize != m_lastPreferedSize) { 495 m_lastPreferedSize = preferedSize; 496 page->chrome()->contentsPreferredSizeChanged(frame(), preferedSize); 497 } 498 } 499 } 500 501 if (contentsSizeChanged) { 502 m_deferSetNeedsLayouts--; 503 504 if (!m_deferSetNeedsLayouts) 505 m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen. 506 } 487 if (!page) 488 return; 489 490 page->chrome()->contentsSizeChanged(frame(), size); //notify only 491 492 m_deferSetNeedsLayouts--; 493 494 if (!m_deferSetNeedsLayouts) 495 m_setNeedsLayoutWasDeferred = false; // FIXME: Find a way to make the deferred layout actually happen. 507 496 } 508 497 -
trunk/Source/WebCore/page/FrameView.h
r87444 r87449 393 393 Color m_baseBackgroundColor; 394 394 IntSize m_lastLayoutSize; 395 IntSize m_lastPreferedSize;396 395 float m_lastZoomFactor; 397 396 -
trunk/Source/WebKit/chromium/ChangeLog
r87444 r87449 1 2011-05-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r87444. 4 http://trac.webkit.org/changeset/87444 5 https://bugs.webkit.org/show_bug.cgi?id=61582 6 7 Layout test regressions in Chromium/WebKit: fast/css/first- 8 letter-text-fragment-crash.html, fast/css/first-letter- 9 visibility.html (Requested by aklein on #webkit). 10 11 * public/WebFrameClient.h: 12 * src/ChromeClientImpl.cpp: 13 * src/ChromeClientImpl.h: 14 1 15 2011-05-26 David Levin <levin@chromium.org> 2 16 -
trunk/Source/WebKit/chromium/public/WebFrameClient.h
r87444 r87449 308 308 virtual void didChangeContentsSize(WebFrame*, const WebSize&) { } 309 309 310 // The preferred dimensions for the rendered HTML contents changed.311 virtual void didChangeContentsPreferredSize(WebFrame*, const WebSize&) const { }312 313 310 // The main frame scrolled. 314 311 virtual void didChangeScrollOffset(WebFrame*) { } -
trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp
r87444 r87449 589 589 } 590 590 591 void ChromeClientImpl::contentsPreferredSizeChanged(Frame* frame, const IntSize& size) const592 {593 WebFrameImpl* webframe = WebFrameImpl::fromFrame(frame);594 if (webframe->client())595 webframe->client()->didChangeContentsPreferredSize(webframe, size);596 }597 598 591 void ChromeClientImpl::scrollbarsModeDidChange() const 599 592 { -
trunk/Source/WebKit/chromium/src/ChromeClientImpl.h
r87444 r87449 120 120 virtual PlatformPageClient platformPageClient() const { return 0; } 121 121 virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const; 122 virtual void contentsPreferredSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;123 122 virtual void scrollRectIntoView( 124 123 const WebCore::IntRect&, const WebCore::ScrollView*) const { }
Note: See TracChangeset
for help on using the changeset viewer.