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

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

Issue 7065057: Merge 87802 - 2011-06-01 Shishir Agrawal <shishir@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 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/dom/Document.h ('k') | Source/WebCore/dom/Document.idl » ('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, 2011 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights 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) 2008, 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * 10 *
(...skipping 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 if (!m_frame || !m_frame->page()) 1368 if (!m_frame || !m_frame->page())
1369 return PageVisibilityStateVisible; 1369 return PageVisibilityStateVisible;
1370 return m_frame->page()->visibilityState(); 1370 return m_frame->page()->visibilityState();
1371 } 1371 }
1372 1372
1373 String Document::webkitVisibilityState() const 1373 String Document::webkitVisibilityState() const
1374 { 1374 {
1375 return pageVisibilityStateString(visibilityState()); 1375 return pageVisibilityStateString(visibilityState());
1376 } 1376 }
1377 1377
1378 bool Document::webkitIsVisible() const 1378 bool Document::webkitHidden() const
1379 { 1379 {
1380 return visibilityState() == PageVisibilityStateVisible; 1380 return visibilityState() != PageVisibilityStateVisible;
1381 } 1381 }
1382 1382
1383 void Document::dispatchVisibilityStateChangeEvent() 1383 void Document::dispatchVisibilityStateChangeEvent()
1384 { 1384 {
1385 dispatchEvent(Event::create(eventNames().webkitvisibilitystatechangeEvent, f alse, false)); 1385 dispatchEvent(Event::create(eventNames().webkitvisibilitychangeEvent, false, false));
1386 } 1386 }
1387 #endif 1387 #endif
1388 1388
1389 String Document::nodeName() const 1389 String Document::nodeName() const
1390 { 1390 {
1391 return "#document"; 1391 return "#document";
1392 } 1392 }
1393 1393
1394 Node::NodeType Document::nodeType() const 1394 Node::NodeType Document::nodeType() const
1395 { 1395 {
(...skipping 3759 matching lines...) Expand 10 before | Expand all | Expand 10 after
5155 if (!loader) 5155 if (!loader)
5156 return 0; 5156 return 0;
5157 5157
5158 if (m_frame->document() != this) 5158 if (m_frame->document() != this)
5159 return 0; 5159 return 0;
5160 5160
5161 return loader; 5161 return loader;
5162 } 5162 }
5163 5163
5164 } // namespace WebCore 5164 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/dom/Document.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698