Merge from Chromium at DEPS revision 33.0.1750.16
This commit was generated by merge_to_master.py.
Change-Id: Ia98a31c43571ef5891e3d3127e0665e0d054294d
diff --git a/Source/bindings/v8/CustomElementConstructorBuilder.cpp b/Source/bindings/v8/CustomElementConstructorBuilder.cpp
index 6fe0030..b134666 100644
--- a/Source/bindings/v8/CustomElementConstructorBuilder.cpp
+++ b/Source/bindings/v8/CustomElementConstructorBuilder.cpp
@@ -145,11 +145,11 @@
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Handle<v8::Function> created = retrieveCallback(isolate, "createdCallback");
- v8::Handle<v8::Function> enteredView = retrieveCallback(isolate, "enteredViewCallback");
- v8::Handle<v8::Function> leftView = retrieveCallback(isolate, "leftViewCallback");
+ v8::Handle<v8::Function> attached = retrieveCallback(isolate, "attachedCallback");
+ v8::Handle<v8::Function> detached = retrieveCallback(isolate, "detachedCallback");
v8::Handle<v8::Function> attributeChanged = retrieveCallback(isolate, "attributeChangedCallback");
- m_callbacks = V8CustomElementLifecycleCallbacks::create(executionContext.get(), m_prototype, created, enteredView, leftView, attributeChanged);
+ m_callbacks = V8CustomElementLifecycleCallbacks::create(executionContext.get(), m_prototype, created, attached, detached, attributeChanged);
return m_callbacks.get();
}
diff --git a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
index fe94e4d..29e1bc0 100644
--- a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
+++ b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.cpp
@@ -45,11 +45,11 @@
#define CALLBACK_LIST(V) \
V(created, Created) \
- V(enteredView, EnteredView) \
- V(leftView, LeftView) \
+ V(attached, Attached) \
+ V(detached, Detached) \
V(attributeChanged, AttributeChanged)
-PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged)
+PassRefPtr<V8CustomElementLifecycleCallbacks> V8CustomElementLifecycleCallbacks::create(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
{
v8::Isolate* isolate = toIsolate(executionContext);
// A given object can only be used as a Custom Element prototype
@@ -62,19 +62,19 @@
CALLBACK_LIST(SET_HIDDEN_PROPERTY)
#undef SET_HIDDEN_PROPERTY
- return adoptRef(new V8CustomElementLifecycleCallbacks(executionContext, prototype, created, enteredView, leftView, attributeChanged));
+ return adoptRef(new V8CustomElementLifecycleCallbacks(executionContext, prototype, created, attached, detached, attributeChanged));
}
-static CustomElementLifecycleCallbacks::CallbackType flagSet(v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged)
+static CustomElementLifecycleCallbacks::CallbackType flagSet(v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
{
// V8 Custom Elements always run created to swizzle prototypes.
int flags = CustomElementLifecycleCallbacks::Created;
- if (!enteredView.IsEmpty())
- flags |= CustomElementLifecycleCallbacks::EnteredView;
+ if (!attached.IsEmpty())
+ flags |= CustomElementLifecycleCallbacks::Attached;
- if (!leftView.IsEmpty())
- flags |= CustomElementLifecycleCallbacks::LeftView;
+ if (!detached.IsEmpty())
+ flags |= CustomElementLifecycleCallbacks::Detached;
if (!attributeChanged.IsEmpty())
flags |= CustomElementLifecycleCallbacks::AttributeChanged;
@@ -88,15 +88,15 @@
data.GetParameter()->clear();
}
-V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged)
- : CustomElementLifecycleCallbacks(flagSet(enteredView, leftView, attributeChanged))
+V8CustomElementLifecycleCallbacks::V8CustomElementLifecycleCallbacks(ExecutionContext* executionContext, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged)
+ : CustomElementLifecycleCallbacks(flagSet(attached, detached, attributeChanged))
, ActiveDOMCallback(executionContext)
, m_owner(0)
, m_world(DOMWrapperWorld::current())
, m_prototype(toIsolate(executionContext), prototype)
, m_created(toIsolate(executionContext), created)
- , m_enteredView(toIsolate(executionContext), enteredView)
- , m_leftView(toIsolate(executionContext), leftView)
+ , m_attached(toIsolate(executionContext), attached)
+ , m_detached(toIsolate(executionContext), detached)
, m_attributeChanged(toIsolate(executionContext), attributeChanged)
{
m_prototype.setWeak(&m_prototype, weakCallback<v8::Object>);
@@ -187,14 +187,14 @@
ScriptController::callFunction(executionContext(), callback, receiver, 0, 0, isolate);
}
-void V8CustomElementLifecycleCallbacks::enteredView(Element* element)
+void V8CustomElementLifecycleCallbacks::attached(Element* element)
{
- call(m_enteredView, element);
+ call(m_attached, element);
}
-void V8CustomElementLifecycleCallbacks::leftView(Element* element)
+void V8CustomElementLifecycleCallbacks::detached(Element* element)
{
- call(m_leftView, element);
+ call(m_detached, element);
}
void V8CustomElementLifecycleCallbacks::attributeChanged(Element* element, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue)
diff --git a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.h b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.h
index 0135463..e911e28 100644
--- a/Source/bindings/v8/V8CustomElementLifecycleCallbacks.h
+++ b/Source/bindings/v8/V8CustomElementLifecycleCallbacks.h
@@ -48,18 +48,18 @@
class V8CustomElementLifecycleCallbacks : public CustomElementLifecycleCallbacks, ActiveDOMCallback {
public:
- static PassRefPtr<V8CustomElementLifecycleCallbacks> create(ExecutionContext*, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged);
+ static PassRefPtr<V8CustomElementLifecycleCallbacks> create(ExecutionContext*, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged);
virtual ~V8CustomElementLifecycleCallbacks();
bool setBinding(CustomElementDefinition* owner, PassOwnPtr<CustomElementBinding>);
private:
- V8CustomElementLifecycleCallbacks(ExecutionContext*, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> enteredView, v8::Handle<v8::Function> leftView, v8::Handle<v8::Function> attributeChanged);
+ V8CustomElementLifecycleCallbacks(ExecutionContext*, v8::Handle<v8::Object> prototype, v8::Handle<v8::Function> created, v8::Handle<v8::Function> attached, v8::Handle<v8::Function> detached, v8::Handle<v8::Function> attributeChanged);
virtual void created(Element*) OVERRIDE;
- virtual void enteredView(Element*) OVERRIDE;
- virtual void leftView(Element*) OVERRIDE;
+ virtual void attached(Element*) OVERRIDE;
+ virtual void detached(Element*) OVERRIDE;
virtual void attributeChanged(Element*, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue) OVERRIDE;
void call(const ScopedPersistent<v8::Function>& weakCallback, Element*);
@@ -70,8 +70,8 @@
RefPtr<DOMWrapperWorld> m_world;
ScopedPersistent<v8::Object> m_prototype;
ScopedPersistent<v8::Function> m_created;
- ScopedPersistent<v8::Function> m_enteredView;
- ScopedPersistent<v8::Function> m_leftView;
+ ScopedPersistent<v8::Function> m_attached;
+ ScopedPersistent<v8::Function> m_detached;
ScopedPersistent<v8::Function> m_attributeChanged;
};
diff --git a/Source/bindings/v8/V8HiddenPropertyName.h b/Source/bindings/v8/V8HiddenPropertyName.h
index 48093af..76dc17c 100644
--- a/Source/bindings/v8/V8HiddenPropertyName.h
+++ b/Source/bindings/v8/V8HiddenPropertyName.h
@@ -40,12 +40,12 @@
V(attributeListener) \
V(callback) \
V(condition) \
+ V(customElementAttached) \
V(customElementAttributeChanged) \
V(customElementCreated) \
+ V(customElementDetached) \
V(customElementDocument) \
- V(customElementEnteredView) \
V(customElementIsInterfacePrototypeObject) \
- V(customElementLeftView) \
V(customElementNamespaceURI) \
V(customElementTagName) \
V(customElementType) \
diff --git a/Source/build/features.gypi b/Source/build/features.gypi
index e5e74d6..ae0049e 100644
--- a/Source/build/features.gypi
+++ b/Source/build/features.gypi
@@ -54,6 +54,7 @@
}],
['OS=="android"', {
'feature_defines': [
+ 'ENABLE_FAST_MOBILE_SCROLLING=1',
'ENABLE_INPUT_SPEECH=0',
'ENABLE_LEGACY_NOTIFICATIONS=0',
'ENABLE_MEDIA_CAPTURE=1',
diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h
index 43496b0..b12a9bf 100644
--- a/Source/core/animation/ActiveAnimations.h
+++ b/Source/core/animation/ActiveAnimations.h
@@ -40,6 +40,7 @@
namespace WebCore {
+class CSSAnimations;
class RenderObject;
class Element;
@@ -50,6 +51,9 @@
class ActiveAnimations {
public:
+ ActiveAnimations()
+ : m_animationStyleChange(false) { }
+
// Animations that are currently active for this element, their effects will be applied
// during a style recalc. CSS Transitions are included in this stack.
AnimationStack& defaultStack() { return m_defaultStack; }
@@ -70,10 +74,18 @@
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
void cancelAnimationOnCompositor();
+ void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleChange = animationStyleChange; }
+
private:
+ bool isAnimationStyleChange() const { return m_animationStyleChange; }
+
AnimationStack m_defaultStack;
CSSAnimations m_cssAnimations;
PlayerSet m_players;
+ bool m_animationStyleChange;
+
+ // CSSAnimations checks if a style change is due to animation.
+ friend class CSSAnimations;
};
} // namespace WebCore
diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
index bc18d7e..102bfae 100644
--- a/Source/core/animation/Animation.cpp
+++ b/Source/core/animation/Animation.cpp
@@ -88,7 +88,7 @@
// FIXME: Handle iteration values which overflow int.
m_compositableValues = m_effect->sample(static_cast<int>(iteration), timeFraction());
if (player()) {
- m_target->setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
+ m_target->setNeedsAnimationStyleRecalc();
return true;
}
return false;
@@ -102,7 +102,7 @@
cancelAnimationOnCompositor();
m_activeInAnimationStack = false;
m_compositableValues.clear();
- m_target->setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
+ m_target->setNeedsAnimationStyleRecalc();
}
bool Animation::updateChildrenAndEffects() const
diff --git a/Source/core/animation/CompositorAnimationsTest.cpp b/Source/core/animation/CompositorAnimationsTest.cpp
index 0cbc371..db0d9a6 100644
--- a/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/Source/core/animation/CompositorAnimationsTest.cpp
@@ -272,6 +272,12 @@
ops.operations().append(TranslateTransformOperation::create(Length(50, WebCore::Percent), Length(2, WebCore::Fixed), TransformOperation::TranslateX));
RefPtr<Keyframe> badKeyframe = createReplaceOpKeyframe(CSSPropertyWebkitTransform, AnimatableTransform::create(ops).get());
EXPECT_FALSE(isCandidateHelperForSingleKeyframe(badKeyframe.get()));
+
+ TransformOperations ops2;
+ Length calcLength = Length(100, WebCore::Percent).blend(Length(100, WebCore::Fixed), 0.5, WebCore::ValueRangeAll);
+ ops2.operations().append(TranslateTransformOperation::create(calcLength, Length(0, WebCore::Fixed), TransformOperation::TranslateX));
+ RefPtr<Keyframe> badKeyframe2 = createReplaceOpKeyframe(CSSPropertyWebkitTransform, AnimatableTransform::create(ops2).get());
+ EXPECT_FALSE(isCandidateHelperForSingleKeyframe(badKeyframe2.get()));
}
TEST_F(AnimationCompositorAnimationsTest, isNotCandidateForCompositorAnimationCustomFilter)
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index 14f8cf4..22b762d 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -519,22 +519,24 @@
}
}
-void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, const CSSAnimationData* anim, const RenderStyle& oldStyle, const RenderStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update)
+void CSSAnimations::calculateTransitionUpdateForProperty(CSSPropertyID id, const CSSAnimationData* anim, const RenderStyle& oldStyle, const RenderStyle& style, const TransitionMap* activeTransitions, CSSAnimationUpdate* update, const Element* element)
{
- if (CSSPropertyAnimation::propertiesEqual(id, &oldStyle, &style))
- return;
-
- RefPtr<AnimatableValue> to = CSSAnimatableValueFactory::create(id, style);
-
+ RefPtr<AnimatableValue> to;
if (activeTransitions) {
TransitionMap::const_iterator activeTransitionIter = activeTransitions->find(id);
if (activeTransitionIter != activeTransitions->end()) {
+ to = CSSAnimatableValueFactory::create(id, style);
const AnimatableValue* activeTo = activeTransitionIter->value.to;
if (to->equals(activeTo))
return;
update->cancelTransition(id);
+ ASSERT(!element->activeAnimations() || !element->activeAnimations()->isAnimationStyleChange());
}
}
+ if (CSSPropertyAnimation::propertiesEqual(id, &oldStyle, &style))
+ return;
+ if (!to)
+ to = CSSAnimatableValueFactory::create(id, style);
RefPtr<AnimatableValue> from = CSSAnimatableValueFactory::create(id, oldStyle);
// If we have multiple transitions on the same property, we will use the
@@ -565,6 +567,7 @@
timing.fillMode = Timing::FillModeBoth;
update->startTransition(id, from.get(), to.get(), InertAnimation::create(effect, timing, isPaused));
+ ASSERT(!element->activeAnimations() || !element->activeAnimations()->isAnimationStyleChange());
}
void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const Element* element, const RenderStyle& style)
@@ -572,10 +575,18 @@
ActiveAnimations* activeAnimations = element->activeAnimations();
const TransitionMap* activeTransitions = activeAnimations ? &activeAnimations->cssAnimations().m_transitions : 0;
+#if ASSERT_DISABLED
+ // In release builds we avoid the cost of checking for new and interrupted transitions if the style recalc is due to animation.
+ const bool animationStyleRecalc = activeAnimations && activeAnimations->isAnimationStyleChange();
+#else
+ // In debug builds we verify that it would have been safe to avoid populating and testing listedProperties if the style recalc is due to animation.
+ const bool animationStyleRecalc = false;
+#endif
+
BitArray<numCSSProperties> listedProperties;
bool anyTransitionHadAnimateAll = false;
const RenderObject* renderer = element->renderer();
- if (style.display() != NONE && renderer && renderer->style() && style.transitions()) {
+ if (!animationStyleRecalc && style.display() != NONE && renderer && renderer->style() && style.transitions()) {
const RenderStyle& oldStyle = *renderer->style();
for (size_t i = 0; i < style.transitions()->size(); ++i) {
@@ -604,7 +615,7 @@
// but this is a bit hard to do with the current applyMatchedProperties system.
if (!update->compositableValuesForAnimations().contains(id)
&& (!activeAnimations || !activeAnimations->cssAnimations().m_previousCompositableValuesForAnimations.contains(id))) {
- calculateTransitionUpdateForProperty(id, anim, oldStyle, style, activeTransitions, update);
+ calculateTransitionUpdateForProperty(id, anim, oldStyle, style, activeTransitions, update, element);
}
}
}
@@ -614,8 +625,10 @@
for (TransitionMap::const_iterator iter = activeTransitions->begin(); iter != activeTransitions->end(); ++iter) {
const TimedItem* timedItem = iter->value.transition;
CSSPropertyID id = iter->key;
- if (timedItem->phase() == TimedItem::PhaseAfter || (!anyTransitionHadAnimateAll && !listedProperties.get(id)))
+ if (timedItem->phase() == TimedItem::PhaseAfter || (!anyTransitionHadAnimateAll && !animationStyleRecalc && !listedProperties.get(id))) {
+ ASSERT(timedItem->phase() == TimedItem::PhaseAfter || !(activeAnimations && activeAnimations->isAnimationStyleChange()));
update->cancelTransition(id);
+ }
}
}
}
diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h
index af43b6f..aacca5d 100644
--- a/Source/core/animation/css/CSSAnimations.h
+++ b/Source/core/animation/css/CSSAnimations.h
@@ -176,7 +176,7 @@
static void calculateAnimationUpdate(CSSAnimationUpdate*, Element*, const RenderStyle&, StyleResolver*);
static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element*, const RenderStyle&);
- static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAnimationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*);
+ static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSAnimationData*, const RenderStyle& oldStyle, const RenderStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*, const Element*);
static void calculateAnimationCompositableValues(CSSAnimationUpdate*, const Element*);
static void calculateTransitionCompositableValues(CSSAnimationUpdate*, const Element*);
diff --git a/Source/core/dom/ContainerNode.cpp b/Source/core/dom/ContainerNode.cpp
index 3f8352c..ba1ac83 100644
--- a/Source/core/dom/ContainerNode.cpp
+++ b/Source/core/dom/ContainerNode.cpp
@@ -806,7 +806,6 @@
setNeedsStyleRecalc();
if (renderer() && renderer()->style()->hasAppearance())
RenderTheme::theme().stateChanged(renderer(), FocusState);
- InspectorInstrumentation::pseudoStateChanged(this);
}
void ContainerNode::setFocus(bool received)
@@ -835,7 +834,6 @@
setNeedsStyleRecalc();
if (renderStyle()->hasAppearance())
RenderTheme::theme().stateChanged(renderer(), PressedState);
- InspectorInstrumentation::pseudoStateChanged(this);
}
}
@@ -850,7 +848,6 @@
if (!renderer()) {
if (!over)
setNeedsStyleRecalc();
- InspectorInstrumentation::pseudoStateChanged(this);
return;
}
@@ -859,7 +856,6 @@
setNeedsStyleRecalc();
if (renderer() && renderer()->style()->hasAppearance())
RenderTheme::theme().stateChanged(renderer(), HoverState);
- InspectorInstrumentation::pseudoStateChanged(this);
}
}
diff --git a/Source/core/dom/Document.idl b/Source/core/dom/Document.idl
index 772a3ad..3669662 100644
--- a/Source/core/dom/Document.idl
+++ b/Source/core/dom/Document.idl
@@ -194,8 +194,7 @@
[Default=Undefined] optional float webkitForce);
[RuntimeEnabled=Touch] TouchList createTouchList(Touch... touches);
- [DeprecateAs=PrefixedDocumentRegister, RuntimeEnabled=CustomElements, ImplementedAs=registerElement, CallWith=ScriptState, CustomElementCallbacks, RaisesException] CustomElementConstructor webkitRegister(DOMString name, optional Dictionary options);
- [RuntimeEnabled=CustomElements, ImplementedAs=registerElement, CallWith=ScriptState, CustomElementCallbacks, RaisesException] CustomElementConstructor register(DOMString name, optional Dictionary options);
+ [RuntimeEnabled=CustomElements, CallWith=ScriptState, CustomElementCallbacks, RaisesException] CustomElementConstructor registerElement(DOMString name, optional Dictionary options);
[CustomElementCallbacks, PerWorldBindings, ActivityLogging=ForIsolatedWorlds, RaisesException] Element createElement(DOMString localName, [TreatNullAs=NullString] DOMString typeExtension);
[CustomElementCallbacks, PerWorldBindings, ActivityLogging=ForIsolatedWorlds, RaisesException] Element createElementNS([TreatNullAs=NullString] DOMString namespaceURI, DOMString qualifiedName,
[TreatNullAs=NullString] DOMString typeExtension);
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 3648539..1dec7bd 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -1534,6 +1534,11 @@
ElementRareData* data = elementRareData();
data->resetStyleState();
data->clearComputedStyle();
+
+ if (change >= Inherit) {
+ if (ActiveAnimations* activeAnimations = data->activeAnimations())
+ activeAnimations->setAnimationStyleChange(false);
+ }
}
if (parentRenderStyle())
change = recalcOwnStyle(change);
@@ -1723,6 +1728,21 @@
elementShadow->didAffectSelector(mask);
}
+void Element::setAnimationStyleChange(bool animationStyleChange)
+{
+ if (ActiveAnimations* activeAnimations = elementRareData()->activeAnimations())
+ activeAnimations->setAnimationStyleChange(animationStyleChange);
+}
+
+void Element::setNeedsAnimationStyleRecalc()
+{
+ if (styleChangeType() != NoStyleChange)
+ return;
+
+ setNeedsStyleRecalc(LocalStyleChange, StyleChangeFromRenderer);
+ setAnimationStyleChange(true);
+}
+
PassRefPtr<ShadowRoot> Element::createShadowRoot(ExceptionState& exceptionState)
{
if (alwaysCreateUserAgentShadowRoot())
diff --git a/Source/core/dom/Element.h b/Source/core/dom/Element.h
index eb5161a..eca5712 100644
--- a/Source/core/dom/Element.h
+++ b/Source/core/dom/Element.h
@@ -301,6 +301,8 @@
virtual bool rendererIsNeeded(const RenderStyle&);
void recalcStyle(StyleRecalcChange, Text* nextTextSibling = 0);
void didAffectSelector(AffectedSelectorMask);
+ void setAnimationStyleChange(bool);
+ void setNeedsAnimationStyleRecalc();
bool supportsStyleSharing() const;
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index 3d9779d..abea9ef 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -790,6 +790,18 @@
if (existingChangeType == NoStyleChange)
markAncestorsWithChildNeedsStyleRecalc();
+
+ if (isElementNode() && hasRareData())
+ toElement(*this).setAnimationStyleChange(false);
+}
+
+void Node::clearNeedsStyleRecalc()
+{
+ m_nodeFlags &= ~StyleChangeMask;
+ clearFlag(NotifyRendererWithIdenticalStyles);
+
+ if (isElementNode() && hasRareData())
+ toElement(*this).setAnimationStyleChange(false);
}
bool Node::inActiveDocument() const
@@ -983,20 +995,20 @@
return false;
}
-Node* Node::commonAncestorOverShadowBoundary(const Node& other)
+Node* Node::commonAncestor(const Node& other, Node* (*parent)(const Node&))
{
if (this == other)
return this;
if (document() != other.document())
return 0;
int thisDepth = 0;
- for (Node* node = this; node; node = node->parentOrShadowHostNode()) {
+ for (Node* node = this; node; node = parent(*node)) {
if (node == &other)
return node;
thisDepth++;
}
int otherDepth = 0;
- for (const Node* node = &other; node; node = node->parentOrShadowHostNode()) {
+ for (const Node* node = &other; node; node = parent(*node)) {
if (node == this)
return this;
otherDepth++;
@@ -1005,16 +1017,16 @@
const Node* otherIterator = &other;
if (thisDepth > otherDepth) {
for (int i = thisDepth; i > otherDepth; --i)
- thisIterator = thisIterator->parentOrShadowHostNode();
+ thisIterator = parent(*thisIterator);
} else if (otherDepth > thisDepth) {
for (int i = otherDepth; i > thisDepth; --i)
- otherIterator = otherIterator->parentOrShadowHostNode();
+ otherIterator = parent(*otherIterator);
}
while (thisIterator) {
if (thisIterator == otherIterator)
return thisIterator;
- thisIterator = thisIterator->parentOrShadowHostNode();
- otherIterator = otherIterator->parentOrShadowHostNode();
+ thisIterator = parent(*thisIterator);
+ otherIterator = parent(*otherIterator);
}
ASSERT(!otherIterator);
return 0;
diff --git a/Source/core/dom/Node.h b/Source/core/dom/Node.h
index 8b63560..3623518 100644
--- a/Source/core/dom/Node.h
+++ b/Source/core/dom/Node.h
@@ -378,11 +378,7 @@
void clearChildNeedsStyleRecalc() { clearFlag(ChildNeedsStyleRecalcFlag); }
void setNeedsStyleRecalc(StyleChangeType = SubtreeStyleChange, StyleChangeSource = StyleChangeFromCSS);
- void clearNeedsStyleRecalc()
- {
- m_nodeFlags &= ~StyleChangeMask;
- clearFlag(NotifyRendererWithIdenticalStyles);
- }
+ void clearNeedsStyleRecalc();
bool childNeedsDistributionRecalc() const { return getFlag(ChildNeedsDistributionRecalc); }
void setChildNeedsDistributionRecalc() { setFlag(ChildNeedsDistributionRecalc); }
@@ -503,7 +499,7 @@
bool contains(const Node*) const;
bool containsIncludingShadowDOM(const Node*) const;
bool containsIncludingHostElements(const Node&) const;
- Node* commonAncestorOverShadowBoundary(const Node&);
+ Node* commonAncestor(const Node&, Node* (*parent)(const Node&));
// FIXME: Remove this when crbug.com/265716 cleans up contains semantics.
bool bindingsContains(const Node* node) const { return containsIncludingShadowDOM(node); }
diff --git a/Source/core/dom/custom/CustomElement.cpp b/Source/core/dom/custom/CustomElement.cpp
index eea313c..0dc1683 100644
--- a/Source/core/dom/custom/CustomElement.cpp
+++ b/Source/core/dom/custom/CustomElement.cpp
@@ -124,7 +124,7 @@
ASSERT(element->customElementState() == Element::Upgraded);
if (!document.domWindow())
return;
- CustomElementCallbackScheduler::scheduleEnteredViewCallback(definitionFor(element)->callbacks(), element);
+ CustomElementCallbackScheduler::scheduleAttachedCallback(definitionFor(element)->callbacks(), element);
}
void CustomElement::didLeaveDocument(Element* element, const Document& document)
@@ -132,7 +132,7 @@
ASSERT(element->customElementState() == Element::Upgraded);
if (!document.domWindow())
return;
- CustomElementCallbackScheduler::scheduleLeftViewCallback(definitionFor(element)->callbacks(), element);
+ CustomElementCallbackScheduler::scheduleDetachedCallback(definitionFor(element)->callbacks(), element);
}
void CustomElement::wasDestroyed(Element* element)
diff --git a/Source/core/dom/custom/CustomElementCallbackInvocation.cpp b/Source/core/dom/custom/CustomElementCallbackInvocation.cpp
index 7263ffc..e4fb331 100644
--- a/Source/core/dom/custom/CustomElementCallbackInvocation.cpp
+++ b/Source/core/dom/custom/CustomElementCallbackInvocation.cpp
@@ -51,13 +51,13 @@
void CreatedInvocation::dispatch(Element* element)
{
if (element->inDocument() && element->document().domWindow())
- CustomElementCallbackScheduler::scheduleEnteredViewCallback(callbacks(), element);
+ CustomElementCallbackScheduler::scheduleAttachedCallback(callbacks(), element);
callbacks()->created(element);
}
-class EnteredLeftViewInvocation : public CustomElementCallbackInvocation {
+class AttachedDetachedInvocation : public CustomElementCallbackInvocation {
public:
- EnteredLeftViewInvocation(PassRefPtr<CustomElementLifecycleCallbacks>, CustomElementLifecycleCallbacks::CallbackType which);
+ AttachedDetachedInvocation(PassRefPtr<CustomElementLifecycleCallbacks>, CustomElementLifecycleCallbacks::CallbackType which);
private:
virtual void dispatch(Element*) OVERRIDE;
@@ -65,21 +65,21 @@
CustomElementLifecycleCallbacks::CallbackType m_which;
};
-EnteredLeftViewInvocation::EnteredLeftViewInvocation(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, CustomElementLifecycleCallbacks::CallbackType which)
+AttachedDetachedInvocation::AttachedDetachedInvocation(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, CustomElementLifecycleCallbacks::CallbackType which)
: CustomElementCallbackInvocation(callbacks)
, m_which(which)
{
- ASSERT(m_which == CustomElementLifecycleCallbacks::EnteredView || m_which == CustomElementLifecycleCallbacks::LeftView);
+ ASSERT(m_which == CustomElementLifecycleCallbacks::Attached || m_which == CustomElementLifecycleCallbacks::Detached);
}
-void EnteredLeftViewInvocation::dispatch(Element* element)
+void AttachedDetachedInvocation::dispatch(Element* element)
{
switch (m_which) {
- case CustomElementLifecycleCallbacks::EnteredView:
- callbacks()->enteredView(element);
+ case CustomElementLifecycleCallbacks::Attached:
+ callbacks()->attached(element);
break;
- case CustomElementLifecycleCallbacks::LeftView:
- callbacks()->leftView(element);
+ case CustomElementLifecycleCallbacks::Detached:
+ callbacks()->detached(element);
break;
default:
ASSERT_NOT_REACHED();
@@ -117,9 +117,9 @@
case CustomElementLifecycleCallbacks::Created:
return adoptPtr(new CreatedInvocation(callbacks));
- case CustomElementLifecycleCallbacks::EnteredView:
- case CustomElementLifecycleCallbacks::LeftView:
- return adoptPtr(new EnteredLeftViewInvocation(callbacks, which));
+ case CustomElementLifecycleCallbacks::Attached:
+ case CustomElementLifecycleCallbacks::Detached:
+ return adoptPtr(new AttachedDetachedInvocation(callbacks, which));
default:
ASSERT_NOT_REACHED();
diff --git a/Source/core/dom/custom/CustomElementCallbackScheduler.cpp b/Source/core/dom/custom/CustomElementCallbackScheduler.cpp
index 2d36478..fc3c90c 100644
--- a/Source/core/dom/custom/CustomElementCallbackScheduler.cpp
+++ b/Source/core/dom/custom/CustomElementCallbackScheduler.cpp
@@ -55,22 +55,22 @@
queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Created));
}
-void CustomElementCallbackScheduler::scheduleEnteredViewCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
+void CustomElementCallbackScheduler::scheduleAttachedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
{
- if (!callbacks->hasEnteredViewCallback())
+ if (!callbacks->hasAttachedCallback())
return;
CustomElementCallbackQueue* queue = instance().schedule(element);
- queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::EnteredView));
+ queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Attached));
}
-void CustomElementCallbackScheduler::scheduleLeftViewCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
+void CustomElementCallbackScheduler::scheduleDetachedCallback(PassRefPtr<CustomElementLifecycleCallbacks> callbacks, PassRefPtr<Element> element)
{
- if (!callbacks->hasLeftViewCallback())
+ if (!callbacks->hasDetachedCallback())
return;
CustomElementCallbackQueue* queue = instance().schedule(element);
- queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::LeftView));
+ queue->append(CustomElementCallbackInvocation::createInvocation(callbacks, CustomElementLifecycleCallbacks::Detached));
}
CustomElementCallbackScheduler& CustomElementCallbackScheduler::instance()
diff --git a/Source/core/dom/custom/CustomElementCallbackScheduler.h b/Source/core/dom/custom/CustomElementCallbackScheduler.h
index 0311d05..741ede2 100644
--- a/Source/core/dom/custom/CustomElementCallbackScheduler.h
+++ b/Source/core/dom/custom/CustomElementCallbackScheduler.h
@@ -46,8 +46,8 @@
public:
static void scheduleAttributeChangedCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue);
static void scheduleCreatedCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>);
- static void scheduleEnteredViewCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>);
- static void scheduleLeftViewCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>);
+ static void scheduleAttachedCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>);
+ static void scheduleDetachedCallback(PassRefPtr<CustomElementLifecycleCallbacks>, PassRefPtr<Element>);
protected:
friend class CustomElementCallbackDispatcher;
diff --git a/Source/core/dom/custom/CustomElementLifecycleCallbacks.h b/Source/core/dom/custom/CustomElementLifecycleCallbacks.h
index eb2f32f..aa182e6 100644
--- a/Source/core/dom/custom/CustomElementLifecycleCallbacks.h
+++ b/Source/core/dom/custom/CustomElementLifecycleCallbacks.h
@@ -45,11 +45,11 @@
bool hasCreatedCallback() const { return m_which & Created; }
virtual void created(Element*) = 0;
- bool hasEnteredViewCallback() const { return m_which & EnteredView; }
- virtual void enteredView(Element*) = 0;
+ bool hasAttachedCallback() const { return m_which & Attached; }
+ virtual void attached(Element*) = 0;
- bool hasLeftViewCallback() const { return m_which & LeftView; }
- virtual void leftView(Element*) = 0;
+ bool hasDetachedCallback() const { return m_which & Detached; }
+ virtual void detached(Element*) = 0;
bool hasAttributeChangedCallback() const { return m_which & AttributeChanged; }
virtual void attributeChanged(Element*, const AtomicString& name, const AtomicString& oldValue, const AtomicString& newValue) = 0;
@@ -57,8 +57,8 @@
enum CallbackType {
None = 0,
Created = 1 << 0,
- EnteredView = 1 << 1,
- LeftView = 1 << 2,
+ Attached = 1 << 1,
+ Detached = 1 << 2,
AttributeChanged = 1 << 3
};
diff --git a/Source/core/frame/UseCounter.cpp b/Source/core/frame/UseCounter.cpp
index 520e121..667e5f9 100644
--- a/Source/core/frame/UseCounter.cpp
+++ b/Source/core/frame/UseCounter.cpp
@@ -646,8 +646,6 @@
// Web Components
case HTMLShadowElementOlderShadowRoot:
return "HTMLShadowElement.olderShadowRoot is deprecated.";
- case PrefixedDocumentRegister:
- return "The document.webkitRegister method is deprecated. Use the document.register method instead.";
// HTML Media Capture
case CaptureAttributeAsEnum:
diff --git a/Source/core/frame/UseCounter.h b/Source/core/frame/UseCounter.h
index 83da16a..4f0c2fd 100644
--- a/Source/core/frame/UseCounter.h
+++ b/Source/core/frame/UseCounter.h
@@ -140,7 +140,7 @@
XSLProcessingInstruction,
XSLTProcessor,
SVGSwitchElement,
- PrefixedDocumentRegister,
+ UnusedSlot05, // Removed, was document.webkitRegister
HTMLShadowElementOlderShadowRoot,
DocumentAll,
FormElement,
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp
index 4d48c5c..a8f12bb 100644
--- a/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/Source/core/inspector/InspectorDOMAgent.cpp
@@ -1938,17 +1938,6 @@
m_frontend->pseudoElementRemoved(parentId, pseudoElementId);
}
-void InspectorDOMAgent::pseudoStateChanged(Node* node)
-{
- if (!node->isElementNode())
- return;
-
- int nodeId = m_documentNodeToIdMap.get(node);
- if (!nodeId)
- return;
- m_frontend->pseudoStateChanged(nodeId);
-}
-
Node* InspectorDOMAgent::nodeForPath(const String& path)
{
// The path is of form "1,HTML,2,BODY,1,DIV"
diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h
index 860fdb3..c1042f5 100644
--- a/Source/core/inspector/InspectorDOMAgent.h
+++ b/Source/core/inspector/InspectorDOMAgent.h
@@ -174,7 +174,6 @@
void frameDocumentUpdated(Frame*);
void pseudoElementCreated(PseudoElement*);
void pseudoElementDestroyed(PseudoElement*);
- void pseudoStateChanged(Node*);
int pushNodeToFrontend(ErrorString*, int documentNodeId, Node*);
Node* nodeForId(int nodeId);
diff --git a/Source/core/inspector/InspectorInstrumentation.idl b/Source/core/inspector/InspectorInstrumentation.idl
index 02e8591..548af1f 100644
--- a/Source/core/inspector/InspectorInstrumentation.idl
+++ b/Source/core/inspector/InspectorInstrumentation.idl
@@ -91,9 +91,6 @@
[DOM, DOMDebugger, Inline=FastReturn]
void didInvalidateStyleAttr([Keep] Node*);
- [DOM, Inline=FastReturn]
- void pseudoStateChanged([Keep] Node*);
-
[CSS, Inline=FastReturn]
void willMutateRules(CSSStyleSheet*);
diff --git a/Source/core/make_core_derived_sources.target.darwin-arm.mk b/Source/core/make_core_derived_sources.target.darwin-arm.mk
index 082fd02..7310024 100644
--- a/Source/core/make_core_derived_sources.target.darwin-arm.mk
+++ b/Source/core/make_core_derived_sources.target.darwin-arm.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/make_core_derived_sources.target.darwin-mips.mk b/Source/core/make_core_derived_sources.target.darwin-mips.mk
index d638077..56949cb 100644
--- a/Source/core/make_core_derived_sources.target.darwin-mips.mk
+++ b/Source/core/make_core_derived_sources.target.darwin-mips.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/make_core_derived_sources.target.darwin-x86.mk b/Source/core/make_core_derived_sources.target.darwin-x86.mk
index ea947c5..8562cdf 100644
--- a/Source/core/make_core_derived_sources.target.darwin-x86.mk
+++ b/Source/core/make_core_derived_sources.target.darwin-x86.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/make_core_derived_sources.target.linux-arm.mk b/Source/core/make_core_derived_sources.target.linux-arm.mk
index 082fd02..7310024 100644
--- a/Source/core/make_core_derived_sources.target.linux-arm.mk
+++ b/Source/core/make_core_derived_sources.target.linux-arm.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/make_core_derived_sources.target.linux-mips.mk b/Source/core/make_core_derived_sources.target.linux-mips.mk
index d638077..56949cb 100644
--- a/Source/core/make_core_derived_sources.target.linux-mips.mk
+++ b/Source/core/make_core_derived_sources.target.linux-mips.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/make_core_derived_sources.target.linux-x86.mk b/Source/core/make_core_derived_sources.target.linux-x86.mk
index ea947c5..8562cdf 100644
--- a/Source/core/make_core_derived_sources.target.linux-x86.mk
+++ b/Source/core/make_core_derived_sources.target.linux-x86.mk
@@ -62,7 +62,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_property_names.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSPropertyNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSPropertyNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSPropertyNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_css_property_names.py css/CSSPropertyNames.in css/SVGCSSPropertyNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.h: $(gyp_shared_intermediate_dir)/blink/CSSPropertyNames.cpp ;
@@ -96,7 +96,7 @@
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_css_value_keywords.py $(LOCAL_PATH)/third_party/WebKit/Source/core/css/CSSValueKeywords.in $(LOCAL_PATH)/third_party/WebKit/Source/core/css/SVGCSSValueKeywords.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_CSSValueKeywords ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; ../build/scripts/make_css_value_keywords.py css/CSSValueKeywords.in css/SVGCSSValueKeywords.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.h: $(gyp_shared_intermediate_dir)/blink/CSSValueKeywords.cpp ;
@@ -182,7 +182,7 @@
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp: $(LOCAL_PATH)/third_party/jinja2/__init__.py $(LOCAL_PATH)/third_party/markupsafe/__init__.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/hasher.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_file.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/in_generator.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/license.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_macros.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/name_utilities.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/template_expander.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/macros.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/make_qualified_names.py $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.cpp.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/templates/MakeQualifiedNames.h.tmpl $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLTagNames.in $(LOCAL_PATH)/third_party/WebKit/Source/core/html/parser/MathMLAttributeNames.in $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_MathMLNames ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/make_qualified_names.py html/parser/MathMLTagNames.in html/parser/MathMLAttributeNames.in --output_dir "$(gyp_shared_intermediate_dir)/blink" --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/MathMLNames.h: $(gyp_shared_intermediate_dir)/blink/MathMLNames.cpp ;
@@ -193,7 +193,7 @@
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h: $(LOCAL_PATH)/third_party/WebKit/Source/core/css/make-css-file-arrays.pl $(LOCAL_PATH)/third_party/WebKit/Source/build/scripts/preprocessor.pm $(LOCAL_PATH)/third_party/WebKit/Source/core/css/html.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/quirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/view-source.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromium.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumLinux.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeChromiumSkia.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWin.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/themeWinQuirks.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/svg.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControls.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/mediaControlsAndroid.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/fullscreen.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/xhtmlmp.css $(LOCAL_PATH)/third_party/WebKit/Source/core/css/viewportAndroid.css $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: third_party_WebKit_Source_core_core_derived_sources_gyp_make_core_derived_sources_target_UserAgentStyleSheets ($@)"
- $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
+ $(hide)cd $(gyp_local_path)/third_party/WebKit/Source/core; mkdir -p $(gyp_shared_intermediate_dir)/blink; python ../build/scripts/action_useragentstylesheets.py "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h" "$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp" css/html.css css/quirks.css css/view-source.css css/themeChromium.css css/themeChromiumAndroid.css css/themeChromiumLinux.css css/themeChromiumSkia.css css/themeWin.css css/themeWinQuirks.css css/svg.css css/mediaControls.css css/mediaControlsAndroid.css css/fullscreen.css css/xhtmlmp.css css/viewportAndroid.css -- css/make-css-file-arrays.pl ../build/scripts/preprocessor.pm -- --defines "\"ENABLE_CUSTOM_SCHEME_HANDLER=0\" \"ENABLE_SVG_FONTS=1\" \"ENABLE_GDI_FONTS_ON_WINDOWS=0\" \"ENABLE_HARFBUZZ_ON_WINDOWS=1\" \"WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1\" \"ENABLE_FAST_MOBILE_SCROLLING=1\" \"ENABLE_INPUT_SPEECH=0\" \"ENABLE_LEGACY_NOTIFICATIONS=0\" \"ENABLE_MEDIA_CAPTURE=1\" \"ENABLE_ORIENTATION_EVENTS=1\" \"ENABLE_TOUCH_ICON_LOADING=1\" \"ENABLE_NAVIGATOR_CONTENT_UTILS=0\" \"ENABLE_OPENTYPE_VERTICAL=1\""
$(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheetsData.cpp: $(gyp_shared_intermediate_dir)/blink/UserAgentStyleSheets.h ;
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 24b02a8..40b59aa 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -1613,6 +1613,15 @@
m_clickNode = 0;
}
+static Node* parentForClickEvent(const Node& node)
+{
+ // IE doesn't dispatch click events for mousedown/mouseup events across form
+ // controls.
+ if (node.isHTMLElement() && toHTMLElement(node).isInteractiveContent())
+ return 0;
+ return node.parentOrShadowHostNode();
+}
+
bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
{
RefPtr<FrameView> protector(m_frame->view());
@@ -1677,7 +1686,7 @@
bool swallowClickEvent = false;
if (m_clickCount > 0 && !contextMenuEvent && mev.targetNode() && m_clickNode) {
- if (Node* clickTargetNode = mev.targetNode()->commonAncestorOverShadowBoundary(*m_clickNode))
+ if (Node* clickTargetNode = mev.targetNode()->commonAncestor(*m_clickNode, parentForClickEvent))
swallowClickEvent = !dispatchMouseEvent(EventTypeNames::click, clickTargetNode, true, m_clickCount, mouseEvent, true);
}
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index cab494d..20f652f 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -28,7 +28,6 @@
#include "core/accessibility/AXObjectCache.h"
#include "core/dom/Document.h"
#include "core/dom/Element.h"
-#include "core/dom/Text.h"
#include "core/events/OverflowEvent.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/editing/Editor.h"
@@ -4866,6 +4865,8 @@
if (style()->styleType() == FIRST_LETTER)
return;
+ // FIXME: We need to destroy the first-letter object if it is no longer the first child. Need to find
+ // an efficient way to check for that situation though before implementing anything.
RenderObject* firstLetterBlock = findFirstLetterBlock(this);
if (!firstLetterBlock)
return;
@@ -4902,29 +4903,9 @@
if (!currChild)
return;
+ // If the child already has style, then it has already been created, so we just want
+ // to update it.
if (currChild->parent()->style()->styleType() == FIRST_LETTER) {
- // Check if the text fragment(currChild) for the first-letter is not related to the remainingText.
- RenderObject* remainingText = currChild->parent()->nextSibling();
- if (remainingText && remainingText->node() && currChild->node() != remainingText->node()) {
- if (!remainingText->isText() || remainingText->isBR())
- return;
-
- if (RenderBoxModelObject* oldFirstLetter = currChild->parent()->isBoxModelObject() ? toRenderBoxModelObject(currChild->parent()) : 0) {
- if (RenderTextFragment* oldRemainingText = oldFirstLetter->firstLetterRemainingText()) {
- LayoutStateDisabler layoutStateDisabler(view());
- // Destroy the text fragment for the old first-letter and update oldRemainingText with its DOM text.
- oldRemainingText->setText(toText(oldRemainingText->node())->data().impl());
-
- if (unsigned newLength = firstLetterLength(toRenderText(remainingText)->originalText()))
- createFirstLetterRenderer(firstLetterBlock, remainingText, newLength);
- }
- }
-
- return;
- }
-
- // If the child already has style, then it has already been created, so we just want
- // to update it.
updateFirstLetterStyle(firstLetterBlock, currChild);
return;
}
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
index 4e2bfec..caef818 100644
--- a/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/Source/core/rendering/RenderBoxModelObject.cpp
@@ -1007,6 +1007,17 @@
// Determine the background positioning area and set destRect to the background painting area.
// destRect will be adjusted later if the background is non-repeating.
bool fixedAttachment = fillLayer->attachment() == FixedBackgroundAttachment;
+
+#if ENABLE(FAST_MOBILE_SCROLLING)
+ if (view()->frameView() && view()->frameView()->canBlitOnScroll()) {
+ // As a side effect of an optimization to blit on scroll, we do not honor the CSS
+ // property "background-attachment: fixed" because it may result in rendering
+ // artifacts. Note, these artifacts only appear if we are blitting on scroll of
+ // a page that has fixed background images.
+ fixedAttachment = false;
+ }
+#endif
+
if (!fixedAttachment) {
geometry.setDestRect(snappedPaintRect);
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 75bf14f..711436e 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -2027,11 +2027,20 @@
s_affectsParentBlock = false;
if (view()->frameView()) {
- bool newStyleSlowScroll = newStyle && newStyle->hasFixedBackgroundImage();
- bool oldStyleSlowScroll = m_style && m_style->hasFixedBackgroundImage();
+ bool shouldBlitOnFixedBackgroundImage = false;
+#if ENABLE(FAST_MOBILE_SCROLLING)
+ // On low-powered/mobile devices, preventing blitting on a scroll can cause noticeable delays
+ // when scrolling a page with a fixed background image. As an optimization, assuming there are
+ // no fixed positoned elements on the page, we can acclerate scrolling (via blitting) if we
+ // ignore the CSS property "background-attachment: fixed".
+ shouldBlitOnFixedBackgroundImage = true;
+#endif
+
+ bool newStyleSlowScroll = newStyle && !shouldBlitOnFixedBackgroundImage && newStyle->hasFixedBackgroundImage();
+ bool oldStyleSlowScroll = m_style && !shouldBlitOnFixedBackgroundImage && m_style->hasFixedBackgroundImage();
bool drawsRootBackground = isRoot() || (isBody() && !rendererHasBackground(document().documentElement()->renderer()));
- if (drawsRootBackground) {
+ if (drawsRootBackground && !shouldBlitOnFixedBackgroundImage) {
if (view()->compositor()->supportsFixedRootBackgroundCompositing()) {
if (newStyleSlowScroll && newStyle->hasEntirelyFixedBackground())
newStyleSlowScroll = false;
diff --git a/Source/core/svg/SVGAElement.cpp b/Source/core/svg/SVGAElement.cpp
index ed5d32d..4cac139 100644
--- a/Source/core/svg/SVGAElement.cpp
+++ b/Source/core/svg/SVGAElement.cpp
@@ -234,7 +234,7 @@
if (parentNode() && parentNode()->isSVGElement())
return parentNode()->childShouldCreateRenderer(child);
- return SVGElement::childShouldCreateRenderer(child);
+ return SVGGraphicsElement::childShouldCreateRenderer(child);
}
} // namespace WebCore
diff --git a/Source/core/svg/SVGSwitchElement.cpp b/Source/core/svg/SVGSwitchElement.cpp
index b4719ce..f4c8dd1 100644
--- a/Source/core/svg/SVGSwitchElement.cpp
+++ b/Source/core/svg/SVGSwitchElement.cpp
@@ -54,6 +54,7 @@
{
// FIXME: This function does not do what the comment below implies it does.
// It will create a renderer for any valid SVG element children, not just the first one.
+ bool shouldCreateRenderer = false;
for (Node* node = firstChild(); node; node = node->nextSibling()) {
if (!node->isSVGElement())
continue;
@@ -62,10 +63,11 @@
if (!element || !element->isValid())
continue;
- return node == &child; // Only allow this child if it's the first valid child
+ shouldCreateRenderer = node == &child; // Only allow this child if it's the first valid child.
+ break;
}
- return false;
+ return shouldCreateRenderer && SVGGraphicsElement::childShouldCreateRenderer(child);
}
RenderObject* SVGSwitchElement::createRenderer(RenderStyle*)
diff --git a/Source/core/webcore_derived.target.darwin-arm.mk b/Source/core/webcore_derived.target.darwin-arm.mk
index c91a0a0..8ba61e3 100644
--- a/Source/core/webcore_derived.target.darwin-arm.mk
+++ b/Source/core/webcore_derived.target.darwin-arm.mk
@@ -398,6 +398,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -553,6 +554,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_derived.target.darwin-mips.mk b/Source/core/webcore_derived.target.darwin-mips.mk
index 906e86a..98c9b4c 100644
--- a/Source/core/webcore_derived.target.darwin-mips.mk
+++ b/Source/core/webcore_derived.target.darwin-mips.mk
@@ -397,6 +397,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -551,6 +552,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_derived.target.darwin-x86.mk b/Source/core/webcore_derived.target.darwin-x86.mk
index 3b3aaaa..2adf449 100644
--- a/Source/core/webcore_derived.target.darwin-x86.mk
+++ b/Source/core/webcore_derived.target.darwin-x86.mk
@@ -400,6 +400,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -558,6 +559,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_derived.target.linux-arm.mk b/Source/core/webcore_derived.target.linux-arm.mk
index c91a0a0..8ba61e3 100644
--- a/Source/core/webcore_derived.target.linux-arm.mk
+++ b/Source/core/webcore_derived.target.linux-arm.mk
@@ -398,6 +398,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -553,6 +554,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_derived.target.linux-mips.mk b/Source/core/webcore_derived.target.linux-mips.mk
index 906e86a..98c9b4c 100644
--- a/Source/core/webcore_derived.target.linux-mips.mk
+++ b/Source/core/webcore_derived.target.linux-mips.mk
@@ -397,6 +397,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -551,6 +552,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_derived.target.linux-x86.mk b/Source/core/webcore_derived.target.linux-x86.mk
index 3b3aaaa..2adf449 100644
--- a/Source/core/webcore_derived.target.linux-x86.mk
+++ b/Source/core/webcore_derived.target.linux-x86.mk
@@ -400,6 +400,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -558,6 +559,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.darwin-arm.mk b/Source/core/webcore_dom.target.darwin-arm.mk
index aa8d109..5b7be86 100644
--- a/Source/core/webcore_dom.target.darwin-arm.mk
+++ b/Source/core/webcore_dom.target.darwin-arm.mk
@@ -258,6 +258,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -408,6 +409,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.darwin-mips.mk b/Source/core/webcore_dom.target.darwin-mips.mk
index 960e5be..5024506 100644
--- a/Source/core/webcore_dom.target.darwin-mips.mk
+++ b/Source/core/webcore_dom.target.darwin-mips.mk
@@ -257,6 +257,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -406,6 +407,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.darwin-x86.mk b/Source/core/webcore_dom.target.darwin-x86.mk
index 42e4ea4..9655ee8 100644
--- a/Source/core/webcore_dom.target.darwin-x86.mk
+++ b/Source/core/webcore_dom.target.darwin-x86.mk
@@ -260,6 +260,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -413,6 +414,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.linux-arm.mk b/Source/core/webcore_dom.target.linux-arm.mk
index aa8d109..5b7be86 100644
--- a/Source/core/webcore_dom.target.linux-arm.mk
+++ b/Source/core/webcore_dom.target.linux-arm.mk
@@ -258,6 +258,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -408,6 +409,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.linux-mips.mk b/Source/core/webcore_dom.target.linux-mips.mk
index 960e5be..5024506 100644
--- a/Source/core/webcore_dom.target.linux-mips.mk
+++ b/Source/core/webcore_dom.target.linux-mips.mk
@@ -257,6 +257,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -406,6 +407,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_dom.target.linux-x86.mk b/Source/core/webcore_dom.target.linux-x86.mk
index 42e4ea4..9655ee8 100644
--- a/Source/core/webcore_dom.target.linux-x86.mk
+++ b/Source/core/webcore_dom.target.linux-x86.mk
@@ -260,6 +260,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -413,6 +414,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.darwin-arm.mk b/Source/core/webcore_html.target.darwin-arm.mk
index 25f1740..769220b 100644
--- a/Source/core/webcore_html.target.darwin-arm.mk
+++ b/Source/core/webcore_html.target.darwin-arm.mk
@@ -343,6 +343,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -493,6 +494,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.darwin-mips.mk b/Source/core/webcore_html.target.darwin-mips.mk
index ab19f84..29292c5 100644
--- a/Source/core/webcore_html.target.darwin-mips.mk
+++ b/Source/core/webcore_html.target.darwin-mips.mk
@@ -342,6 +342,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -491,6 +492,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.darwin-x86.mk b/Source/core/webcore_html.target.darwin-x86.mk
index 086a3c3..3af0ae3 100644
--- a/Source/core/webcore_html.target.darwin-x86.mk
+++ b/Source/core/webcore_html.target.darwin-x86.mk
@@ -345,6 +345,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -498,6 +499,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.linux-arm.mk b/Source/core/webcore_html.target.linux-arm.mk
index 25f1740..769220b 100644
--- a/Source/core/webcore_html.target.linux-arm.mk
+++ b/Source/core/webcore_html.target.linux-arm.mk
@@ -343,6 +343,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -493,6 +494,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.linux-mips.mk b/Source/core/webcore_html.target.linux-mips.mk
index ab19f84..29292c5 100644
--- a/Source/core/webcore_html.target.linux-mips.mk
+++ b/Source/core/webcore_html.target.linux-mips.mk
@@ -342,6 +342,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -491,6 +492,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_html.target.linux-x86.mk b/Source/core/webcore_html.target.linux-x86.mk
index 086a3c3..3af0ae3 100644
--- a/Source/core/webcore_html.target.linux-x86.mk
+++ b/Source/core/webcore_html.target.linux-x86.mk
@@ -345,6 +345,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -498,6 +499,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.darwin-arm.mk b/Source/core/webcore_platform.target.darwin-arm.mk
index 917b7c1..7194884 100644
--- a/Source/core/webcore_platform.target.darwin-arm.mk
+++ b/Source/core/webcore_platform.target.darwin-arm.mk
@@ -97,6 +97,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -247,6 +248,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.darwin-mips.mk b/Source/core/webcore_platform.target.darwin-mips.mk
index 2dabd33..a7cfbdb 100644
--- a/Source/core/webcore_platform.target.darwin-mips.mk
+++ b/Source/core/webcore_platform.target.darwin-mips.mk
@@ -96,6 +96,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -245,6 +246,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.darwin-x86.mk b/Source/core/webcore_platform.target.darwin-x86.mk
index f571cac..31f2e79 100644
--- a/Source/core/webcore_platform.target.darwin-x86.mk
+++ b/Source/core/webcore_platform.target.darwin-x86.mk
@@ -99,6 +99,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -252,6 +253,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.linux-arm.mk b/Source/core/webcore_platform.target.linux-arm.mk
index 917b7c1..7194884 100644
--- a/Source/core/webcore_platform.target.linux-arm.mk
+++ b/Source/core/webcore_platform.target.linux-arm.mk
@@ -97,6 +97,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -247,6 +248,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.linux-mips.mk b/Source/core/webcore_platform.target.linux-mips.mk
index 2dabd33..a7cfbdb 100644
--- a/Source/core/webcore_platform.target.linux-mips.mk
+++ b/Source/core/webcore_platform.target.linux-mips.mk
@@ -96,6 +96,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -245,6 +246,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_platform.target.linux-x86.mk b/Source/core/webcore_platform.target.linux-x86.mk
index f571cac..31f2e79 100644
--- a/Source/core/webcore_platform.target.linux-x86.mk
+++ b/Source/core/webcore_platform.target.linux-x86.mk
@@ -99,6 +99,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -252,6 +253,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.darwin-arm.mk b/Source/core/webcore_remaining.target.darwin-arm.mk
index daebcea..c3ef26e 100644
--- a/Source/core/webcore_remaining.target.darwin-arm.mk
+++ b/Source/core/webcore_remaining.target.darwin-arm.mk
@@ -593,6 +593,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -744,6 +745,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.darwin-mips.mk b/Source/core/webcore_remaining.target.darwin-mips.mk
index 7df118c..f147cbd 100644
--- a/Source/core/webcore_remaining.target.darwin-mips.mk
+++ b/Source/core/webcore_remaining.target.darwin-mips.mk
@@ -592,6 +592,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -742,6 +743,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.darwin-x86.mk b/Source/core/webcore_remaining.target.darwin-x86.mk
index 08d1acf..cca40b7 100644
--- a/Source/core/webcore_remaining.target.darwin-x86.mk
+++ b/Source/core/webcore_remaining.target.darwin-x86.mk
@@ -595,6 +595,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -749,6 +750,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.linux-arm.mk b/Source/core/webcore_remaining.target.linux-arm.mk
index daebcea..c3ef26e 100644
--- a/Source/core/webcore_remaining.target.linux-arm.mk
+++ b/Source/core/webcore_remaining.target.linux-arm.mk
@@ -593,6 +593,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -744,6 +745,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.linux-mips.mk b/Source/core/webcore_remaining.target.linux-mips.mk
index 7df118c..f147cbd 100644
--- a/Source/core/webcore_remaining.target.linux-mips.mk
+++ b/Source/core/webcore_remaining.target.linux-mips.mk
@@ -592,6 +592,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -742,6 +743,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_remaining.target.linux-x86.mk b/Source/core/webcore_remaining.target.linux-x86.mk
index 08d1acf..cca40b7 100644
--- a/Source/core/webcore_remaining.target.linux-x86.mk
+++ b/Source/core/webcore_remaining.target.linux-x86.mk
@@ -595,6 +595,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -749,6 +750,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.darwin-arm.mk b/Source/core/webcore_rendering.target.darwin-arm.mk
index aa1ace4..a0c67dd 100644
--- a/Source/core/webcore_rendering.target.darwin-arm.mk
+++ b/Source/core/webcore_rendering.target.darwin-arm.mk
@@ -251,6 +251,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -401,6 +402,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.darwin-mips.mk b/Source/core/webcore_rendering.target.darwin-mips.mk
index 5928757..b200f32 100644
--- a/Source/core/webcore_rendering.target.darwin-mips.mk
+++ b/Source/core/webcore_rendering.target.darwin-mips.mk
@@ -250,6 +250,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -399,6 +400,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.darwin-x86.mk b/Source/core/webcore_rendering.target.darwin-x86.mk
index b59d485..26ffba6 100644
--- a/Source/core/webcore_rendering.target.darwin-x86.mk
+++ b/Source/core/webcore_rendering.target.darwin-x86.mk
@@ -254,6 +254,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -408,6 +409,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.linux-arm.mk b/Source/core/webcore_rendering.target.linux-arm.mk
index aa1ace4..a0c67dd 100644
--- a/Source/core/webcore_rendering.target.linux-arm.mk
+++ b/Source/core/webcore_rendering.target.linux-arm.mk
@@ -251,6 +251,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -401,6 +402,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.linux-mips.mk b/Source/core/webcore_rendering.target.linux-mips.mk
index 5928757..b200f32 100644
--- a/Source/core/webcore_rendering.target.linux-mips.mk
+++ b/Source/core/webcore_rendering.target.linux-mips.mk
@@ -250,6 +250,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -399,6 +400,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_rendering.target.linux-x86.mk b/Source/core/webcore_rendering.target.linux-x86.mk
index b59d485..26ffba6 100644
--- a/Source/core/webcore_rendering.target.linux-x86.mk
+++ b/Source/core/webcore_rendering.target.linux-x86.mk
@@ -254,6 +254,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -408,6 +409,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.darwin-arm.mk b/Source/core/webcore_svg.target.darwin-arm.mk
index 3324faf..bb10379 100644
--- a/Source/core/webcore_svg.target.darwin-arm.mk
+++ b/Source/core/webcore_svg.target.darwin-arm.mk
@@ -300,6 +300,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -450,6 +451,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.darwin-mips.mk b/Source/core/webcore_svg.target.darwin-mips.mk
index 1dfc901..ac17854 100644
--- a/Source/core/webcore_svg.target.darwin-mips.mk
+++ b/Source/core/webcore_svg.target.darwin-mips.mk
@@ -299,6 +299,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -448,6 +449,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.darwin-x86.mk b/Source/core/webcore_svg.target.darwin-x86.mk
index ea633aa..3a733bd 100644
--- a/Source/core/webcore_svg.target.darwin-x86.mk
+++ b/Source/core/webcore_svg.target.darwin-x86.mk
@@ -302,6 +302,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -455,6 +456,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.linux-arm.mk b/Source/core/webcore_svg.target.linux-arm.mk
index 3324faf..bb10379 100644
--- a/Source/core/webcore_svg.target.linux-arm.mk
+++ b/Source/core/webcore_svg.target.linux-arm.mk
@@ -300,6 +300,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -450,6 +451,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.linux-mips.mk b/Source/core/webcore_svg.target.linux-mips.mk
index 1dfc901..ac17854 100644
--- a/Source/core/webcore_svg.target.linux-mips.mk
+++ b/Source/core/webcore_svg.target.linux-mips.mk
@@ -299,6 +299,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -448,6 +449,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/core/webcore_svg.target.linux-x86.mk b/Source/core/webcore_svg.target.linux-x86.mk
index ea633aa..3a733bd 100644
--- a/Source/core/webcore_svg.target.linux-x86.mk
+++ b/Source/core/webcore_svg.target.linux-x86.mk
@@ -302,6 +302,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -455,6 +456,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/devtools/front_end/DOMAgent.js b/Source/devtools/front_end/DOMAgent.js
index 03c497f..09286b7 100644
--- a/Source/devtools/front_end/DOMAgent.js
+++ b/Source/devtools/front_end/DOMAgent.js
@@ -755,8 +755,7 @@
ChildNodeCountUpdated: "ChildNodeCountUpdated",
UndoRedoRequested: "UndoRedoRequested",
UndoRedoCompleted: "UndoRedoCompleted",
- InspectNodeRequested: "InspectNodeRequested",
- PseudoStateChanged: "PseudoStateChanged"
+ InspectNodeRequested: "InspectNodeRequested"
}
WebInspector.DOMAgent.prototype = {
@@ -1119,17 +1118,6 @@
},
/**
- * @param {!DOMAgent.NodeId} elementId
- */
- _pseudoStateChanged: function(elementId)
- {
- var node = this._idToDOMNode[elementId];
- if (!node)
- return;
- this.dispatchEventToListeners(WebInspector.DOMAgent.Events.PseudoStateChanged, node);
- },
-
- /**
* @param {!WebInspector.DOMNode} node
*/
_unbind: function(node)
@@ -1565,14 +1553,6 @@
pseudoElementRemoved: function(parentId, pseudoElementId)
{
this._domAgent._pseudoElementRemoved(parentId, pseudoElementId);
- },
-
- /**
- * @param {!DOMAgent.NodeId} elementId
- */
- pseudoStateChanged: function(elementId)
- {
- this._domAgent._pseudoStateChanged(elementId);
}
}
diff --git a/Source/devtools/front_end/Drawer.js b/Source/devtools/front_end/Drawer.js
index d51ad37..4e60a51 100644
--- a/Source/devtools/front_end/Drawer.js
+++ b/Source/devtools/front_end/Drawer.js
@@ -213,7 +213,8 @@
*/
function animationCallback(finished)
{
- this._inspectorView.currentPanel().doResize();
+ if (this._inspectorView.currentPanel())
+ this._inspectorView.currentPanel().doResize();
if (!finished)
return;
this._updateTabStrip();
diff --git a/Source/devtools/front_end/StylesSidebarPane.js b/Source/devtools/front_end/StylesSidebarPane.js
index 3bcd543..3a2018b 100644
--- a/Source/devtools/front_end/StylesSidebarPane.js
+++ b/Source/devtools/front_end/StylesSidebarPane.js
@@ -102,7 +102,6 @@
WebInspector.cssModel.addEventListener(WebInspector.CSSStyleModel.Events.MediaQueryResultChanged, this._styleSheetOrMediaQueryResultChanged, this);
WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.AttrModified, this._attributeChanged, this);
WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.AttrRemoved, this._attributeChanged, this);
- WebInspector.domAgent.addEventListener(WebInspector.DOMAgent.Events.PseudoStateChanged, this._pseudoStateChanged, this);
WebInspector.settings.showUserAgentStyles.addChangeListener(this._showUserAgentStylesSettingChanged.bind(this));
WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameResized, this._frameResized, this);
this.element.classList.add("styles-pane");
@@ -444,18 +443,6 @@
this._rebuildUpdate();
},
- _pseudoStateChanged: function(event)
- {
- // Do not update edited element styles under our feet.
- if (this._isEditingStyle || this._userOperation)
- return;
-
- if (!this._canAffectCurrentStyles(event.data))
- return;
-
- this._rebuildUpdate();
- },
-
_canAffectCurrentStyles: function(node)
{
return this.node && (this.node === node || node.parentNode === this.node.parentNode || node.isAncestor(this.node));
diff --git a/Source/devtools/protocol.json b/Source/devtools/protocol.json
index a0e0cd5..1c192fb 100644
--- a/Source/devtools/protocol.json
+++ b/Source/devtools/protocol.json
@@ -2399,14 +2399,6 @@
],
"description": "Called when a pseudo element is removed from an element.",
"hidden": true
- },
- {
- "name": "pseudoStateChanged",
- "parameters": [
- { "name": "nodeId", "$ref": "NodeId", "description": "Id of the element whose pseudo state has changed." }
- ],
- "description": "Called when an element's <code>:active</code>, <code>:focus</code>, or <code>:hover</code> pseudo state is changed.",
- "hidden": true
}
]
},
diff --git a/Source/heap/asm/SaveRegisters_mips.S b/Source/heap/asm/SaveRegisters_mips.S
new file mode 100644
index 0000000..b9948ef
--- /dev/null
+++ b/Source/heap/asm/SaveRegisters_mips.S
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/*
+ * typedef void (*PushAllRegistersCallback)(SafePointBarrier*, ThreadState*, intptr_t*);
+ * extern "C" void pushAllRegisters(SafePointBarrier*, ThreadState*, PushAllRegistersCallback)
+ */
+
+.type pushAllRegisters, %function
+.global pushAllRegisters
+pushAllRegisters:
+ /* FIXME: Implement the actual stub for mips. */
+ jr $ra
diff --git a/Source/heap/asm/SaveRegisters.asm b/Source/heap/asm/SaveRegisters_x86.asm
similarity index 100%
rename from Source/heap/asm/SaveRegisters.asm
rename to Source/heap/asm/SaveRegisters_x86.asm
diff --git a/Source/heap/blink_heap.gypi b/Source/heap/blink_heap.gypi
index 17bc660..3467957 100755
--- a/Source/heap/blink_heap.gypi
+++ b/Source/heap/blink_heap.gypi
@@ -42,13 +42,19 @@
],
'conditions': [
['target_arch == "arm"', {
- 'heap_asm_files': [
- 'asm/SaveRegisters_arm.S',
- ],
- }, { # target_arch != "arm"
- 'heap_asm_files': [
- 'asm/SaveRegisters.asm',
- ],
+ 'heap_asm_files': [
+ 'asm/SaveRegisters_arm.S',
+ ],
+ }],
+ ['target_arch == "mipsel"', {
+ 'heap_asm_files': [
+ 'asm/SaveRegisters_mips.S',
+ ],
+ }],
+ ['target_arch == "ia32" or target_arch == "x64"', {
+ 'heap_asm_files': [
+ 'asm/SaveRegisters_x86.asm',
+ ],
}],
],
},
diff --git a/Source/heap/blink_heap.target.darwin-arm.mk b/Source/heap/blink_heap.target.darwin-arm.mk
index ead0013..3c845c4 100644
--- a/Source/heap/blink_heap.target.darwin-arm.mk
+++ b/Source/heap/blink_heap.target.darwin-arm.mk
@@ -84,6 +84,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -187,6 +188,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap.target.darwin-mips.mk b/Source/heap/blink_heap.target.darwin-mips.mk
index 323510b..f84d6bc 100644
--- a/Source/heap/blink_heap.target.darwin-mips.mk
+++ b/Source/heap/blink_heap.target.darwin-mips.mk
@@ -83,6 +83,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -185,6 +186,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap.target.darwin-x86.mk b/Source/heap/blink_heap.target.darwin-x86.mk
index a76670b..e95547c 100644
--- a/Source/heap/blink_heap.target.darwin-x86.mk
+++ b/Source/heap/blink_heap.target.darwin-x86.mk
@@ -86,6 +86,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -192,6 +193,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap.target.linux-arm.mk b/Source/heap/blink_heap.target.linux-arm.mk
index ead0013..3c845c4 100644
--- a/Source/heap/blink_heap.target.linux-arm.mk
+++ b/Source/heap/blink_heap.target.linux-arm.mk
@@ -84,6 +84,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -187,6 +188,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap.target.linux-mips.mk b/Source/heap/blink_heap.target.linux-mips.mk
index 323510b..f84d6bc 100644
--- a/Source/heap/blink_heap.target.linux-mips.mk
+++ b/Source/heap/blink_heap.target.linux-mips.mk
@@ -83,6 +83,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -185,6 +186,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap.target.linux-x86.mk b/Source/heap/blink_heap.target.linux-x86.mk
index a76670b..e95547c 100644
--- a/Source/heap/blink_heap.target.linux-x86.mk
+++ b/Source/heap/blink_heap.target.linux-x86.mk
@@ -86,6 +86,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -192,6 +193,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/heap/blink_heap_asm_stubs.target.darwin-mips.mk b/Source/heap/blink_heap_asm_stubs.target.darwin-mips.mk
index f6448e3..14b7176 100644
--- a/Source/heap/blink_heap_asm_stubs.target.darwin-mips.mk
+++ b/Source/heap/blink_heap_asm_stubs.target.darwin-mips.mk
@@ -12,34 +12,17 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES :=
-
-### Generated for rule "third_party_WebKit_Source_heap_blink_heap_gyp_blink_heap_asm_stubs_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
- mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o" asm/SaveRegisters.asm
-
-.PHONY: third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
-third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
-
-### Finished generating for all rules
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-LOCAL_GENERATED_SOURCES := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o \
- third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
+LOCAL_GENERATED_SOURCES :=
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-LOCAL_SRC_FILES :=
+LOCAL_SRC_FILES := \
+ third_party/WebKit/Source/heap/asm/SaveRegisters_mips.S
# Flags passed to both C and C++ files.
diff --git a/Source/heap/blink_heap_asm_stubs.target.darwin-x86.mk b/Source/heap/blink_heap_asm_stubs.target.darwin-x86.mk
index 6288906..04f780c 100644
--- a/Source/heap/blink_heap_asm_stubs.target.darwin-x86.mk
+++ b/Source/heap/blink_heap_asm_stubs.target.darwin-x86.mk
@@ -15,27 +15,27 @@
### Generated for rule "third_party_WebKit_Source_heap_blink_heap_gyp_blink_heap_asm_stubs_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-DIA32=1', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
- mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" "-DIA32=1" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o" asm/SaveRegisters.asm
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters_x86.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-DIA32=1', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters_x86.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+ mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" "-DIA32=1" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o" asm/SaveRegisters_x86.asm
.PHONY: third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
-third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o
### Finished generating for all rules
GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+ $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
LOCAL_GENERATED_SOURCES := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o \
+ $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o \
third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
diff --git a/Source/heap/blink_heap_asm_stubs.target.linux-mips.mk b/Source/heap/blink_heap_asm_stubs.target.linux-mips.mk
index f6448e3..14b7176 100644
--- a/Source/heap/blink_heap_asm_stubs.target.linux-mips.mk
+++ b/Source/heap/blink_heap_asm_stubs.target.linux-mips.mk
@@ -12,34 +12,17 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES :=
-
-### Generated for rule "third_party_WebKit_Source_heap_blink_heap_gyp_blink_heap_asm_stubs_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
- mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o" asm/SaveRegisters.asm
-
-.PHONY: third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
-third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
-
-### Finished generating for all rules
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-LOCAL_GENERATED_SOURCES := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o \
- third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
+LOCAL_GENERATED_SOURCES :=
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-LOCAL_SRC_FILES :=
+LOCAL_SRC_FILES := \
+ third_party/WebKit/Source/heap/asm/SaveRegisters_mips.S
# Flags passed to both C and C++ files.
diff --git a/Source/heap/blink_heap_asm_stubs.target.linux-x86.mk b/Source/heap/blink_heap_asm_stubs.target.linux-x86.mk
index 6288906..04f780c 100644
--- a/Source/heap/blink_heap_asm_stubs.target.linux-x86.mk
+++ b/Source/heap/blink_heap_asm_stubs.target.linux-x86.mk
@@ -15,27 +15,27 @@
### Generated for rule "third_party_WebKit_Source_heap_blink_heap_gyp_blink_heap_asm_stubs_target_assemble":
-# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-DIA32=1', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
- mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" "-DIA32=1" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o" asm/SaveRegisters.asm
+# "{'inputs': ['$(gyp_shared_intermediate_dir)/yasm'], 'extension': 'asm', 'process_outputs_as_sources': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o'], 'rule_name': 'assemble', 'rule_sources': ['asm/SaveRegisters_x86.asm'], 'action': ['$(gyp_shared_intermediate_dir)/yasm', '-DIA32=1', '-felf32', '-m', 'x86', '-o', '$(gyp_shared_intermediate_dir)/webcore/heap/%(INPUT_ROOT)s.o', '$(RULE_SOURCES)'], 'message': 'Compile assembly $(RULE_SOURCES)'}":
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_local_path := $(LOCAL_PATH)
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
+$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o: $(LOCAL_PATH)/third_party/WebKit/Source/heap/asm/SaveRegisters_x86.asm $(gyp_shared_intermediate_dir)/yasm $(GYP_TARGET_DEPENDENCIES)
+ mkdir -p $(gyp_shared_intermediate_dir)/webcore/heap; cd $(gyp_local_path)/third_party/WebKit/Source/heap; "$(gyp_shared_intermediate_dir)/yasm" "-DIA32=1" -felf32 -m x86 -o "$(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o" asm/SaveRegisters_x86.asm
.PHONY: third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
-third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger: $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o
### Finished generating for all rules
GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o
+ $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
LOCAL_GENERATED_SOURCES := \
- $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters.o \
+ $(gyp_shared_intermediate_dir)/webcore/heap/SaveRegisters_x86.o \
third_party_WebKit_Source_heap_blink_heap_asm_stubs_gyp_rule_trigger
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
diff --git a/Source/modules/modules.target.darwin-arm.mk b/Source/modules/modules.target.darwin-arm.mk
index 64cf571..a318de8 100644
--- a/Source/modules/modules.target.darwin-arm.mk
+++ b/Source/modules/modules.target.darwin-arm.mk
@@ -353,6 +353,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -491,6 +492,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/modules/modules.target.darwin-mips.mk b/Source/modules/modules.target.darwin-mips.mk
index 9219da8..046bae4 100644
--- a/Source/modules/modules.target.darwin-mips.mk
+++ b/Source/modules/modules.target.darwin-mips.mk
@@ -352,6 +352,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -489,6 +490,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/modules/modules.target.darwin-x86.mk b/Source/modules/modules.target.darwin-x86.mk
index d0c67a4..138e6a7 100644
--- a/Source/modules/modules.target.darwin-x86.mk
+++ b/Source/modules/modules.target.darwin-x86.mk
@@ -355,6 +355,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -496,6 +497,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/modules/modules.target.linux-arm.mk b/Source/modules/modules.target.linux-arm.mk
index 64cf571..a318de8 100644
--- a/Source/modules/modules.target.linux-arm.mk
+++ b/Source/modules/modules.target.linux-arm.mk
@@ -353,6 +353,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -491,6 +492,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/modules/modules.target.linux-mips.mk b/Source/modules/modules.target.linux-mips.mk
index 9219da8..046bae4 100644
--- a/Source/modules/modules.target.linux-mips.mk
+++ b/Source/modules/modules.target.linux-mips.mk
@@ -352,6 +352,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -489,6 +490,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/modules/modules.target.linux-x86.mk b/Source/modules/modules.target.linux-x86.mk
index d0c67a4..138e6a7 100644
--- a/Source/modules/modules.target.linux-x86.mk
+++ b/Source/modules/modules.target.linux-x86.mk
@@ -355,6 +355,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -496,6 +497,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.darwin-arm.mk b/Source/platform/blink_common.target.darwin-arm.mk
index 3c18843..e83baa8 100644
--- a/Source/platform/blink_common.target.darwin-arm.mk
+++ b/Source/platform/blink_common.target.darwin-arm.mk
@@ -87,6 +87,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -215,6 +216,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.darwin-mips.mk b/Source/platform/blink_common.target.darwin-mips.mk
index c648a7e..23a6c24 100644
--- a/Source/platform/blink_common.target.darwin-mips.mk
+++ b/Source/platform/blink_common.target.darwin-mips.mk
@@ -86,6 +86,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -213,6 +214,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.darwin-x86.mk b/Source/platform/blink_common.target.darwin-x86.mk
index ee37ba4..ac2a6f7 100644
--- a/Source/platform/blink_common.target.darwin-x86.mk
+++ b/Source/platform/blink_common.target.darwin-x86.mk
@@ -89,6 +89,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -220,6 +221,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.linux-arm.mk b/Source/platform/blink_common.target.linux-arm.mk
index 3c18843..e83baa8 100644
--- a/Source/platform/blink_common.target.linux-arm.mk
+++ b/Source/platform/blink_common.target.linux-arm.mk
@@ -87,6 +87,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -215,6 +216,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.linux-mips.mk b/Source/platform/blink_common.target.linux-mips.mk
index c648a7e..23a6c24 100644
--- a/Source/platform/blink_common.target.linux-mips.mk
+++ b/Source/platform/blink_common.target.linux-mips.mk
@@ -86,6 +86,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -213,6 +214,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_common.target.linux-x86.mk b/Source/platform/blink_common.target.linux-x86.mk
index ee37ba4..ac2a6f7 100644
--- a/Source/platform/blink_common.target.linux-x86.mk
+++ b/Source/platform/blink_common.target.linux-x86.mk
@@ -89,6 +89,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -220,6 +221,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.darwin-arm.mk b/Source/platform/blink_platform.target.darwin-arm.mk
index f0d53ff..2647039 100644
--- a/Source/platform/blink_platform.target.darwin-arm.mk
+++ b/Source/platform/blink_platform.target.darwin-arm.mk
@@ -471,6 +471,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -615,6 +616,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.darwin-mips.mk b/Source/platform/blink_platform.target.darwin-mips.mk
index 38aa23d..d7992e6 100644
--- a/Source/platform/blink_platform.target.darwin-mips.mk
+++ b/Source/platform/blink_platform.target.darwin-mips.mk
@@ -469,6 +469,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -612,6 +613,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.darwin-x86.mk b/Source/platform/blink_platform.target.darwin-x86.mk
index 1f5d37a..36da235 100644
--- a/Source/platform/blink_platform.target.darwin-x86.mk
+++ b/Source/platform/blink_platform.target.darwin-x86.mk
@@ -472,6 +472,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -619,6 +620,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.linux-arm.mk b/Source/platform/blink_platform.target.linux-arm.mk
index f0d53ff..2647039 100644
--- a/Source/platform/blink_platform.target.linux-arm.mk
+++ b/Source/platform/blink_platform.target.linux-arm.mk
@@ -471,6 +471,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -615,6 +616,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.linux-mips.mk b/Source/platform/blink_platform.target.linux-mips.mk
index 38aa23d..d7992e6 100644
--- a/Source/platform/blink_platform.target.linux-mips.mk
+++ b/Source/platform/blink_platform.target.linux-mips.mk
@@ -469,6 +469,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -612,6 +613,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/blink_platform.target.linux-x86.mk b/Source/platform/blink_platform.target.linux-x86.mk
index 1f5d37a..36da235 100644
--- a/Source/platform/blink_platform.target.linux-x86.mk
+++ b/Source/platform/blink_platform.target.linux-x86.mk
@@ -472,6 +472,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -619,6 +620,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/platform/graphics/ImageDecodingStore.cpp b/Source/platform/graphics/ImageDecodingStore.cpp
index 9add9aa..20ac689 100644
--- a/Source/platform/graphics/ImageDecodingStore.cpp
+++ b/Source/platform/graphics/ImageDecodingStore.cpp
@@ -32,6 +32,9 @@
namespace {
+// Allow up to 128 non-accounted discardable entries. Non-accounted entries are
+// entries that do not contribute to the memory usage of the cache.
+static const size_t maxNonAccountedDiscardableEntries = 128;
// 32MB memory limit for cache.
static const size_t defaultCacheLimitInBytes = 32768 * 1024;
static ImageDecodingStore* s_instance = 0;
@@ -46,7 +49,8 @@
} // namespace
ImageDecodingStore::ImageDecodingStore()
- : m_cacheLimitInBytes(defaultCacheLimitInBytes)
+ : m_discardableEntriesCount(0)
+ , m_cacheLimitInBytes(defaultCacheLimitInBytes)
, m_memoryUsageInBytes(0)
{
}
@@ -345,10 +349,12 @@
template<class T, class U, class V>
void ImageDecodingStore::insertCacheInternal(PassOwnPtr<T> cacheEntry, U* cacheMap, V* identifierMap)
{
- // Usage of discardable memory is not counted because we want to use more
- // than the cache limit allows. Cache limit only applies to non-discardable
- // objects.
- if (!cacheEntry->isDiscardable())
+ if (cacheEntry->isDiscardable()) {
+ ++m_discardableEntriesCount;
+ if (m_discardableEntriesCount <= maxNonAccountedDiscardableEntries)
+ cacheEntry->disableAccounting();
+ }
+ if (cacheEntry->isAccountingEnabled())
incrementMemoryUsage(cacheEntry->memoryUsageInBytes());
// m_orderedCacheList is used to support LRU operations to reorder cache
@@ -368,7 +374,11 @@
template<class T, class U, class V>
void ImageDecodingStore::removeFromCacheInternal(const T* cacheEntry, U* cacheMap, V* identifierMap, Vector<OwnPtr<CacheEntry> >* deletionList)
{
- if (!cacheEntry->isDiscardable())
+ if (cacheEntry->isDiscardable()) {
+ ASSERT(m_discardableEntriesCount > 0);
+ --m_discardableEntriesCount;
+ }
+ if (cacheEntry->isAccountingEnabled())
decrementMemoryUsage(cacheEntry->memoryUsageInBytes());
// Remove entry from identifier map.
diff --git a/Source/platform/graphics/ImageDecodingStore.h b/Source/platform/graphics/ImageDecodingStore.h
index afc4c33..07b1672 100644
--- a/Source/platform/graphics/ImageDecodingStore.h
+++ b/Source/platform/graphics/ImageDecodingStore.h
@@ -161,6 +161,7 @@
: m_generator(generator)
, m_useCount(useCount)
, m_isDiscardable(isDiscardable)
+ , m_isAccountingEnabled(true)
, m_prev(0)
, m_next(0)
{
@@ -177,6 +178,9 @@
void decrementUseCount() { --m_useCount; ASSERT(m_useCount >= 0); }
bool isDiscardable() const { return m_isDiscardable; }
+ void disableAccounting() { m_isAccountingEnabled = false; }
+ bool isAccountingEnabled() const { return m_isAccountingEnabled; }
+
// FIXME: getSafeSize() returns size in bytes truncated to a 32-bits integer.
// Find a way to get the size in 64-bits.
virtual size_t memoryUsageInBytes() const = 0;
@@ -186,6 +190,7 @@
const ImageFrameGenerator* m_generator;
int m_useCount;
bool m_isDiscardable;
+ bool m_isAccountingEnabled;
private:
CacheEntry* m_prev;
@@ -316,6 +321,7 @@
typedef HashMap<const ImageFrameGenerator*, DecoderCacheKeySet> DecoderCacheKeyMap;
DecoderCacheKeyMap m_decoderCacheKeyMap;
+ size_t m_discardableEntriesCount;
size_t m_cacheLimitInBytes;
size_t m_memoryUsageInBytes;
diff --git a/Source/platform/transforms/TranslateTransformOperation.h b/Source/platform/transforms/TranslateTransformOperation.h
index 35f4c6c..ad6e943 100644
--- a/Source/platform/transforms/TranslateTransformOperation.h
+++ b/Source/platform/transforms/TranslateTransformOperation.h
@@ -73,7 +73,7 @@
virtual bool dependsOnBoxSize() const OVERRIDE
{
- return m_x.type() == Percent || m_y.type() == Percent;
+ return m_x.isPercent() || m_y.isPercent();
}
TranslateTransformOperation(const Length& tx, const Length& ty, const Length& tz, OperationType type)
diff --git a/Source/web/webkit.target.darwin-arm.mk b/Source/web/webkit.target.darwin-arm.mk
index 4923812..a62d7ff 100644
--- a/Source/web/webkit.target.darwin-arm.mk
+++ b/Source/web/webkit.target.darwin-arm.mk
@@ -324,6 +324,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -466,6 +467,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/web/webkit.target.darwin-mips.mk b/Source/web/webkit.target.darwin-mips.mk
index 344ffad..0ea3ad2 100644
--- a/Source/web/webkit.target.darwin-mips.mk
+++ b/Source/web/webkit.target.darwin-mips.mk
@@ -323,6 +323,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -464,6 +465,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/web/webkit.target.darwin-x86.mk b/Source/web/webkit.target.darwin-x86.mk
index b884c3f..0caf281 100644
--- a/Source/web/webkit.target.darwin-x86.mk
+++ b/Source/web/webkit.target.darwin-x86.mk
@@ -326,6 +326,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -471,6 +472,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/web/webkit.target.linux-arm.mk b/Source/web/webkit.target.linux-arm.mk
index 4923812..a62d7ff 100644
--- a/Source/web/webkit.target.linux-arm.mk
+++ b/Source/web/webkit.target.linux-arm.mk
@@ -324,6 +324,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -466,6 +467,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/web/webkit.target.linux-mips.mk b/Source/web/webkit.target.linux-mips.mk
index 344ffad..0ea3ad2 100644
--- a/Source/web/webkit.target.linux-mips.mk
+++ b/Source/web/webkit.target.linux-mips.mk
@@ -323,6 +323,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -464,6 +465,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/web/webkit.target.linux-x86.mk b/Source/web/webkit.target.linux-x86.mk
index b884c3f..0caf281 100644
--- a/Source/web/webkit.target.linux-x86.mk
+++ b/Source/web/webkit.target.linux-x86.mk
@@ -326,6 +326,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -471,6 +472,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.darwin-arm.mk b/Source/wtf/wtf.target.darwin-arm.mk
index 07d873e..9279da2 100644
--- a/Source/wtf/wtf.target.darwin-arm.mk
+++ b/Source/wtf/wtf.target.darwin-arm.mk
@@ -161,6 +161,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -264,6 +265,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.darwin-mips.mk b/Source/wtf/wtf.target.darwin-mips.mk
index abb43c9..ae68b90 100644
--- a/Source/wtf/wtf.target.darwin-mips.mk
+++ b/Source/wtf/wtf.target.darwin-mips.mk
@@ -160,6 +160,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -262,6 +263,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.darwin-x86.mk b/Source/wtf/wtf.target.darwin-x86.mk
index d800b09..44f7010 100644
--- a/Source/wtf/wtf.target.darwin-x86.mk
+++ b/Source/wtf/wtf.target.darwin-x86.mk
@@ -163,6 +163,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -269,6 +270,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.linux-arm.mk b/Source/wtf/wtf.target.linux-arm.mk
index 07d873e..9279da2 100644
--- a/Source/wtf/wtf.target.linux-arm.mk
+++ b/Source/wtf/wtf.target.linux-arm.mk
@@ -161,6 +161,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -264,6 +265,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.linux-mips.mk b/Source/wtf/wtf.target.linux-mips.mk
index abb43c9..ae68b90 100644
--- a/Source/wtf/wtf.target.linux-mips.mk
+++ b/Source/wtf/wtf.target.linux-mips.mk
@@ -160,6 +160,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -262,6 +263,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
diff --git a/Source/wtf/wtf.target.linux-x86.mk b/Source/wtf/wtf.target.linux-x86.mk
index d800b09..44f7010 100644
--- a/Source/wtf/wtf.target.linux-x86.mk
+++ b/Source/wtf/wtf.target.linux-x86.mk
@@ -163,6 +163,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
@@ -269,6 +270,7 @@
'-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
'-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
'-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
