History log of /external/webkit/Source/WebCore/page/Settings.h
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ad46784d9075ff6d1e11cd2be47a6169761b0eeb 19-Jul-2012 Teng-Hui Zhu <ztenghui@google.com> add webSetting API to allow media play without user gesture

bug:6806306
This also include partial change from webkit.
http://trac.webkit.org/changeset/91232

Framework change: https://android-git.corp.google.com/g/#/c/208569/

Change-Id: I1a843472c0ce3b01bcad3b7c3c12c93702f2970c
/external/webkit/Source/WebCore/page/Settings.h
361796a8de13ad8057f57e08c2322e3a025ae63b 30-Mar-2012 Victoria Lease <violets@google.com> add enable/disable switch for link prefetch to WebSettings

Bug: 5218987
Change-Id: Ie88a117e52d1835114415ee6721108d8a882594a
/external/webkit/Source/WebCore/page/Settings.h
5fe5f9958e40c39747144b3b454077d73415a112 28-Feb-2012 George Mount <mount@google.com> Merge webkit change to reveal last character in password.

Bug 6083915
cherry pick of webkit 93656
http://trac.webkit.org/changeset/93656

Change-Id: I1f979a3b2b9916736f3785ab2d5998b958b55cd2
/external/webkit/Source/WebCore/page/Settings.h
bbcce278be9be6a85f47928c38a74c8d36a13a85 09-Jun-2011 Ben Murdoch <benm@google.com> Merge WebKit at r84325: Fix conflicts.

Platform.h
ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997)
WTF_USE_SKIA (http://trac.webkit.org/changeset/84106)

JSNavigatorCustom.cpp
V8NavigatorCustom.cpp
ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287)

CSSStyleSelector.cpp
ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986)

Document.cpp
ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349)
ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992)

HTMLInputElement.cpp
ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534)

RangeInputType.cpp
ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/)

ChromeClient.h
ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375)

EventHandler.cpp
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522)

Settings
ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201)
ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628)

Gradient.cpp
Graphicscontext.cpp
HTMLCanvasElement.cpp
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088)
USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101)

PluginView.h
ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071)

RenderBox.h
ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611)

RenderIframe.cpp (moved code to RenderPart.cpp)
PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518)

RenderLayer.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899)

RenderLayer.h
RenderLayerBacking.cpp
ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820)

Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
/external/webkit/Source/WebCore/page/Settings.h
2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 02-Jun-2011 Ben Murdoch <benm@google.com> Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
/external/webkit/Source/WebCore/page/Settings.h
74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 08-Jun-2011 Steve Block <steveblock@google.com> Merge WebKit at r82507: Fix conflicts

- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715

- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797

- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695

- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635

- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874

- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716

- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981

- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378

- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684

- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054

- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835

- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216

- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.

Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
/external/webkit/Source/WebCore/page/Settings.h
2bde8e466a4451c7319e3a072d118917957d6554 25-May-2011 Steve Block <steveblock@google.com> Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
/external/webkit/Source/WebCore/page/Settings.h
cbb4d7cda345c2678aa649cc57bffce8ca84949a 07-Jun-2011 Steve Block <steveblock@google.com> Move all Android modification to Settings to the end of the relevant block

This will ease future merges

Change-Id: I7203cfb0cdc52140802a11cd35c64a9cfd502d30
/external/webkit/Source/WebCore/page/Settings.h
81bc750723a18f21cd17d1b173cd2a4dda9cea6e 24-May-2011 Ben Murdoch <benm@google.com> Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
/external/webkit/Source/WebCore/page/Settings.h
2fc2651226baac27029e38c9d6ef883fa32084db 18-May-2011 Steve Block <steveblock@google.com> Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
/external/webkit/Source/WebCore/page/Settings.h
ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb 16-May-2011 Ben Murdoch <benm@google.com> Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
/external/webkit/Source/WebCore/page/Settings.h
cad810f21b803229eb11403f9209855525a25d57 06-May-2011 Steve Block <steveblock@google.com> Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
/external/webkit/Source/WebCore/page/Settings.h