| b359438e11520b3e3b6801ad1280e1bdef2b986c |
09-Nov-2011 |
Kristian Monsen <kristianm@google.com> |
Removing ANDROID_INSTRUMENTATION code
This has not been used for years, and due to WebKit merges the
results are not accurate anymore.
The resulting code is cleaner, less likely to create merge conflicts,
and does not give the impression that this can be turned on and
it will still work.
Needs CL:
https://android-git.corp.google.com/g/#/c/148912/
Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
TMLDocumentParser.cpp
|
| d0147a863b872ecaa451ab0dce2a348760e99e2c |
13-Jul-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
TMLConstructionSite.cpp
TMLDocumentParser.cpp
TMLToken.h
TMLTreeBuilder.cpp
|
| 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 |
10-Jun-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
SSFilter.cpp
|
| 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 |
02-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
SSPreloadScanner.cpp
SSPreloadScanner.h
TMLDocumentParser.cpp
TMLDocumentParser.h
TMLParserScheduler.h
TMLScriptRunner.cpp
TMLScriptRunnerHost.h
|
| 2bde8e466a4451c7319e3a072d118917957d6554 |
25-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
TMLDocumentParser.cpp
TMLDocumentParser.h
TMLElementStack.cpp
TMLElementStack.h
TMLParserScheduler.cpp
TMLParserScheduler.h
TMLPreloadScanner.cpp
TMLScriptRunnerHost.h
TMLToken.h
TMLTreeBuilder.cpp
|
| 9921f05212aa840e1ce32e9f04fa60ca4b3bcbb7 |
01-Jun-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Fix conflicts.
Android.jscbindings.mk 79223
Conflict due to http://trac.webkit.org/changeset/79223
Android.mk
Conflicts due to http://trac.webkit.org/changeset/79825 and
http://trac.webkit.org/changeset/79978
Android.v8bindings.mk 80367
Conflicts due to http://trac.webkit.org/changeset/80103 and
http://trac.webkit.org/changeset/80367
HTMLMediaElement.cpp
Conflicts due to http://trac.webkit.org/changeset/80030 and
local TOUCH_EVENTS modifications.
HTMLDocumentParser.cpp
Conflict due to http://trac.webkit.org/changeset/79772 and
local ANDROID_INSTRUMENT modifications.
CachedResourceLoader.cpp|h
Conflicts due to http://trac.webkit.org/changeset/78602 and
ANDROID_BLOCK_NETWORK_IMAGE.
MemoryCache.h
Conflicts due to http://trac.webkit.org/changeset/78848 and
ANDROID_INSTRUMENT.
FrameView.cpp
Conflict due to http://trac.webkit.org/changeset/78928 and
locally added updatePositionedObjects function.
NetworkStateNotifier
JobjectWrapper.cpp
Git seems to have got confused with a rename here in
JobjectWrapper.cpp, keep ours.
Conflicts due to http://trac.webkit.org/changeset/79563 and
local Android additions.
PluginViewNone.cpp 79904
Conflicts due to http://trac.webkit.org/changeset/79904 and
local cherry pick of http://trac.webkit.org/changeset/79988
RenderBox.cpp
Conflicts due to http://trac.webkit.org/changeset/79467 and
local android modifications.
Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
TMLDocumentParser.cpp
|
| 81bc750723a18f21cd17d1b173cd2a4dda9cea6e |
24-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
TMLConstructionSite.cpp
TMLConstructionSite.h
TMLDocumentParser.cpp
TMLDocumentParser.h
TMLElementStack.cpp
TMLElementStack.h
TMLParserScheduler.cpp
TMLParserScheduler.h
TMLScriptRunner.cpp
TMLTreeBuilder.cpp
TMLTreeBuilder.h
estingLevelIncrementer.h
SSFilter.cpp
SSFilter.h
reate-html-entity-table
|
| 2fc2651226baac27029e38c9d6ef883fa32084db |
18-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
TMLConstructionSite.cpp
TMLConstructionSite.h
TMLDocumentParser.cpp
TMLDocumentParser.h
TMLInputStream.h
TMLParserIdioms.cpp
TMLScriptRunner.cpp
TMLSourceTracker.cpp
TMLSourceTracker.h
TMLToken.h
TMLTreeBuilder.cpp
TMLTreeBuilder.h
TMLViewSourceParser.cpp
TMLViewSourceParser.h
SSFilter.cpp
SSFilter.h
|
| ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb |
16-May-2011 |
Ben Murdoch <benm@google.com> |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
SSPreloadScanner.h
TMLConstructionSite.h
TMLDocumentParser.h
TMLElementStack.h
TMLFormattingElementList.h
TMLInputStream.h
TMLMetaCharsetParser.h
TMLParserScheduler.h
TMLPreloadScanner.h
TMLScriptRunner.h
TMLToken.h
TMLTokenizer.h
TMLTreeBuilder.cpp
TMLTreeBuilder.h
estingLevelIncrementer.h
|
| cad810f21b803229eb11403f9209855525a25d57 |
06-May-2011 |
Steve Block <steveblock@google.com> |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
SSPreloadScanner.cpp
SSPreloadScanner.h
TMLConstructionSite.cpp
TMLConstructionSite.h
TMLDocumentParser.cpp
TMLDocumentParser.h
TMLElementStack.cpp
TMLElementStack.h
TMLEntityNames.in
TMLEntityParser.cpp
TMLEntityParser.h
TMLEntitySearch.cpp
TMLEntitySearch.h
TMLEntityTable.h
TMLFormattingElementList.cpp
TMLFormattingElementList.h
TMLInputStream.h
TMLMetaCharsetParser.cpp
TMLMetaCharsetParser.h
TMLParserIdioms.cpp
TMLParserIdioms.h
TMLParserScheduler.cpp
TMLParserScheduler.h
TMLPreloadScanner.cpp
TMLPreloadScanner.h
TMLScriptRunner.cpp
TMLScriptRunner.h
TMLScriptRunnerHost.h
TMLToken.h
TMLTokenizer.cpp
TMLTokenizer.h
TMLTreeBuilder.cpp
TMLTreeBuilder.h
TMLViewSourceParser.cpp
TMLViewSourceParser.h
estingLevelIncrementer.h
extDocumentParser.cpp
extDocumentParser.h
extViewSourceParser.cpp
extViewSourceParser.h
reate-html-entity-table
|