| e52b702893ce72ec42d7bf62c4975b4ef61067d2 |
|
23-Feb-2012 |
Victoria Lease <violets@google.com> |
draw inactive find-on-page matches as outlines
Change-Id: Iacbeba1fb4e3c63f8f40c61c8b641c0b6c704cad
/external/webkit/Source/WebCore/rendering/InlineTextBox.cpp
|
| 39ef870949ce97df4abfe4febd0b38b312c85007 |
|
27-Oct-2011 |
Steve Block <steveblock@google.com> |
Cherry-pick WebKit change 87687 to fix debug build
See http://trac.webkit.org/changeset/87687
Bug: 5448972
Change-Id: I1f2da8f5a2264ce6627dc99ebe1b235ae34f7c62
/external/webkit/Source/WebCore/rendering/InlineTextBox.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/InlineTextBox.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/InlineTextBox.cpp
|
| a551df194f6950988c7accff3018f55c9c674bc3 |
|
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix uses of rounding hacks.
Font rounding hacks have been removed upstream, so there
is no need for our local code anymore. Remove all uses
of the ANDROID_DISABLE_ROUNDING_HACKS macro.
Note that this brings our behavior in line with upstream -
Android will see a change in behavior to before the merge
as we did not disable rounding hacks in all cases.
- SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for
disableRoundingHacks, so we don't disable hacks, so this behaviour will
change as rounding hacks are disabled now.
- RenderText::createTextBox() - We pass a value for
disableRoundingHacks, true if any parent is a text control.
So we will change behavior in any case where the parent is not
a text control.
Note that although we may see a change in behavior, that change is
consistent with the upstream codebase.
See http://trac.webkit.org/changeset/78846
Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
/external/webkit/Source/WebCore/rendering/InlineTextBox.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/InlineTextBox.cpp
|
| 1ed8c4d16ac986307f1c0589a3a720a37e60f313 |
|
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: IntRect::bottom()/right() renamed
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
/external/webkit/Source/WebCore/rendering/InlineTextBox.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/InlineTextBox.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/InlineTextBox.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/InlineTextBox.cpp
|
| 65f03d4f644ce73618e5f4f50dd694b26f55ae12 |
|
13-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
/external/webkit/Source/WebCore/rendering/InlineTextBox.cpp
|
| 5b8c725c6846b6f59ba9a5e6f562774f74046622 |
|
09-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Fix conflicts
- HTMLInputElement.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
See http://trac.webkit.org/changeset/74895
- HTMLInputElement.cpp and RangeInputType.cpp
Conflict due to refactoring of event handling on input elements
See http://trac.webkit.org/changeset/74549
- DOMWindow.cpp
Conflict due to DOMWindow::clearDOMStorage()
See http://trac.webkit.org/changeset/74800
- EventHandler.cpp
Conflict due to longpress and doubletap vs touch event refactoring
See http://trac.webkit.org/changeset/74553
- History.cpp
Trivial conflict due to cherry-pick
See http://trac.webkit.org/changeset/74853
- GraphicsContext.cpp
Conflict due to PLATFORM(ANDROID) guard
See http://trac.webkit.org/changeset/74662
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/74971
Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
/external/webkit/Source/WebCore/rendering/InlineTextBox.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/InlineTextBox.cpp
|