| ef70308a818da13f513c6e3b640d8228c99abbd0 |
|
22-Feb-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix overflow clipping of images in auto-fit mode.
In auto-fit mode, text is wrapped based on screen width. However, if
overflow isn't visible for the content box, and it includes block
elements, they may get clipped. Disable overflow clipping in this
scenario.
Bug: 6034321
Change-Id: I1e274df3b5698fb4142e2f0ae4c68578e26d2af4
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 8ffb902ab85b3eb5e2fad95e38034d67e7e2e463 |
|
08-Dec-2011 |
Mangesh Ghiware <mghiware@google.com> |
Revert change that caused text in floating divs to not reflow.
Bug: 5455817 (Text reflow not working in browser)
Change-Id: I2a62a7fb4c7acde640cd87b8d0f03200b8f7fc2f
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| b62826266ccf1d6f2ede3e9735e2279e6dee5a5b |
|
21-Jul-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Limit RTL text wrapping when having floating element.
issue: 5047703
Change-Id: Ie7d9bb54649afb4d025d4ec02bcc42b52b4049d1
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| d5c8fc35c6fd034d37978ad6c4df7e0afdbb0e1b |
|
24-Jun-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Better way to determine not to reflow.
Instead of using border which may be too broad, using whether an object
is floating to fix flickr's reflow issue. Checked sites like slashdot.org
and nytimes.com, this works better.
issue: 4596265
Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 7a0c48bd4bf8c1649fac5f459a1c1c0a647c9997 |
|
23-Jun-2011 |
Shimeng (Simon) Wang <swang@google.com> |
Do not reflow text if a div has border.
This also fixes the case where flickr header's position
is not good since it's reflowed for issue 4596265.
issue: 4596265
Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 |
|
10-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
|
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
|
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 09b60ab8488b362c96df8f268613aafaeebfcfa1 |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
|
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|
| cad810f21b803229eb11403f9209855525a25d57 |
|
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
|