Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(566)

Side by Side Diff: Source/WebCore/dom/Document.h

Issue 10542126: Merge 119158 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 void webkitExitFullscreen(); 1109 void webkitExitFullscreen();
1110 #endif 1110 #endif
1111 1111
1112 // Used to allow element that loads data without going through a FrameLoader to delay the 'load' event. 1112 // Used to allow element that loads data without going through a FrameLoader to delay the 'load' event.
1113 void incrementLoadEventDelayCount() { ++m_loadEventDelayCount; } 1113 void incrementLoadEventDelayCount() { ++m_loadEventDelayCount; }
1114 void decrementLoadEventDelayCount(); 1114 void decrementLoadEventDelayCount();
1115 bool isDelayingLoadEvent() const { return m_loadEventDelayCount; } 1115 bool isDelayingLoadEvent() const { return m_loadEventDelayCount; }
1116 1116
1117 #if ENABLE(TOUCH_EVENTS) 1117 #if ENABLE(TOUCH_EVENTS)
1118 PassRefPtr<Touch> createTouch(DOMWindow*, EventTarget*, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rota tionAngle, float force, ExceptionCode&) const; 1118 PassRefPtr<Touch> createTouch(DOMWindow*, EventTarget*, int identifier, int pageX, int pageY, int screenX, int screenY, int radiusX, int radiusY, float rota tionAngle, float force, ExceptionCode&) const;
1119 PassRefPtr<TouchList> createTouchList(ExceptionCode&) const;
1120 #endif 1119 #endif
1121 1120
1122 const DocumentTiming* timing() const { return &m_documentTiming; } 1121 const DocumentTiming* timing() const { return &m_documentTiming; }
1123 1122
1124 #if ENABLE(REQUEST_ANIMATION_FRAME) 1123 #if ENABLE(REQUEST_ANIMATION_FRAME)
1125 int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>); 1124 int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>);
1126 void webkitCancelAnimationFrame(int id); 1125 void webkitCancelAnimationFrame(int id);
1127 void serviceScriptedAnimations(DOMTimeStamp); 1126 void serviceScriptedAnimations(DOMTimeStamp);
1128 #endif 1127 #endif
1129 1128
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 trackForDebugging(); 1524 trackForDebugging();
1526 #endif 1525 #endif
1527 InspectorCounters::incrementCounter(InspectorCounters::NodeCounter); 1526 InspectorCounters::incrementCounter(InspectorCounters::NodeCounter);
1528 } 1527 }
1529 1528
1530 Node* eventTargetNodeForDocument(Document*); 1529 Node* eventTargetNodeForDocument(Document*);
1531 1530
1532 } // namespace WebCore 1531 } // namespace WebCore
1533 1532
1534 #endif // Document_h 1533 #endif // Document_h
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp ('k') | Source/WebCore/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698