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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1387743002: Fixed expando-loss.html test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cache ScriptState and use it to wrap m_defaultVertexArrayObject. Created 5 years, 2 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
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, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 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) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 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 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 4888 matching lines...) Expand 10 before | Expand all | Expand 10 after
4899 { 4899 {
4900 // We don't ASSERT m_ranges.contains(range) to allow us to call this 4900 // We don't ASSERT m_ranges.contains(range) to allow us to call this
4901 // unconditionally to fix: https://bugs.webkit.org/show_bug.cgi?id=26044 4901 // unconditionally to fix: https://bugs.webkit.org/show_bug.cgi?id=26044
4902 m_ranges.remove(range); 4902 m_ranges.remove(range);
4903 } 4903 }
4904 4904
4905 ScriptValue Document::getCSSCanvasContext(ScriptState* scriptState, const String & type, const String& name, int width, int height) 4905 ScriptValue Document::getCSSCanvasContext(ScriptState* scriptState, const String & type, const String& name, int width, int height)
4906 { 4906 {
4907 HTMLCanvasElement& element = getCSSCanvasElement(name); 4907 HTMLCanvasElement& element = getCSSCanvasElement(name);
4908 element.setSize(IntSize(width, height)); 4908 element.setSize(IntSize(width, height));
4909 CanvasRenderingContext* context = element.getCanvasRenderingContext(type, Ca nvasContextCreationAttributes()); 4909 CanvasRenderingContext* context = element.getCanvasRenderingContext(scriptSt ate, type, CanvasContextCreationAttributes());
4910 if (!context) { 4910 if (!context) {
4911 return ScriptValue::createNull(scriptState); 4911 return ScriptValue::createNull(scriptState);
4912 } 4912 }
4913 4913
4914 return ScriptValue(scriptState, toV8(context, scriptState->context()->Global (), scriptState->isolate())); 4914 return ScriptValue(scriptState, toV8(context, scriptState->context()->Global (), scriptState->isolate()));
4915 } 4915 }
4916 4916
4917 HTMLCanvasElement& Document::getCSSCanvasElement(const String& name) 4917 HTMLCanvasElement& Document::getCSSCanvasElement(const String& name)
4918 { 4918 {
4919 RefPtrWillBeMember<HTMLCanvasElement>& element = m_cssCanvasElements.add(nam e, nullptr).storedValue->value; 4919 RefPtrWillBeMember<HTMLCanvasElement>& element = m_cssCanvasElements.add(nam e, nullptr).storedValue->value;
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
5772 #ifndef NDEBUG 5772 #ifndef NDEBUG
5773 using namespace blink; 5773 using namespace blink;
5774 void showLiveDocumentInstances() 5774 void showLiveDocumentInstances()
5775 { 5775 {
5776 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 5776 Document::WeakDocumentSet& set = Document::liveDocumentSet();
5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5777 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5778 for (Document* document : set) 5778 for (Document* document : set)
5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5779 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5780 } 5780 }
5781 #endif 5781 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698