Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 545 virtual WebFrameImplBase* toImplBase() = 0; | 545 virtual WebFrameImplBase* toImplBase() = 0; |
| 546 // TODO(dcheng): Fix const-correctness issues and remove this overload. | 546 // TODO(dcheng): Fix const-correctness issues and remove this overload. |
| 547 virtual const WebFrameImplBase* toImplBase() const | 547 virtual const WebFrameImplBase* toImplBase() const |
| 548 { | 548 { |
| 549 return const_cast<WebFrame*>(this)->toImplBase(); | 549 return const_cast<WebFrame*>(this)->toImplBase(); |
| 550 } | 550 } |
| 551 | 551 |
| 552 // Returns the frame inside a given frame or iframe element. Returns 0 if | 552 // Returns the frame inside a given frame or iframe element. Returns 0 if |
| 553 // the given element is not a frame, iframe or if the frame is empty. | 553 // the given element is not a frame, iframe or if the frame is empty. |
| 554 BLINK_EXPORT static WebFrame* fromFrameOwnerElement(const WebElement&); | 554 BLINK_EXPORT static WebFrame* fromFrameOwnerElement(const WebElement&); |
| 555 BLINK_EXPORT bool canHaveSecureChild(WebString& errorMessage) const; | |
|
alexmos
2016/05/26 22:13:35
Do we need both this and WebDocument::isSecureCont
falken
2016/05/27 05:47:04
I think there's two problems there:
1) isSecureCon
alexmos
2016/05/27 22:44:30
Yeah, I'm curious if the plugin case cares about s
raymes
2016/05/30 01:08:08
The plugin case is just for metrics - we were just
| |
| 555 | 556 |
| 556 #if BLINK_IMPLEMENTATION | 557 #if BLINK_IMPLEMENTATION |
| 557 static WebFrame* fromFrame(Frame*); | 558 static WebFrame* fromFrame(Frame*); |
| 558 | 559 |
| 559 bool inShadowTree() const { return m_scope == WebTreeScopeType::Shadow; } | 560 bool inShadowTree() const { return m_scope == WebTreeScopeType::Shadow; } |
| 560 | 561 |
| 561 static void traceFrames(Visitor*, WebFrame*); | 562 static void traceFrames(Visitor*, WebFrame*); |
| 562 static void traceFrames(InlinedGlobalMarkingVisitor, WebFrame*); | 563 static void traceFrames(InlinedGlobalMarkingVisitor, WebFrame*); |
| 563 void clearWeakFrames(Visitor*); | 564 void clearWeakFrames(Visitor*); |
| 564 void clearWeakFrames(InlinedGlobalMarkingVisitor); | 565 void clearWeakFrames(InlinedGlobalMarkingVisitor); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 598 WebFrame* m_firstChild; | 599 WebFrame* m_firstChild; |
| 599 WebFrame* m_lastChild; | 600 WebFrame* m_lastChild; |
| 600 | 601 |
| 601 WebFrame* m_opener; | 602 WebFrame* m_opener; |
| 602 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker; | 603 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker; |
| 603 }; | 604 }; |
| 604 | 605 |
| 605 } // namespace blink | 606 } // namespace blink |
| 606 | 607 |
| 607 #endif | 608 #endif |
| OLD | NEW |